mvframe 1.1.11 → 1.1.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mvframe",
   "packageManager": "yarn@4.4.1",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "author": "matt avis",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -77,7 +77,10 @@
     ".cursor/rules"
   ],
   "peerDependencies": {
-    "element-plus": "^2.2.0"
+    "vue": "^3.5.0",
+    "vue-router": "^4.6.0",
+    "pinia": "^3.0.0",
+    "element-plus": "^2.13.0"
   },
   "dependencies": {
     "@visactor/vtable": "^1.26.0",
@@ -85,15 +88,15 @@
     "axios": "^1.7.9",
     "dayjs": "^1.11.20",
     "flag-icons": "^7.2.3",
-    "pinia": "^3.0.0",
-    "vue": "^3.3.4",
-    "vue-router": "^4.6.3",
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.2.1",
     "@vue/shared": "^3.5.25",
-    "element-plus": "^2.13.6",
+    "vue": "^3.5.0",
+    "vue-router": "^4.6.0",
+    "pinia": "^3.0.0",
+    "element-plus": "^2.13.0",
     "rollup-plugin-terser": "^7.0.2",
     "sass-embedded": "^1.97.3",
     "unplugin-auto-import": "0.18.2",

package/scripts/scaffold-app.js

@@ -81,6 +81,14 @@ const SCAFFOLD_SCRIPTS = {
   preview: "vite preview",
 };
 
+const VITE_DEDUPE_DEPENDENCIES = ["vue", "vue-router", "pinia"];
+const VITE_CONFIG_FILES = [
+  "vite.config.js",
+  "vite.config.mjs",
+  "vite.config.ts",
+  "vite.config.mts",
+];
+
 const TEST_DINGTALK_WEBHOOK =
   "https://oapi.dingtalk.com/robot/send?access_token=142b6ddc73e8656b7906a3cb3982836a59f430a6fe5ef619a5689eed91d5f9f7";
 const TEST_DINGTALK_SECRET =
@@ -142,6 +150,84 @@ function installDependencies(projectRoot) {
   });
 }
 
+function formatDedupeArray(deps) {
+  return `[${deps.map((dep) => `"${dep}"`).join(", ")}]`;
+}
+
+function mergeDedupeDeps(currentBody = "") {
+  const current = [...currentBody.matchAll(/["']([^"']+)["']/g)].map((m) => m[1]);
+  return [
+    ...VITE_DEDUPE_DEPENDENCIES,
+    ...current.filter((dep) => !VITE_DEDUPE_DEPENDENCIES.includes(dep)),
+  ];
+}
+
+function injectViteDedupe(source) {
+  const dedupeRe = /dedupe\s*:\s*\[([\s\S]*?)\]/m;
+  if (dedupeRe.test(source)) {
+    return source.replace(dedupeRe, (_all, body) => {
+      return `dedupe: ${formatDedupeArray(mergeDedupeDeps(body))}`;
+    });
+  }
+
+  const resolveRe = /resolve\s*:\s*\{/m;
+  if (resolveRe.test(source)) {
+    return source.replace(resolveRe, (match) => {
+      return `${match}\n    dedupe: ${formatDedupeArray(VITE_DEDUPE_DEPENDENCIES)},`;
+    });
+  }
+
+  const defineConfigRe = /defineConfig\s*\(\s*\{/m;
+  if (defineConfigRe.test(source)) {
+    return source.replace(defineConfigRe, (match) => {
+      return `${match}\n  resolve: {\n    dedupe: ${formatDedupeArray(VITE_DEDUPE_DEPENDENCIES)},\n  },`;
+    });
+  }
+
+  const exportDefaultObjectRe = /export\s+default\s+\{/m;
+  if (exportDefaultObjectRe.test(source)) {
+    return source.replace(exportDefaultObjectRe, (match) => {
+      return `${match}\n  resolve: {\n    dedupe: ${formatDedupeArray(VITE_DEDUPE_DEPENDENCIES)},\n  },`;
+    });
+  }
+
+  return null;
+}
+
+function findViteConfig(projectRoot) {
+  return VITE_CONFIG_FILES.map((file) => path.join(projectRoot, file)).find((fp) =>
+    fs.existsSync(fp),
+  );
+}
+
+function ensureViteDedupe(projectRoot) {
+  const fp = findViteConfig(projectRoot);
+  if (!fp) {
+    console.warn(
+      "[mvframe-init] 未找到 vite.config.*，请手动配置 resolve.dedupe: [\"vue\", \"vue-router\", \"pinia\"]",
+    );
+    return;
+  }
+
+  const current = fs.readFileSync(fp, "utf8");
+  const next = injectViteDedupe(current);
+  if (!next) {
+    console.warn(
+      `[mvframe-init] 未能自动更新 ${path.basename(fp)}，请手动配置 resolve.dedupe: ["vue", "vue-router", "pinia"]`,
+    );
+    return;
+  }
+  if (next === current) {
+    console.log("[mvframe-init] Vite resolve.dedupe 已包含 vue / vue-router / pinia");
+    return;
+  }
+
+  fs.writeFileSync(fp, next, "utf8");
+  console.log(
+    `[mvframe-init] 已更新 ${path.basename(fp)}：resolve.dedupe 去重 vue / vue-router / pinia`,
+  );
+}
+
 function main() {
   if (!fs.existsSync(target)) {
     console.error("[mvframe-init] 目录不存在:", target);
@@ -698,10 +784,13 @@ code {
     );
   }
 
-  const viteConfig = path.join(target, "vite.config.js");
-  if (!fs.existsSync(viteConfig) || FORCE) {
+  const existingViteConfig = findViteConfig(target);
+  const viteConfigRel = existingViteConfig
+    ? path.relative(target, existingViteConfig)
+    : "vite.config.js";
+  if (!existingViteConfig || FORCE) {
     write(
-      "vite.config.js",
+      viteConfigRel,
       `import { defineConfig } from "vite";
 import vue from "@vitejs/plugin-vue";
 import path from "path";
@@ -733,6 +822,7 @@ export default defineConfig({
     }),
   ],
   resolve: {
+    dedupe: ["vue", "vue-router", "pinia"],
     alias: {
       "@": path.resolve(__dirname, "src"),
       "@cps": path.resolve(__dirname, "src/composition"),
@@ -745,6 +835,7 @@ export default defineConfig({
 `,
     );
   }
+  ensureViteDedupe(target);
 
   write(
     ".env.mvframe-notify.example",
@@ -816,7 +907,7 @@ yarn exec mvframe-d
 
 若需跳过对 \`package.json\` 的修改：\`node scripts/scaffold-app.js --no-package-json\` 或 \`node scripts/scaffold-app.js -n\`。
 
-自动生成的 \`vite.config.js\` 已包含 \`unplugin-auto-import\`；\`dts: true\` 时类型默认写在项目根 \`auto-imports.d.ts\`。
+自动生成的 \`vite.config.js\` 已包含 \`unplugin-auto-import\`；\`dts: true\` 时类型默认写在项目根 \`auto-imports.d.ts\`。初始化脚本还会确保宿主 Vite 配置里存在 \`resolve.dedupe: ["vue", "vue-router", "pinia"]\`，避免宿主项目与 \`mvframe\` 各自解析出多份 Vue / Router / Pinia 实例。
 
 \`src/main.js\` 默认在 \`app.use(mvframe, { components: { async: ["VTable"] } })\` 中异步注册 \`VTable\`。这样只有页面实际渲染 \`<VTable>\` 时才加载 VisActor 相关 chunk，避免 \`@visactor/vtable\` 进入宿主首屏同步链。