Bump Yarn to v4 #3612
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,15 +14,21 @@ jobs: | |
| contents: write | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| ref: ${{ github.sha }} | ||
| - 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 | ||
|
|
@@ -38,10 +44,21 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| needs: publish-release | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| ref: ${{ github.sha }} | ||
| - 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 | ||
|
|
@@ -50,7 +67,7 @@ jobs: | |
| fail-on-cache-miss: true | ||
| - name: Dry Run Publish | ||
| # omit npm-token token to perform dry run publish | ||
| uses: MetaMask/action-npm-publish@v5 | ||
|
There was a problem hiding this comment. Nit: Was there a reason for updating to v5 in this PR? Seems like a good idea but it wasn't obvious how that related to the Yarn v4 update. There was a problem hiding this comment. Ah, good question, I didn't highlight this. Yarn v4 now requires passing an |
||
| with: | ||
| slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }} | ||
| subteam: S042S7RE4AE # @metamask-npm-publishers | ||
|
|
@@ -62,18 +79,29 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| needs: publish-npm-dry-run | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| ref: ${{ github.sha }} | ||
| - name: Install Node | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version-file: '.nvmrc' | ||
| - name: Install Yarn | ||
| run: corepack enable | ||
| - name: Restore Yarn cache | ||
Gudahtt marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version-file: '.nvmrc' | ||
| cache: yarn | ||
| - uses: actions/cache@v4 | ||
| with: | ||
| path: | | ||
| ./packages/**/dist | ||
| ./node_modules/.yarn-state.yml | ||
| key: ${{ github.sha }} | ||
| fail-on-cache-miss: true | ||
| - name: Publish | ||
| uses: MetaMask/action-npm-publish@v5 | ||
| with: | ||
| npm-token: ${{ secrets.NPM_TOKEN }} | ||
| env: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,10 @@ | ||
| compressionLevel: mixed | ||
|
There was a problem hiding this comment. These options were added automatically by Yarn 4. As far as I can see, they disable default behavior that would otherwise be turned on: |
||
|
|
||
| enableGlobalCache: false | ||
|
|
||
| enableScripts: false | ||
|
|
||
| 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" | ||
|
There was a problem hiding this comment. All plugins are enabled by default, so there is no need to store these in the repo: yarnpkg/berry#3591 |
||
|
There was a problem hiding this comment. It is no longer necessary to store the Yarn binary in the repo, as Yarn can rely on the version that Corepack installs: yarnpkg/berry#4254 |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -408,6 +408,13 @@ gen_enforced_dependency(WorkspaceCwd, DependencyIdent, CorrectPeerDependencyRang | |
| atom_concat('^', CurrentDependencyVersion, CorrectPeerDependencyRange) | ||
| ). | ||
|
|
||
| % The root workspace (and only the root workspace) needs to specify the Yarn | ||
| % version required for development. | ||
| gen_enforced_field(WorkspaceCwd, 'packageManager', '[email protected]') :- | ||
| WorkspaceCwd == '.'. | ||
| gen_enforced_field(WorkspaceCwd, 'packageManager', null) :- | ||
| WorkspaceCwd \= '.'. | ||
|
|
||
| % All packages must specify a minimum Node version of 18. | ||
| gen_enforced_field(WorkspaceCwd, 'engines.node', '^18.18 || >=20'). | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -60,7 +60,6 @@ | |
| "typedoc": "^0.24.8", | ||
| "typescript": "~4.9.5" | ||
| }, | ||
| "engines": { | ||
| "node": "^18.18 || >=20" | ||
| }, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,7 +65,6 @@ | |
| "typedoc": "^0.24.8", | ||
| "typescript": "~4.9.5" | ||
| }, | ||
| "engines": { | ||
| "node": "^18.18 || >=20" | ||
| }, | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Strange that we're calling
setup-nodehere twiceThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is definitely strange, yes, but there is a reason for it. We need to call it once to be able to use Corepack to install Yarn (recent versions of Node ship with Corepack). However, we can't restore the Yarn cache in this step because we need the correct version of Yarn to do that, and we don't have it yet. So after we install Node once without restoring the Yarn cache, we then install Corepack. Then we run the
setup-nodeaction again, this time restoring the Yarn cache.The alternative for this would be to ship the Yarn binary with the repo as we did before instead of using Corepack. Lego seemed to not like this way because then we need to guarantee that the Yarn binary is correct everywhere (which we never did): MetaMask/metamask-module-template#243 (comment). But we could open up that discussion again.
See relevant module template PRs:
corepack enablebefore installing dependencies metamask-module-template#244