create-windy 0.3.6 → 0.3.7

package/dist/cli.js

@@ -8687,7 +8687,7 @@ function conflict(path2, reason, expectedProjectContent) {
 }
 
 // src/update/planner-file.ts
-async function planFile(path2, baseRoot, targetRoot, source, target, ours, provenance, targetContentOverride, manageGeneratedProjectOwned = false) {
+async function planFile(path2, baseRoot, targetRoot, source, target, ours, provenance, targetContentOverride, manageGeneratedProjectOwned = false, forcePlatformBaseline = false) {
   const [base, theirs] = await Promise.all([
     readOptional(join19(baseRoot, path2)),
     targetContentOverride ? Promise.resolve(targetContentOverride) : readOptional(join19(targetRoot, path2))
@@ -8736,6 +8736,14 @@ 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({
+    forcePlatformBaseline,
+    oursChanged,
+    sourceArtifactHash,
+    base
+  })) {
+    return readyPlannedFile(path2, ownership, "update", "\u5F3A\u5236\u91C7\u7528\u76EE\u6807\u5E73\u53F0\u57FA\u7EBF", expected, theirs);
+  }
   if (!oursChanged && !targetChanged) {
     return readyPlannedFile(path2, ownership, "preserve", "\u53CC\u65B9\u672A\u4FEE\u6539", expected);
   }
@@ -8758,6 +8766,9 @@ async function planFile(path2, baseRoot, targetRoot, source, target, ours, prove
   }
   return conflict2(path2, ownership, "\u5BA2\u6237\u548C Windy \u5747\u5DF2\u4FEE\u6539", expected);
 }
+function shouldForcePlatformBaseline(input) {
+  return input.forcePlatformBaseline && !input.oursChanged && input.base !== undefined && hashContent(input.base) !== input.sourceArtifactHash;
+}
 function targetChangedSinceBase(sourceHash, base, target) {
   return base && target ? hashContent(base) !== hashContent(target) : !!target && hashContent(target) !== sourceHash;
 }
@@ -8959,7 +8970,8 @@ var recipes = [
   { id: "starter-0.3.2-to-0.3.3", from: "0.3.2", to: "0.3.3" },
   { id: "starter-0.3.3-to-0.3.4", from: "0.3.3", to: "0.3.4" },
   { 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.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" }
 ];
 function resolveRecipeChain(sourceVersion, targetVersion) {
   if (sourceVersion === targetVersion)
@@ -9054,7 +9066,8 @@ async function createUpdatePlan(request, artifacts) {
     migrations,
     artifactSet,
     provenance,
-    manageGeneratedProjectOwned: request.targetModules !== undefined
+    manageGeneratedProjectOwned: request.targetModules !== undefined,
+    forcePlatformBaseline: request.forcePlatformBaseline === true
   });
   deriveWebDockerfilePlan(files, projectSnapshots, new Set([...paths, ...workspaceSnapshot.manifests.keys()]));
   for (const file of files) {
@@ -9141,7 +9154,7 @@ async function planFiles(input) {
     } else if (forcedContent) {
       files.push(readyPlannedFile(path2, input.targetEntries.get(path2)?.ownership ?? input.sourceEntries.get(path2)?.ownership ?? classifyOwnership(path2), "update", "\u5408\u5E76\u5E73\u53F0\u4E0E\u4E0B\u6E38 migration \u5386\u53F2", expected, forcedContent));
     } else {
-      files.push(await planFile(path2, input.artifactSet.baseDirectory, input.artifactSet.targetDirectory, input.sourceEntries.get(path2), input.targetEntries.get(path2), ours, input.provenance, input.migrations.contentOverrides.get(path2), input.manageGeneratedProjectOwned));
+      files.push(await planFile(path2, input.artifactSet.baseDirectory, input.artifactSet.targetDirectory, input.sourceEntries.get(path2), input.targetEntries.get(path2), ours, input.provenance, input.migrations.contentOverrides.get(path2), input.manageGeneratedProjectOwned, input.forcePlatformBaseline));
     }
   }
   return files;
@@ -10702,7 +10715,11 @@ async function runUpdate(args, projectDirectory) {
     return;
   }
   const updater = new DefaultStarterUpdater;
-  const plan = await updater.plan({ projectDirectory, targetVersion: target });
+  const plan = await updater.plan({
+    projectDirectory,
+    targetVersion: target,
+    forcePlatformBaseline: args.includes("--force")
+  });
   printPlan(plan);
   if (args.includes("--dry-run")) {
     await rm11(plan.temporaryRoot, { recursive: true, force: true });

package/package.json

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

package/template/.windy-template.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
-  "templateCommit": "5be88a688b54b87cf58a753535efb875ee3058e4",
-  "generatorVersion": "0.3.6",
+  "templateCommit": "fca8f541b8d5593ff4e69daf665624ba131eb3e5",
+  "generatorVersion": "0.3.7",
   "modules": [
     {
       "name": "system",