Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
yulimchen committed Oct 24, 2023
2 parents ca8fa2d + 47196f8 commit 06367a5
Show file tree
Hide file tree
Showing 2 changed files with 4,492 additions and 5,198 deletions.
54 changes: 27 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,48 +24,48 @@
"prepare": "husky install"
},
"dependencies": {
"axios": "^1.4.0",
"axios": "^1.5.1",
"normalize.css": "^8.0.1",
"nprogress": "^0.2.0",
"pinia": "^2.1.4",
"vant": "^4.6.0",
"vue": "^3.3.4",
"vue-router": "^4.2.2"
"pinia": "^2.1.7",
"vant": "^4.7.2",
"vue": "^3.3.6",
"vue-router": "^4.2.5"
},
"devDependencies": {
"@commitlint/config-conventional": "^17.4.4",
"@rushstack/eslint-patch": "^1.1.4",
"@types/node": "^18.11.12",
"@types/nprogress": "^0.2.0",
"@typescript-eslint/parser": "^5.49.0",
"@vitejs/plugin-vue": "^4.0.0",
"@vitejs/plugin-vue-jsx": "^3.0.0",
"@vue/eslint-config-prettier": "^7.0.0",
"@vue/eslint-config-typescript": "^11.0.0",
"@commitlint/config-conventional": "^17.8.1",
"@rushstack/eslint-patch": "^1.5.1",
"@types/node": "^18.18.6",
"@types/nprogress": "^0.2.2",
"@typescript-eslint/parser": "^5.62.0",
"@vitejs/plugin-vue": "^4.4.0",
"@vitejs/plugin-vue-jsx": "^3.0.2",
"@vue/eslint-config-prettier": "^7.1.0",
"@vue/eslint-config-typescript": "^11.0.3",
"@vue/tsconfig": "^0.1.3",
"autoprefixer": "^10.4.13",
"autoprefixer": "^10.4.16",
"cnjm-postcss-px-to-viewport": "^1.0.0",
"commitlint": "^17.4.4",
"eslint": "^8.22.0",
"eslint-plugin-vue": "^9.3.0",
"commitlint": "^17.8.1",
"eslint": "^8.52.0",
"eslint-plugin-vue": "^9.18.0",
"husky": "^8.0.3",
"less": "^4.1.3",
"less": "^4.2.0",
"mockjs": "^1.1.0",
"npm-run-all": "^4.1.5",
"postcss": "^8.4.21",
"prettier": "^2.7.1",
"postcss": "^8.4.31",
"prettier": "^2.8.8",
"standard-version": "^9.5.0",
"tailwindcss": "^3.3.2",
"typescript": "~4.7.4",
"tailwindcss": "^3.3.3",
"typescript": "~5.2.2",
"unplugin-vue-components": "^0.22.12",
"vite": "^4.3.9",
"vite": "^4.5.0",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
"vite-plugin-mock-dev-server": "^0.3.16",
"vite-plugin-mock-dev-server": "^0.3.21",
"vite-plugin-svg-icons": "^2.0.1",
"vite-plugin-vue-setup-extend": "^0.4.0",
"vue-eslint-parser": "^9.1.0",
"vue-tsc": "^1.0.12"
"vue-eslint-parser": "^9.3.2",
"vue-tsc": "^1.8.20"
},
"pnpm": {
"peerDependencyRules": {
Expand Down
Loading

0 comments on commit 06367a5

Please sign in to comment.