-
Notifications
You must be signed in to change notification settings - Fork 16
Dependencies upgrade and module template sync #601
Changes from all commits
8a79524
77eb779
79fdd40
d1dcf99
70668fb
42e9e0c
899f18a
7cca0b9
55c3be3
cb37beb
fd4e72b
5210fff
b9c10cd
c2b6b78
c9e9380
aaba235
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
{ | ||
"ignores": [ | ||
"@lavamoat/allow-scripts", | ||
"@lavamoat/preinstall-always-fail", | ||
"@metamask/auto-changelog", | ||
"@types/*", | ||
"prettier-plugin-packagejson", | ||
"ts-node", | ||
"@storybook/addon-actions", | ||
"@storybook/react-webpack5", | ||
"babel-loader", | ||
"dependency-tree", | ||
"eslint-plugin-node", | ||
"sass", | ||
"webpack", | ||
"@yarnpkg/core", | ||
"@yarnpkg/cli", | ||
"clipanion", | ||
"@yarnpkg/fslib" | ||
Comment on lines
+16
to
+19
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These packages are listed as missing dependencies when they shouldn't be required and are also not listed in the module template There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Resolved by @mcmire comment here https://github.com/MetaMask/design-tokens/pull/600/files#r1474934441 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ah! I see what you mean now. You're right, they aren't in the module template. I notice based on the changelog that |
||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,37 @@ | ||
module.exports = { | ||
root: true, | ||
|
||
extends: ['@metamask/eslint-config', 'plugin:storybook/recommended'], | ||
|
||
overrides: [ | ||
{ | ||
files: ['*.ts'], | ||
extends: ['@metamask/eslint-config-typescript'], | ||
}, | ||
|
||
{ | ||
files: ['*.js'], | ||
parserOptions: { | ||
sourceType: 'script', | ||
}, | ||
extends: ['@metamask/eslint-config-nodejs'], | ||
}, | ||
|
||
{ | ||
files: ['*.test.ts', '*.test.js'], | ||
extends: ['@metamask/eslint-config-jest'], | ||
extends: [ | ||
'@metamask/eslint-config-jest', | ||
'@metamask/eslint-config-nodejs', | ||
], | ||
}, | ||
], | ||
|
||
ignorePatterns: [ | ||
'!.eslintrc.js', | ||
'!.prettierrc.js', | ||
'dist/', | ||
'storybook-static/', | ||
'.yarn/', | ||
'docs/utils/getCSSVariablesFromStylesheet.ts', | ||
], | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,8 @@ | ||
* text=auto | ||
|
||
yarn.lock linguist-generated=false | ||
|
||
# yarn v3 | ||
# See: https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored | ||
/.yarn/releases/** binary | ||
/.yarn/plugins/** binary |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
# Lines starting with '#' are comments. | ||
# Each line is a file pattern followed by one or more owners. | ||
|
||
* @MetaMask/devs | ||
* @MetaMask/engineering |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
## **Description** | ||
|
||
<!-- | ||
Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions: | ||
1. What is the reason for the change? | ||
2. What is the improvement/solution? | ||
--> | ||
|
||
## **Related issues** | ||
|
||
Fixes: | ||
|
||
## **Manual testing steps** | ||
|
||
1. Go to this page... | ||
2. | ||
3. | ||
|
||
## **Screenshots/Recordings** | ||
|
||
<!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> | ||
|
||
### **Before** | ||
|
||
<!-- [screenshots/recordings] --> | ||
|
||
### **After** | ||
|
||
<!-- [screenshots/recordings] --> | ||
|
||
## **Pre-merge author checklist** | ||
|
||
- [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). | ||
- [ ] I've clearly explained what problem this PR is solving and how it is solved. | ||
- [ ] I've linked related issues | ||
- [ ] I've included manual testing steps | ||
- [ ] I've included screenshots/recordings if applicable | ||
- [ ] I’ve included tests if applicable | ||
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable | ||
- [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. | ||
- [ ] I’ve properly set the pull request status: | ||
- [ ] In case it's not yet "ready for review", I've set it to "draft". | ||
- [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". | ||
|
||
## **Pre-merge reviewer checklist** | ||
|
||
- [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). | ||
- [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. |
mcmire marked this conversation as resolved.
Show resolved
Hide resolved
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,34 @@ | ||
name: Build and Deploy Storybook | ||
|
||
on: | ||
push: | ||
branches: | ||
- main | ||
workflow_call: | ||
secrets: | ||
PUBLISH_STORYBOOK_TOKEN: | ||
required: true | ||
|
||
jobs: | ||
build-deploy-storybook: | ||
permissions: | ||
contents: write | ||
runs-on: ubuntu-latest | ||
environment: github-pages | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- name: Checkout the repository | ||
uses: actions/checkout@v3 | ||
- name: Use Node.js | ||
uses: actions/setup-node@v3 | ||
with: | ||
# We check out the pull request's base branch, which will be | ||
# used as the base branch for all git operations. | ||
ref: ${{ github.event.pull_request.base.ref }} | ||
- name: Get Node.js version | ||
id: nvm | ||
run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc) | ||
- uses: actions/setup-node@v2 | ||
node-version-file: '.nvmrc' | ||
cache: 'yarn' | ||
- name: Install npm dependencies | ||
run: yarn --immutable | ||
- name: Run build script | ||
run: yarn build-storybook | ||
- name: Deploy to `storybook-static` directory of `gh-pages` branch | ||
uses: peaceiris/actions-gh-pages@de7ea6f8efb354206b205ef54722213d99067935 | ||
with: | ||
node-version: ${{ steps.nvm.outputs.NODE_VERSION }} | ||
- run: yarn | ||
- uses: MetaMask/action-publish-gh-pages@v2 | ||
with: | ||
build-command: build-storybook | ||
source-directory: storybook-static | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
# This PUBLISH_STORYBOOK_TOKEN needs to be manually set per-repository. | ||
# Look in the repository settings under "Environments", and set this token in the github-pages environment. | ||
personal_token: ${{ secrets.PUBLISH_STORYBOOK_TOKEN }} | ||
publish_dir: ./storybook-static | ||
destination_dir: storybook-static |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
name: Build, Lint, and Test | ||
|
||
on: | ||
workflow_call: | ||
|
||
jobs: | ||
prepare: | ||
name: Prepare | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- name: Use Node.js | ||
uses: actions/setup-node@v3 | ||
with: | ||
node-version-file: '.nvmrc' | ||
cache: 'yarn' | ||
- name: Install Yarn dependencies | ||
run: yarn --immutable | ||
|
||
build: | ||
name: Build | ||
runs-on: ubuntu-latest | ||
needs: | ||
- prepare | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- name: Use Node.js | ||
uses: actions/setup-node@v3 | ||
with: | ||
node-version-file: '.nvmrc' | ||
cache: 'yarn' | ||
- run: yarn --immutable --immutable-cache | ||
- run: yarn build | ||
- name: Require clean working directory | ||
shell: bash | ||
run: | | ||
if ! git diff --exit-code; then | ||
echo "Working tree dirty at end of job" | ||
exit 1 | ||
fi | ||
|
||
lint: | ||
name: Lint | ||
runs-on: ubuntu-latest | ||
needs: | ||
- prepare | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- name: Use Node.js | ||
uses: actions/setup-node@v3 | ||
with: | ||
node-version-file: '.nvmrc' | ||
cache: 'yarn' | ||
- run: yarn --immutable --immutable-cache | ||
- run: yarn lint | ||
- name: Validate RC changelog | ||
if: ${{ startsWith(github.head_ref, 'release/') }} | ||
run: yarn lint:changelog --rc | ||
- name: Validate changelog | ||
if: ${{ !startsWith(github.head_ref, 'release/') }} | ||
run: yarn lint:changelog | ||
- name: Require clean working directory | ||
shell: bash | ||
run: | | ||
if ! git diff --exit-code; then | ||
echo "Working tree dirty at end of job" | ||
exit 1 | ||
fi | ||
|
||
test: | ||
name: Test | ||
runs-on: ubuntu-latest | ||
needs: | ||
- prepare | ||
strategy: | ||
matrix: | ||
node-version: [18.x, 20.x] | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- name: Use Node.js ${{ matrix.node-version }} | ||
uses: actions/setup-node@v3 | ||
with: | ||
node-version: ${{ matrix.node-version }} | ||
cache: 'yarn' | ||
- run: yarn --immutable --immutable-cache | ||
- run: yarn test | ||
- name: Require clean working directory | ||
shell: bash | ||
run: | | ||
if ! git diff --exit-code; then | ||
echo "Working tree dirty at end of job" | ||
exit 1 | ||
fi | ||
|
||
compatibility-test: | ||
name: Compatibility test | ||
runs-on: ubuntu-latest | ||
needs: | ||
- prepare | ||
strategy: | ||
matrix: | ||
node-version: [18.x, 20.x] | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- name: Use Node.js ${{ matrix.node-version }} | ||
uses: actions/setup-node@v3 | ||
with: | ||
node-version: ${{ matrix.node-version }} | ||
cache: 'yarn' | ||
- run: rm yarn.lock && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn | ||
- run: yarn test | ||
- name: Require clean working directory | ||
shell: bash | ||
run: | | ||
git restore yarn.lock | ||
if ! git diff --exit-code; then | ||
echo "Working tree dirty at end of job" | ||
exit 1 | ||
fi |
This file was deleted.
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.
These packages are listed as incorrectly unused dependencies related to storybook when running
yarn lint
this resolves that