Commit c6e135195a30f4c05dfcbd127799daec219042cc
Committed by
GitHub
GitHub
1 parent
1262e130
修复合并代码导致的冲突 (#2905)
* fix: 合并代码导致的问题，升级vite 4.4.0 * fix: stylelint
Showing
7 changed files
with
16 additions
and
19 deletions
Too many changes to show.
To preserve performance only 7 of 22 files are displayed.
apps/test-server/package.json
internal/eslint-config/package.json
| ... | ... | @@ -36,8 +36,8 @@ |
| 36 | 36 | "stub": "pnpm unbuild --stub" |
| 37 | 37 | }, |
| 38 | 38 | "devDependencies": { |
| 39 | - "@typescript-eslint/eslint-plugin": "^5.60.1", | |
| 40 | - "@typescript-eslint/parser": "^5.60.1", | |
| 39 | + "@typescript-eslint/eslint-plugin": "^5.61.0", | |
| 40 | + "@typescript-eslint/parser": "^5.61.0", | |
| 41 | 41 | "eslint": "^8.44.0", |
| 42 | 42 | "eslint-config-prettier": "^8.8.0", |
| 43 | 43 | "eslint-plugin-import": "^2.27.5", | ... | ... |
internal/stylelint-config/package.json
| ... | ... | @@ -36,12 +36,12 @@ |
| 36 | 36 | "postcss-less": "^6.0.0", |
| 37 | 37 | "postcss-scss": "^4.0.6", |
| 38 | 38 | "prettier": "^2.8.8", |
| 39 | - "stylelint": "^15.9.0", | |
| 39 | + "stylelint": "^15.10.1", | |
| 40 | 40 | "stylelint-config-property-sort-order-smacss": "^9.1.0", |
| 41 | - "stylelint-config-recommended": "^12.0.0", | |
| 41 | + "stylelint-config-recommended": "^13.0.0", | |
| 42 | 42 | "stylelint-config-recommended-scss": "^12.0.0", |
| 43 | 43 | "stylelint-config-recommended-vue": "^1.4.0", |
| 44 | - "stylelint-config-standard": "^33.0.0", | |
| 44 | + "stylelint-config-standard": "^34.0.0", | |
| 45 | 45 | "stylelint-config-standard-scss": "^10.0.0", |
| 46 | 46 | "stylelint-order": "^6.0.3", |
| 47 | 47 | "stylelint-prettier": "^3.0.0" | ... | ... |
internal/ts-config/package.json
internal/vite-config/package.json
| ... | ... | @@ -32,7 +32,7 @@ |
| 32 | 32 | }, |
| 33 | 33 | "dependencies": { |
| 34 | 34 | "@ant-design/colors": "^7.0.0", |
| 35 | - "vite": "^4.3.9" | |
| 35 | + "vite": "^4.4.0" | |
| 36 | 36 | }, |
| 37 | 37 | "devDependencies": { |
| 38 | 38 | "@types/fs-extra": "^11.0.1", |
| ... | ... | @@ -49,7 +49,7 @@ |
| 49 | 49 | "sass": "^1.63.6", |
| 50 | 50 | "unocss": "^0.53.4", |
| 51 | 51 | "vite-plugin-compression": "^0.5.1", |
| 52 | - "vite-plugin-dts": "^3.0.2", | |
| 52 | + "vite-plugin-dts": "^3.1.0", | |
| 53 | 53 | "vite-plugin-html": "^3.2.0", |
| 54 | 54 | "vite-plugin-mock": "^2.9.6", |
| 55 | 55 | "vite-plugin-purge-icons": "^0.9.2", | ... | ... |
internal/vite-config/src/plugins/index.ts
| ... | ... | @@ -2,7 +2,6 @@ import vue from '@vitejs/plugin-vue'; |
| 2 | 2 | import vueJsx from '@vitejs/plugin-vue-jsx'; |
| 3 | 3 | import { type PluginOption } from 'vite'; |
| 4 | 4 | import purgeIcons from 'vite-plugin-purge-icons'; |
| 5 | -import vueSetupExtend from 'vite-plugin-vue-setup-extend'; | |
| 6 | 5 | |
| 7 | 6 | import { createAppConfigPlugin } from './appConfig'; |
| 8 | 7 | import { configCompressPlugin } from './compress'; | ... | ... |
package.json
| ... | ... | @@ -29,7 +29,7 @@ |
| 29 | 29 | "lint": "turbo run lint", |
| 30 | 30 | "lint:eslint": "eslint --cache --max-warnings 0 \"{src,mock}/**/*.{vue,ts,tsx}\" --fix", |
| 31 | 31 | "lint:prettier": "prettier --write .", |
| 32 | - "lint:stylelint": "stylelint \"**/*.{vue,css,less.scss}\" --fix --cache --cache-location node_modules/.cache/stylelint/", | |
| 32 | + "lint:stylelint": "stylelint \"**/*.{vue,css,less,scss}\" --fix --cache --cache-location node_modules/.cache/stylelint/", | |
| 33 | 33 | "prepare": "husky install", |
| 34 | 34 | "preview": "npm run build && vite preview", |
| 35 | 35 | "reinstall": "rimraf pnpm-lock.yaml && rimraf package.lock.json && rimraf node_modules && npm run bootstrap", |
| ... | ... | @@ -101,12 +101,10 @@ |
| 101 | 101 | "vue": "^3.3.4", |
| 102 | 102 | "vue-i18n": "^9.2.2", |
| 103 | 103 | "vue-json-pretty": "^2.2.4", |
| 104 | - "vue-router": "^4.2.2", | |
| 104 | + "vue-router": "^4.2.3", | |
| 105 | 105 | "vue-types": "^5.1.0", |
| 106 | 106 | "vuedraggable": "^4.1.0", |
| 107 | - | |
| 108 | 107 | "vxe-table": "^4.4.5", |
| 109 | - | |
| 110 | 108 | "vxe-table-plugin-export-xlsx": "^3.0.4", |
| 111 | 109 | "xe-utils": "^3.5.11", |
| 112 | 110 | "xlsx": "^0.18.5" |
| ... | ... | @@ -114,7 +112,7 @@ |
| 114 | 112 | "devDependencies": { |
| 115 | 113 | "@commitlint/cli": "^17.6.6", |
| 116 | 114 | "@commitlint/config-conventional": "^17.6.6", |
| 117 | - "@iconify/json": "^2.2.85", | |
| 115 | + "@iconify/json": "^2.2.87", | |
| 118 | 116 | "@purge-icons/generated": "^0.9.0", |
| 119 | 117 | "@types/codemirror": "^5.60.8", |
| 120 | 118 | "@types/crypto-js": "^4.1.1", |
| ... | ... | @@ -139,14 +137,14 @@ |
| 139 | 137 | "husky": "^8.0.3", |
| 140 | 138 | "lint-staged": "13.2.3", |
| 141 | 139 | "prettier": "^2.8.8", |
| 142 | - "prettier-plugin-packagejson": "^2.4.3", | |
| 140 | + "prettier-plugin-packagejson": "^2.4.4", | |
| 143 | 141 | "rimraf": "^5.0.1", |
| 144 | 142 | "turbo": "^1.10.7", |
| 145 | 143 | "typescript": "^5.1.6", |
| 146 | 144 | "unbuild": "^1.2.1", |
| 147 | - "vite": "^4.3.9", | |
| 145 | + "vite": "^4.4.0", | |
| 148 | 146 | "vite-plugin-mock": "^2.9.6", |
| 149 | - "vue-tsc": "^1.8.3" | |
| 147 | + "vue-tsc": "^1.8.4" | |
| 150 | 148 | }, |
| 151 | 149 | "packageManager": "pnpm@8.1.0", |
| 152 | 150 | "engines": { | ... | ... |