create-windy 0.3.10 → 0.3.12

package/dist/cli.js

@@ -835,7 +835,7 @@ var helpText = `create-windy <\u9879\u76EE\u540D> [\u9009\u9879]
 
 \u9009\u9879\uFF1A
   --profile private-enterprise  \u5355\u7EC4\u7EC7\u3001\u5355\u79DF\u6237\u3001\u79C1\u6709\u90E8\u7F72 profile
-  --skip-install                \u53EA\u751F\u6210\u6587\u4EF6\uFF0C\u4E0D\u6267\u884C bun install
+  --skip-install                \u751F\u6210\u6216\u66F4\u65B0\u65F6\u4E0D\u6267\u884C bun install
   --verify                      \u5B89\u88C5\u540E\u6267\u884C lint\uFF08\u82E5\u6709\uFF09\u3001typecheck\u3001test \u548C build
   --keep-on-error               \u5931\u8D25\u65F6\u4FDD\u7559\u65B0\u751F\u6210\u76EE\u5F55\u7528\u4E8E\u8BCA\u65AD
   --module <key>                \u589E\u52A0\u6A21\u5757\uFF0C\u53EF\u91CD\u590D\u4F7F\u7528
@@ -866,7 +866,7 @@ async function runCommand(command, args, cwd) {
   await new Promise((resolve2, reject) => {
     const child = spawn(command, args, { cwd, stdio: "inherit" });
     child.once("error", reject);
-    child.once("exit", (code, signal) => {
+    child.once("close", (code, signal) => {
       if (code === 0)
         resolve2();
       else
@@ -7360,6 +7360,36 @@ async function assertRestoredEntries(root, state, backups) {
   }
 }
 
+// src/update/transaction-recovery-preserves.ts
+async function unresolvedPreservePaths(root, backupPath, state) {
+  const unresolved = [];
+  for (const path2 of state.preservePaths ?? []) {
+    const entry = state.entries.find((candidate) => candidate.path === path2);
+    if (!entry) {
+      unresolved.push(path2);
+      continue;
+    }
+    const backup = entry.existed ? await backupExpectation(root, backupPath, entry.path, entry.mode) : { kind: "missing" };
+    const actualHash = await hashSafePath(root, path2);
+    const actualMode = await safeFileMode(root, path2);
+    const mutation = state.mutationEvidence?.find((evidence) => evidence.path === path2);
+    const matchesBackup = matchesExpected(actualHash, actualMode, backup, entry.mode);
+    const matchesOutcome = Boolean(mutation?.linearized && mutation.outcome && matchesExpected(actualHash, actualMode, mutation.outcome, mutation.outcomeMode));
+    if (!matchesBackup && !matchesOutcome) {
+      unresolved.push(path2);
+    }
+  }
+  return unresolved;
+}
+async function backupExpectation(root, backupPath, path2, mode) {
+  const backupFile = `${backupPath}/files/${path2}`;
+  const content = await readSafeOptional(root, backupFile);
+  if (!content || mode !== undefined && await safeFileMode(root, backupFile) !== mode) {
+    throw new Error(`\u4E8B\u52A1\u5907\u4EFD\u4E0D\u5B8C\u6574\uFF0C\u65E0\u6CD5\u89E3\u9664\u4FDD\u62A4\uFF1A${path2}`);
+  }
+  return { kind: "hash", value: hashContent(content) };
+}
+
 // src/update/transaction-recovery.ts
 async function restoreUpdateState(projectDirectory, state, options) {
   const root = await resolveProjectRoot(projectDirectory);
@@ -7386,8 +7416,17 @@ async function restoreUpdateState(projectDirectory, state, options) {
       current = await retainTransactionConflicts(root, conflicts);
     }
   }
+  const retainedPreservePaths = await unresolvedPreservePaths(root, backupPath, current);
+  if (retainedPreservePaths.length !== (current.preservePaths?.length ?? 0)) {
+    const next = {
+      ...current,
+      preservePaths: retainedPreservePaths.length ? retainedPreservePaths : undefined
+    };
+    await publishTransactionState(root, current, next);
+    current = next;
+  }
   const preserved = new Set([
-    ...current.preservePaths ?? [],
+    ...retainedPreservePaths,
     ...options?.preservePaths ?? []
   ]);
   const recoveryExpectations = new Map;
@@ -9060,7 +9099,9 @@ var recipes = [
   { 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.8-to-0.3.9", from: "0.3.8", to: "0.3.9" },
-  { id: "starter-0.3.9-to-0.3.10", from: "0.3.9", to: "0.3.10" }
+  { id: "starter-0.3.9-to-0.3.10", from: "0.3.9", to: "0.3.10" },
+  { id: "starter-0.3.10-to-0.3.11", from: "0.3.10", to: "0.3.11" },
+  { id: "starter-0.3.11-to-0.3.12", from: "0.3.11", to: "0.3.12" }
 ];
 function resolveRecipeChain(sourceVersion, targetVersion) {
   if (sourceVersion === targetVersion)
@@ -10267,11 +10308,13 @@ class DefaultStarterUpdater {
   #execute;
   #beforeTransactionFinalize;
   #finalizeTransaction;
+  #skipInstall;
   constructor(dependencies = {}) {
     this.#artifacts = dependencies.artifacts ?? new PublishedArtifactProvider;
     this.#execute = dependencies.execute ?? runCommand;
     this.#beforeTransactionFinalize = dependencies.beforeTransactionFinalize;
     this.#finalizeTransaction = dependencies.finalizeTransaction ?? finalizeOwnedTransaction;
+    this.#skipInstall = dependencies.skipInstall ?? false;
   }
   async plan(input) {
     return createUpdatePlan(input, this.#artifacts);
@@ -10313,8 +10356,12 @@ class DefaultStarterUpdater {
         name: "\u540C\u6B65 Server \u4E0E Web Dockerfile workspace COPY \u6E05\u5355",
         status: dockerSync.every(({ sync }) => sync.synced) ? "passed" : "skipped"
       });
-      await this.#execute("bun", ["install", "--force"], result2.plan.projectDirectory);
-      steps.push({ name: "bun install --force", status: "passed" });
+      if (this.#skipInstall) {
+        steps.push({ name: "bun install --force", status: "skipped" });
+      } else {
+        await this.#execute("bun", ["install", "--force"], result2.plan.projectDirectory);
+        steps.push({ name: "bun install --force", status: "passed" });
+      }
       const stabilized = await stabilizeManagedContent(result2, this.#execute, async (path2, content) => {
         await writeOwnedTransactionFile(result2.plan.projectDirectory, path2, content, expectedForPath(result2, path2));
         replaceExpectations(result2, [expectationForContent(path2, content)]);
@@ -10828,7 +10875,9 @@ async function runUpdate(args, projectDirectory) {
     console.log(`\u9879\u76EE\u5DF2\u7ECF\u662F ${target}\uFF0C\u65E0\u9700\u66F4\u65B0`);
     return;
   }
-  const updater = new DefaultStarterUpdater;
+  const updater = new DefaultStarterUpdater({
+    skipInstall: args.includes("--skip-install")
+  });
   const plan = await updater.plan({
     projectDirectory,
     targetVersion: target,

package/package.json

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

package/template/.windy-template.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
-  "templateCommit": "3bbd8ca1fcd1fca58daeba2e800510e42db191b0",
-  "generatorVersion": "0.3.10",
+  "templateCommit": "e2545e4bb6f80639f12b79ffbdbd16e834bffa77",
+  "generatorVersion": "0.3.12",
   "modules": [
     {
       "name": "system",