diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml index 41b892e9a5..fbd43ab0af 100644 --- a/.github/workflows/buildandtest.yml +++ b/.github/workflows/buildandtest.yml @@ -175,7 +175,7 @@ jobs: name: ts3.8 path: packages/core/ts3.8 - name: Install Global Dependencies - run: npm i -g add yalc + run: npm i -g yalc - name: Type Check working-directory: dev-packages/type-check run: yarn type-check diff --git a/dev-packages/type-check/run-type-check.sh b/dev-packages/type-check/run-type-check.sh index 041cf231e8..71920eff8a 100755 --- a/dev-packages/type-check/run-type-check.sh +++ b/dev-packages/type-check/run-type-check.sh @@ -10,10 +10,14 @@ yalc publish cd "${__dirpath}/ts3.8-test" +# Add yalc package (creates .yalc/ directory and updates package.json) yalc add @sentry/react-native yarn install +# Re-add yalc package to ensure it's in node_modules (yarn might have removed it) +yalc add @sentry/react-native + echo "Removing duplicate React types..." rm -rf ./node_modules/@types/react-native/node_modules/@types/react diff --git a/package.json b/package.json index 016f1a4ae8..bd69d55849 100644 --- a/package.json +++ b/package.json @@ -50,14 +50,14 @@ "performance-tests/TestAppPlain", "performance-tests/TestAppSentry" ], - "//": [ - "Appium has a dependency on @xmldom/xmldom@^0.x, which causes chromedrive build to fail yarn install", - "See: https://github.com/appium/appium-chromedriver/pull/424" - ], "volta": { "node": "18.20.8", "yarn": "3.6.4" }, + "//": [ + "Appium has a dependency on @xmldom/xmldom@^0.x, which causes chromedrive build to fail yarn install", + "See: https://github.com/appium/appium-chromedriver/pull/424" + ], "resolutions": { "appium-chromedriver@npm:5.6.73/@xmldom/xmldom": "0.8.10", "fast-xml-parser": "^5.3.6", diff --git a/packages/core/.npmignore b/packages/core/.npmignore index bf5fdefe0f..cf002a00a5 100644 --- a/packages/core/.npmignore +++ b/packages/core/.npmignore @@ -4,6 +4,8 @@ !LICENSE.md !CHANGELOG.md !README.md +!/dist/ +!/ts3.8/ !/dist/**/* !ts3.8/**/* !RNSentry.podspec diff --git a/packages/core/android/libs/replay-stubs.jar b/packages/core/android/libs/replay-stubs.jar index d9eb509a5c..0f15f49aa4 100644 Binary files a/packages/core/android/libs/replay-stubs.jar and b/packages/core/android/libs/replay-stubs.jar differ diff --git a/yarn.lock b/yarn.lock index 37515be334..388db597e0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20114,14 +20114,22 @@ __metadata: languageName: node linkType: hard +"fast-xml-builder@npm:^1.0.0": + version: 1.0.0 + resolution: "fast-xml-builder@npm:1.0.0" + checksum: d6fb6d860ebb67c0dbec4c91a5cde3bf3e4cc40407db249539fe0d4e98e5c1bc09b3d45e5cbc412aaee8dd16605467f8c054c104fbccba23cf78ec15ff8767ab + languageName: node + linkType: hard + "fast-xml-parser@npm:^5.3.6": - version: 5.3.7 - resolution: "fast-xml-parser@npm:5.3.7" + version: 5.4.1 + resolution: "fast-xml-parser@npm:5.4.1" dependencies: + fast-xml-builder: ^1.0.0 strnum: ^2.1.2 bin: fxparser: src/cli/cli.js - checksum: 0bb307bc63a01c079ae28b6b62eeea0007d787e6ab47dfca493f40305f78aeedea2906b2632bf0eb9d4d868e748c77c70393a808441fb5949c9d2e6f8f2825f0 + checksum: 98b8d2f208dea6be10740509e4ef59dc175584cfb29cb3f82849f0a79645ccaf40916589533029c30b4b47a78e744e8fc08ff468f214a231f450e51f0d8d32c6 languageName: node linkType: hard @@ -32792,15 +32800,15 @@ __metadata: linkType: hard "tar@npm:^7.5.7": - version: 7.5.7 - resolution: "tar@npm:7.5.7" + version: 7.5.9 + resolution: "tar@npm:7.5.9" dependencies: "@isaacs/fs-minipass": ^4.0.0 chownr: ^3.0.0 minipass: ^7.1.2 minizlib: ^3.1.0 yallist: ^5.0.0 - checksum: 82fa04804b6cae4c0b46b84e97a08c39e1c17bb959350baa32d139bcf5e1fc7ebc3ceb72465dd3e2e311992386ecc13599a257d5672158490ceb9464146d5573 + checksum: 26fbbdf536895814167d03e4883f80febb6520729169c54d0f29ee8a163557283862752493f0e5b60800a6f3608aac3250c41fac8e20a4f056ba4fa63f3dbad7 languageName: node linkType: hard