@idevconn/create-icore 0.3.0 → 0.3.1

package/dist/cli.js

@@ -13,6 +13,13 @@ import { resolve } from "path";
 import { readFile } from "fs/promises";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
+function detectPackageManager() {
+  const ua = process.env["npm_config_user_agent"] ?? "";
+  if (ua.startsWith("yarn/")) return "yarn";
+  if (ua.startsWith("pnpm/")) return "pnpm";
+  if (ua.startsWith("npm/")) return "npm";
+  return "yarn";
+}
 async function readSelfVersion() {
   try {
     const here2 = dirname(fileURLToPath(import.meta.url));
@@ -81,6 +88,9 @@ function parseFlags(argv) {
       case "transport":
         out.transport = v;
         break;
+      case "package-manager":
+        out.packageManager = v;
+        break;
       case "no-git":
         out.initGit = false;
         break;
@@ -190,8 +200,12 @@ Re-run with @latest to refresh:
     initialValue: "tcp"
   });
   if (p.isCancel(transport)) throw new Error("cancelled");
+  const packageManager = flags.packageManager ?? detectPackageManager();
   const initGit = flags.initGit ?? !await p.confirm({ message: "Initialise git repo?", initialValue: true }) === false;
-  const install = flags.install ?? !await p.confirm({ message: "Run yarn install?", initialValue: true }) === false;
+  const install = flags.install ?? !await p.confirm({
+    message: `Run ${packageManager} install?`,
+    initialValue: true
+  }) === false;
   return {
     projectName,
     targetDir: resolve(cwd, projectName),
@@ -203,6 +217,7 @@ Re-run with @latest to refresh:
     example,
     ui,
     transport,
+    packageManager,
     initGit,
     install
   };
@@ -244,6 +259,9 @@ async function rewriteRootPackageJson(targetDir, opts) {
   pkg["version"] = "0.0.1";
   pkg["private"] = true;
   delete pkg.description;
+  if (opts.packageManager !== "yarn") {
+    delete pkg.packageManager;
+  }
   await writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
 }
 async function writeAuthEnv(targetDir, opts) {
@@ -416,6 +434,145 @@ async function removeNotesStack(targetDir) {
   } catch {
   }
 }
+async function stripTsconfigPath(targetDir, alias) {
+  const tsconfigPath = join2(targetDir, "tsconfig.base.json");
+  try {
+    const src = await readFile2(tsconfigPath, "utf8");
+    const escaped = alias.replace(/[@/]/g, (c) => c === "@" ? "@" : "\\/");
+    const pretty = src.replace(new RegExp(`^\\s*"${escaped}": \\[[^\\]]*\\],?\\n`, "m"), "");
+    if (pretty !== src) {
+      await writeFile(tsconfigPath, pretty);
+      return;
+    }
+    const parsed = JSON.parse(src);
+    if (parsed.compilerOptions?.paths) {
+      delete parsed.compilerOptions.paths[alias];
+    }
+    await writeFile(tsconfigPath, JSON.stringify(parsed));
+  } catch {
+  }
+}
+async function removeUnusedAuthStrategies(targetDir, authProvider) {
+  const modulePath = join2(targetDir, "apps/microservices/auth/src/app/app.module.ts");
+  if (authProvider === "supabase") {
+    await rm(join2(targetDir, "libs/auth-strategies/firebase"), { recursive: true, force: true });
+    await stripDeps(join2(targetDir, "apps/microservices/auth/package.json"), [
+      "@icore/auth-firebase"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/auth-firebase");
+    try {
+      const src = await readFile2(modulePath, "utf8");
+      const next = src.replace(/^import \* as admin from 'firebase-admin';\n/m, "").replace(/^import \{[^}]*FirebaseAuthStrategy[^}]*\} from '@icore\/auth-firebase';\n/m, "").replace(/^function makeFirebaseStrategy\b[\s\S]*?\n^}\n/m, "").replace(/(?<=\n) *case 'firebase':\n *return makeFirebaseStrategy\(cfg\);\n/, "");
+      await writeFile(modulePath, next);
+    } catch {
+    }
+  }
+  if (authProvider === "firebase") {
+    await rm(join2(targetDir, "libs/auth-strategies/supabase"), { recursive: true, force: true });
+    await stripDeps(join2(targetDir, "apps/microservices/auth/package.json"), [
+      "@icore/auth-supabase"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/auth-supabase");
+    try {
+      const src = await readFile2(modulePath, "utf8");
+      const next = src.replace(/^import \{ createClient \} from '@supabase\/supabase-js';\n/m, "").replace(/^import \{[^}]*SupabaseAuthStrategy[^}]*\} from '@icore\/auth-supabase';\n/m, "").replace(
+        /\n {10}case 'supabase': \{[\s\S]*?return new SupabaseAuthStrategy\(\{ client \}\);\n {10}\}\n/m,
+        ""
+      );
+      await writeFile(modulePath, next);
+    } catch {
+    }
+  }
+}
+async function removeUnusedStorageStrategies(targetDir, uploadProvider) {
+  if (uploadProvider === "none") return;
+  const modulePath = join2(targetDir, "apps/microservices/upload/src/app/app.module.ts");
+  if (uploadProvider !== "firebase") {
+    await rm(join2(targetDir, "libs/storage-strategies/firebase"), { recursive: true, force: true });
+    await stripDeps(join2(targetDir, "apps/microservices/upload/package.json"), [
+      "@icore/storage-firebase"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/storage-firebase");
+  }
+  if (uploadProvider !== "cloudinary") {
+    await rm(join2(targetDir, "libs/storage-strategies/cloudinary"), {
+      recursive: true,
+      force: true
+    });
+    await stripDeps(join2(targetDir, "apps/microservices/upload/package.json"), [
+      "@icore/storage-cloudinary"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/storage-cloudinary");
+  }
+  if (uploadProvider !== "supabase") {
+    await rm(join2(targetDir, "libs/storage-strategies/supabase"), { recursive: true, force: true });
+    await stripDeps(join2(targetDir, "apps/microservices/upload/package.json"), [
+      "@icore/storage-supabase"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/storage-supabase");
+  }
+  try {
+    let src = await readFile2(modulePath, "utf8");
+    if (uploadProvider !== "firebase") {
+      src = src.replace(/^import \* as admin from 'firebase-admin';\n/m, "").replace(
+        /^import \{[^}]*FirebaseStorageStrategy[^}]*\} from '@icore\/storage-firebase';\n/m,
+        ""
+      ).replace(/^function makeFirebaseStorage\b[\s\S]*?\n^}\n/m, "").replace(/(?<=\n) *case 'firebase':\n *return makeFirebaseStorage\(cfg\);\n/, "");
+    }
+    if (uploadProvider !== "cloudinary") {
+      src = src.replace(/^import \{ v2 as cloudinary \} from 'cloudinary';\n/m, "").replace(
+        /^import \{[^}]*CloudinaryStorageStrategy[^}]*\} from '@icore\/storage-cloudinary';\n/m,
+        ""
+      ).replace(/^function makeCloudinaryStorage\b[\s\S]*?\n^}\n/m, "").replace(/(?<=\n) *case 'cloudinary':\n *return makeCloudinaryStorage\(cfg\);\n/, "");
+    }
+    if (uploadProvider !== "supabase") {
+      src = src.replace(/^import \{ createClient \} from '@supabase\/supabase-js';\n/m, "").replace(
+        /^import \{[^}]*SupabaseStorageStrategy[^}]*\} from '@icore\/storage-supabase';\n/m,
+        ""
+      ).replace(
+        /\n {10}case 'supabase': \{[\s\S]*?bucket: requireEnv\(cfg, 'SUPABASE_STORAGE_BUCKET'\),\n {12}\}\);\n {10}\}\n/m,
+        ""
+      );
+    }
+    await writeFile(modulePath, src);
+  } catch {
+  }
+}
+async function removeUnusedDbStrategies(targetDir, dbProvider) {
+  const modulePath = join2(targetDir, "apps/microservices/notes/src/app/app.module.ts");
+  if (dbProvider === "supabase") {
+    await rm(join2(targetDir, "libs/db-strategies/firestore"), { recursive: true, force: true });
+    await stripDeps(join2(targetDir, "apps/microservices/notes/package.json"), [
+      "@icore/db-firestore"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/db-firestore");
+    try {
+      const src = await readFile2(modulePath, "utf8");
+      const next = src.replace(/^import \* as admin from 'firebase-admin';\n/m, "").replace(/^import \{[^}]*FirestoreDBStrategy[^}]*\} from '@icore\/db-firestore';\n/m, "").replace(
+        /\n {8}if \(provider === 'firestore'[\s\S]*?return new FirestoreDBStrategy\(\{[\s\S]*?\}\);\n {8}\}\n/m,
+        ""
+      );
+      await writeFile(modulePath, next);
+    } catch {
+    }
+  }
+  if (dbProvider === "firebase") {
+    await rm(join2(targetDir, "libs/db-strategies/supabase"), { recursive: true, force: true });
+    await stripDeps(join2(targetDir, "apps/microservices/notes/package.json"), [
+      "@icore/db-supabase"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/db-supabase");
+    try {
+      const src = await readFile2(modulePath, "utf8");
+      const next = src.replace(/^import \{ createClient \} from '@supabase\/supabase-js';\n/m, "").replace(/^import \{[^}]*SupabaseDBStrategy[^}]*\} from '@icore\/db-supabase';\n/m, "").replace(
+        /\n {8}if \(provider === 'supabase'\) \{[\s\S]*?return new SupabaseDBStrategy\(\{ client \}\);\n {8}\}\n/m,
+        ""
+      );
+      await writeFile(modulePath, next);
+    } catch {
+    }
+  }
+}
 async function removeUploadStack(targetDir) {
   const paths = [
     "apps/microservices/upload",
@@ -492,8 +649,9 @@ function gitInit(cwd, projectName) {
     { cwd, stdio: "inherit" }
   );
 }
-function yarnInstall(cwd) {
-  spawnSync("yarn", ["install"], { cwd, stdio: "inherit" });
+function runInstall(cwd, pm) {
+  const [cmd, ...args] = pm === "npm" ? ["npm", "install"] : pm === "pnpm" ? ["pnpm", "install"] : ["yarn", "install"];
+  spawnSync(cmd, args, { cwd, stdio: "inherit" });
 }
 async function scaffold(opts, templatesDir2) {
   await copyTree(templatesDir2, opts.targetDir);
@@ -508,12 +666,26 @@ async function scaffold(opts, templatesDir2) {
   if (opts.payment === "none") await removePaymentStack(opts.targetDir);
   if (opts.jobs === "none") await removeJobsStack(opts.targetDir);
   if (opts.example === "none") await removeNotesStack(opts.targetDir);
-  await writeFile(join2(opts.targetDir, "yarn.lock"), "");
-  if (opts.install) yarnInstall(opts.targetDir);
+  await removeUnusedAuthStrategies(opts.targetDir, opts.authProvider);
+  await removeUnusedStorageStrategies(opts.targetDir, opts.upload);
+  await removeUnusedDbStrategies(opts.targetDir, opts.dbProvider);
+  if (opts.packageManager === "yarn") {
+    await writeFile(join2(opts.targetDir, "yarn.lock"), "");
+  }
+  if (opts.install) runInstall(opts.targetDir, opts.packageManager);
   if (opts.initGit) gitInit(opts.targetDir, opts.projectName);
 }
 
 // src/cli.ts
+var [nodeMajor] = process.versions.node.split(".").map(Number);
+if (nodeMajor < 22) {
+  process.stderr.write(
+    `Error: iCore requires Node.js >= 22. You are running ${process.versions.node}.
+Upgrade: https://nodejs.org
+`
+  );
+  process.exit(1);
+}
 var here = dirname2(fileURLToPath2(import.meta.url));
 var templatesDir = resolve2(here, "..", "templates");
 async function main() {
@@ -533,8 +705,8 @@ async function main() {
   p2.outro(kleur.green("Done."));
   p2.log.info(`Next:`);
   p2.log.info(`  cd ${opts.projectName}`);
-  if (!opts.install) p2.log.info(`  yarn install`);
-  p2.log.info(`  yarn dev      # gateway + auth MS + upload MS + client`);
+  if (!opts.install) p2.log.info(`  ${opts.packageManager} install`);
+  p2.log.info(`  ${opts.packageManager} dev      # gateway + auth MS + upload MS + client`);
   p2.log.info(`  open http://localhost:4200`);
   p2.log.info(`  edit apps/microservices/auth/.env to plug in real ${opts.authProvider} creds`);
 }

package/dist/index.cjs

@@ -75,6 +75,9 @@ async function rewriteRootPackageJson(targetDir, opts) {
   pkg["version"] = "0.0.1";
   pkg["private"] = true;
   delete pkg.description;
+  if (opts.packageManager !== "yarn") {
+    delete pkg.packageManager;
+  }
   await (0, import_promises.writeFile)(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
 }
 async function writeAuthEnv(targetDir, opts) {
@@ -247,6 +250,145 @@ async function removeNotesStack(targetDir) {
   } catch {
   }
 }
+async function stripTsconfigPath(targetDir, alias) {
+  const tsconfigPath = (0, import_node_path.join)(targetDir, "tsconfig.base.json");
+  try {
+    const src = await (0, import_promises.readFile)(tsconfigPath, "utf8");
+    const escaped = alias.replace(/[@/]/g, (c) => c === "@" ? "@" : "\\/");
+    const pretty = src.replace(new RegExp(`^\\s*"${escaped}": \\[[^\\]]*\\],?\\n`, "m"), "");
+    if (pretty !== src) {
+      await (0, import_promises.writeFile)(tsconfigPath, pretty);
+      return;
+    }
+    const parsed = JSON.parse(src);
+    if (parsed.compilerOptions?.paths) {
+      delete parsed.compilerOptions.paths[alias];
+    }
+    await (0, import_promises.writeFile)(tsconfigPath, JSON.stringify(parsed));
+  } catch {
+  }
+}
+async function removeUnusedAuthStrategies(targetDir, authProvider) {
+  const modulePath = (0, import_node_path.join)(targetDir, "apps/microservices/auth/src/app/app.module.ts");
+  if (authProvider === "supabase") {
+    await (0, import_promises.rm)((0, import_node_path.join)(targetDir, "libs/auth-strategies/firebase"), { recursive: true, force: true });
+    await stripDeps((0, import_node_path.join)(targetDir, "apps/microservices/auth/package.json"), [
+      "@icore/auth-firebase"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/auth-firebase");
+    try {
+      const src = await (0, import_promises.readFile)(modulePath, "utf8");
+      const next = src.replace(/^import \* as admin from 'firebase-admin';\n/m, "").replace(/^import \{[^}]*FirebaseAuthStrategy[^}]*\} from '@icore\/auth-firebase';\n/m, "").replace(/^function makeFirebaseStrategy\b[\s\S]*?\n^}\n/m, "").replace(/(?<=\n) *case 'firebase':\n *return makeFirebaseStrategy\(cfg\);\n/, "");
+      await (0, import_promises.writeFile)(modulePath, next);
+    } catch {
+    }
+  }
+  if (authProvider === "firebase") {
+    await (0, import_promises.rm)((0, import_node_path.join)(targetDir, "libs/auth-strategies/supabase"), { recursive: true, force: true });
+    await stripDeps((0, import_node_path.join)(targetDir, "apps/microservices/auth/package.json"), [
+      "@icore/auth-supabase"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/auth-supabase");
+    try {
+      const src = await (0, import_promises.readFile)(modulePath, "utf8");
+      const next = src.replace(/^import \{ createClient \} from '@supabase\/supabase-js';\n/m, "").replace(/^import \{[^}]*SupabaseAuthStrategy[^}]*\} from '@icore\/auth-supabase';\n/m, "").replace(
+        /\n {10}case 'supabase': \{[\s\S]*?return new SupabaseAuthStrategy\(\{ client \}\);\n {10}\}\n/m,
+        ""
+      );
+      await (0, import_promises.writeFile)(modulePath, next);
+    } catch {
+    }
+  }
+}
+async function removeUnusedStorageStrategies(targetDir, uploadProvider) {
+  if (uploadProvider === "none") return;
+  const modulePath = (0, import_node_path.join)(targetDir, "apps/microservices/upload/src/app/app.module.ts");
+  if (uploadProvider !== "firebase") {
+    await (0, import_promises.rm)((0, import_node_path.join)(targetDir, "libs/storage-strategies/firebase"), { recursive: true, force: true });
+    await stripDeps((0, import_node_path.join)(targetDir, "apps/microservices/upload/package.json"), [
+      "@icore/storage-firebase"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/storage-firebase");
+  }
+  if (uploadProvider !== "cloudinary") {
+    await (0, import_promises.rm)((0, import_node_path.join)(targetDir, "libs/storage-strategies/cloudinary"), {
+      recursive: true,
+      force: true
+    });
+    await stripDeps((0, import_node_path.join)(targetDir, "apps/microservices/upload/package.json"), [
+      "@icore/storage-cloudinary"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/storage-cloudinary");
+  }
+  if (uploadProvider !== "supabase") {
+    await (0, import_promises.rm)((0, import_node_path.join)(targetDir, "libs/storage-strategies/supabase"), { recursive: true, force: true });
+    await stripDeps((0, import_node_path.join)(targetDir, "apps/microservices/upload/package.json"), [
+      "@icore/storage-supabase"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/storage-supabase");
+  }
+  try {
+    let src = await (0, import_promises.readFile)(modulePath, "utf8");
+    if (uploadProvider !== "firebase") {
+      src = src.replace(/^import \* as admin from 'firebase-admin';\n/m, "").replace(
+        /^import \{[^}]*FirebaseStorageStrategy[^}]*\} from '@icore\/storage-firebase';\n/m,
+        ""
+      ).replace(/^function makeFirebaseStorage\b[\s\S]*?\n^}\n/m, "").replace(/(?<=\n) *case 'firebase':\n *return makeFirebaseStorage\(cfg\);\n/, "");
+    }
+    if (uploadProvider !== "cloudinary") {
+      src = src.replace(/^import \{ v2 as cloudinary \} from 'cloudinary';\n/m, "").replace(
+        /^import \{[^}]*CloudinaryStorageStrategy[^}]*\} from '@icore\/storage-cloudinary';\n/m,
+        ""
+      ).replace(/^function makeCloudinaryStorage\b[\s\S]*?\n^}\n/m, "").replace(/(?<=\n) *case 'cloudinary':\n *return makeCloudinaryStorage\(cfg\);\n/, "");
+    }
+    if (uploadProvider !== "supabase") {
+      src = src.replace(/^import \{ createClient \} from '@supabase\/supabase-js';\n/m, "").replace(
+        /^import \{[^}]*SupabaseStorageStrategy[^}]*\} from '@icore\/storage-supabase';\n/m,
+        ""
+      ).replace(
+        /\n {10}case 'supabase': \{[\s\S]*?bucket: requireEnv\(cfg, 'SUPABASE_STORAGE_BUCKET'\),\n {12}\}\);\n {10}\}\n/m,
+        ""
+      );
+    }
+    await (0, import_promises.writeFile)(modulePath, src);
+  } catch {
+  }
+}
+async function removeUnusedDbStrategies(targetDir, dbProvider) {
+  const modulePath = (0, import_node_path.join)(targetDir, "apps/microservices/notes/src/app/app.module.ts");
+  if (dbProvider === "supabase") {
+    await (0, import_promises.rm)((0, import_node_path.join)(targetDir, "libs/db-strategies/firestore"), { recursive: true, force: true });
+    await stripDeps((0, import_node_path.join)(targetDir, "apps/microservices/notes/package.json"), [
+      "@icore/db-firestore"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/db-firestore");
+    try {
+      const src = await (0, import_promises.readFile)(modulePath, "utf8");
+      const next = src.replace(/^import \* as admin from 'firebase-admin';\n/m, "").replace(/^import \{[^}]*FirestoreDBStrategy[^}]*\} from '@icore\/db-firestore';\n/m, "").replace(
+        /\n {8}if \(provider === 'firestore'[\s\S]*?return new FirestoreDBStrategy\(\{[\s\S]*?\}\);\n {8}\}\n/m,
+        ""
+      );
+      await (0, import_promises.writeFile)(modulePath, next);
+    } catch {
+    }
+  }
+  if (dbProvider === "firebase") {
+    await (0, import_promises.rm)((0, import_node_path.join)(targetDir, "libs/db-strategies/supabase"), { recursive: true, force: true });
+    await stripDeps((0, import_node_path.join)(targetDir, "apps/microservices/notes/package.json"), [
+      "@icore/db-supabase"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/db-supabase");
+    try {
+      const src = await (0, import_promises.readFile)(modulePath, "utf8");
+      const next = src.replace(/^import \{ createClient \} from '@supabase\/supabase-js';\n/m, "").replace(/^import \{[^}]*SupabaseDBStrategy[^}]*\} from '@icore\/db-supabase';\n/m, "").replace(
+        /\n {8}if \(provider === 'supabase'\) \{[\s\S]*?return new SupabaseDBStrategy\(\{ client \}\);\n {8}\}\n/m,
+        ""
+      );
+      await (0, import_promises.writeFile)(modulePath, next);
+    } catch {
+    }
+  }
+}
 async function removeUploadStack(targetDir) {
   const paths = [
     "apps/microservices/upload",
@@ -323,8 +465,9 @@ function gitInit(cwd, projectName) {
     { cwd, stdio: "inherit" }
   );
 }
-function yarnInstall(cwd) {
-  (0, import_node_child_process.spawnSync)("yarn", ["install"], { cwd, stdio: "inherit" });
+function runInstall(cwd, pm) {
+  const [cmd, ...args] = pm === "npm" ? ["npm", "install"] : pm === "pnpm" ? ["pnpm", "install"] : ["yarn", "install"];
+  (0, import_node_child_process.spawnSync)(cmd, args, { cwd, stdio: "inherit" });
 }
 async function scaffold(opts, templatesDir) {
   await copyTree(templatesDir, opts.targetDir);
@@ -339,8 +482,13 @@ async function scaffold(opts, templatesDir) {
   if (opts.payment === "none") await removePaymentStack(opts.targetDir);
   if (opts.jobs === "none") await removeJobsStack(opts.targetDir);
   if (opts.example === "none") await removeNotesStack(opts.targetDir);
-  await (0, import_promises.writeFile)((0, import_node_path.join)(opts.targetDir, "yarn.lock"), "");
-  if (opts.install) yarnInstall(opts.targetDir);
+  await removeUnusedAuthStrategies(opts.targetDir, opts.authProvider);
+  await removeUnusedStorageStrategies(opts.targetDir, opts.upload);
+  await removeUnusedDbStrategies(opts.targetDir, opts.dbProvider);
+  if (opts.packageManager === "yarn") {
+    await (0, import_promises.writeFile)((0, import_node_path.join)(opts.targetDir, "yarn.lock"), "");
+  }
+  if (opts.install) runInstall(opts.targetDir, opts.packageManager);
   if (opts.initGit) gitInit(opts.targetDir, opts.projectName);
 }
 
@@ -350,6 +498,13 @@ var import_node_path2 = require("path");
 var import_promises2 = require("fs/promises");
 var import_node_path3 = require("path");
 var import_node_url = require("url");
+function detectPackageManager() {
+  const ua = process.env["npm_config_user_agent"] ?? "";
+  if (ua.startsWith("yarn/")) return "yarn";
+  if (ua.startsWith("pnpm/")) return "pnpm";
+  if (ua.startsWith("npm/")) return "npm";
+  return "yarn";
+}
 async function readSelfVersion() {
   try {
     const here = (0, import_node_path3.dirname)((0, import_node_url.fileURLToPath)(importMetaUrl));
@@ -418,6 +573,9 @@ function parseFlags(argv) {
       case "transport":
         out.transport = v;
         break;
+      case "package-manager":
+        out.packageManager = v;
+        break;
       case "no-git":
         out.initGit = false;
         break;
@@ -527,8 +685,12 @@ Re-run with @latest to refresh:
     initialValue: "tcp"
   });
   if (p.isCancel(transport)) throw new Error("cancelled");
+  const packageManager = flags.packageManager ?? detectPackageManager();
   const initGit = flags.initGit ?? !await p.confirm({ message: "Initialise git repo?", initialValue: true }) === false;
-  const install = flags.install ?? !await p.confirm({ message: "Run yarn install?", initialValue: true }) === false;
+  const install = flags.install ?? !await p.confirm({
+    message: `Run ${packageManager} install?`,
+    initialValue: true
+  }) === false;
   return {
     projectName,
     targetDir: (0, import_node_path2.resolve)(cwd, projectName),
@@ -540,6 +702,7 @@ Re-run with @latest to refresh:
     example,
     ui,
     transport,
+    packageManager,
     initGit,
     install
   };

package/dist/index.d.cts

@@ -6,6 +6,7 @@ type JobsProvider = 'bullmq' | 'none';
 type ExampleMode = 'notes' | 'none';
 type UiLibrary = 'shadcn' | 'antd' | 'mui';
 type MsTransport = 'tcp' | 'redis' | 'nats';
+type PackageManager = 'yarn' | 'npm' | 'pnpm';
 interface CreateIcoreOptions {
     projectName: string;
     targetDir: string;
@@ -17,6 +18,7 @@ interface CreateIcoreOptions {
     example: ExampleMode;
     ui: UiLibrary;
     transport: MsTransport;
+    packageManager: PackageManager;
     initGit: boolean;
     install: boolean;
 }
@@ -29,4 +31,4 @@ interface PromptInput {
 }
 declare function collectOptions({ argv, cwd }: PromptInput): Promise<CreateIcoreOptions>;
 
-export { type AuthProvider, type CreateIcoreOptions, type DbProvider, type ExampleMode, type JobsProvider, type MsTransport, type PaymentProvider, type UiLibrary, type UploadProvider, collectOptions, scaffold };
+export { type AuthProvider, type CreateIcoreOptions, type DbProvider, type ExampleMode, type JobsProvider, type MsTransport, type PackageManager, type PaymentProvider, type UiLibrary, type UploadProvider, collectOptions, scaffold };

package/dist/index.d.ts

@@ -6,6 +6,7 @@ type JobsProvider = 'bullmq' | 'none';
 type ExampleMode = 'notes' | 'none';
 type UiLibrary = 'shadcn' | 'antd' | 'mui';
 type MsTransport = 'tcp' | 'redis' | 'nats';
+type PackageManager = 'yarn' | 'npm' | 'pnpm';
 interface CreateIcoreOptions {
     projectName: string;
     targetDir: string;
@@ -17,6 +18,7 @@ interface CreateIcoreOptions {
     example: ExampleMode;
     ui: UiLibrary;
     transport: MsTransport;
+    packageManager: PackageManager;
     initGit: boolean;
     install: boolean;
 }
@@ -29,4 +31,4 @@ interface PromptInput {
 }
 declare function collectOptions({ argv, cwd }: PromptInput): Promise<CreateIcoreOptions>;
 
-export { type AuthProvider, type CreateIcoreOptions, type DbProvider, type ExampleMode, type JobsProvider, type MsTransport, type PaymentProvider, type UiLibrary, type UploadProvider, collectOptions, scaffold };
+export { type AuthProvider, type CreateIcoreOptions, type DbProvider, type ExampleMode, type JobsProvider, type MsTransport, type PackageManager, type PaymentProvider, type UiLibrary, type UploadProvider, collectOptions, scaffold };

package/dist/index.js

@@ -34,6 +34,9 @@ async function rewriteRootPackageJson(targetDir, opts) {
   pkg["version"] = "0.0.1";
   pkg["private"] = true;
   delete pkg.description;
+  if (opts.packageManager !== "yarn") {
+    delete pkg.packageManager;
+  }
   await writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
 }
 async function writeAuthEnv(targetDir, opts) {
@@ -206,6 +209,145 @@ async function removeNotesStack(targetDir) {
   } catch {
   }
 }
+async function stripTsconfigPath(targetDir, alias) {
+  const tsconfigPath = join(targetDir, "tsconfig.base.json");
+  try {
+    const src = await readFile(tsconfigPath, "utf8");
+    const escaped = alias.replace(/[@/]/g, (c) => c === "@" ? "@" : "\\/");
+    const pretty = src.replace(new RegExp(`^\\s*"${escaped}": \\[[^\\]]*\\],?\\n`, "m"), "");
+    if (pretty !== src) {
+      await writeFile(tsconfigPath, pretty);
+      return;
+    }
+    const parsed = JSON.parse(src);
+    if (parsed.compilerOptions?.paths) {
+      delete parsed.compilerOptions.paths[alias];
+    }
+    await writeFile(tsconfigPath, JSON.stringify(parsed));
+  } catch {
+  }
+}
+async function removeUnusedAuthStrategies(targetDir, authProvider) {
+  const modulePath = join(targetDir, "apps/microservices/auth/src/app/app.module.ts");
+  if (authProvider === "supabase") {
+    await rm(join(targetDir, "libs/auth-strategies/firebase"), { recursive: true, force: true });
+    await stripDeps(join(targetDir, "apps/microservices/auth/package.json"), [
+      "@icore/auth-firebase"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/auth-firebase");
+    try {
+      const src = await readFile(modulePath, "utf8");
+      const next = src.replace(/^import \* as admin from 'firebase-admin';\n/m, "").replace(/^import \{[^}]*FirebaseAuthStrategy[^}]*\} from '@icore\/auth-firebase';\n/m, "").replace(/^function makeFirebaseStrategy\b[\s\S]*?\n^}\n/m, "").replace(/(?<=\n) *case 'firebase':\n *return makeFirebaseStrategy\(cfg\);\n/, "");
+      await writeFile(modulePath, next);
+    } catch {
+    }
+  }
+  if (authProvider === "firebase") {
+    await rm(join(targetDir, "libs/auth-strategies/supabase"), { recursive: true, force: true });
+    await stripDeps(join(targetDir, "apps/microservices/auth/package.json"), [
+      "@icore/auth-supabase"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/auth-supabase");
+    try {
+      const src = await readFile(modulePath, "utf8");
+      const next = src.replace(/^import \{ createClient \} from '@supabase\/supabase-js';\n/m, "").replace(/^import \{[^}]*SupabaseAuthStrategy[^}]*\} from '@icore\/auth-supabase';\n/m, "").replace(
+        /\n {10}case 'supabase': \{[\s\S]*?return new SupabaseAuthStrategy\(\{ client \}\);\n {10}\}\n/m,
+        ""
+      );
+      await writeFile(modulePath, next);
+    } catch {
+    }
+  }
+}
+async function removeUnusedStorageStrategies(targetDir, uploadProvider) {
+  if (uploadProvider === "none") return;
+  const modulePath = join(targetDir, "apps/microservices/upload/src/app/app.module.ts");
+  if (uploadProvider !== "firebase") {
+    await rm(join(targetDir, "libs/storage-strategies/firebase"), { recursive: true, force: true });
+    await stripDeps(join(targetDir, "apps/microservices/upload/package.json"), [
+      "@icore/storage-firebase"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/storage-firebase");
+  }
+  if (uploadProvider !== "cloudinary") {
+    await rm(join(targetDir, "libs/storage-strategies/cloudinary"), {
+      recursive: true,
+      force: true
+    });
+    await stripDeps(join(targetDir, "apps/microservices/upload/package.json"), [
+      "@icore/storage-cloudinary"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/storage-cloudinary");
+  }
+  if (uploadProvider !== "supabase") {
+    await rm(join(targetDir, "libs/storage-strategies/supabase"), { recursive: true, force: true });
+    await stripDeps(join(targetDir, "apps/microservices/upload/package.json"), [
+      "@icore/storage-supabase"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/storage-supabase");
+  }
+  try {
+    let src = await readFile(modulePath, "utf8");
+    if (uploadProvider !== "firebase") {
+      src = src.replace(/^import \* as admin from 'firebase-admin';\n/m, "").replace(
+        /^import \{[^}]*FirebaseStorageStrategy[^}]*\} from '@icore\/storage-firebase';\n/m,
+        ""
+      ).replace(/^function makeFirebaseStorage\b[\s\S]*?\n^}\n/m, "").replace(/(?<=\n) *case 'firebase':\n *return makeFirebaseStorage\(cfg\);\n/, "");
+    }
+    if (uploadProvider !== "cloudinary") {
+      src = src.replace(/^import \{ v2 as cloudinary \} from 'cloudinary';\n/m, "").replace(
+        /^import \{[^}]*CloudinaryStorageStrategy[^}]*\} from '@icore\/storage-cloudinary';\n/m,
+        ""
+      ).replace(/^function makeCloudinaryStorage\b[\s\S]*?\n^}\n/m, "").replace(/(?<=\n) *case 'cloudinary':\n *return makeCloudinaryStorage\(cfg\);\n/, "");
+    }
+    if (uploadProvider !== "supabase") {
+      src = src.replace(/^import \{ createClient \} from '@supabase\/supabase-js';\n/m, "").replace(
+        /^import \{[^}]*SupabaseStorageStrategy[^}]*\} from '@icore\/storage-supabase';\n/m,
+        ""
+      ).replace(
+        /\n {10}case 'supabase': \{[\s\S]*?bucket: requireEnv\(cfg, 'SUPABASE_STORAGE_BUCKET'\),\n {12}\}\);\n {10}\}\n/m,
+        ""
+      );
+    }
+    await writeFile(modulePath, src);
+  } catch {
+  }
+}
+async function removeUnusedDbStrategies(targetDir, dbProvider) {
+  const modulePath = join(targetDir, "apps/microservices/notes/src/app/app.module.ts");
+  if (dbProvider === "supabase") {
+    await rm(join(targetDir, "libs/db-strategies/firestore"), { recursive: true, force: true });
+    await stripDeps(join(targetDir, "apps/microservices/notes/package.json"), [
+      "@icore/db-firestore"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/db-firestore");
+    try {
+      const src = await readFile(modulePath, "utf8");
+      const next = src.replace(/^import \* as admin from 'firebase-admin';\n/m, "").replace(/^import \{[^}]*FirestoreDBStrategy[^}]*\} from '@icore\/db-firestore';\n/m, "").replace(
+        /\n {8}if \(provider === 'firestore'[\s\S]*?return new FirestoreDBStrategy\(\{[\s\S]*?\}\);\n {8}\}\n/m,
+        ""
+      );
+      await writeFile(modulePath, next);
+    } catch {
+    }
+  }
+  if (dbProvider === "firebase") {
+    await rm(join(targetDir, "libs/db-strategies/supabase"), { recursive: true, force: true });
+    await stripDeps(join(targetDir, "apps/microservices/notes/package.json"), [
+      "@icore/db-supabase"
+    ]);
+    await stripTsconfigPath(targetDir, "@icore/db-supabase");
+    try {
+      const src = await readFile(modulePath, "utf8");
+      const next = src.replace(/^import \{ createClient \} from '@supabase\/supabase-js';\n/m, "").replace(/^import \{[^}]*SupabaseDBStrategy[^}]*\} from '@icore\/db-supabase';\n/m, "").replace(
+        /\n {8}if \(provider === 'supabase'\) \{[\s\S]*?return new SupabaseDBStrategy\(\{ client \}\);\n {8}\}\n/m,
+        ""
+      );
+      await writeFile(modulePath, next);
+    } catch {
+    }
+  }
+}
 async function removeUploadStack(targetDir) {
   const paths = [
     "apps/microservices/upload",
@@ -282,8 +424,9 @@ function gitInit(cwd, projectName) {
     { cwd, stdio: "inherit" }
   );
 }
-function yarnInstall(cwd) {
-  spawnSync("yarn", ["install"], { cwd, stdio: "inherit" });
+function runInstall(cwd, pm) {
+  const [cmd, ...args] = pm === "npm" ? ["npm", "install"] : pm === "pnpm" ? ["pnpm", "install"] : ["yarn", "install"];
+  spawnSync(cmd, args, { cwd, stdio: "inherit" });
 }
 async function scaffold(opts, templatesDir) {
   await copyTree(templatesDir, opts.targetDir);
@@ -298,8 +441,13 @@ async function scaffold(opts, templatesDir) {
   if (opts.payment === "none") await removePaymentStack(opts.targetDir);
   if (opts.jobs === "none") await removeJobsStack(opts.targetDir);
   if (opts.example === "none") await removeNotesStack(opts.targetDir);
-  await writeFile(join(opts.targetDir, "yarn.lock"), "");
-  if (opts.install) yarnInstall(opts.targetDir);
+  await removeUnusedAuthStrategies(opts.targetDir, opts.authProvider);
+  await removeUnusedStorageStrategies(opts.targetDir, opts.upload);
+  await removeUnusedDbStrategies(opts.targetDir, opts.dbProvider);
+  if (opts.packageManager === "yarn") {
+    await writeFile(join(opts.targetDir, "yarn.lock"), "");
+  }
+  if (opts.install) runInstall(opts.targetDir, opts.packageManager);
   if (opts.initGit) gitInit(opts.targetDir, opts.projectName);
 }
 
@@ -309,6 +457,13 @@ import { resolve } from "path";
 import { readFile as readFile2 } from "fs/promises";
 import { dirname, join as join2 } from "path";
 import { fileURLToPath } from "url";
+function detectPackageManager() {
+  const ua = process.env["npm_config_user_agent"] ?? "";
+  if (ua.startsWith("yarn/")) return "yarn";
+  if (ua.startsWith("pnpm/")) return "pnpm";
+  if (ua.startsWith("npm/")) return "npm";
+  return "yarn";
+}
 async function readSelfVersion() {
   try {
     const here = dirname(fileURLToPath(import.meta.url));
@@ -377,6 +532,9 @@ function parseFlags(argv) {
       case "transport":
         out.transport = v;
         break;
+      case "package-manager":
+        out.packageManager = v;
+        break;
       case "no-git":
         out.initGit = false;
         break;
@@ -486,8 +644,12 @@ Re-run with @latest to refresh:
     initialValue: "tcp"
   });
   if (p.isCancel(transport)) throw new Error("cancelled");
+  const packageManager = flags.packageManager ?? detectPackageManager();
   const initGit = flags.initGit ?? !await p.confirm({ message: "Initialise git repo?", initialValue: true }) === false;
-  const install = flags.install ?? !await p.confirm({ message: "Run yarn install?", initialValue: true }) === false;
+  const install = flags.install ?? !await p.confirm({
+    message: `Run ${packageManager} install?`,
+    initialValue: true
+  }) === false;
   return {
     projectName,
     targetDir: resolve(cwd, projectName),
@@ -499,6 +661,7 @@ Re-run with @latest to refresh:
     example,
     ui,
     transport,
+    packageManager,
     initGit,
     install
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idevconn/create-icore",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Bootstrap a new project from the iCore scaffold (Nx + NestJS + React + Vite + shadcn/Tailwind, swappable auth + storage providers).",
   "license": "Apache-2.0",
   "author": "iDEVconn",

package/templates/apps/microservices/auth/src/app/app.module.ts

@@ -8,20 +8,24 @@ import { FirebaseAuthStrategy, HttpIdentityToolkitClient } from '@icore/auth-fir
 import type { AuthStrategy } from '@icore/shared';
 import { AuthController } from './auth.controller';
 
+function requireEnv(cfg: ConfigService, key: string): string {
+  const val = cfg.getOrThrow<string>(key);
+  if (!val) throw new Error(`${key} is not set — check apps/microservices/auth/.env`);
+  return val;
+}
+
 function makeFirebaseStrategy(cfg: ConfigService): AuthStrategy {
-  const projectId = cfg.getOrThrow<string>('FB_ADMIN_PROJECT_ID');
+  const projectId = requireEnv(cfg, 'FB_ADMIN_PROJECT_ID');
   if (admin.apps.length === 0) {
     admin.initializeApp({
       credential: admin.credential.cert({
         projectId,
-        clientEmail: cfg.getOrThrow<string>('FB_ADMIN_CLIENT_EMAIL'),
-        privateKey: cfg.getOrThrow<string>('FB_ADMIN_PRIVATE_KEY').replace(/\\n/g, '\n'),
+        clientEmail: requireEnv(cfg, 'FB_ADMIN_CLIENT_EMAIL'),
+        privateKey: requireEnv(cfg, 'FB_ADMIN_PRIVATE_KEY').replace(/\\n/g, '\n'),
       }),
     });
   }
-  const identityToolkit = new HttpIdentityToolkitClient(
-    cfg.getOrThrow<string>('FIREBASE_WEB_API_KEY'),
-  );
+  const identityToolkit = new HttpIdentityToolkitClient(requireEnv(cfg, 'FIREBASE_WEB_API_KEY'));
   return new FirebaseAuthStrategy({
     identityToolkit,
     adminAuth: admin.auth(),
@@ -43,12 +47,12 @@ function makeFirebaseStrategy(cfg: ConfigService): AuthStrategy {
     {
       provide: 'AuthStrategy',
       useFactory: (cfg: ConfigService): AuthStrategy => {
-        const provider = cfg.getOrThrow<string>('AUTH_PROVIDER');
+        const provider = requireEnv(cfg, 'AUTH_PROVIDER');
         switch (provider) {
           case 'supabase': {
             const client = createClient(
-              cfg.getOrThrow<string>('SUPABASE_URL'),
-              cfg.getOrThrow<string>('SUPABASE_SERVICE_ROLE_KEY'),
+              requireEnv(cfg, 'SUPABASE_URL'),
+              requireEnv(cfg, 'SUPABASE_SERVICE_ROLE_KEY'),
               { auth: { autoRefreshToken: false, persistSession: false } },
             );
             return new SupabaseAuthStrategy({ client });

package/templates/apps/microservices/notes/src/app/app.module.ts

@@ -8,6 +8,12 @@ import { FirestoreDBStrategy } from '@icore/db-firestore';
 import type { DBStrategy } from '@icore/shared';
 import { NotesController } from './notes.controller';
 
+function requireEnv(cfg: ConfigService, key: string): string {
+  const val = cfg.getOrThrow<string>(key);
+  if (!val) throw new Error(`${key} is not set — check apps/microservices/notes/.env`);
+  return val;
+}
+
 @Module({
   imports: [
     ConfigModule.forRoot({
@@ -23,11 +29,11 @@ import { NotesController } from './notes.controller';
     {
       provide: 'DBStrategy',
       useFactory: (cfg: ConfigService): DBStrategy => {
-        const provider = cfg.getOrThrow<string>('DB_PROVIDER');
+        const provider = requireEnv(cfg, 'DB_PROVIDER');
         if (provider === 'supabase') {
           const client = createClient(
-            cfg.getOrThrow<string>('SUPABASE_URL'),
-            cfg.getOrThrow<string>('SUPABASE_SERVICE_ROLE_KEY'),
+            requireEnv(cfg, 'SUPABASE_URL'),
+            requireEnv(cfg, 'SUPABASE_SERVICE_ROLE_KEY'),
             { auth: { autoRefreshToken: false, persistSession: false } },
           );
           return new SupabaseDBStrategy({ client });
@@ -36,9 +42,9 @@ import { NotesController } from './notes.controller';
           if (admin.apps.length === 0) {
             admin.initializeApp({
               credential: admin.credential.cert({
-                projectId: cfg.getOrThrow<string>('FB_ADMIN_PROJECT_ID'),
-                clientEmail: cfg.getOrThrow<string>('FB_ADMIN_CLIENT_EMAIL'),
-                privateKey: cfg.getOrThrow<string>('FB_ADMIN_PRIVATE_KEY').replace(/\\n/g, '\n'),
+                projectId: requireEnv(cfg, 'FB_ADMIN_PROJECT_ID'),
+                clientEmail: requireEnv(cfg, 'FB_ADMIN_CLIENT_EMAIL'),
+                privateKey: requireEnv(cfg, 'FB_ADMIN_PRIVATE_KEY').replace(/\\n/g, '\n'),
               }),
             });
           }

package/templates/apps/microservices/upload/src/app/app.module.ts

@@ -10,14 +10,20 @@ import { CloudinaryStorageStrategy, type CloudinaryApiLike } from '@icore/storag
 import type { StorageStrategy } from '@icore/shared';
 import { StorageController } from './storage.controller';
 
+function requireEnv(cfg: ConfigService, key: string): string {
+  const val = cfg.getOrThrow<string>(key);
+  if (!val) throw new Error(`${key} is not set — check apps/microservices/upload/.env`);
+  return val;
+}
+
 function makeFirebaseStorage(cfg: ConfigService): StorageStrategy {
-  const bucketName = cfg.getOrThrow<string>('FIREBASE_STORAGE_BUCKET');
+  const bucketName = requireEnv(cfg, 'FIREBASE_STORAGE_BUCKET');
   if (admin.apps.length === 0) {
     admin.initializeApp({
       credential: admin.credential.cert({
-        projectId: cfg.getOrThrow<string>('FB_ADMIN_PROJECT_ID'),
-        clientEmail: cfg.getOrThrow<string>('FB_ADMIN_CLIENT_EMAIL'),
-        privateKey: cfg.getOrThrow<string>('FB_ADMIN_PRIVATE_KEY').replace(/\\n/g, '\n'),
+        projectId: requireEnv(cfg, 'FB_ADMIN_PROJECT_ID'),
+        clientEmail: requireEnv(cfg, 'FB_ADMIN_CLIENT_EMAIL'),
+        privateKey: requireEnv(cfg, 'FB_ADMIN_PRIVATE_KEY').replace(/\\n/g, '\n'),
       }),
     });
   }
@@ -30,9 +36,9 @@ function makeFirebaseStorage(cfg: ConfigService): StorageStrategy {
 
 function makeCloudinaryStorage(cfg: ConfigService): StorageStrategy {
   cloudinary.config({
-    cloud_name: cfg.getOrThrow<string>('CLOUDINARY_CLOUD_NAME'),
-    api_key: cfg.getOrThrow<string>('CLOUDINARY_API_KEY'),
-    api_secret: cfg.getOrThrow<string>('CLOUDINARY_API_SECRET'),
+    cloud_name: requireEnv(cfg, 'CLOUDINARY_CLOUD_NAME'),
+    api_key: requireEnv(cfg, 'CLOUDINARY_API_KEY'),
+    api_secret: requireEnv(cfg, 'CLOUDINARY_API_SECRET'),
     secure: true,
   });
 
@@ -89,17 +95,17 @@ function makeCloudinaryStorage(cfg: ConfigService): StorageStrategy {
     {
       provide: 'StorageStrategy',
       useFactory: (cfg: ConfigService): StorageStrategy => {
-        const provider = cfg.getOrThrow<string>('STORAGE_PROVIDER');
+        const provider = requireEnv(cfg, 'STORAGE_PROVIDER');
         switch (provider) {
           case 'supabase': {
             const client = createClient(
-              cfg.getOrThrow<string>('SUPABASE_URL'),
-              cfg.getOrThrow<string>('SUPABASE_SERVICE_ROLE_KEY'),
+              requireEnv(cfg, 'SUPABASE_URL'),
+              requireEnv(cfg, 'SUPABASE_SERVICE_ROLE_KEY'),
               { auth: { autoRefreshToken: false, persistSession: false } },
             );
             return new SupabaseStorageStrategy({
               client,
-              bucket: cfg.getOrThrow<string>('SUPABASE_STORAGE_BUCKET'),
+              bucket: requireEnv(cfg, 'SUPABASE_STORAGE_BUCKET'),
             });
           }
           case 'firebase':

package/templates/libs/shared/src/strategies/fakes/fake-auth.ts

@@ -1,4 +1,3 @@
-import { randomUUID } from 'node:crypto';
 import type {
   AuthSession,
   AuthStrategy,
@@ -33,7 +32,7 @@ export class FakeAuthStrategy implements AuthStrategy {
 
   async signUp(email: string, password: string): Promise<AuthSession> {
     if (this.users.has(email)) throw new Error('user_exists');
-    const user: StoredUser = { id: randomUUID(), email, password };
+    const user: StoredUser = { id: globalThis.crypto.randomUUID(), email, password };
     this.users.set(email, user);
     return this.issueSession(user);
   }
@@ -72,10 +71,10 @@ export class FakeAuthStrategy implements AuthStrategy {
   async sendMagicLink(req: MagicLinkRequest): Promise<void> {
     let user = this.users.get(req.email);
     if (!user) {
-      user = { id: randomUUID(), email: req.email, password: '' };
+      user = { id: globalThis.crypto.randomUUID(), email: req.email, password: '' };
       this.users.set(req.email, user);
     }
-    const token = randomUUID();
+    const token = globalThis.crypto.randomUUID();
     this.magicLinkTokens.set(token, user.id);
     this.magicLinkByEmail.set(req.email, token);
   }
@@ -95,7 +94,7 @@ export class FakeAuthStrategy implements AuthStrategy {
   }
 
   async startOAuth(provider: OAuthProvider, callbackUrl: string): Promise<OAuthStartResult> {
-    const state = randomUUID();
+    const state = globalThis.crypto.randomUUID();
     this.lastOAuthState = state;
     const url = new URL(`https://fake-${provider}.example.com/authorize`);
     url.searchParams.set('redirect_uri', callbackUrl);
@@ -111,7 +110,7 @@ export class FakeAuthStrategy implements AuthStrategy {
     this.oauthCodes.delete(code);
     let user = this.users.get(pending.email);
     if (!user) {
-      user = { id: randomUUID(), email: pending.email, password: '' };
+      user = { id: globalThis.crypto.randomUUID(), email: pending.email, password: '' };
       this.users.set(pending.email, user);
     }
     return this.issueSession(user);
@@ -123,7 +122,7 @@ export class FakeAuthStrategy implements AuthStrategy {
   getLastOAuthChallenge(provider: OAuthProvider, email: string): { code: string; state: string } {
     if (!this.lastOAuthState) throw new Error('no startOAuth called yet');
     const state = this.lastOAuthState;
-    const code = randomUUID();
+    const code = globalThis.crypto.randomUUID();
     this.oauthStates.set(state, { provider, email });
     this.oauthCodes.set(code, state);
     return { code, state };
@@ -137,8 +136,8 @@ export class FakeAuthStrategy implements AuthStrategy {
   }
 
   private issueSession(user: StoredUser): AuthSession {
-    const accessToken = randomUUID();
-    const refreshToken = randomUUID();
+    const accessToken = globalThis.crypto.randomUUID();
+    const refreshToken = globalThis.crypto.randomUUID();
     this.tokensToUid.set(accessToken, user.id);
     this.refreshToUid.set(refreshToken, user.id);
     return {

package/templates/libs/shared/src/strategies/fakes/fake-storage.ts

@@ -1,4 +1,3 @@
-import { randomUUID } from 'node:crypto';
 import type { FileInput, StorageRef, StorageStrategy } from '../storage';
 
 interface StoredFile {
@@ -13,7 +12,7 @@ export class FakeStorageStrategy implements StorageStrategy {
   private readonly files = new Map<string, StoredFile>();
 
   async upload(userId: string, file: FileInput): Promise<StorageRef> {
-    const path = `${userId}/${randomUUID()}-${file.filename}`;
+    const path = `${userId}/${globalThis.crypto.randomUUID()}-${file.filename}`;
     const ref: StorageRef = { bucket: this.bucket, path };
     this.files.set(this.key(ref), {
       ownerId: userId,