chore: Move from yarn to pnpm (WIP) #2590
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -49,7 +49,7 @@ jobs: | |
| run: | | ||
| export VERSION=${{ steps.branch_env.outputs.version }} | ||
| sudo gem install --no-document fpm | ||
| git clone https://github.com/FangSen9000/apisix-build-tools.git | ||
|
There was a problem hiding this comment. 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 | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -49,8 +49,9 @@ jobs: | |
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: 16.x | ||
|
|
||
| - name: Install PNPM | ||
| run: npm i -g [email protected] | ||
|
There was a problem hiding this comment. Have you checked out this https://github.com/pnpm/action-setup? I think this might be a little better. But, anyway, let's run through the test first. There was a problem hiding this comment. Let me first say a good news. Yesterday's problem has been solved. The reason is that he didn't use Chrome browser to run it. Just add a setting. `"For example, I just found that it seems that many errors in file format are related to yarn. Many workflow files have been perfected around this. Then, the pnpm directly downloaded by GitHub does not seem to support node.js12. It describes that the downloaded pnpm does not support NPM below 14 (in fact, you can install a low-level package and ask him to support it, but it feels that it will be troublesome. I am afraid there are more problems.) Only 14 and 16 can be built when building tests. " "When downloading the relevant environment, it seems that there are some restrictions. Maybe it can be solved by storing it in the warehouse through some link, but I haven't started to look at it. I'm afraid this is also very troublesome. This picture is the reason why the three people are useless. Action is prohibited. It clearly meets the requirements he said, but it can't be used."` @SkyeYoung I mentioned this problem. You can look at the pictures. If anyone can solve it, it's best. |
||
|
|
||
| - name: Setup golang environment | ||
| uses: actions/setup-go@v3 | ||
|
|
@@ -84,14 +85,19 @@ jobs: | |
| cypress-${{ runner.os }}-cypress-cache0 | ||
|
|
||
| - name: Install dependencies | ||
| run: pnpm install | ||
|
|
||
| - name: Install Cypress binary | ||
| run: pnpx cypress install | ||
|
|
||
| - run: pnpx browserslist@latest --update-db | ||
|
|
||
| - name: Start frontend then test | ||
| run: | | ||
| pnpm start-server-and-test 'cross-env SERVE_ENV=test pnpm start' http-get://localhost:8000 'cross-env CYPRESS_SERVE_ENV=test pnpm cypress run --browser chrome --spec "**/integration/${{matrix.folderPrefix}}/**.spec.js"' | ||
|
|
||
| - name: Report e2e coverage | ||
| run: pnpx nyc report --reporter=text-summary | ||
|
|
||
| - name: Upload coverage to Codecov | ||
| run: | | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -42,8 +42,16 @@ jobs: | |
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: 16.x | ||
|
|
||
| - 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 --frozen-lockfile | ||
|
|
||
| - name: Setup golang environment | ||
| uses: actions/setup-go@v3 | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -37,18 +37,23 @@ jobs: | |
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: ${{ matrix.node-version }} | ||
|
|
||
| - 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 pnpm install | ||
|
|
||
| - name: Lint | ||
| working-directory: web | ||
| run: pnpm lint:js && pnpm lint:style | ||
|
|
||
| - name: Build the Dashboard | ||
| working-directory: web | ||
| run: pnpm build | ||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -2,4 +2,4 @@ | |
| . "$(dirname "$0")/_/husky.sh" | ||
|
|
||
| cd web | ||
| pnpm lint-staged | ||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -16,6 +16,6 @@ Dockerfile* | |
| LICENSE | ||
| .eslintcache | ||
| *.lock | ||
| pnpm-error.log | ||
| .history | ||
| CNAME | ||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -5,41 +5,42 @@ | |
| "description": "Dashboard for Apache APISIX", | ||
| "scripts": { | ||
| "prepare": "cd .. && husky install web/.husky", | ||
| "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 && 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 && 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\" --syntax less", | ||
| "prettier": "prettier -c --write \"**/*\"", | ||
| "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 --browser chrome", | ||
| "cypress:run-plugin-ci": "cross-env CYPRESS_SERVE_ENV=test cypress run --browser chrome --spec 'cypress/integration/plugin/*.spec.js'" | ||
| }, | ||
| "license": "Apache-2.0", | ||
| "lint-staged": { | ||
| "**/*.less": "stylelint --syntax less", | ||
| "**/*.{js,jsx,ts,tsx}": "pnpm run lint-staged:js", | ||
| "**/*.{js,jsx,tsx,ts,less,md,json}": [ | ||
| "prettier --write" | ||
| ] | ||
|
|
@@ -55,16 +56,21 @@ | |
| "@ant-design/pro-table": "2.30.1", | ||
| "@antv/x6": "^1.18.5", | ||
| "@antv/x6-react-components": "^1.1.7", | ||
| "@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", | ||
| "base-64": "^1.0.0", | ||
| "classnames": "^2.2.6", | ||
| "core-js": "^2.5.7", | ||
| "dayjs": "1.8.30", | ||
| "dva-core": "1.6.0-beta.7", | ||
| "file-saver": "^2.0.5", | ||
| "js-beautify": "^1.13.0", | ||
| "js-yaml": "^4.0.0", | ||
|
|
@@ -75,18 +81,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": "^1.0.2", | ||
| "use-merge-value": "^1.0.1", | ||
| "uuid": "7.0.3", | ||
| "webpack": "^4.40.0 || ^5.0.0", | ||
| "yaml": "^1.10.0" | ||
| }, | ||
| "devDependencies": { | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.