mvframe 1.0.68 → 1.0.69

package/README.cn.md

@@ -163,7 +163,7 @@ yarn build
 
 ## 命令行：项目目录雏形（推荐）
 
-在**空目录或已有 Vite 工程根目录**执行，生成 `src/views`、`src/component`、`src/api`、`src/assets/img`、`src/assets/style`、`src/router`、`src/pinia/chip`、`src/config` 及示例 `main.js` / `App.vue`（已 `app.use(mvframe, …)` 挂好路由、Pinia `storeChips`、config），并复制 **`/.cursor/rules/*.mdc`**（与 mvframe 仓库内 Cursor 规则一致）。若不存在则附带 `index.html` 与 `vite.config.js`。会**合并** `package.json` 的 `dependencies` / `devDependencies`（与 Vite 模板一致；**同名包保留你原有版本**），最后请执行 **`yarn install`**；加 `--no-package-json` 可不改动 `package.json`。
+在**空目录或已有 Vite 工程根目录**执行，生成 `src/views`、`src/component`、`src/api`、`src/assets/img`、`src/assets/style`、`src/router`、`src/pinia/chip`、`src/config` 及示例 `main.js` / `App.vue`（已 `app.use(mvframe, …)` 挂好路由、Pinia `storeChips`、config），并复制 **`/.cursor/rules/*.mdc`**（与 mvframe 仓库内 Cursor 规则一致）。若不存在则附带 `index.html` 与 `vite.config.js`。会**合并** `package.json` 的 `scripts` / `dependencies` / `devDependencies`（与 Vite 模板一致；**同名脚本和包保留你原有值**），并自动执行 **`yarn install`**，最后请执行 **`yarn dev`**；加 `--no-package-json` 可不改动 `package.json` 且跳过安装。
 
 ```bash
 cd /path/to/your-app

package/README.md

@@ -163,7 +163,7 @@ Production uses **library mode** with entry `src/index.js` and obfuscation-relat
 
 ## CLI: project skeleton
 
-From an **empty folder or existing Vite root**, generates `src/views`, `src/component`, `src/api`, `src/assets/img`, `src/assets/style`, `src/router`, `src/pinia/chip`, `src/config`, plus starter `main.js` / `App.vue` with `app.use(mvframe, …)` (routes, Pinia `storeChips`, config), and copies **`/.cursor/rules/*.mdc`** from the package (same as this repo’s Cursor rules). Adds `index.html` and `vite.config.js` only if missing (use `--force` to overwrite). **Merges** `dependencies` / `devDependencies` into `package.json` (existing versions win for shared keys); use `--no-package-json` to skip. Then run **`yarn install`**.
+From an **empty folder or existing Vite root**, generates `src/views`, `src/component`, `src/api`, `src/assets/img`, `src/assets/style`, `src/router`, `src/pinia/chip`, `src/config`, plus starter `main.js` / `App.vue` with `app.use(mvframe, …)` (routes, Pinia `storeChips`, config), and copies **`/.cursor/rules/*.mdc`** from the package (same as this repo’s Cursor rules). Adds `index.html` and `vite.config.js` only if missing (use `--force` to overwrite). **Merges** `scripts` / `dependencies` / `devDependencies` into `package.json` (existing values win for shared keys), then runs **`yarn install`**; use `--no-package-json` to skip package changes and install. Then run **`yarn dev`**.
 
 ```bash
 cd /path/to/your-app

package/dist/vendor.js

@@ -9320,7 +9320,7 @@ const gi = {
 }, Ai = {
   name: "Matt Avias Frame",
   copyright: "©2026",
-  version: "1.0.68",
+  version: "1.0.69",
   author: "Matt Avias",
   date: "2026-02-26",
   /** 默认语言 key，与 `$getLang`、localStorage `lang` 一致；业务在 app.use(mvframe, { config }) 里覆盖 */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mvframe",
   "packageManager": "yarn@4.4.1",
