chore: bump Yarn to 4.1.1 (#3004)

.changeset/honest-moles-lay.md

@@ -0,0 +1,2 @@
+---
+---

.github/workflows/pr.yml

@@ -15,17 +15,15 @@ jobs:
           fetch-depth: 0
       - name: Setup the toolchain
         uses: ./.github/actions/setup-toolchain
-      - name: Ensure rnx-kit packages come from our repository
-        run: |
-          if grep 'rnx-kit.*@npm' yarn.lock; then
-            exit 1
-          fi
       - name: Deduplicate packages
         run: |
           yarn dedupe --check
-      - name: Install package dependencies
+      - name: Install npm dependencies
         run: |
           yarn
+      - name: Ensure rnx-kit packages come from our repository
+        run: |
+          node scripts/lint-lockfile.js
       - name: Check for change files
         run: |
           yarn change:check --since origin/${{ github.base_ref }}

.yarnrc.yml

@@ -1,5 +1,8 @@
+compressionLevel: 0
+enableGlobalCache: false
 enableScripts: false
 enableTelemetry: false
+globalFolder: ".yarn/berry" # Workaround for 'EXDEV: cross-device link not permitted' errors on GHA
 logFilters:
   - code: YN0007 # X must be built because it never has been before or the last one failed
     level: discard
@@ -16,6 +19,9 @@ packageExtensions:
     peerDependenciesMeta:
       "@types/react":
         optional: true
+  "@react-native-community/cli-debugger-ui@*":
+    dependencies:
+      "@babel/runtime": ^7.20.0
   "@react-native/babel-plugin-codegen@*":
     peerDependencies:
       "@babel/preset-env": ^7.20.0
@@ -34,9 +40,6 @@ packageExtensions:
   "@react-native/virtualized-lists@*":
     peerDependencies:
       "@babel/runtime": ^7.20.0
-  "@react-native-community/cli-debugger-ui@*":
-    dependencies:
-      "@babel/runtime": ^7.20.0
   babel-plugin-transform-flow-enums@*:
     peerDependencies:
       "@babel/core": ^7.20.0
@@ -74,4 +77,5 @@ packageExtensions:
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-compat.cjs
     spec: "@yarnpkg/plugin-compat"
-yarnPath: .yarn/releases/yarn-3.8.0.cjs
+tsEnableAutoTypes: false
+yarnPath: .yarn/releases/yarn-4.1.1.cjs

docsite/.yarnrc.yml

@@ -1,5 +1,8 @@
+compressionLevel: 0
+enableGlobalCache: false
 enableScripts: false
 enableTelemetry: false
+globalFolder: "../.yarn/berry" # Workaround for 'EXDEV: cross-device link not permitted' errors on GHA
 logFilters:
   - code: YN0007 # X must be built because it never has been before or the last one failed
     level: discard
@@ -23,7 +26,7 @@ packageExtensions:
       algoliasearch: ">= 4.9.1 < 6"
   "@docsearch/react@^3.5":
     dependencies:
-      "@algolia/client-search": "^4.19.1"
+      "@algolia/client-search": ^4.19.1
   "@docusaurus/core@^3.0":
     peerDependencies:
       typescript: ">= 2.7"
@@ -67,4 +70,5 @@ packageExtensions:
     peerDependencies:
       typescript: ">= 2.7"
       webpack: ">= 4"
-yarnPath: ../.yarn/releases/yarn-3.8.0.cjs
+tsEnableAutoTypes: false
+yarnPath: ../.yarn/releases/yarn-4.1.1.cjs

docsite/package.json

@@ -27,7 +27,7 @@
   "engines": {
     "node": ">=18.12"
   },
-  "packageManager": "yarn@3.8.0",
+  "packageManager": "yarn@4.1.1",
   "browserslist": {
     "production": [
       ">0.5%",

package.json

@@ -47,7 +47,7 @@
   "engines": {
     "node": ">=16.13"
   },
-  "packageManager": "yarn@3.8.0",
+  "packageManager": "yarn@4.1.1",
   "resolutions": {
     "@microsoft/eslint-plugin-sdl/eslint-plugin-react": "^7.33.0",
     "@microsoft/eslint-plugin-sdl/eslint-plugin-security": "^1.4.0",

packages/jest-preset/test/index.test.ts

@@ -1,5 +1,5 @@
-import os from "os";
-import path from "path";
+import * as os from "node:os";
+import * as path from "node:path";
 import jestPreset from "../src/index";
 
 function setFixture(name: string): void {
@@ -22,14 +22,16 @@ describe("jest-preset", () => {
     },
     moduleNameMapper: {},
     setupFiles: [
-      expect.stringContaining(path.join(reactNativePath, "jest", "setup.js")),
+      expect.stringMatching(
+        /[/\\]react-native.*?[/\\]package[/\\]jest[/\\]setup\.js$/
+      ),
     ],
-    testEnvironment: expect.stringContaining(
-      path.join(reactNativePath, "jest", "react-native-env.js")
+    testEnvironment: expect.stringMatching(
+      /[/\\]react-native.*?[/\\]package[/\\]jest[/\\]react-native-env\.js$/
     ),
     transform: {
-      "\\.(bmp|gif|jpg|jpeg|mp4|png|psd|svg|webp)$": expect.stringContaining(
-        path.join(reactNativePath, "jest", "assetFileTransformer.js")
+      "\\.(bmp|gif|jpg|jpeg|mp4|png|psd|svg|webp)$": expect.stringMatching(
+        /[/\\]react-native.*?[/\\]package[/\\]jest[/\\]assetFileTransformer\.js$/
       ),
       "\\.[jt]sx?$": "babel-jest",
     },
@@ -160,10 +162,10 @@ describe("jest-preset", () => {
             {
               presets: [
                 [
-                  expect.stringMatching(/[/\\]@babel[/\\]preset-env/),
+                  expect.stringMatching(/[/\\]@babel-preset-env/),
                   { targets: { node: "current" } },
                 ],
-                expect.stringMatching(/[/\\]@babel[/\\]preset-typescript/),
+                expect.stringMatching(/[/\\]@babel-preset-typescript/),
               ],
             },
           ],

packages/test-app/ios/Podfile.lock

@@ -1050,14 +1050,14 @@ PODS:
     - React-jsi (= 0.73.5)
     - React-logger (= 0.73.5)
     - React-perflogger (= 0.73.5)
-  - ReactNativeHost (0.4.4):
+  - ReactNativeHost (0.4.5):
     - React-Core
     - React-cxxreact
     - React-RCTAppDelegate
     - React-RCTFabric
     - ReactCommon/turbomodule/core
     - Yoga
-  - ReactTestApp-DevSupport (3.2.5):
+  - ReactTestApp-DevSupport (3.3.5):
     - React-Core
     - React-jsi
   - ReactTestApp-MSAL (2.1.8):
@@ -1140,7 +1140,7 @@ DEPENDENCIES:
   - React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`)
   - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
-  - "ReactNativeHost (from `../../../node_modules/.store/react-native-test-app-virtual-0e21c93062/node_modules/react-native-test-app/node_modules/@rnx-kit/react-native-host`)"
+  - "ReactNativeHost (from `../../../node_modules/.store/react-native-test-app-virtual-cdbc93cd17/node_modules/@rnx-kit/react-native-host`)"
   - ReactTestApp-DevSupport (from `../node_modules/react-native-test-app`)
   - "ReactTestApp-MSAL (from `../node_modules/@rnx-kit/react-native-test-app-msal`)"
   - ReactTestApp-Resources (from `..`)
@@ -1252,7 +1252,7 @@ EXTERNAL SOURCES:
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
   ReactNativeHost:
-    :path: "../../../node_modules/.store/react-native-test-app-virtual-0e21c93062/node_modules/react-native-test-app/node_modules/@rnx-kit/react-native-host"
+    :path: "../../../node_modules/.store/react-native-test-app-virtual-cdbc93cd17/node_modules/@rnx-kit/react-native-host"
   ReactTestApp-DevSupport:
     :path: "../node_modules/react-native-test-app"
   ReactTestApp-MSAL:
@@ -1317,10 +1317,10 @@ SPEC CHECKSUMS:
   React-runtimescheduler: 7b558337d22a47a270b5c99d8016b5ab743b3035
   React-utils: 987a4526a2fc0acdfaf87888adfe0bf9d0452066
   ReactCommon: dcc87812d79ce368cc41b7cf49fb624cf3c22b6b
-  ReactNativeHost: ea3fff430ebf9c057071a5dff4ef7a75ce8857e3
-  ReactTestApp-DevSupport: 300a04c076acd40b00a1f2160fb1229854934040
+  ReactNativeHost: b2b9c6771473629a28db45c6295d789d553f8512
+  ReactTestApp-DevSupport: 7996b78090b3d5e2e2a49b8ab7fdd84ff91be30f
   ReactTestApp-MSAL: f41794214b301ab1e969a95112e276acc7204a7a
-  ReactTestApp-Resources: ecfced6249be8a1d032cc75c6339538214e2bab1
+  ReactTestApp-Resources: a4cc1f968cd26bdbd18ee0bfbd0ab8dd0ea90101
   RNWWebStorage: 6dca525e55525aa59b6f81d7330d5727d8f0ad5c
   RNXAuth: da888a17b9a0f54908f6daa8b2e020d3585f91cc
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17

packages/test-app/macos/Podfile.lock

@@ -1018,17 +1018,21 @@ PODS:
     - React-jsi (= 0.73.14)
     - React-logger (= 0.73.14)
     - React-perflogger (= 0.73.14)
-  - ReactNativeHost (0.4.2):
+  - ReactNativeHost (0.4.5):
     - React-Core
     - React-cxxreact
     - ReactCommon/turbomodule/core
-  - ReactTestApp-DevSupport (3.1.3):
+  - ReactTestApp-DevSupport (3.3.5):
     - React-Core
     - React-jsi
-  - ReactTestApp-MSAL (2.1.7):
+  - ReactTestApp-MSAL (2.1.8):
     - MSAL
   - ReactTestApp-Resources (1.0.0-dev)
-  - RNXAuth (0.2.5):
+  - RNWWebStorage (0.2.2):
+    - glog
+    - RCT-Folly (= 2022.05.16.00)
+    - React-Core
+  - RNXAuth (0.2.6):
     - React-Core
   - SocketRocket (0.7.0)
   - Yoga (1.14.0)
@@ -1084,10 +1088,11 @@ DEPENDENCIES:
   - React-runtimescheduler (from `../node_modules/react-native-macos/ReactCommon/react/renderer/runtimescheduler`)
   - React-utils (from `../node_modules/react-native-macos/ReactCommon/react/utils`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native-macos/ReactCommon`)
-  - "ReactNativeHost (from `../../../node_modules/.store/react-native-test-app-virtual-dcc392aebd/node_modules/react-native-test-app/node_modules/@rnx-kit/react-native-host`)"
+  - "ReactNativeHost (from `../../../node_modules/.store/react-native-test-app-virtual-cdbc93cd17/node_modules/@rnx-kit/react-native-host`)"
   - ReactTestApp-DevSupport (from `../node_modules/react-native-test-app`)
   - "ReactTestApp-MSAL (from `../node_modules/@rnx-kit/react-native-test-app-msal`)"
   - ReactTestApp-Resources (from `..`)
+  - "RNWWebStorage (from `../node_modules/@react-native-webapis/web-storage`)"
   - "RNXAuth (from `../node_modules/@rnx-kit/react-native-auth`)"
   - SocketRocket (from `../node_modules/react-native-macos/third-party-podspecs/SocketRocket.podspec`)
   - Yoga (from `../node_modules/react-native-macos/ReactCommon/yoga`)
@@ -1192,13 +1197,15 @@ EXTERNAL SOURCES:
   ReactCommon:
     :path: "../node_modules/react-native-macos/ReactCommon"
   ReactNativeHost:
-    :path: "../../../node_modules/.store/react-native-test-app-virtual-dcc392aebd/node_modules/react-native-test-app/node_modules/@rnx-kit/react-native-host"
+    :path: "../../../node_modules/.store/react-native-test-app-virtual-cdbc93cd17/node_modules/@rnx-kit/react-native-host"
   ReactTestApp-DevSupport:
     :path: "../node_modules/react-native-test-app"
   ReactTestApp-MSAL:
     :path: "../node_modules/@rnx-kit/react-native-test-app-msal"
   ReactTestApp-Resources:
     :path: ".."
+  RNWWebStorage:
+    :path: "../node_modules/@react-native-webapis/web-storage"
   RNXAuth:
     :path: "../node_modules/@rnx-kit/react-native-auth"
   SocketRocket:
@@ -1210,7 +1217,7 @@ SPEC CHECKSUMS:
   boost: 0686b6af8cbd638c784fea5afb789be66699823c
   DoubleConversion: ca54355f8932558971f6643521d62b9bc8231cee
   FBLazyVector: 894590de0c3b29e7afb35dd1453bc5c86be6f9cb
-  FBReactNativeSpec: bb23d054b335ef5c969a2102d8322a30ad5fb364
+  FBReactNativeSpec: 7581e5a5c70e2491f254be9f0d8004953bcc827c
   fmt: 03574da4b7ba40de39da59677ca66610ce8c4a02
   glog: 3a72874c0322c7caf24931d3a2777cb7a3090529
   MSAL: 75402959845e55146583efbf37ff4ad90b408630
@@ -1250,16 +1257,17 @@ SPEC CHECKSUMS:
   React-RCTText: 5e456a226626efd96262fba36abaab2b43d440b2
   React-RCTVibration: 81ad73ef5548b14d38e1485cb024dc3c0df731b5
   React-rendererdebug: d9b6b6689349488cd578416e08b6047d1542c69b
-  React-rncore: b7af066be7c9c9191a22665c6f7bc51eea60cda3
+  React-rncore: 32cf204455aa0fb1c7c775d69279a7b839177805
   React-runtimeexecutor: 8ad8c669b133e10fc4b0449a2bebc894cb15ea8f
   React-runtimescheduler: 05be0834ecdc24c7f7c11b9a7d1df428bde8c4f2
   React-utils: 765ee35dea3a549844bd6bc5418881a87f3e72d2
   ReactCommon: bd4c9c2d97f38318f343bdae6752e9f2d45da014
-  ReactNativeHost: 87c7181cb3b0ce016e094ede3cc03b4f61c97dd5
-  ReactTestApp-DevSupport: 70abdd0836d0c3004dca4780b10bd3ca933d3d52
-  ReactTestApp-MSAL: 9d917ca1097f71e53e845466df0e40c6d5b6259a
-  ReactTestApp-Resources: bb546b3a5dca4b7931bee423d4ef28cd94b346cf
-  RNXAuth: 143c5c98a5123d590a6ad6b79afcda3e28b6c57e
+  ReactNativeHost: ef266683ed8fa40fe48438b3f2ef0b5e3bb72201
+  ReactTestApp-DevSupport: 7996b78090b3d5e2e2a49b8ab7fdd84ff91be30f
+  ReactTestApp-MSAL: f41794214b301ab1e969a95112e276acc7204a7a
+  ReactTestApp-Resources: 23ebf203a76bfaa5b08de3118ae3daa2baa25478
+  RNWWebStorage: 1b0a56ca5a3994c88a46f69e26374787f0b0bf87
+  RNXAuth: da888a17b9a0f54908f6daa8b2e020d3585f91cc
   SocketRocket: f6c6249082c011e6de2de60ed641ef8bbe0cfac9
   Yoga: be49bbfe083338605b543c38aba44c90ac3a18a5
 

packages/test-app/package.json

@@ -62,7 +62,7 @@
     "eslint": "^8.56.0",
     "jest": "^29.2.1",
     "prettier": "^3.0.0",
-    "react-native-test-app": "^3.0.0",
+    "react-native-test-app": "^3.3.5",
     "react-test-renderer": "18.2.0",
     "typescript": "^5.0.0"
   },

scripts/align-deps-preset.cjs

@@ -91,7 +91,7 @@ const profile = {
   },
   "test-app": {
     name: "react-native-test-app",
-    version: "^3.0.0",
+    version: "^3.3.5",
     devOnly: true,
   },
   typescript: {

scripts/lint-lockfile.js

@@ -0,0 +1,16 @@
+// @ts-check
+import yaml from "js-yaml";
+import * as fs from "node:fs";
+
+const yml = fs.readFileSync("yarn.lock", { encoding: "utf-8" });
+const lockfile = /** @type {Record<string, Record<string, string>>} */ (
+  yaml.load(yml)
+);
+process.exitCode = Object.entries(lockfile).reduce((error, [key, pkg]) => {
+  if (key.includes("@rnx-kit") && pkg.version !== "0.0.0-use.local") {
+    console.error(`${key}: resolved to npm:${pkg.version}`);
+    return error + 1;
+  } else {
+    return error;
+  }
+}, 0);

scripts/package.json

@@ -18,6 +18,7 @@
     "esbuild": "^0.20.0",
     "eslint": "^8.56.0",
     "jest": "^29.2.1",
+    "js-yaml": "^4.1.0",
     "markdown-table": "^3.0.0",
     "prettier": "^3.0.0",
     "typedoc": "^0.25.0",
@@ -28,6 +29,7 @@
     "@eslint/js": "^8.33.0",
     "@rnx-kit/tsconfig": "workspace:*",
     "@types/jest": "^29.2.1",
+    "@types/js-yaml": "^4.0.5",
     "@types/node": "^20.0.0",
     "@types/yargs": "^16.0.0"
   }