create-ampless 0.2.0-alpha.21 → 0.2.0-alpha.22

package/dist/index.js

@@ -1761,6 +1761,14 @@ import { join as join3, relative, extname as extname2, dirname } from "path";
 import { log as log3, outro } from "@clack/prompts";
 import pc3 from "picocolors";
 import { execa as execa4 } from "execa";
+var AMPLESS_MANAGED_APP_PATHS = [
+  "app/(admin)/admin",
+  "app/api/admin",
+  "app/api/media",
+  "app/api/mcp",
+  "app/login",
+  "app/site"
+];
 var AMPLESS_PACKAGES = /* @__PURE__ */ new Set([
   "ampless",
   "@ampless/admin",
@@ -1882,6 +1890,63 @@ async function walkDir(dir, base, out) {
     }
   }
 }
+async function listFilesRecursive(root) {
+  const out = [];
+  async function walk(current, relPrefix) {
+    const entries = await readdir3(current, { withFileTypes: true });
+    for (const entry of entries) {
+      const rel = relPrefix ? `${relPrefix}/${entry.name}` : entry.name;
+      if (entry.isDirectory()) {
+        await walk(join3(current, entry.name), rel);
+      } else if (entry.isFile()) {
+        out.push(rel);
+      }
+    }
+  }
+  if (!existsSync5(root)) return out;
+  await walk(root, "");
+  return out;
+}
+async function pruneEmptyDirs(root) {
+  if (!existsSync5(root)) return;
+  const entries = await readdir3(root, { withFileTypes: true });
+  for (const entry of entries) {
+    if (entry.isDirectory()) {
+      await pruneEmptyDirs(join3(root, entry.name));
+    }
+  }
+  const remaining = await readdir3(root);
+  if (remaining.length === 0) {
+    await rm2(root, { recursive: true, force: true });
+  }
+}
+async function findObsoleteAppFiles(destDir, sharedDir) {
+  const obsolete = [];
+  for (const managedPath of AMPLESS_MANAGED_APP_PATHS) {
+    const userPath = join3(destDir, managedPath);
+    if (!existsSync5(userPath)) continue;
+    const templatePath2 = join3(sharedDir, managedPath);
+    const templateFiles = new Set(await listFilesRecursive(templatePath2));
+    const userFiles = await listFilesRecursive(userPath);
+    for (const f of userFiles) {
+      if (!templateFiles.has(f)) {
+        obsolete.push(`${managedPath}/${f}`);
+      }
+    }
+  }
+  return obsolete;
+}
+async function removeObsoleteAppFiles(destDir, paths) {
+  for (const rel of paths) {
+    const abs = join3(destDir, rel);
+    if (existsSync5(abs)) {
+      await rm2(abs, { force: true });
+    }
+  }
+  for (const managedPath of AMPLESS_MANAGED_APP_PATHS) {
+    await pruneEmptyDirs(join3(destDir, managedPath));
+  }
+}
 function substituteVars(content, vars) {
   return content.replace(/\{\{(\w+)\}\}/g, (_, key) => vars[key] ?? `{{${key}}}`);
 }
@@ -1935,6 +2000,7 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
   const shippedThemes = themeSyncEnabled ? await listShippedThemes(templatesRoot) : [];
   const existingThemes = themeSyncEnabled ? await discoverInstalledThemes(destDir) : [];
   const preservedThemes = existingThemes.filter((t) => !shippedThemes.includes(t));
+  const obsoleteFiles = await findObsoleteAppFiles(destDir, sharedDir);
   log3.info(
     `replace: ${pc3.green(`\u8FFD\u52A0 ${replaceNew.length}`)} / ${pc3.yellow(`\u66F4\u65B0 ${replaceUpdate.length}`)}`
   );
@@ -1949,6 +2015,9 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
       `themes:  ${pc3.cyan(`\u30C7\u30D5\u30A9\u30EB\u30C8\u30C6\u30FC\u30DE\u3092\u540C\u671F: ${shippedThemes.length}`)} / ${pc3.dim(`\u30AB\u30B9\u30BF\u30E0\u30C6\u30FC\u30DE (my-*) \u3092\u4FDD\u6301: ${preservedThemes.length}`)}`
     );
   }
+  if (obsoleteFiles.length > 0) {
+    log3.info(`cleanup: ${pc3.yellow(`\u524A\u9664 ${obsoleteFiles.length}`)} (ampless-managed app/ \u914D\u4E0B\u3067\u30C6\u30F3\u30D7\u30EC\u306B\u7121\u3044\u30D5\u30A1\u30A4\u30EB)`);
+  }
   log3.info(`protected: ${pc3.dim(`\u30C6\u30F3\u30D7\u30EC\u306B\u5B58\u5728\u3059\u308B\u304C\u89E6\u3089\u306A\u3044: ${classification.protected.length} \u500B`)}`);
   if (opts.dryRun) {
     return {
@@ -1958,7 +2027,8 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
       protected: classification.protected,
       themesSynced: shippedThemes,
       themesPreserved: preservedThemes,
-      packageJsonMerged: false
+      packageJsonMerged: false,
+      obsoleteRemoved: obsoleteFiles
     };
   }
   for (const rel of classification.replace) {
@@ -1972,6 +2042,7 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
     await copyWithSubstitution(src, dst, vars);
   }
   const themeResult = themeSyncEnabled ? await syncThemes(destDir, templatesRoot) : { synced: [], preserved: [] };
+  await removeObsoleteAppFiles(destDir, obsoleteFiles);
   const templatePkgRaw = await readFile3(join3(sharedDir, "package.json"), "utf-8");
   const templatePkg = JSON.parse(templatePkgRaw);
   const indent = detectIndent(projectPkgRaw);
@@ -2011,7 +2082,8 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
     protected: classification.protected,
     themesSynced: themeResult.synced,
     themesPreserved: themeResult.preserved,
-    packageJsonMerged: true
+    packageJsonMerged: true,
+    obsoleteRemoved: obsoleteFiles
   };
 }
 async function runUpgrade(args) {

package/package.json

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