-  "version": "1.0.68",
+  "version": "1.0.69",
   "author": "matt avis",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/scripts/scaffold-app.js

@@ -13,6 +13,7 @@
 
 const fs = require("fs");
 const path = require("path");
+const { execFileSync } = require("child_process");
 
 const FORCE = process.argv.includes("--force");
 const NO_PKG = process.argv.includes("--no-package-json");
@@ -75,9 +76,16 @@ const SCAFFOLD_DEV_DEPENDENCIES = {
   "unplugin-auto-import": "^0.18.2",
 };
 
+const SCAFFOLD_SCRIPTS = {
+  dev: "vite",
+  build: "vite build",
+  preview: "vite preview",
+};
+
 /**
- * 合并 package.json：保留原有字段与其它依赖；仅补足脚手架所需包。
+ * 合并 package.json：保留原有字段与其它依赖；仅补足脚手架所需包与启动脚本。
  * 同名依赖以目标项目已有版本为准（{ ...建议, ...已有 }）。
+ * 同名 scripts 也以目标项目已有命令为准，避免覆盖自定义 dev/build。
  */
 function mergePackageJson(projectRoot) {
   const pkgPath = path.join(projectRoot, "package.json");
@@ -96,15 +104,15 @@ function mergePackageJson(projectRoot) {
       version: "0.1.0",
       private: true,
       type: "module",
-      scripts: {
-        dev: "vite",
-        build: "vite build",
-        preview: "vite preview",
-      },
+      scripts: { ...SCAFFOLD_SCRIPTS },
     };
     console.log("[mvframe-init] 新建 package.json");
   }
 
+  pkg.scripts = {
+    ...SCAFFOLD_SCRIPTS,
+    ...(pkg.scripts && typeof pkg.scripts === "object" ? pkg.scripts : {}),
+  };
   pkg.dependencies = {
     ...SCAFFOLD_DEPENDENCIES,
     ...(pkg.dependencies && typeof pkg.dependencies === "object" ? pkg.dependencies : {}),
@@ -117,7 +125,17 @@ function mergePackageJson(projectRoot) {
   };
 
   fs.writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`, "utf8");
-  console.log("[mvframe-init] 已合并 package.json 的 dependencies / devDependencies（已有版本优先）");
+  console.log(
+    "[mvframe-init] 已合并 package.json 的 scripts / dependencies / devDependencies（已有值优先）",
+  );
+}
+
+function installDependencies(projectRoot) {
+  console.log("[mvframe-init] 执行 yarn install");
+  execFileSync("yarn", ["install"], {
+    cwd: projectRoot,
+    stdio: "inherit",
+  });
 }
 
 function main() {
@@ -718,10 +736,10 @@ export default defineConfig({
 
 ## 依赖
 
-初始化脚本会**合并**（不整文件覆盖）\`package.json\` 的 \`dependencies\` / \`devDependencies\`：**已声明的包保留你的版本号**，仅补上缺失项。然后执行：
+初始化脚本会**合并**（不整文件覆盖）\`package.json\` 的 \`scripts\` / \`dependencies\` / \`devDependencies\`：**已声明的脚本和包保留你的原值**，仅补上缺失项，并自动执行 \`yarn install\`。然后执行：
 
 \`\`\`bash
-yarn install
+yarn dev
 \`\`\`
 
 若需跳过对 \`package.json\` 的修改：\`node scripts/scaffold-app.js --no-package-json\`。
@@ -793,11 +811,10 @@ yarn exec mvframe-install-cursor-skill
 
   if (!NO_PKG) {
     mergePackageJson(target);
+    installDependencies(target);
   }
 
-  console.log(
-    "[mvframe-init] 完成。请阅读 MVFRAME-SCAFFOLD.md 并在项目根执行 yarn install（或 npm install）。",
-  );
+  console.log("[mvframe-init] 完成。请阅读 MVFRAME-SCAFFOLD.md 并在项目根执行 yarn dev。");
 }
 
 main();