create-ampless 1.0.0-alpha.81 → 1.0.0-alpha.83

package/dist/index.js

@@ -1938,6 +1938,9 @@ function isThemeDirName(name) {
   }
   return true;
 }
+function isQuarantinedThemeName(name) {
+  return !isThemeDirName(name);
+}
 async function listShippedThemes(templatesRoot) {
   if (!existsSync5(templatesRoot)) return [];
   const entries = await readdir3(templatesRoot, { withFileTypes: true });
@@ -1969,6 +1972,16 @@ async function syncThemes(destDir, templatesRoot) {
   const shipped = await listShippedThemes(templatesRoot);
   const themesDir = join3(destDir, "themes");
   await mkdir2(themesDir, { recursive: true });
+  const quarantined = [];
+  if (existsSync5(themesDir)) {
+    const present = await readdir3(themesDir, { withFileTypes: true });
+    for (const entry of present) {
+      if (!entry.isDirectory()) continue;
+      if (!isQuarantinedThemeName(entry.name)) continue;
+      await rm2(join3(themesDir, entry.name), { recursive: true, force: true });
+      quarantined.push(entry.name);
+    }
+  }
   for (const name of shipped) {
     const src = join3(templatesRoot, name);
     const dst = join3(themesDir, name);
@@ -1982,10 +1995,12 @@ async function syncThemes(destDir, templatesRoot) {
   }
   const installed = await discoverInstalledThemes(destDir);
   const shippedSet = new Set(shipped);
-  const preserved = installed.filter((t) => !shippedSet.has(t));
+  const preserved = installed.filter(
+    (t) => !shippedSet.has(t) && !isQuarantinedThemeName(t)
+  );
   const all = [...shipped, ...preserved];
   await writeFile3(join3(destDir, "themes-registry.ts"), buildRegistry(all), "utf-8");
-  return { synced: shipped, preserved };
+  return { synced: shipped, preserved, quarantined };
 }
 async function walkDir(dir, base, out) {
   const entries = await readdir3(dir, { withFileTypes: true });
@@ -2114,7 +2129,10 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
   const seedSkipped = classification.seed.filter((r) => existsSync5(join3(destDir, r)));
   const shippedThemes = themeSyncEnabled ? await listShippedThemes(templatesRoot) : [];
   const existingThemes = themeSyncEnabled ? await discoverInstalledThemes(destDir) : [];
-  const preservedThemes = existingThemes.filter((t) => !shippedThemes.includes(t));
+  const quarantinedThemesPreview = existingThemes.filter(isQuarantinedThemeName);
+  const preservedThemes = existingThemes.filter(
+    (t) => !shippedThemes.includes(t) && !isQuarantinedThemeName(t)
+  );
   const obsoleteFiles = await findObsoleteFiles(destDir, sharedDir);
   log3.info(
     `replace: ${pc3.green(`${replaceNew.length} added`)} / ${pc3.yellow(`${replaceUpdate.length} updated`)}`
@@ -2129,6 +2147,11 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
     log3.info(
       `themes:  ${pc3.cyan(`${shippedThemes.length} default themes synced`)} / ${pc3.dim(`${preservedThemes.length} custom (my-*) themes preserved`)}`
     );
+    if (quarantinedThemesPreview.length > 0) {
+      log3.info(
+        `recover: ${pc3.yellow(`${quarantinedThemesPreview.length} bogus theme dir(s) removed`)} (${quarantinedThemesPreview.join(", ")} \u2014 scaffold templates leaked in by an earlier buggy create-ampless@alpha)`
+      );
+    }
   }
   if (obsoleteFiles.length > 0) {
     log3.info(`cleanup: ${pc3.yellow(`${obsoleteFiles.length} removed`)} (files under ampless-managed app/ paths that no longer exist in the template)`);
@@ -2142,6 +2165,7 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
       protected: classification.protected,
       themesSynced: shippedThemes,
       themesPreserved: preservedThemes,
+      themesQuarantined: quarantinedThemesPreview,
       packageJsonMerged: false,
       obsoleteRemoved: obsoleteFiles
     };
@@ -2156,7 +2180,7 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
     const dst = join3(destDir, rel);
     await copyWithSubstitution(src, dst, vars);
   }
-  const themeResult = themeSyncEnabled ? await syncThemes(destDir, templatesRoot) : { synced: [], preserved: [] };
+  const themeResult = themeSyncEnabled ? await syncThemes(destDir, templatesRoot) : { synced: [], preserved: [], quarantined: [] };
   await removeObsoleteFiles(destDir, obsoleteFiles);
   const templatePkgRaw = await readFile3(join3(sharedDir, "package.json"), "utf-8");
   const templatePkg = JSON.parse(templatePkgRaw);
@@ -2197,6 +2221,7 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
     protected: classification.protected,
     themesSynced: themeResult.synced,
     themesPreserved: themeResult.preserved,
+    themesQuarantined: themeResult.quarantined,
     packageJsonMerged: true,
     obsoleteRemoved: obsoleteFiles
   };

package/dist/templates/_shared/package.json

@@ -33,9 +33,9 @@
     "@ampless/plugin-schema-jsonld": "^0.1.1-alpha.2",
     "@ampless/plugin-seo": "^0.2.0-alpha.23",
     "@ampless/plugin-webhook": "^0.2.0-alpha.23",
-    "@ampless/admin": "^1.0.0-alpha.50",
+    "@ampless/admin": "^1.0.0-alpha.51",
     "@ampless/backend": "^1.0.0-alpha.40",
-    "@ampless/runtime": "^1.0.0-alpha.29",
+    "@ampless/runtime": "^1.0.0-alpha.30",
     "@digital-go-jp/tailwind-theme-plugin": "^0.3.4",
     "ampless": "^1.0.0-alpha.23",
     "aws-amplify": "^6.17.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ampless",
-  "version": "1.0.0-alpha.81",
+  "version": "1.0.0-alpha.83",
   "description": "Create a new ampless project",
   "license": "MIT",
   "type": "module",