-
Notifications
You must be signed in to change notification settings - Fork 563
chore: Move from yarn to pnpm #2602
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
7f8f629
1a5363a
140df5c
9c3bf72
13f8fd5
30bd95a
ca358de
65a0264
a02478d
cd17fea
94928d3
06c438f
3dd6109
57df6ad
1328488
a11943f
7c0d89a
3e9bf83
eab805d
93ef342
5fef10f
17cb86b
be30722
17dc652
2c54fef
e3f114d
53e3c8d
cb0a45f
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 |
---|---|---|
|
@@ -49,7 +49,7 @@ jobs: | |
run: | | ||
export VERSION=${{ steps.branch_env.outputs.version }} | ||
sudo gem install --no-document fpm | ||
git clone https://github.com/api7/apisix-build-tools.git | ||
git clone https://github.com/FangSen9000/apisix-build-tools.git | ||
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. Note that we should let the API7 community merge my changes to the build script before merging this pr. |
||
|
||
# move codes under build tool | ||
mkdir ./apisix-build-tools/apisix-dashboard | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,8 +49,9 @@ jobs: | |
uses: actions/setup-node@v3 | ||
with: | ||
node-version: 16.x | ||
cache: 'yarn' | ||
cache-dependency-path: web/yarn.lock | ||
|
||
- name: Install PNPM | ||
run: npm i -g [email protected] | ||
|
||
- name: Setup golang environment | ||
uses: actions/setup-go@v3 | ||
|
@@ -84,14 +85,20 @@ jobs: | |
cypress-${{ runner.os }}-cypress-cache0 | ||
|
||
- name: Install dependencies | ||
run: yarn | ||
run: pnpm install --unsafe-perm | ||
|
||
- name: Install Cypress binary | ||
run: pnpx cypress install | ||
|
||
- run: pnpx browserslist@latest --update-db | ||
- run: npx browserslist@latest --update-db | ||
|
||
- name: Start frontend then test | ||
run: | | ||
yarn start-server-and-test 'cross-env SERVE_ENV=test UMI_UI=none MOCK=none SERVE_URL_TEST=http://localhost:9000 yarn start' http-get://localhost:8000 'cross-env CYPRESS_SERVE_ENV=test SERVE_URL_TEST=http://localhost:9000 yarn cypress run --spec "**/e2e/${{matrix.folderPrefix}}/**.cy.js"' | ||
pnpm start-server-and-test 'cross-env SERVE_ENV=test UMI_UI=none MOCK=none SERVE_URL_TEST=http://localhost:9000 pnpm start' http-get://localhost:8000 'cross-env CYPRESS_SERVE_ENV=test SERVE_URL_TEST=http://localhost:9000 pnpm cypress run --spec "**/e2e/${{matrix.folderPrefix}}/**.cy.js"' | ||
|
||
- name: Report e2e coverage | ||
run: npx nyc report --reporter=text-summary | ||
run: pnpx nyc report --reporter=text-summary | ||
|
||
- name: Upload coverage to Codecov | ||
run: | | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,8 +42,16 @@ jobs: | |
uses: actions/setup-node@v3 | ||
with: | ||
node-version: 16.x | ||
cache: 'yarn' | ||
cache-dependency-path: web/yarn.lock | ||
|
||
- name: Install PNPM | ||
run: npm i -g [email protected] | ||
|
||
- name: Change the NPM Settings for PNPM | ||
run: npm config set strict-peer-dependencies=false | ||
- run: npm config set auto-install-peers=true | ||
|
||
- name: Install dependencies | ||
run: pnpm install --unsafe-perm | ||
|
||
- name: Setup golang environment | ||
uses: actions/setup-go@v3 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -37,18 +37,23 @@ jobs: | |
uses: actions/setup-node@v3 | ||
with: | ||
node-version: ${{ matrix.node-version }} | ||
cache: 'yarn' | ||
cache-dependency-path: web/yarn.lock | ||
|
||
- name: Install PNPM | ||
run: npm i -g [email protected] | ||
|
||
- name: Change the NPM Settings for PNPM | ||
run: npm config set strict-peer-dependencies=false | ||
- run: npm config set auto-install-peers=true | ||
|
||
# Install dependencies | ||
- name: Install dependencies | ||
working-directory: web | ||
run: CYPRESS_INSTALL_BINARY=0 yarn | ||
run: CYPRESS_INSTALL_BINARY=0 pnpm install --unsafe-perm | ||
|
||
- name: Lint | ||
working-directory: web | ||
run: yarn run lint:js && yarn run lint:style | ||
run: pnpm lint:js && pnpm lint:style | ||
|
||
- name: Build the Dashboard | ||
working-directory: web | ||
run: yarn build | ||
run: pnpm build |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,4 +2,4 @@ | |
. "$(dirname "$0")/_/husky.sh" | ||
|
||
cd web | ||
yarn lint-staged | ||
pnpm lint-staged |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,6 +16,6 @@ Dockerfile* | |
LICENSE | ||
.eslintcache | ||
*.lock | ||
yarn-error.log | ||
pnpm-error.log | ||
.history | ||
CNAME |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,41 +5,42 @@ | |
"description": "Dashboard for Apache APISIX", | ||
"scripts": { | ||
"prepare": "cd .. && husky install web/.husky", | ||
"analyze": "cross-env ANALYZE=1 yarn run build", | ||
"build": "cp -R ./node_modules/monaco-editor ./public/ && umi build", | ||
"dev": "yarn run start:dev", | ||
"fetch:blocks": "pro fetch-blocks --branch antd@4 && yarn run prettier", | ||
"analyze": "cross-env ANALYZE=1 pnpm run build", | ||
"build": "cp -R ./node_modules/.pnpm/[email protected]/node_modules/monaco-editor ./public/ && umi build", | ||
"dev": "pnpm run start:dev", | ||
"fetch:blocks": "pro fetch-blocks --branch antd@4 && pnpm run prettier", | ||
"i18n-remove": "pro i18n-remove --locale=zh-CN --write", | ||
"postinstall": "umi g tmp", | ||
"lint": "umi g tmp && yarn run lint:js && yarn run lint:style && yarn run lint:prettier", | ||
"lint": "umi g tmp && pnpm run lint:js && pnpm run lint:style && pnpm run lint:prettier", | ||
"lint-staged": "lint-staged", | ||
"lint-staged:js": "eslint --ext .js,.jsx,.ts,.tsx ", | ||
"lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src && yarn run lint:style", | ||
"lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src && pnpm run lint:style", | ||
"lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src", | ||
"lint:prettier": "prettier --check \"**/*\" --end-of-line auto", | ||
"lint:style": "stylelint --fix \"src/**/*.less\"", | ||
"prettier": "prettier -c --write \"**/*\"", | ||
"site": "yarn run fetch:blocks && yarn run build", | ||
"start": "cp -R ./node_modules/monaco-editor ./public/ && umi dev", | ||
"start:e2e": "cross-env SERVE_ENV=test yarn run start", | ||
"test:e2e": "start-server-and-test 'cross-env SERVE_ENV=test yarn start' http-get://localhost:8000 cypress:run-ci", | ||
"test-plugin:e2e": "start-server-and-test 'cross-env SERVE_ENV=test yarn start' http-get://localhost:8000 cypress:run-plugin-ci", | ||
"start:dev": "cross-env REACT_APP_ENV=dev MOCK=none yarn run start", | ||
"start:no-mock": "cross-env MOCK=none yarn run start", | ||
"start:no-ui": "cross-env UMI_UI=none yarn run start", | ||
"start:pre": "cross-env REACT_APP_ENV=pre yarn run start", | ||
"start:test": "cross-env REACT_APP_ENV=test MOCK=none yarn run start", | ||
"site": "pnpm run fetch:blocks && pnpm run build", | ||
"start": "cp -R ./node_modules/.pnpm/[email protected]/node_modules/monaco-editor ./public/ && umi dev", | ||
"start:umi-dev": "umi dev", | ||
"start:e2e": "cross-env SERVE_ENV=test pnpm run start", | ||
"test:e2e": "start-server-and-test 'cross-env SERVE_ENV=test pnpm start' http-get://localhost:8000 cypress:run-ci", | ||
"test-plugin:e2e": "start-server-and-test 'cross-env SERVE_ENV=test pnpm start' http-get://localhost:8000 cypress:run-plugin-ci", | ||
"start:dev": "cross-env REACT_APP_ENV=dev MOCK=none pnpm run start", | ||
"start:no-mock": "cross-env MOCK=none pnpm run start", | ||
"start:no-ui": "cross-env UMI_UI=none pnpm run start", | ||
"start:pre": "cross-env REACT_APP_ENV=pre pnpm run start", | ||
"start:test": "cross-env REACT_APP_ENV=test MOCK=none pnpm run start", | ||
"test:component": "umi test ./src/components", | ||
"tsc": "tsc", | ||
"cypress:open": "cross-env CYPRESS_SERVE_ENV=test cypress open", | ||
"cypress:open-dev": "cross-env CYPRESS_SERVE_ENV=dev cypress open", | ||
"cypress:run-ci": "cross-env CYPRESS_SERVE_ENV=test cypress run", | ||
"cypress:run-plugin-ci": "cross-env CYPRESS_SERVE_ENV=test cypress run --spec 'cypress/e2e/plugin/*.cy.js'" | ||
"cypress:run-ci": "cross-env CYPRESS_SERVE_ENV=test cypress run --browser chrome", | ||
"cypress:run-plugin-ci": "cross-env CYPRESS_SERVE_ENV=test cypress run --browser chrome --spec 'cypress/e2e/plugin/*.cy.js'" | ||
}, | ||
"license": "Apache-2.0", | ||
"lint-staged": { | ||
"**/*.less": "stylelint", | ||
"**/*.{js,jsx,ts,tsx}": "yarn run lint-staged:js", | ||
"**/*.{js,jsx,ts,tsx}": "pnpm run lint-staged:js", | ||
"**/*.{js,jsx,tsx,ts,less,md,json}": [ | ||
"prettier --write" | ||
] | ||
|
@@ -55,17 +56,25 @@ | |
"@ant-design/pro-table": "2.30.1", | ||
"@antv/x6": "^1.18.5", | ||
"@antv/x6-react-components": "^1.1.7", | ||
"@babel/core": "^7.0.1", | ||
"@babel/preset-env": "^7.0.0", | ||
"@babel/runtime-corejs2": "^7.10.3", | ||
"@monaco-editor/react": "^4.3.1", | ||
"@rjsf/antd": "2.2.0", | ||
"@rjsf/core": "2.2.0", | ||
"@types/js-yaml": "^4.0.0", | ||
"@umijs/route-utils": "^2.2.0", | ||
"ajv": "^7.0.3", | ||
"ajv-formats": "^1.5.1", | ||
"antd": "^4.4.0", | ||
"antd-dayjs-webpack-plugin": "1.0.0", | ||
"babel-loader": "^8.0.2", | ||
"base-64": "^1.0.0", | ||
"classnames": "^2.2.6", | ||
"dayjs": "1.8.28", | ||
"core-js": "^2.5.7", | ||
"dayjs": "1.8.30", | ||
"dotenv": "^16.0.1", | ||
"dva-core": "1.6.0-beta.7", | ||
"file-saver": "^2.0.5", | ||
"js-beautify": "^1.13.0", | ||
"js-yaml": "^4.0.0", | ||
|
@@ -76,17 +85,25 @@ | |
"path-to-regexp": "2.4.0", | ||
"qs": "^6.9.0", | ||
"query-string": "^6.13.7", | ||
"re2": "^1.15.4", | ||
"react": "^16.8.6", | ||
"react-copy-to-clipboard": "^5.0.3", | ||
"react-device-detect": "^1.12.1", | ||
"react-dom": "^16.8.6", | ||
"react-helmet-async": "^1.0.4", | ||
"react-is": ">= 16.8.0", | ||
"react-router": "^4.3.1 || ^5.0.0", | ||
"redbox-react": "1.x", | ||
"redux": "4.x", | ||
"start-server-and-test": "^1.11.5", | ||
"styled-components": "^5.2.1", | ||
"typescript": ">= 2.7", | ||
"umi": "^3.1.2", | ||
"umi-request": "^1.0.8", | ||
"url-regex-safe": "^3.0.0", | ||
"use-merge-value": "^1.0.1", | ||
"uuid": "7.0.3", | ||
"webpack": "^4.40.0 || ^5.0.0", | ||
"yaml": "^1.10.0" | ||
}, | ||
"devDependencies": { | ||
|
Uh oh!
There was an error while loading. Please reload this page.