Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ jobs:
name: Publish release
permissions:
contents: write
id-token: write
uses: ./.github/workflows/publish-release.yml
secrets:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
Expand Down
17 changes: 11 additions & 6 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_call:
secrets:
NPM_TOKEN:
required: true
required: false
SLACK_WEBHOOK_URL:
required: true
PUBLISH_DOCS_TOKEN:
Expand Down Expand Up @@ -50,8 +50,7 @@ jobs:
with:
name: publish-release-artifacts-${{ github.sha }}
- name: Dry Run Publish
# omit npm-token token to perform dry run publish
Comment thread
cursor[bot] marked this conversation as resolved.
uses: MetaMask/action-npm-publish@v5
uses: MetaMask/action-npm-publish@v6
Comment thread
Mrtenz marked this conversation as resolved.
with:
slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
subteam: S042S7RE4AE # @metamask-npm-publishers
Expand All @@ -63,6 +62,9 @@ jobs:
needs: publish-npm-dry-run
runs-on: ubuntu-latest
environment: npm-publish
permissions:
contents: read
id-token: write
steps:
- name: Checkout and setup environment
uses: MetaMask/action-checkout-and-setup@v3
Expand All @@ -74,10 +76,13 @@ jobs:
with:
name: publish-release-artifacts-${{ github.sha }}
- name: Publish
uses: MetaMask/action-npm-publish@v5
uses: MetaMask/action-npm-publish@v6
with:
# This `NPM_TOKEN` needs to be manually set per-repository.
# Look in the repository settings under "Environments", and set this token in the `npm-publish` environment.
# This `NPM_TOKEN` needs to be manually set to publish a package for
# the first time only.
# Look in the repository settings under "Environments", and set this
# token in the `npm-publish` environment, and delete it after the
# initial publish.
npm-token: ${{ secrets.NPM_TOKEN }}
env:
SKIP_PREPACK: true
Expand Down
4 changes: 2 additions & 2 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ logFilters:
- code: YN0004
level: discard

nodeLinker: node-modules

# Configure the NPM minimal age gate to 3 days, meaning packages must be at
# least 3 days old to be installed.
npmMinimalAgeGate: 4320 # 3 days (in minutes)
Expand All @@ -26,8 +28,6 @@ npmPreapprovedPackages:
- '@metamask-previews/*'
- '@lavamoat/*'

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"
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,13 @@
"vite": "^8.0.8",
"vitest": "^4.1.4"
},
"resolutions": {
"fflate": "0.8.2"
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we said we wouldn't do this, but it breaks the tests in the module template, making it impossible to merge anything. 😞

},
"engines": {
"node": "^20 || ^22 || >=24"
},
"packageManager": "yarn@4.14.1",
"packageManager": "yarn@4.16.0",
"lavamoat": {
"allowScripts": {
"@lavamoat/preinstall-always-fail": false,
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 9
version: 10
cacheKey: 10

"@aashutoshrathi/word-wrap@npm:^1.2.3":
Expand Down Expand Up @@ -3163,7 +3163,7 @@ __metadata:
languageName: node
linkType: hard

"fflate@npm:^0.8.2":
"fflate@npm:0.8.2":
version: 0.8.2
resolution: "fflate@npm:0.8.2"
checksum: 10/2bd26ba6d235d428de793c6a0cd1aaa96a06269ebd4e21b46c8fd1bd136abc631acf27e188d47c3936db090bf3e1ede11d15ce9eae9bffdc4bfe1b9dc66ca9cb
Expand Down
Loading