create-windy 0.3.15 → 0.3.16

package/README.md

@@ -59,7 +59,7 @@ npx create-windy@latest my-dashboard \
   `system.operations`。
 - 默认不选：离线 `system.license`、文件、任务、通知、工作流、搜索、数据治理、
   Agent、批量数据和示例工单等模块。
-- 默认代码质量：Oxlint + Oxfmt。Husky 会在提交前通过 lint-staged 自动格式化暂存
+- 默认代码质量：Oxlint + Oxfmt。Husky 会在提交前通过 lint-staged 自动格式化并检查暂存
   文件，不会把未暂存内容带入提交；lint、typecheck 和 test 保留为显式命令。
 - `--no-oxc` 会物理排除 Oxc 配置、Husky hook、lint-staged、依赖和质量脚本。
 - 默认法律许可证：`UNLICENSED`，不会生成 `LICENSE` 文件。

package/dist/cli.js

@@ -4011,7 +4011,7 @@ create-windy \u9ED8\u8BA4\u5EFA\u7ACB \`main\` \u5206\u652F\u5E76\u521B\u5EFA \`
 
 // src/project-package.ts
 var defaultLintStaged = {
-  "*.{cjs,css,cts,html,js,json,jsonc,jsx,less,md,mdx,mjs,mts,scss,ts,tsx,vue,yaml,yml}": "oxfmt --write"
+  "*.{cjs,css,cts,html,js,json,jsonc,jsx,less,md,mdx,mjs,mts,scss,ts,tsx,vue,yaml,yml}": ["oxfmt --write", "oxlint"]
 };
 function createStarterPackage(source, projectName, includeOxc = true, projectLicense = "UNLICENSED", selectedModules = [], generatorVersion) {
   const { "lint-staged": sourceLintStaged, ...sourceWithoutLintStaged } = source;
@@ -8869,6 +8869,10 @@ async function planFile(path2, baseRoot, targetRoot, source, target, ours, prove
   if (!oursChanged && !targetChanged) {
     return readyPlannedFile(path2, ownership, "preserve", "\u53CC\u65B9\u672A\u4FEE\u6539", expected);
   }
+  if (targetChanged && path2.endsWith("package.json") && base) {
+    const merged = mergePackageJson(base, ours, theirs);
+    return merged.content ? readyPlannedFile(path2, ownership, "update", "package.json \u5B57\u6BB5\u7EA7\u5408\u5E76", expected, merged.content) : conflict2(path2, ownership, `\u5B57\u6BB5\u51B2\u7A81\uFF1A${merged.conflicts.join("\u3001")}`, expected);
+  }
   if (!oursChanged) {
     return readyPlannedFile(path2, ownership, "update", "\u4EC5 Windy \u4FEE\u6539", expected, theirs);
   }
@@ -8878,10 +8882,6 @@ async function planFile(path2, baseRoot, targetRoot, source, target, ours, prove
   if (hashContent(ours) === target.hash) {
     return readyPlannedFile(path2, ownership, "preserve", "\u5DF2\u5305\u542B\u76EE\u6807\u5185\u5BB9", expected);
   }
-  if (path2.endsWith("package.json") && base) {
-    const merged = mergePackageJson(base, ours, theirs);
-    return merged.content ? readyPlannedFile(path2, ownership, "update", "package.json \u5B57\u6BB5\u7EA7\u5408\u5E76", expected, merged.content) : conflict2(path2, ownership, `\u5B57\u6BB5\u51B2\u7A81\uFF1A${merged.conflicts.join("\u3001")}`, expected);
-  }
   if (base) {
     const merged = await mergeTextFile(base, ours, theirs);
     return merged.content ? readyPlannedFile(path2, ownership, "update", "\u4E09\u65B9\u5408\u5E76", expected, merged.content) : conflict2(path2, ownership, merged.conflict || "\u4E09\u65B9\u5408\u5E76\u5931\u8D25", expected);
@@ -9092,7 +9092,8 @@ var recipes = [
   { id: "starter-0.3.11-to-0.3.12", from: "0.3.11", to: "0.3.12" },
   { id: "starter-0.3.12-to-0.3.13", from: "0.3.12", to: "0.3.13" },
   { id: "starter-0.3.13-to-0.3.14", from: "0.3.13", to: "0.3.14" },
-  { id: "starter-0.3.14-to-0.3.15", from: "0.3.14", to: "0.3.15" }
+  { id: "starter-0.3.14-to-0.3.15", from: "0.3.14", to: "0.3.15" },
+  { id: "starter-0.3.15-to-0.3.16", from: "0.3.15", to: "0.3.16" }
 ];
 function resolveRecipeChain(sourceVersion, targetVersion) {
   if (sourceVersion === targetVersion)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-windy",
-  "version": "0.3.15",
+  "version": "0.3.16",
   "description": "创建单组织、单租户、私有部署优先的 Windy 企业 Dashboard Starter",
   "type": "module",
   "bin": {

package/template/.windy-template.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
-  "templateCommit": "da31c4d38a1db64a5eaaeca914a9afe694d930c3",
-  "generatorVersion": "0.3.15",
+  "templateCommit": "39074967cfcee6aca5ff6d3e2791b93ab90e70af",
+  "generatorVersion": "0.3.16",
   "modules": [
     {
       "name": "system",

package/template/package.json

@@ -70,7 +70,10 @@
     "test": "bun test --path-ignore-patterns='packages/create-windy/template/**' && bun run --cwd apps/web test"
   },
   "lint-staged": {
-    "*.{cjs,css,cts,html,js,json,jsonc,jsx,less,md,mdx,mjs,mts,scss,ts,tsx,vue,yaml,yml}": "oxfmt --write"
+    "*.{cjs,css,cts,html,js,json,jsonc,jsx,less,md,mdx,mjs,mts,scss,ts,tsx,vue,yaml,yml}": [
+      "oxfmt --write",
+      "oxlint"
+    ]
   },
   "devDependencies": {
     "@types/bun": "^1.3.14",