Skip to content

Commit e72ac8a

Browse files
committed
Merge branch 'main' into pages
2 parents edfbe7d + b004c22 commit e72ac8a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+3357
-1869
lines changed

Diff for: .nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v22.12.0
1+
v22.14.0

Diff for: build/optimize.ts

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const include = [
1717
"qrcode",
1818
"intro.js",
1919
"vue-i18n",
20+
"deep-chat",
2021
"vxe-table",
2122
"vue-types",
2223
"js-cookie",
@@ -28,6 +29,7 @@ const include = [
2829
"sortablejs",
2930
"swiper/vue",
3031
"mint-filter",
32+
"highlight.js",
3133
"@vueuse/core",
3234
"vue3-danmaku",
3335
"v-contextmenu",

Diff for: build/plugins.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@ export function getPluginsList(
1919
): PluginOption[] {
2020
const lifecycle = process.env.npm_lifecycle_event;
2121
return [
22-
vue(),
22+
vue({
23+
template: {
24+
compilerOptions: {
25+
isCustomElement: tag => tag === "deep-chat"
26+
}
27+
}
28+
}),
2329
// jsx、tsx语法支持
2430
vueJsx(),
2531
VueI18nPlugin({

Diff for: package.json

+56-46
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,24 @@
5656
"@pureadmin/table": "^3.2.1",
5757
"@pureadmin/utils": "^2.5.0",
5858
"@vue-flow/background": "^1.3.2",
59-
"@vue-flow/core": "^1.41.6",
60-
"@vueuse/core": "^12.0.0",
59+
"@vue-flow/core": "^1.42.1",
60+
"@vueuse/core": "^12.5.0",
6161
"@vueuse/motion": "^2.2.6",
6262
"@wangeditor/editor": "^5.1.23",
6363
"@wangeditor/editor-for-vue": "^5.1.12",
6464
"@zxcvbn-ts/core": "^3.0.4",
6565
"animate.css": "^4.1.1",
6666
"axios": "^1.7.9",
6767
"china-area-data": "^5.0.1",
68-
"codemirror": "^5",
68+
"codemirror": "^5.65.18",
6969
"codemirror-editor-vue3": "^2.8.0",
7070
"cropperjs": "^1.6.2",
7171
"dayjs": "^1.11.13",
72-
"echarts": "^5.5.1",
72+
"deep-chat": "^2.1.1",
73+
"echarts": "^5.6.0",
7374
"el-table-infinite-scroll": "^3.0.6",
74-
"element-plus": "^2.9.0",
75+
"element-plus": "^2.9.4",
76+
"highlight.js": "^11.11.1",
7577
"intro.js": "^7.2.0",
7678
"js-cookie": "^3.0.5",
7779
"jsbarcode": "^3.11.6",
@@ -81,98 +83,98 @@
8183
"mqtt": "4.3.7",
8284
"nprogress": "^0.2.0",
8385
"path-browserify": "^1.0.1",
84-
"pinia": "^2.3.0",
86+
"pinia": "^3.0.1",
8587
"pinyin-pro": "^3.26.0",
86-
"plus-pro-components": "^0.1.18",
88+
"plus-pro-components": "^0.1.20",
8789
"qrcode": "^1.5.4",
88-
"qs": "^6.13.1",
90+
"qs": "^6.14.0",
8991
"responsive-storage": "^2.2.0",
9092
"sortablejs": "^1.15.6",
91-
"swiper": "^11.1.15",
93+
"swiper": "^11.2.3",
9294
"typeit": "^8.8.7",
9395
"v-contextmenu": "^3.2.0",
9496
"v3-infinite-loading": "^1.3.2",
95-
"vditor": "^3.10.8",
97+
"vditor": "^3.10.9",
9698
"version-rocket": "^1.7.4",
9799
"vue": "^3.5.13",
98-
"vue-i18n": "^10.0.5",
100+
"vue-i18n": "^11.1.1",
99101
"vue-json-pretty": "^2.4.0",
100-
"vue-pdf-embed": "^2.1.1",
102+
"vue-pdf-embed": "^2.1.2",
101103
"vue-router": "^4.5.0",
102-
"vue-tippy": "^6.5.0",
104+
"vue-tippy": "^6.6.0",
103105
"vue-types": "^5.1.3",
104106
"vue-virtual-scroller": "2.0.0-beta.8",
105-
"vue-waterfall-plugin-next": "^2.6.4",
107+
"vue-waterfall-plugin-next": "^2.6.5",
106108
"vue3-danmaku": "^1.6.1",
107109
"vue3-puzzle-vcode": "^1.1.7",
108110
"vuedraggable": "^4.1.0",
109111
"vxe-table": "4.6.25",
110-
"wavesurfer.js": "^7.8.10",
112+
"wavesurfer.js": "^7.9.1",
111113
"xgplayer": "^3.0.20",
112114
"xlsx": "^0.18.5"
113115
},
114116
"devDependencies": {
115-
"@commitlint/cli": "^19.6.0",
116-
"@commitlint/config-conventional": "^19.6.0",
117+
"@commitlint/cli": "^19.7.1",
118+
"@commitlint/config-conventional": "^19.7.1",
117119
"@commitlint/types": "^19.5.0",
118-
"@eslint/js": "^9.16.0",
119-
"@faker-js/faker": "^9.3.0",
120+
"@eslint/js": "^9.20.0",
121+
"@faker-js/faker": "^9.5.0",
120122
"@iconify-icons/ep": "^1.2.12",
121123
"@iconify-icons/ri": "^1.2.10",
122-
"@iconify/vue": "^4.2.0",
123-
"@intlify/unplugin-vue-i18n": "^6.0.1",
124+
"@iconify/vue": "4.2.0",
125+
"@intlify/unplugin-vue-i18n": "^6.0.3",
124126
"@types/codemirror": "^5.60.15",
125127
"@types/dagre": "^0.7.52",
126128
"@types/intro.js": "^5.1.5",
127129
"@types/js-cookie": "^3.0.6",
128-
"@types/node": "^20.17.9",
130+
"@types/node": "^20.17.19",
129131
"@types/nprogress": "^0.2.3",
130132
"@types/path-browserify": "^1.0.3",
131133
"@types/qrcode": "^1.5.5",
132-
"@types/qs": "^6.9.17",
134+
"@types/qs": "^6.9.18",
133135
"@types/sortablejs": "^1.15.8",
134-
"@typescript-eslint/eslint-plugin": "^8.18.0",
135-
"@typescript-eslint/parser": "^8.18.0",
136+
"@typescript-eslint/eslint-plugin": "^8.24.0",
137+
"@typescript-eslint/parser": "^8.24.0",
136138
"@vitejs/plugin-vue": "^5.2.1",
137139
"@vitejs/plugin-vue-jsx": "^4.1.1",
138140
"autoprefixer": "^10.4.20",
139141
"boxen": "^8.0.1",
140-
"code-inspector-plugin": "^0.18.2",
142+
"code-inspector-plugin": "^0.20.0",
141143
"cssnano": "^7.0.6",
142144
"dagre": "^0.8.5",
143-
"eslint": "^9.16.0",
144-
"eslint-config-prettier": "^9.1.0",
145+
"eslint": "^9.20.1",
146+
"eslint-config-prettier": "^10.0.1",
145147
"eslint-define-config": "^2.1.0",
146-
"eslint-plugin-prettier": "^5.2.1",
148+
"eslint-plugin-prettier": "^5.2.3",
147149
"eslint-plugin-vue": "^9.32.0",
148150
"gradient-string": "^3.0.0",
149151
"husky": "^9.1.7",
150-
"lint-staged": "^15.2.10",
151-
"postcss": "^8.4.49",
152-
"postcss-html": "^1.7.0",
152+
"lint-staged": "^15.4.3",
153+
"postcss": "^8.5.2",
154+
"postcss-html": "^1.8.0",
153155
"postcss-import": "^16.1.0",
154156
"postcss-scss": "^4.0.9",
155-
"prettier": "^3.4.2",
157+
"prettier": "^3.5.1",
156158
"rimraf": "^6.0.1",
157-
"rollup-plugin-visualizer": "^5.12.0",
158-
"sass": "^1.82.0",
159-
"stylelint": "^16.11.0",
160-
"stylelint-config-recess-order": "^5.1.1",
161-
"stylelint-config-recommended-vue": "^1.5.0",
162-
"stylelint-config-standard-scss": "^13.1.0",
163-
"stylelint-prettier": "^5.0.2",
159+
"rollup-plugin-visualizer": "^5.14.0",
160+
"sass": "^1.85.0",
161+
"stylelint": "^16.14.1",
162+
"stylelint-config-recess-order": "^6.0.0",
163+
"stylelint-config-recommended-vue": "^1.6.0",
164+
"stylelint-config-standard-scss": "^14.0.0",
165+
"stylelint-prettier": "^5.0.3",
164166
"svgo": "^3.3.2",
165-
"tailwindcss": "^3.4.16",
166-
"typescript": "5.6.3",
167-
"vite": "^6.0.3",
167+
"tailwindcss": "3.4.17",
168+
"typescript": "^5.7.3",
169+
"vite": "^6.1.0",
168170
"vite-plugin-cdn-import": "^1.0.1",
169171
"vite-plugin-compression": "^0.5.1",
170-
"vite-plugin-fake-server": "^2.1.5",
172+
"vite-plugin-fake-server": "^2.2.0",
171173
"vite-plugin-remove-console": "^2.2.0",
172174
"vite-plugin-router-warn": "^1.0.0",
173175
"vite-svg-loader": "^5.1.0",
174176
"vue-eslint-parser": "^9.4.3",
175-
"vue-tsc": "^2.1.10"
177+
"vue-tsc": "^2.2.0"
176178
},
177179
"engines": {
178180
"node": "^18.18.0 || ^20.9.0 || >=22.0.0",
@@ -196,6 +198,14 @@
196198
"allowedVersions": {
197199
"eslint": "9"
198200
}
199-
}
201+
},
202+
"onlyBuiltDependencies": [
203+
"@parcel/watcher",
204+
"core-js",
205+
"es5-ext",
206+
"esbuild",
207+
"typeit",
208+
"vue-demi"
209+
]
200210
}
201211
}

0 commit comments

Comments
 (0)