diff --git a/src/dashboard/.eslintrc.js b/src/dashboard/.eslintrc.js index c3a5b51b..71c1b510 100644 --- a/src/dashboard/.eslintrc.js +++ b/src/dashboard/.eslintrc.js @@ -2,8 +2,19 @@ SPDX-License-Identifier: Apache-2.0 */ module.exports = { - parser: 'babel-eslint', - extends: ['airbnb', 'prettier', 'plugin:compat/recommended'], + parser: '@babel/eslint-parser', + extends: [ + 'airbnb', + 'prettier', + 'plugin:compat/recommended', + ], + + parserOptions: { + requireConfigFile: false, + babelOptions: { + presets: ['@babel/preset-env', '@babel/preset-react'], + }, + }, env: { browser: true, node: true, diff --git a/src/dashboard/package.json b/src/dashboard/package.json index 071854fd..b45e1ab4 100644 --- a/src/dashboard/package.json +++ b/src/dashboard/package.json @@ -11,12 +11,12 @@ "docker-prod:dev": "docker compose -f ./docker/docker-compose.yml up", "docker:build": "docker compose -f ./docker/docker-compose.dev.yml build", "docker:dev": "docker compose -f ./docker/docker-compose.dev.yml up", - "docker:push": "npm run docker-hub:build && npm run docker:tag && docker push antdesign/ant-design-pro", + "docker:push": "yarn docker-hub:build && yarn docker:tag && docker push antdesign/ant-design-pro", "docker:tag": "docker tag ant-design-pro antdesign/ant-design-pro", "functions:build": "yarn run generateMock && netlify dev", "netlify:dev": "netlify dev", "generateMock": "node ./scripts/generateMock", - "lint": "eslint --ext .js src mock tests && npm run lint:style && npm run lint:prettier", + "lint": "eslint --ext .js src mock tests && yarn lint:style && yarn lint:prettier", "lint-staged": "lint-staged", "lint-staged:js": "eslint --ext .js", "lint:fix": "eslint --fix --ext .js src mock tests && stylelint --fix 'src/**/*.less' --syntax less", @@ -29,7 +29,7 @@ "test": "umi test", "test:all": "node ./tests/run-tests.js", "test:component": "umi test ./src/components", - "tslint": "npm run tslint:fix", + "tslint": "yarn tslint:fix", "tslint:fix": "tslint --fix 'src/**/*.ts*'" }, "husky": { @@ -55,7 +55,7 @@ "@ant-design/pro-layout": "^5.0.0", "@antv/data-set": "^0.10.1", "antd": "^4.2.5", - "bizcharts": "3.5.2-beta.1", + "bizcharts": "3.5.3", "bizcharts-plugin-slider": "^2.1.1-beta.1", "body-parser": "^1.19.0", "cello-paginator": "^1.0.1", @@ -66,8 +66,8 @@ "lodash": "^4.17.11", "lodash-decorators": "^6.0.1", "memoize-one": "^5.0.0", - "moment": "^2.24.0", "merge-umi-mock-data": "^1.0.0", + "moment": "^2.24.0", "numeral": "^2.0.6", "nzh": "^1.0.4", "omit.js": "^1.0.0", @@ -93,27 +93,26 @@ "@types/history": "^4.7.2", "@types/react": "^16.8.1", "@types/react-dom": "^16.0.11", - "glob": "^9.0.0", "@umijs/preset-react": "^1.2.2", "antd-pro-merge-less": "^1.0.0", "antd-theme-webpack-plugin": "^1.2.0", - "babel-eslint": "^10.0.1", "chalk": "^2.4.2", "check-prettier": "^1.0.1", "cross-env": "^5.2.0", "cross-port-killer": "^1.0.1", "enzyme": "^3.9.0", - "eslint": "^5.13.0", - "eslint-config-airbnb": "^17.1.0", + "eslint": "^8.57.1", + "eslint-config-airbnb": "^19.0.4", "eslint-config-prettier": "^4.1.0", "eslint-plugin-babel": "^5.3.0", - "eslint-plugin-compat": "^2.6.3", - "eslint-plugin-import": "2.20.1", + "eslint-plugin-compat": "^6.0.1", + "eslint-plugin-import": "2.31.0", "eslint-plugin-jsx-a11y": "^6.2.1", - "eslint-plugin-markdown": "^2.2.0", - "eslint-plugin-react": "^7.12.4", + "eslint-plugin-markdown": "^3.0.0", + "eslint-plugin-react": "^7.32.2", "faker": "^4.1.0", "gh-pages": "^6.1.1", + "glob": "^9.0.0", "husky": "^4.2.5", "jest-puppeteer": "^4.1.0", "jsdom-global": "^3.0.2", diff --git a/tests/dashboard/docker-compose.yml b/tests/dashboard/docker-compose.yml index 4d3f59f2..d1812548 100644 --- a/tests/dashboard/docker-compose.yml +++ b/tests/dashboard/docker-compose.yml @@ -1,8 +1,8 @@ version: '3.2' services: test-dashboard: - image: node:14.18 + image: node:20.15 volumes: - $ROOT_PATH/src/dashboard:/dashboard working_dir: /dashboard - command: bash -c "npm i && npm run lint" + command: bash -c "yarn && yarn lint"