Update Yarn to version Berry

facebook · Apr 7, 2022 · 559b64d · 559b64d
1 parent f56dfe9
commit 559b64d
Show file tree

Hide file tree

Showing 23 changed files with 24,745 additions and 17,414 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,7 +16,7 @@ aliases:
     restore_cache:
       name: Restore node_modules cache
       keys:
-        - v2-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}-{{ checksum "workspace_info.txt" }}-node-modules
+        - v2-node-{{ arch }}-{{ .Branch }}-{{ checksum "/tmp/checksum.txt" }}-node-modules
 
   - &TEST_PARALLELISM 20
 
@@ -46,23 +46,25 @@ jobs:
       - *restore_yarn_cache
       - run:
           name: Install Packages
-          command: yarn --frozen-lockfile --cache-folder ~/.cache/yarn
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
+          command: yarn --immutable --immutable-cache --check-cache
+      - run:
+          name: Generate cache key
+          command: ./scripts/circleci/checksum.sh /tmp/checksum.txt
       - save_cache:
           # Store the yarn cache globally for all lock files with this same
           # checksum. This will speed up the setup job for all PRs where the
           # lockfile is the same.
           name: Save yarn cache for future installs
           key: v2-node-{{ arch }}-{{ checksum "yarn.lock" }}-yarn
           paths:
-            - ~/.cache/yarn
+            - ~/.yarn/berry/cache
       - save_cache:
           # Store node_modules for all jobs in this workflow so that they don't
           # need to each run a yarn install for each job. This will speed up
-          # all jobs run on this branch with the same lockfile.
+          # all jobs run on this branch with the same lockfile. Because of yarn workspaces info is deprecated, all yarn.lock and package.json files are checksummed.
           name: Save node_modules cache
           # This cache key is per branch, a yarn install in setup is required.
-          key: v2-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}-{{ checksum "workspace_info.txt" }}-node-modules
+          key: v2-node-{{ arch }}-{{ .Branch }}-{{ checksum "/tmp/checksum.txt" }}-node-modules
           paths:
             - node_modules
 
@@ -72,7 +74,6 @@ jobs:
 
     steps:
       - checkout
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run: node ./scripts/prettier/index
       - run: node ./scripts/tasks/eslint
@@ -87,7 +88,6 @@ jobs:
 
     steps:
       - checkout
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run: node ./scripts/tasks/flow-ci
 
@@ -97,7 +97,6 @@ jobs:
 
     steps:
       - checkout
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run:
           command: |
@@ -114,7 +113,6 @@ jobs:
     parallelism: 40
     steps:
       - checkout
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run: yarn build-combined
       - persist_to_workspace:
@@ -153,7 +151,6 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run: echo "<< pipeline.git.revision	>>" >> build/COMMIT_SHA
         # Compress build directory into a single tarball for easy download
@@ -173,7 +170,6 @@ jobs:
       - attach_workspace:
           at: .
       - run: echo "<< pipeline.git.revision	>>" >> build/COMMIT_SHA
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run:
           command: node ./scripts/tasks/danger
@@ -185,11 +181,10 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run:
           name: Install Packages
-          command: yarn --frozen-lockfile --cache-folder ~/.cache/yarn
+          command: yarn --immutable
       - run:
           environment:
             RELEASE_CHANNEL: experimental
@@ -204,16 +199,15 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run:
           name: Install Packages
-          command: yarn --frozen-lockfile --cache-folder ~/.cache/yarn
+          command: yarn --immutable
       - run:
           name: Playwright install deps
           command: |
-            npx playwright install
-            sudo npx playwright install-deps
+            yarn dlx playwright install
+            sudo yarn dlx playwright install-deps
       - run:
           environment:
             RELEASE_CHANNEL: experimental
@@ -226,7 +220,6 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run: yarn lint-build
 
@@ -237,7 +230,6 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run: yarn check-release-dependencies
 
@@ -248,7 +240,6 @@ jobs:
     steps:
       - checkout
       - attach_workspace: *attach_workspace
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run:
           name: Search build artifacts for unminified errors
@@ -265,7 +256,6 @@ jobs:
         type: string
     steps:
       - checkout
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run: yarn test <<parameters.args>> --ci
 
@@ -280,11 +270,10 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run:
           name: Install nested packages from Yarn cache
-          command: yarn --frozen-lockfile --cache-folder ~/.cache/yarn
+          command: yarn --immutable
       - run: yarn test --build <<parameters.args>> --ci
 
   RELEASE_CHANNEL_stable_yarn_test_dom_fixtures:
@@ -294,15 +283,14 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run:
           name: Run DOM fixture tests
           environment:
             RELEASE_CHANNEL: stable
           command: |
             cd fixtures/dom
-            yarn --frozen-lockfile
+            yarn
             yarn prestart
             yarn test --maxWorkers=2
 
@@ -311,7 +299,6 @@ jobs:
     environment: *environment
     steps:
       - checkout
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run:
           name: Run fuzz tests
@@ -331,7 +318,6 @@ jobs:
     environment: *environment
     steps:
       - checkout
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run:
           name: Run publish script
@@ -350,7 +336,6 @@ jobs:
     environment: *environment
     steps:
       - checkout
-      - run: yarn workspaces info | head -n -1 > workspace_info.txt
       - *restore_node_modules
       - run:
           name: Confirm reconciler forks are the same

diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,13 @@ chrome-user-data
 .vscode
 *.swp
 *.swo
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
 
 packages/react-devtools-core/dist
 packages/react-devtools-extensions/chrome/build

