Bump Yarn to 4.2.2

This allows us to use newer features of Yarn. For instance, we will be able to write constraints in JavaScript format rather than Prolog.
MetaMask · Jun 6, 2024 · b35e280 · b35e280
1 parent 9f3498a
commit b35e280
Show file tree

Hide file tree

Showing 45 changed files with 4,222 additions and 5,006 deletions.
diff --git a/.github/workflows/ensure-blocking-pr-labels-absent.yml b/.github/workflows/ensure-blocking-pr-labels-absent.yml
@@ -13,13 +13,19 @@ jobs:
     permissions:
       pull-requests: read
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - name: Use Node.js
+        uses: actions/setup-node@v4
         with:
-          cache: yarn
-      - name: Install dependencies
-        run: yarn --immutable
+          node-version-file: '.nvmrc'
+      - name: Install Yarn
+        run: corepack enable
+      - name: Restore Yarn cache
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+      - run: yarn --immutable
       - name: Run command
         uses: actions/github-script@v7
         with:

diff --git a/.github/workflows/lint-build-test.yml b/.github/workflows/lint-build-test.yml
@@ -13,9 +13,15 @@ jobs:
     outputs:
       child-workspace-package-names: ${{ steps.workspace-package-names.outputs.child-workspace-package-names }}
     steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - name: Install Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install Yarn
+        run: corepack enable
+      - name: Restore Yarn cache
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn
@@ -34,9 +40,15 @@ jobs:
       matrix:
         node-version: [20.x]
     steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - name: Install Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install Yarn
+        run: corepack enable
+      - name: Restore Yarn cache
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn
@@ -59,9 +71,15 @@ jobs:
         node-version: [20.x]
         package-name: ${{ fromJson(needs.prepare.outputs.child-workspace-package-names) }}
     steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - name: Install Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install Yarn
+        run: corepack enable
+      - name: Restore Yarn cache
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn
@@ -83,9 +101,15 @@ jobs:
       matrix:
         node-version: [20.x]
     steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - name: Install Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install Yarn
+        run: corepack enable
+      - name: Restore Yarn cache
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn
@@ -108,9 +132,15 @@ jobs:
         node-version: [18.x, 20.x]
         package-name: ${{ fromJson(needs.prepare.outputs.child-workspace-package-names) }}
     steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - name: Install Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install Yarn
+        run: corepack enable
+      - name: Restore Yarn cache
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn

diff --git a/.github/workflows/publish-preview.yml b/.github/workflows/publish-preview.yml
@@ -12,7 +12,7 @@ jobs:
     outputs:
       IS_FORK: ${{ steps.is-fork.outputs.IS_FORK }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Determine whether this PR is from a fork
         id: is-fork
         run: echo "IS_FORK=$(gh pr view --json isCrossRepository --jq '.isCrossRepository' "${PR_NUMBER}" )" >> "$GITHUB_OUTPUT"
@@ -29,14 +29,20 @@ jobs:
     if: ${{ needs.is-fork-pull-request.outputs.IS_FORK == 'false' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Checkout pull request
+      - uses: actions/checkout@v4
+      - name: Check out pull request
         run: gh pr checkout "${PR_NUMBER}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PR_NUMBER: ${{ github.event.issue.number }}
-      - name: Setup Node
-        uses: actions/setup-node@v3
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+      - name: Install Yarn
+        run: corepack enable
+      - name: Restore Yarn cache
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: yarn

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -14,15 +14,21 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.sha }}
-      - name: Setup Node
-        uses: actions/setup-node@v3
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+      - name: Install Yarn
+        run: corepack enable
+      - name: Restore Yarn cache
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: yarn
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ./packages/**/dist
@@ -38,10 +44,21 @@ jobs:
     runs-on: ubuntu-latest
     needs: publish-release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.sha }}
-      - uses: actions/cache@v3
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+      - name: Install Yarn
+        run: corepack enable
+      - name: Restore Yarn cache
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: yarn
+      - uses: actions/cache@v4
         with:
           path: |
             ./packages/**/dist
@@ -62,10 +79,21 @@ jobs:
     runs-on: ubuntu-latest
     needs: publish-npm-dry-run
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.sha }}
-      - uses: actions/cache@v3
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+      - name: Install Yarn
+        run: corepack enable
+      - name: Restore Yarn cache
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: yarn
+      - uses: actions/cache@v4
         with:
           path: |
             ./packages/**/dist

diff --git a/.yarn/plugins/@yarnpkg/plugin-constraints.cjs b/.yarn/plugins/@yarnpkg/plugin-constraints.cjs
diff --git a/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
diff --git a/.yarn/releases/yarn-3.3.0.cjs b/.yarn/releases/yarn-3.3.0.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,6 +1,10 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
 enableScripts: false
 
-enableTelemetry: 0
+enableTelemetry: false
 
 logFilters:
   - code: YN0004
@@ -11,9 +15,3 @@ nodeLinker: node-modules
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-allow-scripts.cjs
     spec: "https://raw.githubusercontent.com/LavaMoat/LavaMoat/main/packages/yarn-plugin-allow-scripts/bundles/@yarnpkg/plugin-allow-scripts.js"
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
-  - path: .yarn/plugins/@yarnpkg/plugin-constraints.cjs
-    spec: "@yarnpkg/plugin-constraints"
-
-yarnPath: .yarn/releases/yarn-3.3.0.cjs
diff --git a/constraints.pro b/constraints.pro
@@ -408,6 +408,9 @@ gen_enforced_dependency(WorkspaceCwd, DependencyIdent, CorrectPeerDependencyRang
       atom_concat('^', CurrentDependencyVersion, CorrectPeerDependencyRange)
   ).
 
