create-windy 0.5.0 → 0.5.1

package/dist/cli.js

@@ -2661,16 +2661,27 @@ async function pruneDatabaseArtifacts(root, tableNames, statementTokens) {
     for (const path of await collectFiles2(drizzleRoot)) {
       if (path.endsWith(".sql")) {
         const source = await readFile6(path, "utf8");
-        const statements = source.split("--> statement-breakpoint").map((statement) => statement.trim()).filter(Boolean).filter((statement) => !tablePatterns.some((pattern) => pattern.test(statement)) && !statementTokens.some((token) => statement.includes(token)));
-        await writeFile5(path, statements.length ? `${statements.join(`
+        const statements = source.split("--> statement-breakpoint").map((statement) => statement.trim()).filter(Boolean);
+        const retained = statements.filter((statement) => !tablePatterns.some((pattern) => pattern.test(statement)) && !statementTokens.some((token) => statement.includes(token)));
+        if (retained.length === statements.length)
+          continue;
+        await writeFile5(path, retained.length ? `${retained.join(`
 --> statement-breakpoint
 `)}
 ` : `-- \u6B64 migration \u7684\u6A21\u5757\u672A\u88AB\u5F53\u524D\u9879\u76EE\u9009\u62E9\u3002
 `);
       } else if (path.endsWith("_snapshot.json")) {
         const snapshot = JSON.parse(await readFile6(path, "utf8"));
-        for (const name of tableNames)
-          delete snapshot.tables?.[`public.${name}`];
+        let changed = false;
+        for (const name of tableNames) {
+          const key = `public.${name}`;
+          if (!Object.hasOwn(snapshot.tables ?? {}, key))
+            continue;
+          delete snapshot.tables?.[key];
+          changed = true;
+        }
+        if (!changed)
+          continue;
         await writeFile5(path, `${JSON.stringify(snapshot, null, 2)}
 `);
       }
@@ -7558,6 +7569,11 @@ var recipes = [
     id: "starter-0.4.1-to-0.5.0",
     from: "0.4.1",
     to: "0.5.0"
+  },
+  {
+    id: "starter-0.5.0-to-0.5.1",
+    from: "0.5.0",
+    to: "0.5.1"
   }
 ];
 function resolveRecipeChain(sourceVersion, targetVersion) {
@@ -8634,6 +8650,11 @@ function mergeValue(base, ours, theirs, path2, conflicts) {
     return theirs;
   if (equal(theirs, base))
     return ours;
+  if (path2 === "package.json.files") {
+    const files = mergeAppendOnlyStringSet(base, ours, theirs);
+    if (files)
+      return files;
+  }
   if (isObject(base) && isObject(ours) && isObject(theirs)) {
     const output = {};
     const keys = new Set([
@@ -8654,6 +8675,15 @@ function mergeValue(base, ours, theirs, path2, conflicts) {
 function equal(left, right) {
   return JSON.stringify(left) === JSON.stringify(right);
 }
+function mergeAppendOnlyStringSet(base, ours, theirs) {
+  if (!isStringArray(base) || !isStringArray(ours) || !isStringArray(theirs) || !base.every((value) => ours.includes(value) && theirs.includes(value))) {
+    return;
+  }
+  return [...new Set([...ours, ...theirs])].sort();
+}
+function isStringArray(value) {
+  return Array.isArray(value) && value.every((item) => typeof item === "string");
+}
 function isObject(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }

package/package.json

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

package/template/.windy-template.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
-  "templateCommit": "647dac095fa843d7c6eaa3e734d3fbf0d80d81d8",
-  "generatorVersion": "0.5.0",
+  "templateCommit": "25b98ed98562c416c6dcfe48940cd0cae43252d4",
+  "generatorVersion": "0.5.1",
   "modules": [
     {
       "name": "system",