@donotdev/cli 0.0.4 → 0.0.6

package/dist/bin/commands/bump.js

@@ -7425,11 +7425,17 @@ var init_PathResolver = __esm({
       /**
        * Get path to empty.js module for optional dependency aliasing
        * Used by Vite and Turbopack to alias missing optional deps
-       * @returns Absolute path to empty.js
+       * @param returnPackageSpecifier - If true, returns package specifier '@donotdev/core/empty' for Turbopack. If false, returns absolute path for Vite.
+       * @returns Package specifier or absolute path to empty.js
        */
-      getEmptyModulePath() {
+      getEmptyModulePath(returnPackageSpecifier = false) {
+        if (returnPackageSpecifier) {
+          return "@donotdev/core/empty";
+        }
+        const resolved = this.resolvePackage("@donotdev/core/empty");
+        if (resolved) return resolved;
         const thisDir = dirname(fileURLToPath(import.meta.url));
-        return this.normalizePath(join(thisDir, "../vite/empty.js"));
+        return this.normalizePath(join(thisDir, "../empty.js"));
       }
       // === PRIVATE METHODS ===
       /**
@@ -7489,10 +7495,6 @@ import {
   resolve as resolve2,
   isAbsolute as pathIsAbsolute
 } from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
-function getDirnameFromUrl(importMetaUrl) {
-  return dirname2(fileURLToPath2(importMetaUrl));
-}
 function detectExecutionMode() {
   const currentDir = process.cwd();
   const toolingPath = joinPath(currentDir, PACKAGE_PATHS.TOOLING);
@@ -7505,10 +7507,6 @@ function detectExecutionMode() {
   }
   return "published";
 }
-function getCliRootFromBundle() {
-  const currentDir = getDirnameFromUrl(import.meta.url);
-  return normalizePath(currentDir, "..", "..", "..");
-}
 function globSync(pattern, options = {}) {
   const patterns = Array.isArray(pattern) ? pattern : [pattern];
   const cwd = options.cwd || pathResolverInstance.getAppRoot() || process.cwd();
@@ -7566,7 +7564,7 @@ var init_pathResolver = __esm({
 
 // packages/tooling/src/bundler/utils.ts
 import { createRequire as createRequire3 } from "node:module";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
 import { dirname as dirname3, resolve as resolve3 } from "node:path";
 import { Buffer as Buffer2 } from "node:buffer";
 import process from "node:process";
@@ -7575,7 +7573,7 @@ var init_utils = __esm({
   "packages/tooling/src/bundler/utils.ts"() {
     "use strict";
     require2 = createRequire3(import.meta.url);
-    __filename = fileURLToPath3(import.meta.url);
+    __filename = fileURLToPath2(import.meta.url);
     __dirname = dirname3(__filename);
     if (typeof globalThis !== "undefined") {
       globalThis.require = require2;
@@ -7617,52 +7615,60 @@ async function askForConfirmation(message, defaultValue = false) {
 // packages/tooling/src/utils/matrix.ts
 init_utils();
 init_pathResolver();
+import { createRequire as createRequire4 } from "node:module";
 var cachedMatrix = null;
 function getMatrixPath(mode) {
+  try {
+    const require3 = createRequire4(import.meta.url);
+    const resolved = require3.resolve("@donotdev/cli/dependencies-matrix.json");
+    if (pathExists(resolved)) {
+      return resolved;
+    }
+  } catch {
+  }
   const executionMode = mode || detectExecutionMode();
   if (executionMode === "development") {
     const repoRoot = getRepoRoot();
-    const devPath = normalizePath(
-      repoRoot,
-      "packages/cli/dependencies-matrix.json"
-    );
-    if (!pathExists(devPath)) {
-      throw new Error(`[DEV] Matrix not found at: ${devPath}`);
+    if (repoRoot) {
+      const devPath = normalizePath(
+        repoRoot,
+        "packages/cli/dependencies-matrix.json"
+      );
+      if (pathExists(devPath)) {
+        return devPath;
+      }
     }
-    return devPath;
-  }
-  const cliPackagePath = getCliRootFromBundle();
-  const matrixPath = joinPath(cliPackagePath, "dependencies-matrix.json");
-  if (!pathExists(matrixPath)) {
-    throw new Error(`[PROD] Matrix not found at: ${matrixPath}`);
   }
-  return matrixPath;
+  return null;
 }
 function getCliVersion(mode) {
+  try {
+    const require3 = createRequire4(import.meta.url);
+    const packageJsonPath = require3.resolve("@donotdev/cli/package.json");
+    const pkg = readSync(packageJsonPath, { format: "json" });
+    return String(pkg?.version || "0.0.0");
+  } catch {
+  }
   const executionMode = mode || detectExecutionMode();
   if (executionMode === "development") {
     const repoRoot = getRepoRoot();
     const cliPackageJson = joinPath(repoRoot, "packages/cli/package.json");
-    if (!pathExists(cliPackageJson)) {
-      throw new Error(`[DEV] CLI package.json not found at: ${cliPackageJson}`);
+    if (pathExists(cliPackageJson)) {
+      const pkg = readSync(cliPackageJson, { format: "json" });
+      return String(pkg?.version || "0.0.0");
     }
-    const pkg2 = readSync(cliPackageJson, { format: "json" });
-    return String(pkg2?.version || "0.0.0");
-  }
-  const cliPackagePath = getCliRootFromBundle();
-  const packageJsonPath = joinPath(cliPackagePath, "package.json");
-  if (!pathExists(packageJsonPath)) {
-    throw new Error(`[PROD] CLI package.json not found at: ${packageJsonPath}`);
   }
-  const pkg = readSync(packageJsonPath, { format: "json" });
-  return String(pkg?.version || "0.0.0");
+  return "0.0.0";
 }
 function loadMatrix(mode) {
   if (cachedMatrix) return cachedMatrix;
   const matrixPath = getMatrixPath(mode);
+  if (!matrixPath) {
+    return null;
+  }
   const content = readSync(matrixPath, { format: "json" });
   if (!content) {
-    throw new Error(`Failed to read dependencies-matrix.json at ${matrixPath}`);
+    return null;
   }
   cachedMatrix = {
     matrix: content,
@@ -7680,9 +7686,10 @@ function flattenGroups(groups) {
   return flat;
 }
 function getMigrationGuide(currentMajor, targetMajor, mode) {
-  const { matrix } = loadMatrix(mode);
+  const matrixResult = loadMatrix(mode);
+  if (!matrixResult) return void 0;
   const key = `${currentMajor}.0\u2192${targetMajor}.0`;
-  return matrix.migrationGuides?.[key];
+  return matrixResult.matrix.migrationGuides?.[key];
 }
 
 // packages/tooling/src/utils/package-deps.ts
@@ -7772,7 +7779,7 @@ async function queryNpmVersions(packages) {
 function detectProjectDeps(files) {
   const frameworkPkgs = /* @__PURE__ */ new Set();
   const externalDeps = /* @__PURE__ */ new Set();
-  const currentVersions = /* @__PURE__ */ new Map();
+  const packageOccurrences = /* @__PURE__ */ new Map();
   for (const file of files) {
     const pkg = parsePackageJson(file);
     if (!pkg) continue;
@@ -7784,9 +7791,10 @@ function detectProjectDeps(files) {
       if (!deps) continue;
       for (const [name, version] of Object.entries(deps)) {
         const key = `${name}:${field}`;
-        if (!currentVersions.has(key)) {
-          currentVersions.set(key, { version, field, file });
+        if (!packageOccurrences.has(key)) {
+          packageOccurrences.set(key, []);
         }
+        packageOccurrences.get(key).push({ version, field, file });
         if (name.startsWith("@donotdev/")) {
           frameworkPkgs.add(name);
         } else {
@@ -7795,7 +7803,7 @@ function detectProjectDeps(files) {
       }
     }
   }
-  return { frameworkPkgs, externalDeps, currentVersions };
+  return { frameworkPkgs, externalDeps, packageOccurrences };
 }
 async function main(options = {}) {
   const { dryRun } = options;
@@ -7816,16 +7824,21 @@ async function main(options = {}) {
     return 0;
   }
   log.info(`Found ${files.length} package.json file(s)`);
-  const { frameworkPkgs, externalDeps, currentVersions } = detectProjectDeps(files);
+  const { frameworkPkgs, externalDeps, packageOccurrences } = detectProjectDeps(files);
   log.info(`Found ${frameworkPkgs.size} @donotdev/* package(s)`);
   log.info(`Found ${externalDeps.size} external dep(s)`);
   log.info("Querying npm...");
   const npmVersions = await queryNpmVersions(Array.from(frameworkPkgs));
-  const { matrix } = loadMatrix();
-  const matrixVersions = flattenGroups(matrix.groups);
+  const matrixResult = loadMatrix();
+  const matrixVersions = matrixResult ? flattenGroups(matrixResult.matrix.groups) : {};
+  if (!matrixResult && externalDeps.size > 0) {
+    log.info(
+      "Matrix not found - only updating @donotdev/* packages (external deps skipped)"
+    );
+  }
   const updates = [];
   const majorUpdates = [];
-  for (const [key, current] of currentVersions) {
+  for (const [key, occurrences] of packageOccurrences) {
     const [name, field] = key.split(":");
     if (name === "@donotdev/templates") continue;
     let latest;
@@ -7835,29 +7848,33 @@ async function main(options = {}) {
       latest = matrixVersions[name];
     }
     if (!latest) continue;
-    const cmp = compareVersions(current.version, latest);
-    if (cmp.equal || cmp.ahead) continue;
-    const update = {
-      pkg: name,
-      field,
-      current: current.version,
-      latest,
-      file: current.file,
-      isMajor: cmp.isMajor
-    };
-    if (cmp.isMajor) {
-      const currentMajor = Number(
-        normalizeVersion(current.version).split(".")[0]
-      );
-      const latestMajor = Number(normalizeVersion(latest).split(".")[0]);
-      const guide = getMigrationGuide(currentMajor, latestMajor);
-      if (guide) {
-        update.migrationPath = guide.path;
-        update.breakingChanges = guide.breakingChanges;
+    for (const occurrence of occurrences) {
+      const normalizedCurrent = normalizeVersion(occurrence.version);
+      const normalizedLatest = normalizeVersion(latest);
+      const cmp = compareVersions(normalizedCurrent, normalizedLatest);
+      if (cmp.equal || cmp.ahead) continue;
+      const update = {
+        pkg: name,
+        field,
+        current: occurrence.version,
+        latest,
+        file: occurrence.file,
+        isMajor: cmp.isMajor
+      };
+      if (cmp.isMajor) {
+        const currentMajor = Number(normalizedCurrent.split(".")[0]);
+        const latestMajor = Number(normalizedLatest.split(".")[0]);
+        if (matrixResult) {
+          const guide = getMigrationGuide(currentMajor, latestMajor);
+          if (guide) {
+            update.migrationPath = guide.path;
+            update.breakingChanges = guide.breakingChanges;
+          }
+        }
+        majorUpdates.push(update);
+      } else {
+        updates.push(update);
       }
-      majorUpdates.push(update);
-    } else {
-      updates.push(update);
     }
   }
   if (updates.length === 0 && majorUpdates.length === 0) {
@@ -7894,20 +7911,13 @@ ${majorUpdates.length} major update(s) available (manual review required):`
     let shouldApply = false;
     if (dryRun) {
       log.info("\n[DRY RUN] Would update package.json files:");
-      for (const file of files) {
-        const pkg = parsePackageJson(file);
-        if (!pkg) continue;
-        for (const u2 of updates) {
-          for (const field of [
-            "dependencies",
-            "devDependencies",
-            "peerDependencies"
-          ]) {
-            if (pkg[field]?.[u2.pkg]) {
-              log.info(`  ${file}: ${u2.pkg} \u2192 ^${u2.latest}`);
-            }
-          }
-        }
+      for (const u2 of updates) {
+        const relativeFile = appRoot ? getRelativePathBetween(appRoot, u2.file) : u2.file;
+        const normalizedLatest = normalizeVersion(u2.latest);
+        const displayLatest = ensureCaretPrefix(normalizedLatest);
+        log.info(
+          `  ${relativeFile}: ${u2.pkg} ${u2.current} \u2192 ${displayLatest} (${u2.field})`
+        );
       }
       log.info("\n[DRY RUN] No files modified");
     } else {
@@ -7916,32 +7926,41 @@ ${majorUpdates.length} major update(s) available (manual review required):`
       );
       shouldApply = await askForConfirmation("Apply updates?", true);
       if (shouldApply) {
-        const updatedFiles = /* @__PURE__ */ new Set();
-        for (const file of files) {
+        const updatedFiles = /* @__PURE__ */ new Map();
+        for (const u2 of updates) {
+          if (!updatedFiles.has(u2.file)) {
+            updatedFiles.set(u2.file, /* @__PURE__ */ new Set());
+          }
+          updatedFiles.get(u2.file).add(`${u2.pkg}:${u2.field}`);
+        }
+        for (const [file, packageKeys] of updatedFiles) {
           const pkg = parsePackageJson(file);
           if (!pkg) continue;
           let changed = false;
-          for (const u2 of updates) {
-            for (const field of [
-              "dependencies",
-              "devDependencies",
-              "peerDependencies"
-            ]) {
-              const deps = pkg[field];
-              if (deps?.[u2.pkg]) {
-                deps[u2.pkg] = ensureCaretPrefix(u2.latest);
-                changed = true;
-              }
+          for (const packageKey of packageKeys) {
+            const [pkgName, field] = packageKey.split(":");
+            const update = updates.find(
+              (u2) => u2.file === file && u2.pkg === pkgName && u2.field === field
+            );
+            if (!update) continue;
+            const deps = pkg[field];
+            if (deps?.[pkgName]) {
+              const normalizedLatest = normalizeVersion(update.latest);
+              deps[pkgName] = ensureCaretPrefix(normalizedLatest);
+              changed = true;
             }
           }
           if (changed) {
             writePackageJson(file, pkg);
-            updatedFiles.add(file);
+            const relativeFile = appRoot ? getRelativePathBetween(appRoot, file) : file;
+            log.info(`Updated: ${relativeFile}`);
           }
         }
         if (updatedFiles.size > 0) {
-          log.success(`
-Done. Run "bun install" to apply.`);
+          log.success(
+            `
+Done. Updated ${updatedFiles.size} file(s). Run "bun install" to apply.`
+          );
         }
       } else {
         log.info("\nUpdates not applied");

package/dist/bin/commands/cacheout.js

@@ -7141,11 +7141,17 @@ var init_PathResolver = __esm({
       /**
        * Get path to empty.js module for optional dependency aliasing
        * Used by Vite and Turbopack to alias missing optional deps
-       * @returns Absolute path to empty.js
+       * @param returnPackageSpecifier - If true, returns package specifier '@donotdev/core/empty' for Turbopack. If false, returns absolute path for Vite.
+       * @returns Package specifier or absolute path to empty.js
        */
-      getEmptyModulePath() {
+      getEmptyModulePath(returnPackageSpecifier = false) {
+        if (returnPackageSpecifier) {
+          return "@donotdev/core/empty";
+        }
+        const resolved = this.resolvePackage("@donotdev/core/empty");
+        if (resolved) return resolved;
         const thisDir = dirname(fileURLToPath(import.meta.url));
-        return this.normalizePath(join(thisDir, "../vite/empty.js"));
+        return this.normalizePath(join(thisDir, "../empty.js"));
       }
       // === PRIVATE METHODS ===
       /**

package/dist/bin/commands/create-app.js

@@ -7687,11 +7687,17 @@ var init_PathResolver = __esm({
       /**
        * Get path to empty.js module for optional dependency aliasing
        * Used by Vite and Turbopack to alias missing optional deps
-       * @returns Absolute path to empty.js
+       * @param returnPackageSpecifier - If true, returns package specifier '@donotdev/core/empty' for Turbopack. If false, returns absolute path for Vite.
+       * @returns Package specifier or absolute path to empty.js
        */
-      getEmptyModulePath() {
+      getEmptyModulePath(returnPackageSpecifier = false) {
+        if (returnPackageSpecifier) {
+          return "@donotdev/core/empty";
+        }
+        const resolved = this.resolvePackage("@donotdev/core/empty");
+        if (resolved) return resolved;
         const thisDir = dirname(fileURLToPath(import.meta.url));
-        return this.normalizePath(join(thisDir, "../vite/empty.js"));
+        return this.normalizePath(join(thisDir, "../empty.js"));
       }
       // === PRIVATE METHODS ===
       /**
@@ -8432,52 +8438,60 @@ async function updateRootPackageJson(rootDir, appNames) {
 // packages/tooling/src/utils/matrix.ts
 init_utils();
 init_pathResolver();
+import { createRequire as createRequire4 } from "node:module";
 var cachedMatrix = null;
 function getMatrixPath(mode) {
+  try {
+    const require3 = createRequire4(import.meta.url);
+    const resolved = require3.resolve("@donotdev/cli/dependencies-matrix.json");
+    if (pathExists(resolved)) {
+      return resolved;
+    }
+  } catch {
+  }
   const executionMode = mode || detectExecutionMode();
   if (executionMode === "development") {
     const repoRoot = getRepoRoot();
-    const devPath = normalizePath(
-      repoRoot,
-      "packages/cli/dependencies-matrix.json"
-    );
-    if (!pathExists(devPath)) {
-      throw new Error(`[DEV] Matrix not found at: ${devPath}`);
+    if (repoRoot) {
+      const devPath = normalizePath(
+        repoRoot,
+        "packages/cli/dependencies-matrix.json"
+      );
+      if (pathExists(devPath)) {
+        return devPath;
+      }
     }
-    return devPath;
   }
-  const cliPackagePath = getCliRootFromBundle();
-  const matrixPath = joinPath(cliPackagePath, "dependencies-matrix.json");
-  if (!pathExists(matrixPath)) {
-    throw new Error(`[PROD] Matrix not found at: ${matrixPath}`);
-  }
-  return matrixPath;
+  return null;
 }
 function getCliVersion(mode) {
+  try {
+    const require3 = createRequire4(import.meta.url);
+    const packageJsonPath = require3.resolve("@donotdev/cli/package.json");
+    const pkg = readSync(packageJsonPath, { format: "json" });
+    return String(pkg?.version || "0.0.0");
+  } catch {
+  }
   const executionMode = mode || detectExecutionMode();
   if (executionMode === "development") {
     const repoRoot = getRepoRoot();
     const cliPackageJson = joinPath(repoRoot, "packages/cli/package.json");
-    if (!pathExists(cliPackageJson)) {
-      throw new Error(`[DEV] CLI package.json not found at: ${cliPackageJson}`);
+    if (pathExists(cliPackageJson)) {
+      const pkg = readSync(cliPackageJson, { format: "json" });
+      return String(pkg?.version || "0.0.0");
     }
-    const pkg2 = readSync(cliPackageJson, { format: "json" });
-    return String(pkg2?.version || "0.0.0");
   }
-  const cliPackagePath = getCliRootFromBundle();
-  const packageJsonPath = joinPath(cliPackagePath, "package.json");
-  if (!pathExists(packageJsonPath)) {
-    throw new Error(`[PROD] CLI package.json not found at: ${packageJsonPath}`);
-  }
-  const pkg = readSync(packageJsonPath, { format: "json" });
-  return String(pkg?.version || "0.0.0");
+  return "0.0.0";
 }
 function loadMatrix(mode) {
   if (cachedMatrix) return cachedMatrix;
   const matrixPath = getMatrixPath(mode);
+  if (!matrixPath) {
+    return null;
+  }
   const content = readSync(matrixPath, { format: "json" });
   if (!content) {
-    throw new Error(`Failed to read dependencies-matrix.json at ${matrixPath}`);
+    return null;
   }
   cachedMatrix = {
     matrix: content,
@@ -8627,7 +8641,7 @@ function generateScripts(templateName, options) {
   const scripts = {};
   if (templateName.includes("vite")) {
     scripts.dev = "vite";
-    scripts.build = "tsc --noEmit && cross-env NODE_ENV=production VITE_NODE_POLYFILL=true vite build";
+    scripts.build = "vite build";
     scripts.preview = "vite preview";
     scripts.lint = "eslint src/";
     scripts["type-check"] = "tsc --noEmit";
@@ -8661,7 +8675,13 @@ function generateScripts(templateName, options) {
   return scripts;
 }
 function generatePackageJson(templateName, mode, options = {}) {
-  const { matrix, cliVersion } = loadMatrix(mode);
+  const matrixResult = loadMatrix(mode);
+  if (!matrixResult) {
+    throw new Error(
+      "dependencies-matrix.json not found. This command requires the matrix file."
+    );
+  }
+  const { matrix, cliVersion } = matrixResult;
   const template = matrix.templateMapping?.[templateName];
   if (!template) {
     throw new Error(`Template "${templateName}" not found in matrix`);
@@ -8711,14 +8731,19 @@ function generatePackageJson(templateName, mode, options = {}) {
     result.peerDependencies = peerDependencies;
   }
   if (templateName === "consumer-root") {
-    result.packageManager = "bun@1.3.3";
-    result.engines = { node: ">=20.0.0", bun: ">=1.1.0" };
+    result.packageManager = "bun@1.3.5";
+    result.engines = { node: ">=24.0.0", bun: ">=1.3.0" };
     result.workspaces = ["apps/*", "entities"];
   }
   if (templateName === "entities") {
     result.main = "./index.ts";
     result.types = "./index.ts";
   }
+  if (templateName.includes("vite") || templateName.includes("nextjs") || templateName.includes("functions")) {
+    if (!dependencies.entities) {
+      dependencies.entities = "workspace:*";
+    }
+  }
   if (templateName.includes("functions")) {
     result.engines = { node: "20" };
     if (options.appName) {
@@ -8841,7 +8866,8 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
     firebaseProjectId: appName.toLowerCase(),
     firebaseSecretName: appName.toUpperCase().replace(/-/g, "_"),
     monorepoRelativePath: "../../packages/tooling",
-    appTemplate
+    appTemplate,
+    isNextjs: appTemplate === "nextjs"
   };
   const templateSourceDir = joinPath(templatesRoot, templateDir);
   const templateFiles = await glob("**/*", {
@@ -8934,7 +8960,7 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
       await replacePlaceholders(firebaseJsonDest, replacements);
     }
   }
-  if (appConfig.needsBackend && appConfig.backendPlatform === "vercel") {
+  if (appTemplate === "nextjs" || appConfig.needsBackend && appConfig.backendPlatform === "vercel") {
     const vercelJsonSource = joinPath(
       deploymentTemplateDir,
       "vercel.json.example"