Skip to content

Commit 217ff6e

Browse files
committed
Rebase with latest dev
1 parent 412cdeb commit 217ff6e

4 files changed

Lines changed: 331 additions & 154 deletions

File tree

client/build-config.shared.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ export const legacyAliases = {
1818
jqueryVendor: path.join(libsBase, "jquery/jquery.js"),
1919
storemodern: path.join(__dirname, "node_modules/store/dist/store.modern.js"),
2020

21-
// Vue
22-
vue: path.join(__dirname, "node_modules/vue/dist/vue.esm.js"),
21+
// Vue — point at @vue/compat for the Vue 2 → 3 migration. The compat
22+
// build is Vue 3 with Vue 2 behavior emulation; replacing this path
23+
// with the plain Vue 3 build will break SFCs still using Vue 2 syntax.
24+
vue: path.join(__dirname, "node_modules/@vue/compat/dist/vue.esm-bundler.js"),
2325

2426
// Build config
2527
config: path.join(scriptsBase, "config", process.env.NODE_ENV || "development") + ".js",

client/package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
"pnpm": {
2424
"overrides": {
2525
"chokidar": "3.5.3",
26-
"vue": "2.7.16",
2726
"@fortawesome/fontawesome-common-types": "6.2.1"
2827
},
2928
"onlyBuiltDependencies": [
@@ -172,7 +171,7 @@
172171
"@types/markdown-it": "^13.0.4",
173172
"@typescript-eslint/eslint-plugin": "^6.8.0",
174173
"@typescript-eslint/parser": "^6.8.0",
175-
"@vitejs/plugin-vue2": "^2.3.4",
174+
"@vitejs/plugin-vue": "^5.2.0",
176175
"@vitest/coverage-v8": "^4.0.14",
177176
"@vitest/spy": "^4.0.14",
178177
"@vitest/ui": "^4.0.14",
@@ -205,8 +204,6 @@
205204
"vitest-fail-on-console": "^0.10.1",
206205
"vitest-location-mock": "^1.0.4",
207206
"vue-eslint-parser": "^10.2.0",
208-
"vue-template-compiler": "^2.7.16",
209-
"vue-loader": "^17",
210207
"vue-tsc": "2.2.12",
211208
"xml-js": "^1.6.11",
212209
"xml2js": "^0.6.2"

0 commit comments

Comments
 (0)