diff --git a/src/dashboard/package.json b/src/dashboard/package.json index 071854fdc..c49515944 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": { @@ -90,10 +90,10 @@ "validator": "^13.7.0" }, "devDependencies": { + "glob":"^9.0.0", "@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", diff --git a/tests/dashboard/docker-compose.yml b/tests/dashboard/docker-compose.yml index 4d3f59f20..a493f2dd8 100644 --- a/tests/dashboard/docker-compose.yml +++ b/tests/dashboard/docker-compose.yml @@ -5,4 +5,4 @@ services: volumes: - $ROOT_PATH/src/dashboard:/dashboard working_dir: /dashboard - command: bash -c "npm i && npm run lint" + command: bash -c "yarn && yarn lint"