@idevconn/create-icore 0.3.0 → 0.4.0

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) {
@@ -55,6 +58,19 @@ async function writeUploadEnv(targetDir, opts) {
   }
   await writeFile(join(targetDir, "apps/microservices/upload/.env"), next);
 }
+async function writeNotesEnv(targetDir, opts) {
+  if (opts.example === "none") return;
+  const envExample = join(targetDir, "apps/microservices/notes/.env.example");
+  try {
+    const env = await readFile(envExample, "utf8");
+    let next = env.replace(/^NOTES_TRANSPORT=.*$/m, `NOTES_TRANSPORT=${opts.transport}`);
+    if (opts.transport !== "tcp") {
+      next = next.replace(/^# (NOTES_(?:REDIS|NATS)_URL=)/m, "$1");
+    }
+    await writeFile(join(targetDir, "apps/microservices/notes/.env"), next);
+  } catch {
+  }
+}
 async function writeGatewayEnv(targetDir, opts) {
   const envExample = join(targetDir, "apps/api/.env.example");
   const env = await readFile(envExample, "utf8");
@@ -206,6 +222,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,14 +437,16 @@ 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);
   await rewriteRootPackageJson(opts.targetDir, opts);
   await writeAuthEnv(opts.targetDir, opts);
   await writeUploadEnv(opts.targetDir, opts);
+  await writeNotesEnv(opts.targetDir, opts);
   await writePaymentEnv(opts.targetDir, opts);
   await writeGatewayEnv(opts.targetDir, opts);
   await writeRootEnv(opts.targetDir, opts);
@@ -298,8 +455,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 +471,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 +546,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 +658,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 +675,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.4.0",
   "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

@@ -5,23 +5,29 @@ import { createClient } from '@supabase/supabase-js';
 import * as admin from 'firebase-admin';
 import { SupabaseAuthStrategy } from '@icore/auth-supabase';
 import { FirebaseAuthStrategy, HttpIdentityToolkitClient } from '@icore/auth-firebase';
+import { FakeAuthStrategy } from '@icore/shared';
 import type { AuthStrategy } from '@icore/shared';
+import { Logger } from '@nestjs/common';
 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,20 +49,28 @@ function makeFirebaseStrategy(cfg: ConfigService): AuthStrategy {
     {
       provide: 'AuthStrategy',
       useFactory: (cfg: ConfigService): AuthStrategy => {
-        const provider = cfg.getOrThrow<string>('AUTH_PROVIDER');
-        switch (provider) {
-          case 'supabase': {
-            const client = createClient(
-              cfg.getOrThrow<string>('SUPABASE_URL'),
-              cfg.getOrThrow<string>('SUPABASE_SERVICE_ROLE_KEY'),
-              { auth: { autoRefreshToken: false, persistSession: false } },
-            );
-            return new SupabaseAuthStrategy({ client });
+        try {
+          const provider = requireEnv(cfg, 'AUTH_PROVIDER');
+          switch (provider) {
+            case 'supabase': {
+              const client = createClient(
+                requireEnv(cfg, 'SUPABASE_URL'),
+                requireEnv(cfg, 'SUPABASE_SERVICE_ROLE_KEY'),
+                { auth: { autoRefreshToken: false, persistSession: false } },
+              );
+              return new SupabaseAuthStrategy({ client });
+            }
+            case 'firebase':
+              return makeFirebaseStrategy(cfg);
+            default:
+              throw new Error(`Unsupported AUTH_PROVIDER: ${provider}`);
           }
-          case 'firebase':
-            return makeFirebaseStrategy(cfg);
-          default:
-            throw new Error(`Unsupported AUTH_PROVIDER: ${provider}`);
+        } catch (err) {
+          new Logger('AuthStrategy').warn(
+            `Not configured: ${err instanceof Error ? err.message : String(err)}. ` +
+              `Requests will fail until apps/microservices/auth/.env is set.`,
+          );
+          return new FakeAuthStrategy();
         }
       },
       inject: [ConfigService],

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

@@ -5,9 +5,17 @@ import { createClient } from '@supabase/supabase-js';
 import * as admin from 'firebase-admin';
 import { SupabaseDBStrategy } from '@icore/db-supabase';
 import { FirestoreDBStrategy } from '@icore/db-firestore';
+import { FakeDBStrategy } from '@icore/shared';
 import type { DBStrategy } from '@icore/shared';
+import { Logger } from '@nestjs/common';
 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,32 +31,40 @@ import { NotesController } from './notes.controller';
     {
       provide: 'DBStrategy',
       useFactory: (cfg: ConfigService): DBStrategy => {
-        const provider = cfg.getOrThrow<string>('DB_PROVIDER');
-        if (provider === 'supabase') {
-          const client = createClient(
-            cfg.getOrThrow<string>('SUPABASE_URL'),
-            cfg.getOrThrow<string>('SUPABASE_SERVICE_ROLE_KEY'),
-            { auth: { autoRefreshToken: false, persistSession: false } },
-          );
-          return new SupabaseDBStrategy({ client });
-        }
-        if (provider === 'firestore' || provider === 'firebase') {
-          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'),
-              }),
+        try {
+          const provider = requireEnv(cfg, 'DB_PROVIDER');
+          if (provider === 'supabase') {
+            const client = createClient(
+              requireEnv(cfg, 'SUPABASE_URL'),
+              requireEnv(cfg, 'SUPABASE_SERVICE_ROLE_KEY'),
+              { auth: { autoRefreshToken: false, persistSession: false } },
+            );
+            return new SupabaseDBStrategy({ client });
+          }
+          if (provider === 'firestore' || provider === 'firebase') {
+            if (admin.apps.length === 0) {
+              admin.initializeApp({
+                credential: admin.credential.cert({
+                  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'),
+                }),
+              });
+            }
+            return new FirestoreDBStrategy({
+              db: admin.firestore() as unknown as ConstructorParameters<
+                typeof FirestoreDBStrategy
+              >[0]['db'],
             });
           }
-          return new FirestoreDBStrategy({
-            db: admin.firestore() as unknown as ConstructorParameters<
-              typeof FirestoreDBStrategy
-            >[0]['db'],
-          });
+          throw new Error(`Unsupported DB_PROVIDER: ${provider}`);
+        } catch (err) {
+          new Logger('DBStrategy').warn(
+            `Not configured: ${err instanceof Error ? err.message : String(err)}. ` +
+              `Requests will fail until apps/microservices/notes/.env is set.`,
+          );
+          return new FakeDBStrategy();
         }
-        throw new Error(`Unsupported DB_PROVIDER: ${provider}`);
       },
       inject: [ConfigService],
     },

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

@@ -7,17 +7,25 @@ import { v2 as cloudinary } from 'cloudinary';
 import { SupabaseStorageStrategy } from '@icore/storage-supabase';
 import { FirebaseStorageStrategy } from '@icore/storage-firebase';
 import { CloudinaryStorageStrategy, type CloudinaryApiLike } from '@icore/storage-cloudinary';
+import { FakeStorageStrategy } from '@icore/shared';
 import type { StorageStrategy } from '@icore/shared';
+import { Logger } from '@nestjs/common';
 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 +38,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,25 +97,33 @@ function makeCloudinaryStorage(cfg: ConfigService): StorageStrategy {
     {
       provide: 'StorageStrategy',
       useFactory: (cfg: ConfigService): StorageStrategy => {
-        const provider = cfg.getOrThrow<string>('STORAGE_PROVIDER');
-        switch (provider) {
-          case 'supabase': {
-            const client = createClient(
-              cfg.getOrThrow<string>('SUPABASE_URL'),
-              cfg.getOrThrow<string>('SUPABASE_SERVICE_ROLE_KEY'),
-              { auth: { autoRefreshToken: false, persistSession: false } },
-            );
-            return new SupabaseStorageStrategy({
-              client,
-              bucket: cfg.getOrThrow<string>('SUPABASE_STORAGE_BUCKET'),
-            });
+        try {
+          const provider = requireEnv(cfg, 'STORAGE_PROVIDER');
+          switch (provider) {
+            case 'supabase': {
+              const client = createClient(
+                requireEnv(cfg, 'SUPABASE_URL'),
+                requireEnv(cfg, 'SUPABASE_SERVICE_ROLE_KEY'),
+                { auth: { autoRefreshToken: false, persistSession: false } },
+              );
+              return new SupabaseStorageStrategy({
+                client,
+                bucket: requireEnv(cfg, 'SUPABASE_STORAGE_BUCKET'),
+              });
+            }
+            case 'firebase':
+              return makeFirebaseStorage(cfg);
+            case 'cloudinary':
+              return makeCloudinaryStorage(cfg);
+            default:
+              throw new Error(`Unsupported STORAGE_PROVIDER: ${provider}`);
           }
-          case 'firebase':
-            return makeFirebaseStorage(cfg);
-          case 'cloudinary':
-            return makeCloudinaryStorage(cfg);
-          default:
-            throw new Error(`Unsupported STORAGE_PROVIDER: ${provider}`);
+        } catch (err) {
+          new Logger('StorageStrategy').warn(
+            `Not configured: ${err instanceof Error ? err.message : String(err)}. ` +
+              `Requests will fail until apps/microservices/upload/.env is set.`,
+          );
+          return new FakeStorageStrategy();
         }
       },
       inject: [ConfigService],

package/templates/apps/templates/client-antd/vite.config.mts

@@ -2,9 +2,16 @@
 import fs from 'node:fs';
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
-import { TanStackRouterVite } from '@tanstack/router-plugin/vite';
+import { tanstackRouter } from '@tanstack/router-plugin/vite';
 import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
+import {
+  commonDefines,
+  commonManualChunks,
+  commonTestConfig,
+  injectAppVersionPlugin,
+  noServerModulesPlugin,
+} from '@icore/vite-plugins';
 
 const rootPackageJsonPath = new URL('../../../package.json', import.meta.url);
 const rootPackageJson = JSON.parse(fs.readFileSync(rootPackageJsonPath, 'utf-8')) as {
@@ -14,11 +21,7 @@ const rootPackageJson = JSON.parse(fs.readFileSync(rootPackageJsonPath, 'utf-8')
 };
 
 function depVersion(name: string): string {
-  return (
-    rootPackageJson.dependencies?.[name] ??
-    rootPackageJson.devDependencies?.[name] ??
-    '?'
-  );
+  return rootPackageJson.dependencies?.[name] ?? rootPackageJson.devDependencies?.[name] ?? '?';
 }
 
 export default defineConfig(() => ({
@@ -33,22 +36,11 @@ export default defineConfig(() => ({
     host: 'localhost',
   },
   define: {
-    'import.meta.env.VITE_APP_VERSION': JSON.stringify(rootPackageJson.version),
-    // Dep versions injected at build time so routes don't need JSON imports
-    'import.meta.env.VITE_DEP_REACT': JSON.stringify(depVersion('react')),
+    ...commonDefines(rootPackageJson),
     'import.meta.env.VITE_DEP_ANTD': JSON.stringify(depVersion('antd')),
-    'import.meta.env.VITE_DEP_VITE': JSON.stringify(depVersion('vite')),
-    'import.meta.env.VITE_DEP_TANSTACK_ROUTER': JSON.stringify(
-      depVersion('@tanstack/react-router'),
-    ),
-    'import.meta.env.VITE_DEP_TANSTACK_QUERY': JSON.stringify(
-      depVersion('@tanstack/react-query'),
-    ),
-    'import.meta.env.VITE_DEP_ZUSTAND': JSON.stringify(depVersion('zustand')),
-    'import.meta.env.VITE_DEP_CASL': JSON.stringify(depVersion('@casl/ability')),
   },
   plugins: [
-    TanStackRouterVite({
+    tanstackRouter({
       target: 'react',
       autoCodeSplitting: true,
       routeFileIgnorePattern: '(__tests__|\\.test\\.(t|j)sx?$)',
@@ -56,12 +48,8 @@ export default defineConfig(() => ({
     react(),
     nxViteTsPaths(),
     nxCopyAssetsPlugin(['*.md']),
-    {
-      name: 'inject-app-version-meta',
-      transformIndexHtml(html: string) {
-        return html.replace('%APP_VERSION%', rootPackageJson.version);
-      },
-    },
+    noServerModulesPlugin(),
+    injectAppVersionPlugin(rootPackageJson),
   ],
   // Uncomment this if you are using workers.
   // worker: {
@@ -76,32 +64,12 @@ export default defineConfig(() => ({
     },
     rolldownOptions: {
       output: {
-        manualChunks: (id: string) => {
-          if (!id.includes('node_modules')) return;
-          if (id.includes('/react/') || id.includes('/react-dom/') || id.includes('scheduler'))
-            return 'vendor-react';
-          if (id.includes('@tanstack')) return 'vendor-tanstack';
-          if (id.includes('i18next') || id.includes('react-i18next')) return 'vendor-i18n';
-          if (id.includes('@casl')) return 'vendor-casl';
+        manualChunks: commonManualChunks((id) => {
           if (id.includes('/antd/') || id.includes('@ant-design') || id.includes('rc-'))
             return 'vendor-antd';
-          if (id.includes('zustand')) return 'vendor-state';
-          if (id.includes('@idevconn')) return 'vendor-idevconn';
-          return 'vendor-core';
-        },
+        }),
       },
     },
   },
-  test: {
-    name: 'client-antd',
-    watch: false,
-    globals: true,
-    environment: 'jsdom',
-    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      reportsDirectory: '../../../coverage/apps/templates/client-antd',
-      provider: 'v8' as const,
-    },
-  },
+  test: commonTestConfig('client-antd', '../../../coverage/apps/templates/client-antd'),
 }));