Skip to content
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.

Sign up for GitHub

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

Update Npm to Yarn #647

Closed
wants to merge 5 commits into from
Closed

Update Npm to Yarn #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9aea896
update npm to yarn
link1697 Sep 13, 2024
b28927e
Merge branch 'main' of https://github.com/link1697/cello
Oct 3, 2024
5f5ebe8
Merge branch 'main' of https://github.com/link1697/cello
Oct 15, 2024
b3b14ef
update postgres to v12
Oct 3, 2024
ed167b0
Merge branch 'hyperledger:main' into yarn
link1697 Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bootup/kubernetes/templates/postgres/deploy.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
spec:
containers:
- name: postgres
image: postgres:11.1
image: postgres:12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember this k8s plugin is not used anymore?
Can you confirm?

ports:
- containerPort: 5432
envFrom:
Expand Down
8 changes: 4 additions & 4 deletions src/dashboard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tests/dashboard/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading