@appsbyme/create-basekit 1.0.4 → 1.0.5

package/dist/commands/app/index.cjs

@@ -5232,19 +5232,7 @@ function createSpinner(text) {
 init_cjs_shims();
 var import_fs2 = __toESM(require("fs"), 1);
 var import_path = __toESM(require("path"), 1);
-var DJANGO_BASE_PYPI_REQUIREMENT = "appsbyme-basekit[cli]==1.0.0";
-function getWebKitRootFromPackage() {
-  let dir = import_path.default.resolve(__dirname);
-  for (let i = 0; i < 6; i += 1) {
-    if (import_fs2.default.existsSync(import_path.default.join(dir, "packages", "utils", "package.json"))) {
-      return dir;
-    }
-    const parent = import_path.default.dirname(dir);
-    if (parent === dir) break;
-    dir = parent;
-  }
-  return import_path.default.resolve(__dirname, "../../..");
-}
+var DJANGO_BASE_PYPI_REQUIREMENT = "appsbyme-basekit[cli]>=1.0.0";
 function djangoBasePipInstallArg(spec) {
   if (spec.kind === "pypi") {
     return spec.pipSpec;
@@ -5260,7 +5248,7 @@ function filePipSpec(absoluteDir) {
   const withSlash = normalized.startsWith("/") ? normalized : `/${normalized}`;
   return `file://${withSlash}`;
 }
-function resolveDjangoBaseInstallSpec(opts) {
+function resolveDjangoBaseInstallSpec(opts = {}) {
   const env = opts.env ?? process.env;
   const envPath = env.BASEKIT_DJANGO_BASE?.trim();
   if (envPath) {
@@ -5273,24 +5261,6 @@ function resolveDjangoBaseInstallSpec(opts) {
       };
     }
   }
-  const besideProject = import_path.default.resolve(opts.projectRoot, "..", "basekit");
-  if (isUsableCheckout(besideProject)) {
-    return {
-      kind: "file",
-      pipSpec: filePipSpec(besideProject),
-      label: `sibling beside project (${besideProject})`
-    };
-  }
-  if (opts.webKitRoot) {
-    const besideWebKit = import_path.default.resolve(opts.webKitRoot, "..", "basekit");
-    if (isUsableCheckout(besideWebKit)) {
-      return {
-        kind: "file",
-        pipSpec: filePipSpec(besideWebKit),
-        label: `sibling beside basekit-web (${besideWebKit})`
-      };
-    }
-  }
   return {
     kind: "pypi",
     pipSpec: DJANGO_BASE_PYPI_REQUIREMENT,
@@ -5315,10 +5285,7 @@ async function scaffoldBackend(opts) {
   }
   venvSpinner.succeed("Virtual environment created at backend/.venv");
   const pip = venvBin(venvDir, "pip");
-  const djangoBase = resolveDjangoBaseInstallSpec({
-    projectRoot,
-    webKitRoot: getWebKitRootFromPackage()
-  });
+  const djangoBase = resolveDjangoBaseInstallSpec();
   const pipArg = djangoBasePipInstallArg(djangoBase);
   const installSpinner = createSpinner(`Installing appsbyme-basekit[cli] from ${djangoBase.label}\u2026`);
   const installResult = await execAsync(
@@ -5427,19 +5394,46 @@ function safeUnlink(absPath) {
 // src/commands/app/frontend.ts
 init_cjs_shims();
 var import_path8 = __toESM(require("path"), 1);
-var import_fs8 = __toESM(require("fs"), 1);
+var import_fs9 = __toESM(require("fs"), 1);
 
 // src/commands/web/index.ts
 init_cjs_shims();
-var import_path5 = __toESM(require("path"), 1);
-var import_fs6 = __toESM(require("fs"), 1);
+var import_path6 = __toESM(require("path"), 1);
+var import_fs7 = __toESM(require("fs"), 1);
 var import_prompts = __toESM(require_prompts3(), 1);
 
 // src/commands/web/scaffold.ts
 init_cjs_shims();
-var import_fs5 = __toESM(require("fs"), 1);
-var import_path4 = __toESM(require("path"), 1);
+var import_fs6 = __toESM(require("fs"), 1);
+var import_path5 = __toESM(require("path"), 1);
+var import_node_url2 = require("url");
+
+// src/commands/app/package-paths.ts
+init_cjs_shims();
+var import_fs4 = __toESM(require("fs"), 1);
+var import_path3 = __toESM(require("path"), 1);
 var import_node_url = require("url");
+function getCreateBasekitPackageRoot(fromDir = import_path3.default.dirname((0, import_node_url.fileURLToPath)(importMetaUrl))) {
+  let dir = import_path3.default.resolve(fromDir);
+  for (let i = 0; i < 8; i += 1) {
+    const pkgPath = import_path3.default.join(dir, "package.json");
+    if (import_fs4.default.existsSync(pkgPath)) {
+      try {
+        const name = JSON.parse(import_fs4.default.readFileSync(pkgPath, "utf8")).name;
+        if (name === "@appsbyme/create-basekit") {
+          return dir;
+        }
+      } catch {
+      }
+    }
+    const parent = import_path3.default.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  throw new Error(
+    `Could not find @appsbyme/create-basekit package root (started at ${fromDir})`
+  );
+}
 
 // src/commands/web/spinner.ts
 init_cjs_shims();
@@ -5473,8 +5467,8 @@ function createSpinner2(text) {
 // src/commands/web/utils.ts
 init_cjs_shims();
 var import_child_process2 = require("child_process");
-var import_fs4 = __toESM(require("fs"), 1);
-var import_path3 = __toESM(require("path"), 1);
+var import_fs5 = __toESM(require("fs"), 1);
+var import_path4 = __toESM(require("path"), 1);
 function logStep2(msg) {
   console.log(`
 \u25B6 ${msg}`);
@@ -5492,27 +5486,27 @@ function logError2(msg) {
   console.error(`  \u2717 ${msg}`);
 }
 function exists2(absPath) {
-  return import_fs4.default.existsSync(absPath);
+  return import_fs5.default.existsSync(absPath);
 }
 function copyDir(src, dest) {
-  import_fs4.default.cpSync(src, dest, { recursive: true });
+  import_fs5.default.cpSync(src, dest, { recursive: true });
 }
 function readText2(absPath) {
-  return import_fs4.default.readFileSync(absPath, "utf-8");
+  return import_fs5.default.readFileSync(absPath, "utf-8");
 }
 function writeText2(absPath, content) {
-  import_fs4.default.writeFileSync(absPath, content);
+  import_fs5.default.writeFileSync(absPath, content);
 }
 function readJson(absPath) {
-  return JSON.parse(import_fs4.default.readFileSync(absPath, "utf-8"));
+  return JSON.parse(import_fs5.default.readFileSync(absPath, "utf-8"));
 }
 function writeJson(absPath, data) {
-  import_fs4.default.writeFileSync(absPath, JSON.stringify(data, null, 2) + "\n");
+  import_fs5.default.writeFileSync(absPath, JSON.stringify(data, null, 2) + "\n");
 }
 function safeUnlink2(absPath) {
   if (!exists2(absPath)) return false;
   try {
-    import_fs4.default.unlinkSync(absPath);
+    import_fs5.default.unlinkSync(absPath);
     return true;
   } catch {
     return false;
@@ -5521,7 +5515,7 @@ function safeUnlink2(absPath) {
 function safeRmDir(absDir) {
   if (!exists2(absDir)) return false;
   try {
-    import_fs4.default.rmSync(absDir, { recursive: true, force: true });
+    import_fs5.default.rmSync(absDir, { recursive: true, force: true });
     return true;
   } catch {
     return false;
@@ -5589,7 +5583,7 @@ function removeMarkedSection(content, marker) {
   return content.replace(regex, "\n");
 }
 function getDestDir(appName) {
-  return import_path3.default.resolve(process.cwd(), appName);
+  return import_path4.default.resolve(process.cwd(), appName);
 }
 function patchReplace(content, pattern, replacement, description) {
   const result = content.replace(pattern, replacement);
@@ -5601,23 +5595,15 @@ function patchReplace(content, pattern, replacement, description) {
 
 // src/commands/web/scaffold.ts
 function templateDir() {
-  const here = import_path4.default.dirname((0, import_node_url.fileURLToPath)(importMetaUrl));
-  const candidates = [
-    import_path4.default.join(here, "../../../template-web"),
-    import_path4.default.join(here, "../template-web")
-  ];
-  for (const candidate of candidates) {
-    const resolved = import_path4.default.resolve(candidate);
-    if (import_fs5.default.existsSync(resolved)) return resolved;
-  }
-  throw new Error(
-    `Starter template is missing (searched: ${candidates.map((c) => import_path4.default.resolve(c)).join(", ")})`
+  return import_path5.default.join(
+    getCreateBasekitPackageRoot(import_path5.default.dirname((0, import_node_url2.fileURLToPath)(importMetaUrl))),
+    "template-web"
   );
 }
 async function scaffold(opts) {
   const { appName, description, destDir, enableTailwind, enablePwa, enableDocker, enableHusky } = opts;
   if (exists2(destDir)) {
-    throw new Error(`Directory "${import_path4.default.basename(destDir)}" already exists.`);
+    throw new Error(`Directory "${import_path5.default.basename(destDir)}" already exists.`);
   }
   try {
     await scaffoldInner(opts);
@@ -5634,10 +5620,11 @@ async function scaffoldInner(opts) {
   const { appName, description, destDir, enableTailwind, enablePwa, enableDocker, enableHusky, portOffset } = opts;
   await cloneTemplate(destDir);
   materializeGitignore(destDir);
-  safeUnlink2(import_path4.default.join(destDir, "yarn.lock"));
-  safeRmDir(import_path4.default.join(destDir, ".git"));
+  materializeYarnrc(destDir);
+  safeUnlink2(import_path5.default.join(destDir, "yarn.lock"));
+  safeRmDir(import_path5.default.join(destDir, ".git"));
   logOk2("Removed .git history \u2014 clean slate");
-  safeUnlink2(import_path4.default.join(destDir, "commitlint.config.js"));
+  safeUnlink2(import_path5.default.join(destDir, "commitlint.config.js"));
   cleanupGitignore(destDir);
   logStep2("Customising template");
   replaceTokens(destDir, appName, description);
@@ -5676,7 +5663,7 @@ async function scaffoldInner(opts) {
 }
 async function cloneTemplate(destDir) {
   const source = templateDir();
-  if (!import_fs5.default.existsSync(source)) {
+  if (!import_fs6.default.existsSync(source)) {
     throw new Error(`Starter template is missing at ${source}`);
   }
   const spinner = createSpinner2("Copying starter template\u2026");
@@ -5689,16 +5676,21 @@ async function cloneTemplate(destDir) {
   spinner.succeed("Template copied");
 }
 function materializeGitignore(destDir) {
-  const packagedPath = import_path4.default.join(destDir, "_gitignore");
+  const packagedPath = import_path5.default.join(destDir, "_gitignore");
+  if (!exists2(packagedPath)) return;
+  import_fs6.default.renameSync(packagedPath, import_path5.default.join(destDir, ".gitignore"));
+}
+function materializeYarnrc(destDir) {
+  const packagedPath = import_path5.default.join(destDir, "_yarnrc.yml");
   if (!exists2(packagedPath)) return;
-  import_fs5.default.renameSync(packagedPath, import_path4.default.join(destDir, ".gitignore"));
+  import_fs6.default.renameSync(packagedPath, import_path5.default.join(destDir, ".yarnrc.yml"));
 }
 var TEMPLATE_TITLE = "React Starter Kit";
 var TEMPLATE_DESCRIPTION = "A modern React starter kit with TypeScript, Vite, SCSS, and comprehensive tooling for building scalable applications";
 function replaceTokens(destDir, appName, description) {
   const pkgName = toPackageName(appName);
   const appTitle = toTitle(appName);
-  const pkgPath = import_path4.default.join(destDir, "package.json");
+  const pkgPath = import_path5.default.join(destDir, "package.json");
   if (exists2(pkgPath)) {
     const pkg = readJson(pkgPath);
     pkg["name"] = pkgName;
@@ -5713,7 +5705,7 @@ function replaceTokens(destDir, appName, description) {
     writeJson(pkgPath, pkg);
     logOk2("package.json \u2014 name, description, version, stripped monorepo fields");
   }
-  const indexPath = import_path4.default.join(destDir, "index.html");
+  const indexPath = import_path5.default.join(destDir, "index.html");
   if (exists2(indexPath)) {
     let html = readText2(indexPath);
     html = html.replace(
@@ -5731,7 +5723,7 @@ function replaceTokens(destDir, appName, description) {
     writeText2(indexPath, html);
     logOk2("index.html \u2014 title, meta description, application-name");
   }
-  const configPath = import_path4.default.join(destDir, "src", "configs", "appConfig.ts");
+  const configPath = import_path5.default.join(destDir, "src", "configs", "appConfig.ts");
   if (exists2(configPath)) {
     let cfg = readText2(configPath);
     cfg = cfg.replace(
@@ -5741,7 +5733,7 @@ function replaceTokens(destDir, appName, description) {
     writeText2(configPath, cfg);
     logOk2("src/configs/appConfig.ts \u2014 default title");
   }
-  const readmePath = import_path4.default.join(destDir, "README.md");
+  const readmePath = import_path5.default.join(destDir, "README.md");
   if (exists2(readmePath)) {
     let readme = readText2(readmePath);
     readme = readme.replace(
@@ -5755,7 +5747,7 @@ function replaceTokens(destDir, appName, description) {
     writeText2(readmePath, readme);
     logOk2("README.md \u2014 heading");
   }
-  const manifestPath = import_path4.default.join(destDir, "public", "manifest.webmanifest");
+  const manifestPath = import_path5.default.join(destDir, "public", "manifest.webmanifest");
   if (exists2(manifestPath)) {
     let manifest = readText2(manifestPath);
     manifest = manifest.replace(
@@ -5767,7 +5759,7 @@ function replaceTokens(destDir, appName, description) {
   }
 }
 function patchDockerComposeForProject(destDir, appName, portOffset) {
-  const composePath = import_path4.default.join(destDir, "docker-compose.yml");
+  const composePath = import_path5.default.join(destDir, "docker-compose.yml");
   if (!exists2(composePath)) return;
   logStep2("Patching docker-compose.yml \u2014 container names + ports");
   let content = readText2(composePath);
@@ -5800,7 +5792,7 @@ function patchDockerComposeForProject(destDir, appName, portOffset) {
   }
 }
 function patchMakefileForProject(destDir, appName) {
-  const makefilePath = import_path4.default.join(destDir, "Makefile");
+  const makefilePath = import_path5.default.join(destDir, "Makefile");
   if (!exists2(makefilePath)) return;
   let content = readText2(makefilePath);
   content = content.replace(
@@ -5813,7 +5805,7 @@ function patchMakefileForProject(destDir, appName) {
   logOk2("Makefile \u2014 ensured dynamic container names");
 }
 function patchViteConfigPort(destDir, portOffset) {
-  const configPath = import_path4.default.join(destDir, "vite.config.ts");
+  const configPath = import_path5.default.join(destDir, "vite.config.ts");
   if (!exists2(configPath)) return;
   const devPort = 3e3 + portOffset;
   let content = readText2(configPath);
@@ -5824,7 +5816,7 @@ function patchViteConfigPort(destDir, portOffset) {
 function patchEnvExamplePorts(destDir, portOffset) {
   const bePort = 8e3 + portOffset;
   for (const envFile of [".env.example", ".env.local"]) {
-    const envPath = import_path4.default.join(destDir, envFile);
+    const envPath = import_path5.default.join(destDir, envFile);
     if (!exists2(envPath)) continue;
     let content = readText2(envPath);
     content = patchReplace(
@@ -5841,17 +5833,17 @@ function removeDocker(destDir) {
   const files = ["Dockerfile", "docker-compose.yml", ".dockerignore", "nginx.conf"];
   let deleted = 0;
   for (const f of files) {
-    if (safeUnlink2(import_path4.default.join(destDir, f))) deleted++;
+    if (safeUnlink2(import_path5.default.join(destDir, f))) deleted++;
   }
-  if (safeRmDir(import_path4.default.join(destDir, "nginx"))) {
+  if (safeRmDir(import_path5.default.join(destDir, "nginx"))) {
     deleted++;
     logInfo2("nginx/ \u2014 removed");
   }
-  if (safeUnlink2(import_path4.default.join(destDir, "Makefile"))) {
+  if (safeUnlink2(import_path5.default.join(destDir, "Makefile"))) {
     deleted++;
     logInfo2("Makefile \u2014 removed");
   }
-  const readmePath = import_path4.default.join(destDir, "README.md");
+  const readmePath = import_path5.default.join(destDir, "README.md");
   if (exists2(readmePath)) {
     let readme = readText2(readmePath);
     readme = removeMarkedSection(readme, "DOCKER");
@@ -5861,7 +5853,7 @@ function removeDocker(destDir) {
     writeText2(readmePath, readme);
     logInfo2("README.md \u2014 removed Docker sections");
   }
-  const envExPath = import_path4.default.join(destDir, ".env.example");
+  const envExPath = import_path5.default.join(destDir, ".env.example");
   if (exists2(envExPath)) {
     let env = readText2(envExPath);
     env = env.replace(/# -{5,}\s*\n# 🐳 Docker[^#]*/g, "");
@@ -5884,16 +5876,16 @@ var PWA_FILES = [
 function removePwa(destDir) {
   let deleted = 0;
   for (const f of PWA_FILES) {
-    if (safeUnlink2(import_path4.default.join(destDir, f))) deleted++;
+    if (safeUnlink2(import_path5.default.join(destDir, f))) deleted++;
   }
-  if (safeRmDir(import_path4.default.join(destDir, "public", "icons"))) deleted++;
-  safeRmDir(import_path4.default.join(destDir, "src", "sw"));
-  safeRmDir(import_path4.default.join(destDir, "src", "pwa"));
+  if (safeRmDir(import_path5.default.join(destDir, "public", "icons"))) deleted++;
+  safeRmDir(import_path5.default.join(destDir, "src", "sw"));
+  safeRmDir(import_path5.default.join(destDir, "src", "pwa"));
   removePwaFromPackageJson(destDir);
   removePwaFromPluginsIndex(destDir);
   removePwaFromViteConfig(destDir);
   removePwaFromIndexHtml(destDir);
-  const readmePath = import_path4.default.join(destDir, "README.md");
+  const readmePath = import_path5.default.join(destDir, "README.md");
   if (exists2(readmePath)) {
     let readme = readText2(readmePath);
     readme = removeMarkedSection(readme, "PWA");
@@ -5908,7 +5900,7 @@ function removePwa(destDir) {
   logOk2(`Deleted ${deleted} PWA file(s)`);
 }
 function removePwaFromPackageJson(destDir) {
-  const pkgPath = import_path4.default.join(destDir, "package.json");
+  const pkgPath = import_path5.default.join(destDir, "package.json");
   if (!exists2(pkgPath)) return;
   const pkg = readJson(pkgPath);
   let changed = false;
@@ -5929,7 +5921,7 @@ function removePwaFromPackageJson(destDir) {
   removePkgScript(destDir, "setup:pwa");
 }
 function removePwaFromPluginsIndex(destDir) {
-  const indexPath = import_path4.default.join(destDir, "plugins", "index.ts");
+  const indexPath = import_path5.default.join(destDir, "plugins", "index.ts");
   if (!exists2(indexPath)) return;
   let content = readText2(indexPath);
   content = content.replace(/^.*pwaPlugin.*\n/gm, "");
@@ -5941,7 +5933,7 @@ function removePwaFromPluginsIndex(destDir) {
   logInfo2("plugins/index.ts \u2014 removed PWA plugin exports");
 }
 function removePwaFromViteConfig(destDir) {
-  const configPath = import_path4.default.join(destDir, "vite.config.ts");
+  const configPath = import_path5.default.join(destDir, "vite.config.ts");
   if (!exists2(configPath)) return;
   let content = readText2(configPath);
   content = content.replace(
@@ -5962,7 +5954,7 @@ function removePwaFromViteConfig(destDir) {
   logInfo2("vite.config.ts \u2014 removed PWA plugin usage");
 }
 function removePwaFromIndexHtml(destDir) {
-  const indexPath = import_path4.default.join(destDir, "index.html");
+  const indexPath = import_path5.default.join(destDir, "index.html");
   if (!exists2(indexPath)) return;
   let html = readText2(indexPath);
   html = html.replace(/\s*<link rel="manifest"[^>]*>\s*/g, "\n    ");
@@ -5980,7 +5972,7 @@ function removePwaFromIndexHtml(destDir) {
   logInfo2("index.html \u2014 removed PWA meta tags and manifest link");
 }
 function removePwaFromMainTsx(destDir) {
-  const mainPath = import_path4.default.join(destDir, "src", "main.tsx");
+  const mainPath = import_path5.default.join(destDir, "src", "main.tsx");
   if (!exists2(mainPath)) return;
   let content = readText2(mainPath);
   content = content.replace(/^import\s*\{[^}]*initPWA[^}]*\}\s*from\s*['"][^'"]*pwa['"];\s*\n/gm, "");
@@ -5990,7 +5982,7 @@ function removePwaFromMainTsx(destDir) {
   logInfo2("src/main.tsx \u2014 removed initPWA import and call");
 }
 function removePwaFromAppTsx(destDir) {
-  const appPath = import_path4.default.join(destDir, "src", "App.tsx");
+  const appPath = import_path5.default.join(destDir, "src", "App.tsx");
   if (!exists2(appPath)) return;
   let content = readText2(appPath);
   content = content.replace(/,\s*PwaUpdateBanner\b/g, "");
@@ -6001,11 +5993,11 @@ function removePwaFromAppTsx(destDir) {
   logInfo2("src/App.tsx \u2014 removed PwaUpdateBanner");
 }
 function removeHusky(destDir) {
-  const huskyDir = import_path4.default.join(destDir, ".husky");
+  const huskyDir = import_path5.default.join(destDir, ".husky");
   if (safeRmDir(huskyDir)) {
     logInfo2(".husky/ \u2014 removed");
   }
-  const pkgPath = import_path4.default.join(destDir, "package.json");
+  const pkgPath = import_path5.default.join(destDir, "package.json");
   if (exists2(pkgPath)) {
     const pkg = readJson(pkgPath);
     let changed = false;
@@ -6045,7 +6037,7 @@ function addTailwind(destDir) {
   importTailwindInMain(destDir);
 }
 function addTailwindDeps(destDir) {
-  const pkgPath = import_path4.default.join(destDir, "package.json");
+  const pkgPath = import_path5.default.join(destDir, "package.json");
   if (!exists2(pkgPath)) return;
   const pkg = readJson(pkgPath);
   const devDeps = pkg["devDependencies"] ?? {};
@@ -6056,7 +6048,7 @@ function addTailwindDeps(destDir) {
   logOk2("package.json \u2014 added tailwindcss + @tailwindcss/vite");
 }
 function addTailwindVitePlugin(destDir) {
-  const configPath = import_path4.default.join(destDir, "vite.config.ts");
+  const configPath = import_path5.default.join(destDir, "vite.config.ts");
   if (!exists2(configPath)) return;
   let content = readText2(configPath);
   if (!content.includes("@tailwindcss/vite")) {
@@ -6127,12 +6119,12 @@ function createTailwindCss(destDir) {
   --radius-lg: var(--radius-4);
 }
 `;
-  const stylesDir = import_path4.default.join(destDir, "src", "styles");
-  writeText2(import_path4.default.join(stylesDir, "tailwind.css"), tailwindCss);
+  const stylesDir = import_path5.default.join(destDir, "src", "styles");
+  writeText2(import_path5.default.join(stylesDir, "tailwind.css"), tailwindCss);
   logOk2("src/styles/tailwind.css \u2014 created with theme bridge");
 }
 function importTailwindInMain(destDir) {
-  const mainPath = import_path4.default.join(destDir, "src", "main.tsx");
+  const mainPath = import_path5.default.join(destDir, "src", "main.tsx");
   if (!exists2(mainPath)) return;
   let content = readText2(mainPath);
   const tailwindImport = "import '@styles/tailwind.css';";
@@ -6166,7 +6158,7 @@ function cleanupSetupScripts(destDir, opts) {
   if (scriptsToRemove.length === 0) return;
   logStep2("Removing unused setup scripts");
   for (const script of scriptsToRemove) {
-    const scriptPath = import_path4.default.join(destDir, "scripts", script);
+    const scriptPath = import_path5.default.join(destDir, "scripts", script);
     if (safeUnlink2(scriptPath)) {
       logOk2(`scripts/${script} \u2014 removed`);
     }
@@ -6243,11 +6235,11 @@ function injectBrandColors(destDir, opts) {
     "}",
     ""
   ].join("\n");
-  const themesDir = import_path4.default.join(destDir, "src", "styles", "themes");
-  const brandPath = import_path4.default.join(themesDir, "_brand.scss");
+  const themesDir = import_path5.default.join(destDir, "src", "styles", "themes");
+  const brandPath = import_path5.default.join(themesDir, "_brand.scss");
   writeText2(brandPath, brandScss);
   logOk2("src/styles/themes/_brand.scss \u2014 created");
-  const indexPath = import_path4.default.join(themesDir, "_index.scss");
+  const indexPath = import_path5.default.join(themesDir, "_index.scss");
   if (exists2(indexPath)) {
     let idx = readText2(indexPath);
     if (!idx.includes("@forward './brand'")) {
@@ -6258,8 +6250,8 @@ function injectBrandColors(destDir, opts) {
   }
 }
 function generateEnvLocal(destDir, appName) {
-  const examplePath = import_path4.default.join(destDir, ".env.example");
-  const localPath = import_path4.default.join(destDir, ".env.local");
+  const examplePath = import_path5.default.join(destDir, ".env.example");
+  const localPath = import_path5.default.join(destDir, ".env.local");
   if (!exists2(examplePath)) {
     logInfo2(".env.example not found \u2014 skipping .env.local generation");
     return;
@@ -6274,7 +6266,7 @@ function generateEnvLocal(destDir, appName) {
   logOk2(".env.local generated from .env.example");
 }
 function cleanupGitignore(destDir) {
-  const gitignorePath = import_path4.default.join(destDir, ".gitignore");
+  const gitignorePath = import_path5.default.join(destDir, ".gitignore");
   if (!exists2(gitignorePath)) return;
   let content = readText2(gitignorePath);
   const monorepoPatterns = [
@@ -6306,7 +6298,7 @@ function cleanupTemplateDocs(destDir) {
   logStep2("Removing template documentation files");
   let removed = 0;
   for (const f of docFiles) {
-    if (safeUnlink2(import_path4.default.join(destDir, f))) {
+    if (safeUnlink2(import_path5.default.join(destDir, f))) {
       logOk2(`${f} \u2014 removed`);
       removed++;
     }
@@ -6342,7 +6334,7 @@ function initGitRepo(destDir, appName) {
   }
 }
 function removePkgScript(destDir, scriptName) {
-  const pkgPath = import_path4.default.join(destDir, "package.json");
+  const pkgPath = import_path5.default.join(destDir, "package.json");
   if (!exists2(pkgPath)) return;
   const pkg = readJson(pkgPath);
   const scripts = pkg["scripts"];
@@ -6415,7 +6407,7 @@ async function runWebCommand(argv) {
     return;
   }
   if (args.includes("--version") || args.includes("-v")) {
-    console.log("1.0.4");
+    console.log("1.0.5");
     return;
   }
   printBanner();
@@ -6430,7 +6422,7 @@ async function runWebCommand(argv) {
     const destDir2 = getDestDir(appName2);
     const pm2 = detectDefaultPm();
     console.log("");
-    logStep2(`Creating "${appName2}" (non-interactive) in ${import_path5.default.relative(process.cwd(), import_path5.default.dirname(destDir2))}`);
+    logStep2(`Creating "${appName2}" (non-interactive) in ${import_path6.default.relative(process.cwd(), import_path6.default.dirname(destDir2))}`);
     try {
       await scaffold({
         appName: appName2,
@@ -6579,7 +6571,7 @@ async function runWebCommand(argv) {
   const appName = toPackageName(argName ?? answers.appName ?? "my-web-app");
   const destDir = getDestDir(appName);
   console.log("");
-  logStep2(`Creating "${appName}" in ${import_path5.default.relative(process.cwd(), import_path5.default.dirname(destDir))}`);
+  logStep2(`Creating "${appName}" in ${import_path6.default.relative(process.cwd(), import_path6.default.dirname(destDir))}`);
   try {
     await scaffold({
       appName,
@@ -6619,19 +6611,19 @@ async function runWebCommand(argv) {
 function printBanner() {
   console.log("");
   console.log("  \u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557");
-  console.log(`  \u2551  create-basekit web  v${"1.0.4"}  \u2551`);
+  console.log(`  \u2551  create-basekit web  v${"1.0.5"}  \u2551`);
   console.log("  \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D");
   console.log("");
 }
 function abortIfInsideWorkspace(argv) {
   const exampleName = argv.find((a) => !a.startsWith("-") && !isValueOfFlag(argv, a))?.trim() ?? "my-app";
   let dir = process.cwd();
-  const root = import_path5.default.parse(dir).root;
+  const root = import_path6.default.parse(dir).root;
   while (dir !== root) {
-    const pkgPath = import_path5.default.join(dir, "package.json");
-    if (import_fs6.default.existsSync(pkgPath)) {
+    const pkgPath = import_path6.default.join(dir, "package.json");
+    if (import_fs7.default.existsSync(pkgPath)) {
       try {
-        const pkg = JSON.parse(import_fs6.default.readFileSync(pkgPath, "utf8"));
+        const pkg = JSON.parse(import_fs7.default.readFileSync(pkgPath, "utf8"));
         if (pkg.workspaces) {
           console.error("");
           console.error("  \u2717  Cannot create app inside a Yarn workspace.");
@@ -6653,7 +6645,7 @@ function abortIfInsideWorkspace(argv) {
       } catch {
       }
     }
-    const parent = import_path5.default.dirname(dir);
+    const parent = import_path6.default.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
@@ -6725,82 +6717,12 @@ function isValueOfFlag(args, value) {
   return prev !== void 0 && prev.startsWith("--");
 }
 
-// src/commands/app/local-basekit-pins.ts
-init_cjs_shims();
-var import_path6 = __toESM(require("path"), 1);
-var BASEKIT_PACKAGE_DIRS = {
-  "@appsbyme/basekit-hooks": "hooks",
-  "@appsbyme/basekit-styles": "styles",
-  "@appsbyme/basekit-ui": "ui",
-  "@appsbyme/basekit-utils": "utils",
-  "@appsbyme/basekit-eslint-config": "eslint-config",
-  "@appsbyme/basekit-stylelint-config": "stylelint-config",
-  "@appsbyme/basekit-tsconfig": "tsconfig"
-};
-function webKitPackagesAvailable(webKitRoot) {
-  return exists(import_path6.default.join(webKitRoot, "packages", "utils", "package.json"));
-}
-function toFileSpecifier(fromDir, absolutePackageDir) {
-  let relative = import_path6.default.relative(fromDir, absolutePackageDir);
-  if (!relative.startsWith(".")) {
-    relative = `./${relative}`;
-  }
-  return `file:${relative.replace(/\\/g, "/")}`;
-}
-function rewriteSection(section, frontendDir, webKitRoot) {
-  if (!section) return 0;
-  let count = 0;
-  for (const [name, dirName] of Object.entries(BASEKIT_PACKAGE_DIRS)) {
-    if (!(name in section)) continue;
-    const absolute = import_path6.default.join(webKitRoot, "packages", dirName);
-    if (!exists(import_path6.default.join(absolute, "package.json"))) {
-      logWarn(`Local package missing for ${name} \u2014 left as ${section[name]}`);
-      continue;
-    }
-    section[name] = toFileSpecifier(frontendDir, absolute);
-    count += 1;
-  }
-  return count;
-}
-function applyLocalBasekitPins(projectRoot, webKitRoot = getWebKitRootFromPackage()) {
-  if (!webKitPackagesAvailable(webKitRoot)) {
-    logInfo("Local basekit-web packages not found \u2014 leaving @appsbyme registry pins");
-    return false;
-  }
-  const packageJsonPath = import_path6.default.join(projectRoot, "frontend", "package.json");
-  if (!exists(packageJsonPath)) {
-    logWarn("frontend/package.json not found \u2014 skipping local @appsbyme pins");
-    return false;
-  }
-  const pkg = JSON.parse(readText(packageJsonPath));
-  const frontendDir = import_path6.default.join(projectRoot, "frontend");
-  let rewritten = rewriteSection(pkg.dependencies, frontendDir, webKitRoot) + rewriteSection(pkg.devDependencies, frontendDir, webKitRoot) + rewriteSection(pkg.resolutions, frontendDir, webKitRoot);
-  if (!pkg.resolutions) pkg.resolutions = {};
-  for (const [name, dirName] of Object.entries(BASEKIT_PACKAGE_DIRS)) {
-    const absolute = import_path6.default.join(webKitRoot, "packages", dirName);
-    if (!exists(import_path6.default.join(absolute, "package.json"))) continue;
-    const next = toFileSpecifier(frontendDir, absolute);
-    if (pkg.resolutions[name] !== next) {
-      pkg.resolutions[name] = next;
-      rewritten += 1;
-    }
-  }
-  if (rewritten === 0) {
-    logInfo("No @appsbyme pins to rewrite in frontend/package.json");
-    return false;
-  }
-  writeText(packageJsonPath, `${JSON.stringify(pkg, null, 2)}
-`);
-  logOk(`Rewrote ${rewritten} @appsbyme pin(s) to local file: paths`);
-  return true;
-}
-
 // src/commands/app/yarn-install.ts
 init_cjs_shims();
-var import_fs7 = __toESM(require("fs"), 1);
+var import_fs8 = __toESM(require("fs"), 1);
 var import_path7 = __toESM(require("path"), 1);
 async function yarnInstall(dir, label) {
-  if (!import_fs7.default.existsSync(import_path7.default.join(dir, "package.json"))) {
+  if (!import_fs8.default.existsSync(import_path7.default.join(dir, "package.json"))) {
     logWarn(`${label}/package.json not found \u2014 skipping yarn install`);
     return false;
   }
@@ -6854,7 +6776,6 @@ function buildWebScaffoldArgv(projectName, portOffset, nonInteractive) {
     "--port-offset",
     String(portOffset),
     "--no-git",
-    // Install after optional local @appsbyme file: pin rewrite (kit authors)
     "--no-install"
   ];
   if (nonInteractive) {
@@ -6862,6 +6783,14 @@ function buildWebScaffoldArgv(projectName, portOffset, nonInteractive) {
   }
   return args;
 }
+function stripNestedFrontendGithub(frontendDir) {
+  const nestedGithub = import_path8.default.join(frontendDir, ".github");
+  if (!import_fs9.default.existsSync(nestedGithub)) {
+    return false;
+  }
+  import_fs9.default.rmSync(nestedGithub, { recursive: true, force: true });
+  return true;
+}
 async function scaffoldFrontend(opts) {
   const { projectName, portOffset, projectRoot, nonInteractive } = opts;
   logStep("Running create-basekit web (answer the remaining prompts)");
@@ -6873,11 +6802,13 @@ async function scaffoldFrontend(opts) {
   }
   const scaffoldedDir = import_path8.default.join(projectRoot, projectName);
   const frontendDir = import_path8.default.join(projectRoot, "frontend");
-  if (import_fs8.default.existsSync(scaffoldedDir)) {
-    import_fs8.default.renameSync(scaffoldedDir, frontendDir);
+  if (import_fs9.default.existsSync(scaffoldedDir)) {
+    import_fs9.default.renameSync(scaffoldedDir, frontendDir);
     logOk(`Renamed ${projectName}/ \u2192 frontend/`);
   }
-  applyLocalBasekitPins(projectRoot);
+  if (stripNestedFrontendGithub(frontendDir)) {
+    logOk("Removed frontend/.github (root CI owns workflows)");
+  }
   await yarnInstall(frontendDir, "frontend");
   logOk("Frontend scaffolded");
 }
@@ -6885,7 +6816,7 @@ async function scaffoldFrontend(opts) {
 // src/commands/app/mobile.ts
 init_cjs_shims();
 var import_path11 = __toESM(require("path"), 1);
-var import_fs11 = __toESM(require("fs"), 1);
+var import_fs12 = __toESM(require("fs"), 1);
 
 // src/commands/mobile/index.ts
 init_cjs_shims();
@@ -6893,14 +6824,14 @@ var import_prompts2 = __toESM(require_prompts3(), 1);
 
 // src/commands/mobile/scaffold.ts
 init_cjs_shims();
-var import_fs10 = __toESM(require("fs"), 1);
+var import_fs11 = __toESM(require("fs"), 1);
 var import_path10 = __toESM(require("path"), 1);
-var import_node_url2 = require("url");
+var import_node_url3 = require("url");
 
 // src/commands/mobile/utils.ts
 init_cjs_shims();
 var import_child_process3 = require("child_process");
-var import_fs9 = __toESM(require("fs"), 1);
+var import_fs10 = __toESM(require("fs"), 1);
 var import_path9 = __toESM(require("path"), 1);
 function logStep3(msg) {
   console.log(`
@@ -6916,21 +6847,21 @@ function logError3(msg) {
   console.error(`  \u2717 ${msg}`);
 }
 function exists3(absPath) {
-  return import_fs9.default.existsSync(absPath);
+  return import_fs10.default.existsSync(absPath);
 }
 function copyDir2(src, dest) {
-  import_fs9.default.cpSync(src, dest, { recursive: true });
+  import_fs10.default.cpSync(src, dest, { recursive: true });
 }
 function readText3(absPath) {
-  return import_fs9.default.readFileSync(absPath, "utf-8");
+  return import_fs10.default.readFileSync(absPath, "utf-8");
 }
 function writeText3(absPath, content) {
-  import_fs9.default.writeFileSync(absPath, content);
+  import_fs10.default.writeFileSync(absPath, content);
 }
 function safeRmDir2(absDir) {
   if (!exists3(absDir)) return false;
   try {
-    import_fs9.default.rmSync(absDir, { recursive: true, force: true });
+    import_fs10.default.rmSync(absDir, { recursive: true, force: true });
     return true;
   } catch {
     return false;
@@ -7025,17 +6956,9 @@ function createSpinner3(text) {
 
 // src/commands/mobile/scaffold.ts
 function templateDir2() {
-  const here = import_path10.default.dirname((0, import_node_url2.fileURLToPath)(importMetaUrl));
-  const candidates = [
-    import_path10.default.join(here, "../../../template-mobile"),
-    import_path10.default.join(here, "../template-mobile")
-  ];
-  for (const candidate of candidates) {
-    const resolved = import_path10.default.resolve(candidate);
-    if (import_fs10.default.existsSync(resolved)) return resolved;
-  }
-  throw new Error(
-    `Starter template is missing (searched: ${candidates.map((c) => import_path10.default.resolve(c)).join(", ")})`
+  return import_path10.default.join(
+    getCreateBasekitPackageRoot(import_path10.default.dirname((0, import_node_url3.fileURLToPath)(importMetaUrl))),
+    "template-mobile"
   );
 }
 async function scaffold2(opts) {
@@ -7059,6 +6982,7 @@ async function scaffoldInner2(opts) {
   const apiUrl = `http://localhost:${8e3 + portOffset}/api/v1`;
   await cloneTemplate2(destDir);
   materializeGitignore2(destDir);
+  materializeYarnrc2(destDir);
   if (opts.monorepo) {
     stripBundledShared(destDir);
     adjustSharedPaths(destDir);
@@ -7080,7 +7004,7 @@ async function scaffoldInner2(opts) {
 }
 async function cloneTemplate2(destDir) {
   const source = templateDir2();
-  if (!import_fs10.default.existsSync(source)) {
+  if (!import_fs11.default.existsSync(source)) {
     throw new Error(`Starter template is missing at ${source}`);
   }
   logStep3("Copying the Expo starter");
@@ -7097,7 +7021,12 @@ async function cloneTemplate2(destDir) {
 function materializeGitignore2(destDir) {
   const packagedPath = import_path10.default.join(destDir, "_gitignore");
   if (!exists3(packagedPath)) return;
-  import_fs10.default.renameSync(packagedPath, import_path10.default.join(destDir, ".gitignore"));
+  import_fs11.default.renameSync(packagedPath, import_path10.default.join(destDir, ".gitignore"));
+}
+function materializeYarnrc2(destDir) {
+  const packagedPath = import_path10.default.join(destDir, "_yarnrc.yml");
+  if (!exists3(packagedPath)) return;
+  import_fs11.default.renameSync(packagedPath, import_path10.default.join(destDir, ".yarnrc.yml"));
 }
 function stripBundledShared(destDir) {
   const sharedDir = import_path10.default.join(destDir, "packages");
@@ -7203,15 +7132,15 @@ function cleanupArtifacts(destDir) {
   safeRmDir2(import_path10.default.join(destDir, ".git"));
   const lockPath = import_path10.default.join(destDir, "yarn.lock");
   if (exists3(lockPath)) {
-    import_fs10.default.unlinkSync(lockPath);
+    import_fs11.default.unlinkSync(lockPath);
   }
   const readmePath = import_path10.default.join(destDir, "README.md");
   if (exists3(readmePath)) {
-    import_fs10.default.unlinkSync(readmePath);
+    import_fs11.default.unlinkSync(readmePath);
   }
   const licensePath = import_path10.default.join(destDir, "LICENSE");
   if (exists3(licensePath)) {
-    import_fs10.default.unlinkSync(licensePath);
+    import_fs11.default.unlinkSync(licensePath);
   }
 }
 function initGitRepo2(destDir) {
@@ -7281,7 +7210,7 @@ async function runMobileCommand(argv) {
     return;
   }
   if (args.includes("--version") || args.includes("-v")) {
-    console.log("1.0.4");
+    console.log("1.0.5");
     return;
   }
   printBanner2();
@@ -7384,7 +7313,7 @@ async function runMobileCommand(argv) {
 function printBanner2() {
   console.log("");
   console.log("  \u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557");
-  console.log(`  \u2551  create-basekit mobile  v${"1.0.4"}  \u2551`);
+  console.log(`  \u2551  create-basekit mobile  v${"1.0.5"}  \u2551`);
   console.log("  \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D");
   console.log("");
   console.log("  Expo (React Native) app scaffolder");
@@ -7489,7 +7418,7 @@ async function scaffoldMobile(opts) {
   const scaffoldedDir = import_path11.default.join(projectRoot, projectName);
   const mobileDir = import_path11.default.join(projectRoot, "mobile");
   if (exists(scaffoldedDir)) {
-    import_fs11.default.renameSync(scaffoldedDir, mobileDir);
+    import_fs12.default.renameSync(scaffoldedDir, mobileDir);
     logOk(`Renamed ${projectName}/ \u2192 mobile/`);
   }
   return true;
@@ -7501,21 +7430,12 @@ var import_path13 = __toESM(require("path"), 1);
 
 // src/commands/app/project-identity.ts
 init_cjs_shims();
-var import_fs12 = __toESM(require("fs"), 1);
+var import_fs13 = __toESM(require("fs"), 1);
 var import_path12 = __toESM(require("path"), 1);
-var import_node_url3 = require("url");
-function resolveNewProjectFixturePath(fromDir = import_path12.default.dirname((0, import_node_url3.fileURLToPath)(importMetaUrl))) {
-  const candidates = [
-    import_path12.default.join(fromDir, "../../../fixtures/new_project.py"),
-    import_path12.default.join(fromDir, "../fixtures/new_project.py")
-  ];
-  for (const candidate of candidates) {
-    const resolved = import_path12.default.resolve(candidate);
-    if (import_fs12.default.existsSync(resolved)) return resolved;
-  }
-  throw new Error(
-    `fixtures/new_project.py missing (searched: ${candidates.map((c) => import_path12.default.resolve(c)).join(", ")})`
-  );
+var import_node_url4 = require("url");
+function resolveNewProjectFixturePath(fromDir = import_path12.default.dirname((0, import_node_url4.fileURLToPath)(importMetaUrl))) {
+  const fixture = import_path12.default.join(getCreateBasekitPackageRoot(fromDir), "fixtures", "new_project.py");
+  return fixture;
 }
 function deriveProjectIdentity(projectName) {
   const slug = toPythonSlug(projectName);
@@ -7537,8 +7457,8 @@ function writeProjectIdentity(projectRoot, projectName) {
   mkdirp(scriptsDir);
   const fixturePath = resolveNewProjectFixturePath();
   const scriptPath = import_path12.default.join(scriptsDir, "new_project.py");
-  import_fs12.default.copyFileSync(fixturePath, scriptPath);
-  import_fs12.default.chmodSync(scriptPath, 493);
+  import_fs13.default.copyFileSync(fixturePath, scriptPath);
+  import_fs13.default.chmodSync(scriptPath, 493);
 }
 
 // src/commands/app/root-files.ts
@@ -7570,14 +7490,10 @@ function createRootFiles({
   logOk(".github/");
   mkdirp(import_path13.default.join(projectRoot, ".claude"));
   logOk(".claude/");
-  if (mobile) {
-    const workflowsDir = import_path13.default.join(projectRoot, ".github", "workflows");
-    mkdirp(workflowsDir);
-    writeText(import_path13.default.join(workflowsDir, "ci.yml"), githubCi(projectName, frontend));
-    logOk(".github/workflows/ci.yml");
-    writeText(import_path13.default.join(projectRoot, ".github", "dependabot.yml"), githubDependabot(frontend));
-    logOk(".github/dependabot.yml");
-  }
+  const workflowsDir = import_path13.default.join(projectRoot, ".github", "workflows");
+  mkdirp(workflowsDir);
+  writeText(import_path13.default.join(workflowsDir, "ci.yml"), githubCi(projectName, frontend, mobile));
+  logOk(".github/workflows/ci.yml");
 }
 function rootReadme(projectName, portOffset, mobile, frontend = true) {
   const bePort = 8e3 + portOffset;
@@ -7903,7 +7819,7 @@ function rootMakefile(mobile, frontend = true) {
 ` : "";
   const feStop = frontend ? '	@pkill -f "[v]ite" >/dev/null 2>&1 || true\n' : "";
   const feTarget = frontend ? `
-start-fe: ## Start frontend only (host yarn \u2014 works with local @appsbyme file: pins)
+start-fe: ## Start frontend only (host yarn)
 	@cd frontend && yarn dev
 ` : "";
   const setupFe = frontend ? "	@cd frontend && yarn install\n" : "";
@@ -7971,32 +7887,95 @@ ${setupTarget}${feTarget}${mobileTargets}stop: ## Stop all running services
 ${feStop}${mobile ? '	@pkill -f "[e]xpo start" >/dev/null 2>&1 || true\n' : ""}	@echo "Done."
 `;
 }
-function githubCi(projectName, frontend = true) {
+function githubCi(projectName, frontend = true, mobile = false) {
+  const dockerNeeds = frontend ? "[backend, frontend]" : "[backend]";
+  const frontendDockerStep = frontend ? `
+      - name: Build frontend image
+        run: docker build -f frontend/Dockerfile -t ${projectName}-fe:\${{ github.sha }} .
+` : "";
+  const frontendSharedInstall = mobile ? `
+      - name: Install shared dependencies
+        working-directory: packages/shared
+        run: yarn install --immutable
+` : "";
+  const frontendCachePath = mobile ? `|
+            frontend/yarn.lock
+            packages/shared/yarn.lock` : "frontend/yarn.lock";
   const frontendJob = frontend ? `
   frontend:
-    name: Frontend (Node)
+    name: "Frontend \u2014 type-check + lint + test"
     runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: frontend
     steps:
       - uses: actions/checkout@v4
+      - name: Enable Corepack (Yarn 4)
+        run: corepack enable
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
-      - run: corepack enable
+          node-version: 22
+          cache: yarn
+          cache-dependency-path: ${frontendCachePath}
+${frontendSharedInstall}      - run: yarn install --immutable
+      - run: yarn type-check
+      - run: yarn lint
+      - run: yarn stylelint
+      - run: yarn test:run
+      - run: yarn build
+` : "";
+  const mobileJobs = mobile ? `
+  mobile:
+    name: "Mobile \u2014 type-check + lint + test"
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: mobile
+    steps:
+      - uses: actions/checkout@v4
+      - name: Enable Corepack (Yarn 4)
+        run: corepack enable
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: yarn
+          cache-dependency-path: |
+            mobile/yarn.lock
+            packages/shared/yarn.lock
       - run: yarn install --immutable
+      - name: Install shared dependencies
+        working-directory: packages/shared
+        run: yarn install --immutable
+      - run: yarn type-check
       - run: yarn lint
-      - run: npx tsc --noEmit
-      - run: yarn test --run
+      - run: yarn test --watchman=false
+
+  shared:
+    name: "Shared \u2014 type-check + test"
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: packages/shared
+    steps:
+      - uses: actions/checkout@v4
+      - name: Enable Corepack (Yarn 4)
+        run: corepack enable
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: yarn
+          cache-dependency-path: packages/shared/yarn.lock
+      - run: yarn install --immutable
+      - run: yarn type-check
+      - run: yarn test
 ` : "";
   return `name: CI
 
 on:
   push:
-    branches: [main]
+    branches: [master]
   pull_request:
-    branches: [main]
+    branches: [master]
 
 concurrency:
   group: \${{ github.workflow }}-\${{ github.ref }}
@@ -8004,94 +7983,41 @@ concurrency:
 
 jobs:
   backend:
-    name: Backend (Python)
+    name: "Backend \u2014 lint + test"
     runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: backend
-    services:
-      postgres:
-        image: postgres:16
-        env:
-          POSTGRES_USER: ci
-          POSTGRES_PASSWORD: ci
-          POSTGRES_DB: ${projectName.replace(/-/g, "_")}_test
-        ports: ["5432:5432"]
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-      redis:
-        image: redis:7
-        ports: ["6379:6379"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: "3.12"
-      - run: pip install -e ".[dev,test]"
+          cache: pip
+          cache-dependency-path: backend/requirements*.txt
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt -r requirements-dev.txt
       - run: ruff check .
       - run: ruff format --check .
-      - run: pytest --tb=short -q
-${frontendJob}
-  mobile:
-    name: Mobile (Expo)
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: mobile
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - run: yarn install
-      - run: npx tsc --noEmit
-      - run: yarn test --ci
-
-  shared:
-    name: Shared packages
+      - name: Run tests
+        env:
+          DJANGO_SETTINGS_MODULE: config.settings.test
+          SECRET_KEY: ci-test-secret-key-not-for-production
+          CELERY_TASK_ALWAYS_EAGER: "True"
+        run: python -m pytest --tb=short -q
+${frontendJob}${mobileJobs}
+  docker:
+    name: "Docker \u2014 smoke build"
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: packages/shared
+    needs: ${dockerNeeds}
+    if: github.ref == 'refs/heads/master'
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - run: npx tsc --noEmit
-`;
-}
-function githubDependabot(frontend = true) {
-  const frontendUpdate = frontend ? `
-  - package-ecosystem: npm
-    directory: /frontend
-    schedule:
-      interval: weekly
-    open-pull-requests-limit: 10
-` : "";
-  return `version: 2
-updates:
-  - package-ecosystem: pip
-    directory: /backend
-    schedule:
-      interval: weekly
-    open-pull-requests-limit: 10
-${frontendUpdate}
-  - package-ecosystem: npm
-    directory: /mobile
-    schedule:
-      interval: weekly
-    open-pull-requests-limit: 10
-
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: weekly
-    open-pull-requests-limit: 5
-`;
+      - name: Build backend image
+        run: docker build -t ${projectName}-be:\${{ github.sha }} ./backend
+${frontendDockerStep}`;
 }
 
 // src/commands/app/shared-package.ts
@@ -8110,6 +8036,8 @@ function scaffoldSharedPackage(projectRoot, projectName) {
   mkdirp(import_path14.default.join(sharedRoot, "src", "i18n"));
   writeText(import_path14.default.join(sharedRoot, "package.json"), sharedPackageJson(projectName));
   logOk("package.json");
+  writeText(import_path14.default.join(sharedRoot, ".yarnrc.yml"), "nodeLinker: node-modules\n");
+  logOk(".yarnrc.yml");
   writeText(import_path14.default.join(sharedRoot, "tsconfig.json"), sharedTsconfig());
   logOk("tsconfig.json");
   writeText(import_path14.default.join(sharedRoot, "vitest.config.ts"), sharedVitestConfig());
@@ -8442,10 +8370,14 @@ init_cjs_shims();
 var import_path15 = __toESM(require("path"), 1);
 function patchSharedReferences(projectRoot) {
   logStep("Patching shared package references");
-  patchFrontendDockerfile(projectRoot);
+  patchFrontendDocker(projectRoot);
   verifyFrontendSharedAlias(projectRoot);
   verifyMobileSharedPaths(projectRoot);
 }
+function patchFrontendDocker(projectRoot) {
+  patchFrontendDockerfile(projectRoot);
+  patchFrontendCompose(projectRoot);
+}
 function patchFrontendDockerfile(projectRoot) {
   const dockerfilePath = import_path15.default.join(projectRoot, "frontend", "Dockerfile");
   if (!exists(dockerfilePath)) {
@@ -8453,30 +8385,102 @@ function patchFrontendDockerfile(projectRoot) {
     return;
   }
   let content = readText(dockerfilePath);
-  if (content.includes("COPY packages/shared/")) {
-    logOk("Dockerfile \u2014 packages/shared/ COPY already present");
+  if (content.includes("WORKDIR /workspace/packages/shared") && content.includes("COPY packages/shared/") && content.includes("COPY frontend/")) {
+    logOk("Dockerfile \u2014 monorepo shared COPY + install already present");
     return;
   }
-  const manifestCopyPatterns = [
-    /^(COPY package\.json \.yarnrc\.yml \.\/\n)/m,
-    /^(COPY package\.json yarn\.lock \.yarnrc\.yml \.\/\n)/m
-  ];
-  const matched = manifestCopyPatterns.find((pattern) => pattern.test(content));
-  if (matched) {
-    content = content.replace(matched, "$1COPY packages/shared/ packages/shared/\n");
-    content = content.replace(
-      /# Root manifests and lockfile are copied first so `yarn install` is only\n# re-run when dependencies change, not on every source file change\.\n/,
-      "# Root manifests, lockfile, and shared packages are copied first so\n# `yarn install` is only re-run when dependencies change.\n"
-    );
+  if (content.includes("COPY packages/shared/") && content.includes("WORKDIR /workspace/frontend") && !content.includes("WORKDIR /workspace/packages/shared")) {
     content = content.replace(
-      /# Copy dependency files first so dependency installation is cached separately\.\n/,
-      "# Copy dependency files and shared packages first so installs cache separately.\n"
+      "WORKDIR /workspace/frontend\nRUN --mount=type=cache,target=/root/.yarn/berry/cache \\\n    yarn install --immutable",
+      [
+        "# Shared must have its own node_modules (zod, etc.) \u2014 tsc resolves from source.",
+        "WORKDIR /workspace/packages/shared",
+        "RUN --mount=type=cache,target=/root/.yarn/berry/cache \\",
+        "    yarn install --immutable",
+        "",
+        "WORKDIR /workspace/frontend",
+        "RUN --mount=type=cache,target=/root/.yarn/berry/cache \\",
+        "    yarn install --immutable"
+      ].join("\n")
     );
     writeText(dockerfilePath, content);
-    logOk("Dockerfile \u2014 added COPY packages/shared/ for Docker builds");
+    logOk("Dockerfile \u2014 added packages/shared yarn install for Docker builds");
+    return;
+  }
+  const builderCopy = [
+    "WORKDIR /workspace",
+    "",
+    "RUN corepack enable",
+    "",
+    "COPY packages/shared/ packages/shared/",
+    "COPY frontend/package.json frontend/yarn.lock frontend/.yarnrc.yml frontend/",
+    "",
+    "# Shared must have its own node_modules (zod, etc.) \u2014 tsc resolves from source.",
+    "WORKDIR /workspace/packages/shared",
+    "RUN --mount=type=cache,target=/root/.yarn/berry/cache \\",
+    "    yarn install --immutable",
+    "",
+    "WORKDIR /workspace/frontend",
+    "RUN --mount=type=cache,target=/root/.yarn/berry/cache \\",
+    "    yarn install --immutable",
+    "",
+    "COPY frontend/ .",
+    "RUN yarn build"
+  ].join("\n");
+  const replaced = content.replace(
+    /WORKDIR \/app[\s\S]*?RUN yarn build/,
+    builderCopy
+  );
+  if (replaced === content) {
+    const replaced2 = content.replace(
+      /# Set working directory\nWORKDIR \/app[\s\S]*?RUN yarn build/,
+      `# Monorepo root is the build context (see docker-compose app-prod).
+${builderCopy}`
+    );
+    if (replaced2 === content) {
+      logWarn("Dockerfile \u2014 could not rewrite builder stage; patch skipped");
+      return;
+    }
+    content = replaced2;
   } else {
-    logWarn("Dockerfile \u2014 could not locate manifest COPY line; patch skipped");
+    content = replaced;
+  }
+  content = content.replace(
+    /^COPY nginx\.conf /m,
+    "COPY frontend/nginx.conf "
+  );
+  content = content.replace(
+    /^COPY nginx\//m,
+    "COPY frontend/nginx/"
+  );
+  content = content.replace(
+    /COPY --from=builder \/app\/dist /,
+    "COPY --from=builder /workspace/frontend/dist "
+  );
+  writeText(dockerfilePath, content);
+  logOk("Dockerfile \u2014 switched to monorepo root context with packages/shared");
+}
+function patchFrontendCompose(projectRoot) {
+  const composePath = import_path15.default.join(projectRoot, "frontend", "docker-compose.yml");
+  if (!exists(composePath)) {
+    logWarn("Frontend docker-compose.yml not found \u2014 skipping compose patch");
+    return;
   }
+  let content = readText(composePath);
+  if (content.includes("context: ..") && content.includes("dockerfile: frontend/Dockerfile")) {
+    logOk("docker-compose.yml \u2014 monorepo build context already set");
+    return;
+  }
+  const next = content.replace(
+    /app-prod:\n(\s+)build:\n\s+context: \.\n\s+dockerfile: Dockerfile/,
+    "app-prod:\n$1build:\n$1  context: ..\n$1  dockerfile: frontend/Dockerfile"
+  );
+  if (next === content) {
+    logWarn("docker-compose.yml \u2014 could not locate app-prod build block; patch skipped");
+    return;
+  }
+  writeText(composePath, next);
+  logOk("docker-compose.yml \u2014 app-prod build context set to repo root");
 }
 function verifyFrontendSharedAlias(projectRoot) {
   const tsconfigPath = import_path15.default.join(projectRoot, "frontend", "tsconfig.json");
@@ -8530,7 +8534,7 @@ function verifyMobileSharedPaths(projectRoot) {
 }
 
 // src/commands/app/index.ts
-var import_fs13 = __toESM(require("fs"), 1);
+var import_fs14 = __toESM(require("fs"), 1);
 
 // src/commands/app/ai-helpers.ts
 init_cjs_shims();
@@ -8552,7 +8556,7 @@ function getAiHelpersRetryHint(target) {
       const packageJson = require2.resolve(AI_HELPERS_PACKAGE_JSON);
       binPath = import_path16.default.join(import_path16.default.dirname(packageJson), "bin", "cli.mjs");
     } catch {
-      return "Install/link the basekit-web workspace dependencies, then re-run create-basekit app with --ai-helpers.";
+      return `Install with \`npm i -D ${AI_HELPERS_PKG}\` (or \`npx ${AI_HELPERS_PKG}\`), then re-run create-basekit app with --ai-helpers.`;
     }
   }
   return `node ${JSON.stringify(binPath)} ${JSON.stringify(target)} --with-claude`;
@@ -8581,7 +8585,7 @@ async function runAppCommand(argv) {
     return;
   }
   if (args.includes("--version") || args.includes("-V")) {
-    console.log("1.0.4");
+    console.log("1.0.5");
     return;
   }
   printBanner3();
@@ -8688,7 +8692,7 @@ async function runAppCommand(argv) {
     logError(err instanceof Error ? err.message : String(err));
     if (exists(projectRoot)) {
       try {
-        import_fs13.default.rmSync(projectRoot, { recursive: true, force: true });
+        import_fs14.default.rmSync(projectRoot, { recursive: true, force: true });
         logInfo(`Cleaned up ${projectName}/`);
       } catch {
         logError(`Could not clean up ${projectName}/ \u2014 remove it manually before retrying.`);
@@ -8715,12 +8719,12 @@ function initRootGit(projectRoot, includeMobile = false) {
     logInfo("git not found \u2014 skipping repository initialisation");
     return;
   }
-  const fs14 = require("fs");
+  const fs15 = require("fs");
   const subDirs = includeMobile ? ["backend", "frontend", "mobile"] : ["backend", "frontend"];
   for (const sub of subDirs) {
     const gitDir = import_path17.default.join(projectRoot, sub, ".git");
     if (exists(gitDir)) {
-      fs14.rmSync(gitDir, { recursive: true, force: true });
+      fs15.rmSync(gitDir, { recursive: true, force: true });
     }
   }
   const init = exec("git init", projectRoot);
@@ -8743,7 +8747,7 @@ function initRootGit(projectRoot, includeMobile = false) {
 function printBanner3() {
   console.log("");
   console.log("  \u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557");
-  console.log(`  \u2551   create-basekit app  v${"1.0.4"}        \u2551`);
+  console.log(`  \u2551   create-basekit app  v${"1.0.5"}        \u2551`);
   console.log("  \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D");
   console.log("");
   console.log("  Full-stack project scaffolder");
@@ -8751,7 +8755,7 @@ function printBanner3() {
 }
 function printHelp3() {
   console.log(`
-  create-basekit app v${"1.0.4"}
+  create-basekit app v${"1.0.5"}
 
   Usage: npx @appsbyme/create-basekit app [project-name] [options]