diff --git a/.yarn/releases/yarn-3.2.0.cjs b/.yarn/releases/yarn-3.2.0.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,4 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.2.0.cjs
+enableGlobalCache: true
diff --git a/appveyor.yml b/appveyor.yml
@@ -26,7 +26,7 @@ deploy: off
 
 install:
   - ps: Install-Product node $env:nodejs_version $env:platform
-  - yarn install --frozen-lockfile
+  - yarn --immutable
 
 test_script:
   - node --version

diff --git a/package.json b/package.json
@@ -149,5 +149,6 @@
   },
   "resolutions": {
     "react-is": "npm:react-is"
-  }
+  },
+  "packageManager": "[email protected]"
 }
diff --git a/packages/jest-mock-scheduler/package.json b/packages/jest-mock-scheduler/package.json
@@ -5,8 +5,8 @@
   "description": "Jest matchers and utilities for testing the scheduler package.",
   "main": "index.js",
   "repository": {
-    "type" : "git",
-    "url" : "https://github.com/facebook/react.git",
+    "type": "git",
+    "url": "https://github.com/facebook/react.git",
     "directory": "packages/jest-mock-scheduler"
   },
   "keywords": [

diff --git a/packages/react-cache/package.json b/packages/react-cache/package.json
@@ -4,8 +4,8 @@
   "description": "A basic cache for React applications",
   "version": "2.0.0-alpha.0",
   "repository": {
-    "type" : "git",
-    "url" : "https://github.com/facebook/react.git",
+    "type": "git",
+    "url": "https://github.com/facebook/react.git",
     "directory": "packages/react-cache"
   },
   "files": [

diff --git a/packages/react-client/package.json b/packages/react-client/package.json
@@ -16,8 +16,8 @@
     "cjs/"
   ],
   "repository": {
-    "type" : "git",
-    "url" : "https://github.com/facebook/react.git",
+    "type": "git",
+    "url": "https://github.com/facebook/react.git",
     "directory": "packages/react-client"
   },
   "engines": {

diff --git a/packages/react-debug-tools/package.json b/packages/react-debug-tools/package.json
@@ -17,8 +17,8 @@
   ],
   "main": "index.js",
   "repository": {
-    "type" : "git",
-    "url" : "https://github.com/facebook/react.git",
+    "type": "git",
+    "url": "https://github.com/facebook/react.git",
     "directory": "packages/react-debug-tools"
   },
   "engines": {

diff --git a/packages/react-devtools/package.json b/packages/react-devtools/package.json
@@ -8,9 +8,7 @@
     "url": "https://github.com/facebook/react.git",
     "directory": "packages/react-devtools"
   },
-  "bin": {
-    "react-devtools": "./bin.js"
-  },
+  "bin": "./bin.js",
   "files": [
     "bin.js",
     "app.html",

diff --git a/packages/react-fetch/package.json b/packages/react-fetch/package.json
@@ -3,8 +3,8 @@
   "description": "Helpers for creating React data sources",
   "version": "0.0.0",
   "repository": {
-    "type" : "git",
-    "url" : "https://github.com/facebook/react.git",
+    "type": "git",
+    "url": "https://github.com/facebook/react.git",
     "directory": "packages/react-fetch"
   },
   "files": [

diff --git a/packages/react-fs/package.json b/packages/react-fs/package.json
@@ -3,8 +3,8 @@
   "description": "React bindings for the filesystem",
   "version": "0.0.0",
   "repository": {
-    "type" : "git",
-    "url" : "https://github.com/facebook/react.git",
+    "type": "git",
+    "url": "https://github.com/facebook/react.git",
     "directory": "packages/react-fs"
   },
   "files": [

diff --git a/packages/react-native-renderer/package.json b/packages/react-native-renderer/package.json
@@ -3,8 +3,8 @@
   "version": "16.0.0",
   "private": true,
   "repository": {
-    "type" : "git",
-    "url" : "https://github.com/facebook/react.git",
+    "type": "git",
+    "url": "https://github.com/facebook/react.git",
     "directory": "packages/react-native-renderer"
   },
   "dependencies": {

diff --git a/packages/react-noop-renderer/package.json b/packages/react-noop-renderer/package.json
@@ -5,14 +5,14 @@
   "description": "React package for testing the Fiber, Fizz and Flight reconcilers.",
   "main": "index.js",
   "repository": {
-    "type" : "git",
-    "url" : "https://github.com/facebook/react.git",
+    "type": "git",
+    "url": "https://github.com/facebook/react.git",
     "directory": "packages/react-noop-renderer"
   },
   "license": "MIT",
   "dependencies": {
-    "react-reconciler": "*",
     "react-client": "*",
+    "react-reconciler": "*",
     "react-server": "*"
   },
   "peerDependencies": {

diff --git a/packages/react-pg/package.json b/packages/react-pg/package.json
@@ -3,8 +3,8 @@
   "description": "React bindings for PostgreSQL",
   "version": "0.0.0",
   "repository": {
-    "type" : "git",
-    "url" : "https://github.com/facebook/react.git",
+    "type": "git",
+    "url": "https://github.com/facebook/react.git",
     "directory": "packages/react-pg"
   },
   "files": [
@@ -28,7 +28,7 @@
     "./package.json": "./package.json"
   },
   "peerDependencies": {
-    "react": "^17.0.0",
-    "pg": "*"
+    "pg": "*",
+    "react": "^17.0.0"
   }
 }
diff --git a/packages/react-server-dom-relay/package.json b/packages/react-server-dom-relay/package.json
@@ -3,8 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "repository": {
-    "type" : "git",
-    "url" : "https://github.com/facebook/react.git",
+    "type": "git",
+    "url": "https://github.com/facebook/react.git",
     "directory": "packages/react-server-dom-relay"
   },
   "dependencies": {