+% All packages must specify the exact version of Yarn required for development.
+gen_enforced_field(WorkspaceCwd, 'packageManager', '[email protected]').
+
 % All packages must specify a minimum Node version of 18.
 gen_enforced_field(WorkspaceCwd, 'engines.node', '^18.18 || >=20').
 

diff --git a/docs/contributing.md b/docs/contributing.md
@@ -4,7 +4,8 @@
 
 - Install the current LTS version of [Node.js](https://nodejs.org)
   - If you are using [nvm](https://github.com/creationix/nvm#installation) (recommended) running `nvm install` will install the latest version and running `nvm use` will automatically choose the right node version for you.
-- Install [Yarn v3](https://yarnpkg.com/getting-started/install).
+- Install [Yarn](https://yarnpkg.com) via [Corepack](https://github.com/nodejs/corepack?tab=readme-ov-file#how-to-install)
+  - If you have Yarn installed globally via Homebrew or NPM, you'll need to uninstall it before enabling it via Corepack.
 - Run `yarn install` to install dependencies and run any required post-install scripts.
 - Run `yarn simple-git-hooks` to add a [Git hook](https://github.com/toplenboren/simple-git-hooks#what-is-a-git-hook) to your local development environment which will ensure that all files pass linting before you push a branch.
 

diff --git a/package.json b/package.json
@@ -88,7 +88,7 @@
     "typescript": "~4.9.5",
     "yargs": "^17.7.2"
   },
-  "packageManager": "yarn@3.3.0",
+  "packageManager": "yarn@4.2.2",
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json
@@ -69,6 +69,7 @@
     "@metamask/keyring-controller": "^17.0.0",
     "@metamask/snaps-controllers": "^8.1.1"
   },
+  "packageManager": "[email protected]",
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/address-book-controller/package.json b/packages/address-book-controller/package.json
@@ -55,6 +55,7 @@
     "typedoc-plugin-missing-exports": "^2.0.0",
     "typescript": "~4.9.5"
   },
+  "packageManager": "[email protected]",
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/announcement-controller/package.json b/packages/announcement-controller/package.json
@@ -53,6 +53,7 @@
     "typedoc-plugin-missing-exports": "^2.0.0",
     "typescript": "~4.9.5"
   },
+  "packageManager": "[email protected]",
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/approval-controller/package.json b/packages/approval-controller/package.json
@@ -57,6 +57,7 @@
     "typedoc-plugin-missing-exports": "^2.0.0",
     "typescript": "~4.9.5"
   },
+  "packageManager": "[email protected]",
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json
@@ -94,6 +94,7 @@
     "@metamask/network-controller": "^19.0.0",
     "@metamask/preferences-controller": "^13.0.0"
   },
+  "packageManager": "[email protected]",
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/base-controller/package.json b/packages/base-controller/package.json
@@ -55,6 +55,7 @@
     "typedoc-plugin-missing-exports": "^2.0.0",
     "typescript": "~4.9.5"
   },
+  "packageManager": "[email protected]",
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/build-utils/package.json b/packages/build-utils/package.json
@@ -55,6 +55,7 @@
     "typedoc-plugin-missing-exports": "^2.0.0",
     "typescript": "~4.9.5"
   },
+  "packageManager": "[email protected]",
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/chain-controller/package.json b/packages/chain-controller/package.json
@@ -61,6 +61,7 @@
     "typedoc-plugin-missing-exports": "^2.0.0",
     "typescript": "~4.9.5"
   },
+  "packageManager": "[email protected]",
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/composable-controller/package.json b/packages/composable-controller/package.json
@@ -56,6 +56,7 @@
     "typedoc-plugin-missing-exports": "^2.0.0",
     "typescript": "~4.9.5"
   },
+  "packageManager": "[email protected]",
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json
@@ -62,6 +62,7 @@
     "typedoc-plugin-missing-exports": "^2.0.0",
     "typescript": "~4.9.5"
   },
+  "packageManager": "[email protected]",
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/ens-controller/package.json b/packages/ens-controller/package.json
@@ -61,6 +61,7 @@
   "peerDependencies": {
     "@metamask/network-controller": "^19.0.0"
   },
+  "packageManager": "[email protected]",
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/eth-json-rpc-provider/package.json b/packages/eth-json-rpc-provider/package.json
@@ -60,7 +60,7 @@
     "typedoc": "^0.24.8",
     "typescript": "~4.9.5"
   },
-  "packageManager": "yarn@3.3.0",
+  "packageManager": "yarn@4.2.2",
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/gas-fee-controller/package.json b/packages/gas-fee-controller/package.json
@@ -69,6 +69,7 @@
   "peerDependencies": {
     "@metamask/network-controller": "^19.0.0"
   },
+  "packageManager": "[email protected]",
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/json-rpc-engine/package.json b/packages/json-rpc-engine/package.json
@@ -65,7 +65,7 @@
     "typedoc": "^0.24.8",
     "typescript": "~4.9.5"
   },
-  "packageManager": "yarn@3.3.0",
+  "packageManager": "yarn@4.2.2",
   "engines": {
     "node": "^18.18 || >=20"
   },