create-windy 0.3.8 → 0.3.9

package/dist/cli.js

@@ -8772,12 +8772,17 @@ async function planFile(path2, baseRoot, targetRoot, source, target, ours, prove
   const oursChanged = hashContent(ours) !== source.hash;
   const sourceArtifactHash = artifactHashOf(source);
   const targetChanged = targetChangedSinceBase(sourceArtifactHash, base, theirs);
-  if (shouldForcePlatformBaseline({
+  const forceTargetBaseline = shouldForcePlatformBaseline({
     forcePlatformBaseline,
     oursChanged,
     sourceArtifactHash,
     base
-  })) {
+  });
+  if (forceTargetBaseline && 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 (forceTargetBaseline) {
     return readyPlannedFile(path2, ownership, "update", "\u5F3A\u5236\u91C7\u7528\u76EE\u6807\u5E73\u53F0\u57FA\u7EBF", expected, theirs);
   }
   if (!oursChanged && !targetChanged) {
@@ -9008,7 +9013,8 @@ var recipes = [
   { id: "starter-0.3.4-to-0.3.5", from: "0.3.4", to: "0.3.5" },
   { id: "starter-0.3.5-to-0.3.6", from: "0.3.5", to: "0.3.6" },
   { id: "starter-0.3.6-to-0.3.7", from: "0.3.6", to: "0.3.7" },
-  { id: "starter-0.3.7-to-0.3.8", from: "0.3.7", to: "0.3.8" }
+  { id: "starter-0.3.7-to-0.3.8", from: "0.3.7", to: "0.3.8" },
+  { id: "starter-0.3.8-to-0.3.9", from: "0.3.8", to: "0.3.9" }
 ];
 function resolveRecipeChain(sourceVersion, targetVersion) {
   if (sourceVersion === targetVersion)

package/package.json

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

package/template/.windy-template.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
-  "templateCommit": "25260c844c95d14d4ac3ccae6e7553dbde2fd9c6",
-  "generatorVersion": "0.3.8",
+  "templateCommit": "fe9c5197b083b0d4ff03f9550043d96a392992a1",
+  "generatorVersion": "0.3.9",
   "modules": [
     {
       "name": "system",