@thinhnguyencth1204/nextcli 0.4.2 → 0.5.0

package/README.md

@@ -27,7 +27,7 @@ This command is fully interactive:
 
 - enter project name
 - select package manager in CLI UI (`npm`, `pnpm`, `yarn`, `bun`)
-- multi-select optional modules (`chat`, `supabase`, `supabase-realtime`, `seo`, `resend`)
+- multi-select optional modules (`chat`, `supabase-realtime`, `seo`, `resend`)
 - confirm install step
 - normalizes project directory name into a safe project slug for generated `package.json` and env placeholders
 - ships `SETUP.md` and `PROJECT_STRUCTURE.md` in the generated project root
@@ -95,7 +95,6 @@ Module copy is non-destructive: existing files are kept and reported as skipped
 Interactive multiselect shows available module catalog:
 
 - `chat`
-- `supabase`
 - `supabase-realtime`
 - `seo`
 - `resend`
@@ -103,9 +102,11 @@ Interactive multiselect shows available module catalog:
 Non-interactive example:
 
 ```bash
-node ../dist/cli.js add module --module seo --module supabase --yes
+node ../dist/cli.js add module --module seo --module supabase-realtime --yes
 ```
 
+`supabase` is no longer an optional module; Supabase client, Storage helpers, and Supabase Postgres env placeholders are part of the base template.
+
 ## Command: add auth-provider
 
 Enable social auth providers after project creation (not created by default):
@@ -128,7 +129,7 @@ node ../dist/cli.js add auth-provider --provider google --provider facebook --ye
 This command:
 
 - updates `src/lib/auth.ts` provider block
-- merges provider env keys into `.env` and `.env.example`
+- merges provider env keys into `.env`, `.env.example`, and `.env.development`
 - runs Better Auth schema generation helper (with install prompt if CLI is missing in interactive mode)
 
 ## Command: migrate
@@ -154,6 +155,7 @@ node ../dist/cli.js migrate --name init_auth --skip-generate
 
 - Next.js App Router + TypeScript
 - Better Auth + Prisma adapter
+- Supabase as the default Postgres/Storage stack
 - Prisma ORM (`prisma/schema.prisma`, `prisma/migrations`)
 - Axios fetch wrapper
 - TanStack React Query
@@ -164,7 +166,7 @@ node ../dist/cli.js migrate --name init_auth --skip-generate
 - i18n base with `next-intl`
 - Sonner notifications
 - date-fns utility library
-- Optional modules: chat, supabase, supabase-realtime, seo, resend
+- Optional modules: chat, supabase-realtime, seo, resend
 
 ## Template structure
 
@@ -175,7 +177,6 @@ Base template lives in:
 Optional module templates:
 
 - `templates/features/chat`
-- `templates/features/supabase`
 - `templates/features/supabase-realtime`
 - `templates/features/seo`
 - `templates/features/resend`

package/dist/cli.js

@@ -137,7 +137,7 @@ async function replaceTokensInDirectory(directoryPath, replacements) {
     }
   }
 }
-async function mergeEnvFile(envFilePath, entries) {
+async function mergeEnvFile(envFilePath, entries, options = {}) {
   const envExists = await pathExists(envFilePath);
   const currentContent = envExists ? await readFile(envFilePath, "utf8") : "";
   const lines = currentContent ? currentContent.split("\n") : [];
@@ -161,6 +161,18 @@ async function mergeEnvFile(envFilePath, entries) {
   if (additions.length === 0) {
     return;
   }
+  if (options.header && currentContent.includes(options.header)) {
+    const nextContent2 = currentContent.replace(
+      options.header,
+      `${options.header}
+${additions.join("\n")}`
+    );
+    await writeFile(envFilePath, nextContent2, "utf8");
+    return;
+  }
+  if (options.header) {
+    additions.unshift(options.header);
+  }
   const separator = currentContent.endsWith("\n") || currentContent.length === 0 ? "" : "\n";
   const nextContent = `${currentContent}${separator}${additions.join("\n")}
 `;
@@ -202,7 +214,6 @@ var rootDir = path2.resolve(currentDir, "../");
 var templatePaths = {
   base: path2.join(rootDir, "templates/next-base"),
   chat: path2.join(rootDir, "templates/features/chat"),
-  supabase: path2.join(rootDir, "templates/features/supabase"),
   supabaseRealtime: path2.join(rootDir, "templates/features/supabase-realtime"),
   seo: path2.join(rootDir, "templates/features/seo"),
   resend: path2.join(rootDir, "templates/features/resend")
@@ -223,25 +234,6 @@ var optionalModules = [
 | \`NEXT_PUBLIC_ENABLE_CHAT\` | Set \`true\` when chat module is enabled (auto on add) |
 
 Requires \`supabase-realtime\` (auto-added). Run \`db:migrate\` after add \u2014 chat Prisma models are appended.`
-  },
-  {
-    id: "supabase",
-    label: "Supabase",
-    description: "Adds Supabase client and storage upload helpers",
-    templatePath: templatePaths.supabase,
-    env: {
-      NEXT_PUBLIC_SUPABASE_URL: "",
-      NEXT_PUBLIC_SUPABASE_ANON_KEY: "",
-      NEXT_PUBLIC_SUPABASE_STORAGE_BUCKET: "public"
-    },
-    dependencies: {
-      "@supabase/supabase-js": "^2.44.2"
-    },
-    setupSection: `| Variable | Where to get |
-| -------- | ------------ |
-| \`NEXT_PUBLIC_SUPABASE_URL\` | Supabase Dashboard \u2192 Project Settings \u2192 API \u2192 Project URL |
-| \`NEXT_PUBLIC_SUPABASE_ANON_KEY\` | Same page \u2192 Project API keys \u2192 \`anon\` \`public\` |
-| \`NEXT_PUBLIC_SUPABASE_STORAGE_BUCKET\` | Storage \u2192 create bucket \u2192 use bucket name (default scaffold: \`public\`) |`
   },
   {
     id: "supabase-realtime",
@@ -255,7 +247,7 @@ Requires \`supabase-realtime\` (auto-added). Run \`db:migrate\` after add \u2014
     dependencies: {
       "@supabase/supabase-js": "^2.44.2"
     },
-    setupSection: `Uses same Supabase URL/anon key as \`supabase\` module. Enable Realtime on tables in Supabase Dashboard \u2192 Database \u2192 Replication.`
+    setupSection: `Uses the base Supabase URL/anon key. Enable Realtime on tables in Supabase Dashboard \u2192 Database \u2192 Replication.`
   },
   {
     id: "seo",
@@ -560,7 +552,7 @@ import { readdir as readdir3, readFile as readFile4, writeFile as writeFile4 } f
 import path4 from "path";
 import { readdir as readdir2, readFile as readFile3, writeFile as writeFile3 } from "fs/promises";
 var defaultManifest = {
-  cli: "0.4.2",
+  cli: "0.5.0",
   defaultLocale: "vi",
   locales: ["vi"],
   namespaces: ["common", "auth", "example"],
@@ -625,7 +617,9 @@ async function reconcileManifest(projectDir) {
     ]
   };
   merged.defaultLocale = merged.locales.includes(merged.defaultLocale) ? merged.defaultLocale : merged.locales[0] ?? "vi";
-  merged.modules = [...new Set(merged.modules)];
+  merged.modules = [...new Set(merged.modules)].filter(
+    (moduleId) => moduleId !== "supabase"
+  );
   merged.features = [...new Set(merged.features)];
   await writeManifest(projectDir, merged);
   return merged;
@@ -1307,24 +1301,6 @@ function normalizeModuleSelection(moduleIds) {
     autoAddedModules: autoAdded
   };
 }
-async function upsertEnvValue(envFilePath, key, value) {
-  if (!await pathExists(envFilePath)) {
-    return;
-  }
-  const content = await readFile6(envFilePath, "utf8");
-  const entry = `${key}=${value}`;
-  const pattern = new RegExp(`^${key}=.*$`, "m");
-  if (pattern.test(content)) {
-    const next = content.replace(pattern, entry);
-    if (next !== content) {
-      await writeFile6(envFilePath, next, "utf8");
-    }
-    return;
-  }
-  const separator = content.endsWith("\n") || content.length === 0 ? "" : "\n";
-  await writeFile6(envFilePath, `${content}${separator}${entry}
-`, "utf8");
-}
 function registerAddCommand(program2) {
   const add = program2.command("add").description("Add modules to an existing app");
   add.command("feature").description("Scaffold a feature folder under src/features").argument("<feature-name>", "Feature name").action(async (featureName) => {
@@ -1452,9 +1428,22 @@ function registerAddCommand(program2) {
       process.exitCode = 1;
       return;
     }
-    const validIds = new Set(optionalModules.map((module) => module.id));
-    const requestedIds = options.module ? options.module.flatMap((value) => value.split(",")).map((value) => value.trim()).filter(Boolean) : [];
-    for (const moduleId of requestedIds) {
+    const validIds = new Set(
+      optionalModules.map((module) => module.id)
+    );
+    const requestedValues = options.module ? options.module.flatMap((value) => value.split(",")).map((value) => value.trim()).filter(Boolean) : [];
+    const requestedIds = [];
+    for (const moduleId of requestedValues) {
+      if (validIds.has(moduleId)) {
+        requestedIds.push(moduleId);
+        continue;
+      }
+      if (moduleId === "supabase") {
+        log.info(
+          "Supabase is now part of the base template; only supabase-realtime is optional."
+        );
+        continue;
+      }
       if (!validIds.has(moduleId)) {
         log.error(`Unknown module: ${moduleId}`);
         process.exitCode = 1;
@@ -1493,35 +1482,21 @@ function registerAddCommand(program2) {
     if (selectedModules.includes("chat")) {
       chatSchemaStatus = await ensureChatSchemaInProject(cwd);
     }
-    const envEntries = selectedModules.reduce(
-      (acc, moduleId) => {
-        const module = getModuleById(moduleId);
-        return {
-          ...acc,
-          ...module.env
-        };
-      },
-      {}
-    );
-    if (Object.keys(envEntries).length > 0) {
-      const envTargets = [".env", ".env.example", ".env.development"];
+    const envTargets = [".env", ".env.example", ".env.development"];
+    for (const moduleId of selectedModules) {
+      const module = getModuleById(moduleId);
+      if (Object.keys(module.env).length === 0) {
+        continue;
+      }
       for (const envFile of envTargets) {
         const envPath = path7.join(cwd, envFile);
         if (await pathExists(envPath)) {
-          await mergeEnvFile(envPath, envEntries);
+          await mergeEnvFile(envPath, module.env, {
+            header: `# --- module: ${module.id} ---`
+          });
         }
       }
     }
-    if (selectedModules.includes("chat")) {
-      const envTargets = [".env", ".env.example", ".env.development"];
-      for (const envFile of envTargets) {
-        await upsertEnvValue(
-          path7.join(cwd, envFile),
-          "NEXT_PUBLIC_ENABLE_CHAT",
-          "true"
-        );
-      }
-    }
     const dependencyEntries = selectedModules.reduce(
       (acc, moduleId) => {
         const module = getModuleById(moduleId);
@@ -1735,7 +1710,9 @@ function registerAddCommand(program2) {
     for (const envFile of envTargets) {
       const envPath = path7.join(cwd, envFile);
       if (await pathExists(envPath)) {
-        await mergeEnvFile(envPath, envEntries);
+        await mergeEnvFile(envPath, envEntries, {
+          header: "# --- auth providers ---"
+        });
       }
     }
     finishPrompt(`Enabled providers: ${mergedProviders.join(", ")}`);
@@ -1854,22 +1831,18 @@ function registerCreateCommand(program2) {
     if (selectedModules.includes("chat")) {
       chatSchemaStatus = await ensureChatSchemaInProject(targetPath);
     }
-    const moduleEnvEntries = selectedModules.reduce(
-      (acc, moduleId) => {
-        const module = getModuleById(moduleId);
-        return {
-          ...acc,
-          ...module.env
-        };
-      },
-      {}
-    );
-    if (Object.keys(moduleEnvEntries).length > 0) {
-      const envTargets = [".env", ".env.example", ".env.development"];
+    const envTargets = [".env", ".env.example", ".env.development"];
+    for (const moduleId of selectedModules) {
+      const module = getModuleById(moduleId);
+      if (Object.keys(module.env).length === 0) {
+        continue;
+      }
       for (const envFile of envTargets) {
         const envPath = path8.join(targetPath, envFile);
         if (await pathExists(envPath)) {
-          await mergeEnvFile(envPath, moduleEnvEntries);
+          await mergeEnvFile(envPath, module.env, {
+            header: `# --- module: ${module.id} ---`
+          });
         }
       }
     }
@@ -1892,9 +1865,8 @@ function registerCreateCommand(program2) {
     const betterAuthSecret = randomBytes(32).toString("base64url");
     await replaceTokensInDirectory(targetPath, {
       __PROJECT_NAME__: projectSlug,
-      __ENABLE_CHAT__: selectedModules.includes("chat") ? "true" : "false",
       __BETTER_AUTH_SECRET__: betterAuthSecret,
-      __NEXTCLI_VERSION__: "0.4.2"
+      __NEXTCLI_VERSION__: "0.5.0"
     });
     await mergeModuleSetupSections(
       targetPath,
@@ -1905,7 +1877,7 @@ function registerCreateCommand(program2) {
     if (manifest) {
       await writeManifest(targetPath, {
         ...manifest,
-        cli: "0.4.2",
+        cli: "0.5.0",
         modules: selectedModules
       });
     }
@@ -2147,7 +2119,7 @@ var NexTCLICommand = class _NexTCLICommand extends Command {
 
 // src/cli.ts
 var program = new NexTCLICommand();
-program.name("nextcli").description("Scaffold outsource-ready Next.js projects").version("0.4.2");
+program.name("nextcli").description("Scaffold outsource-ready Next.js projects").version("0.5.0");
 registerCreateCommand(program);
 registerAddCommand(program);
 registerMigrateCommand(program);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thinhnguyencth1204/nextcli",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "CLI scaffolder for outsourced Next.js projects",
   "type": "module",
   "bin": {
@@ -16,6 +16,7 @@
     "dev": "tsup --watch",
     "typecheck": "tsc --noEmit",
     "smoke": "node dist/cli.js --help",
+    "smoke:full": "bun run scripts/pre-publish-smoke.ts",
     "prepublishOnly": "npm run build"
   },
   "keywords": [

package/templates/next-base/.env

@@ -1,11 +1,13 @@
-DATABASE_URL="postgresql://postgres:postgres@localhost:5432/__PROJECT_NAME__"
+# --- Database (Supabase) ---
+DATABASE_URL="postgresql://postgres:your-supabase-db-password@db.your-project-ref.supabase.co:5432/postgres"
+NEXT_PUBLIC_SUPABASE_URL=""
+NEXT_PUBLIC_SUPABASE_ANON_KEY=""
+NEXT_PUBLIC_SUPABASE_STORAGE_BUCKET="public"
+
+# --- Auth ---
 BETTER_AUTH_SECRET="__BETTER_AUTH_SECRET__"
 BETTER_AUTH_URL="http://localhost:3000"
 
+# --- App ---
 NEXT_PUBLIC_APP_URL="http://localhost:3000"
-NEXT_PUBLIC_ENABLE_CHAT=__ENABLE_CHAT__
 NEXT_PUBLIC_DEFAULT_LOCALE="en"
-GOOGLE_CLIENT_ID=""
-GOOGLE_CLIENT_SECRET=""
-FACEBOOK_CLIENT_ID=""
-FACEBOOK_CLIENT_SECRET=""

package/templates/next-base/.env.development

@@ -1,11 +1,13 @@
-DATABASE_URL="postgresql://postgres:postgres@localhost:5432/__PROJECT_NAME___dev"
+# --- Database (Supabase) ---
+DATABASE_URL="postgresql://postgres:your-supabase-db-password@db.your-project-ref.supabase.co:5432/postgres"
+NEXT_PUBLIC_SUPABASE_URL=""
+NEXT_PUBLIC_SUPABASE_ANON_KEY=""
+NEXT_PUBLIC_SUPABASE_STORAGE_BUCKET="public"
+
+# --- Auth ---
 BETTER_AUTH_SECRET="__BETTER_AUTH_SECRET__"
 BETTER_AUTH_URL="http://localhost:3000"
 
+# --- App ---
 NEXT_PUBLIC_APP_URL="http://localhost:3000"
-NEXT_PUBLIC_ENABLE_CHAT=__ENABLE_CHAT__
 NEXT_PUBLIC_DEFAULT_LOCALE="en"
-GOOGLE_CLIENT_ID=""
-GOOGLE_CLIENT_SECRET=""
-FACEBOOK_CLIENT_ID=""
-FACEBOOK_CLIENT_SECRET=""

package/templates/next-base/.env.example

@@ -1,11 +1,13 @@
-DATABASE_URL="postgresql://postgres:postgres@localhost:5432/__PROJECT_NAME__"
+# --- Database (Supabase) ---
+DATABASE_URL="postgresql://postgres:your-supabase-db-password@db.your-project-ref.supabase.co:5432/postgres"
+NEXT_PUBLIC_SUPABASE_URL=""
+NEXT_PUBLIC_SUPABASE_ANON_KEY=""
+NEXT_PUBLIC_SUPABASE_STORAGE_BUCKET="public"
+
+# --- Auth ---
 BETTER_AUTH_SECRET="your-32-plus-char-random-secret"
 BETTER_AUTH_URL="http://localhost:3000"
 
+# --- App ---
 NEXT_PUBLIC_APP_URL="http://localhost:3000"
-NEXT_PUBLIC_ENABLE_CHAT=__ENABLE_CHAT__
 NEXT_PUBLIC_DEFAULT_LOCALE="en"
-GOOGLE_CLIENT_ID=""
-GOOGLE_CLIENT_SECRET=""
-FACEBOOK_CLIENT_ID=""
-FACEBOOK_CLIENT_SECRET=""

package/templates/next-base/PROJECT_STRUCTURE.md

@@ -41,7 +41,7 @@ Generated by NexTCLI. Folders marked **(module)** or **(feature)** appear only w
 | `rbac.ts`                    | Role hierarchy guards                             |
 | `prisma.ts`                  | DB client                                         |
 | `api-response.ts`            | `/api/v1/*` envelope helpers                      |
-| `supabase/`                  | **(module: `supabase`)** client + storage helpers |
+| `supabase/`                  | Supabase client + Storage helpers                 |
 | `resend/`                    | **(module: `resend`)** email client + send helper |
 
 ## `src/features/` vs `src/example/`
@@ -74,7 +74,6 @@ Locale config with `nextcli:locales` / `nextcli:namespaces` markers (patched by
 | Module              | Adds                                                                |
 | ------------------- | ------------------------------------------------------------------- |
 | `chat`              | Chat routes, hooks, Prisma chat models (+ auto `supabase-realtime`) |
-| `supabase`          | `src/lib/supabase/*`, Storage upload helpers                        |
 | `supabase-realtime` | Realtime channel helpers                                            |
 | `seo`               | robots/sitemap/JSON-LD helpers                                      |
 | `resend`            | `src/lib/resend/*`, `src/emails/*`                                  |

package/templates/next-base/SETUP.md

@@ -4,7 +4,7 @@ Quick reference for env vars and branding after `nextcli create`.
 
 ## First run (required)
 
-1. Start PostgreSQL and set `DATABASE_URL` in `.env`.
+1. Create a Supabase project and set `DATABASE_URL` in `.env`.
 2. `bun run db:migrate` — applies `prisma/migrations` (includes `Role`, `User.username`, `requirePasswordChange`).
 3. `bun run dev` — bootstrap seeds `admin` / `admin` on first start.
 
@@ -23,12 +23,15 @@ Quick reference for env vars and branding after `nextcli create`.
 
 Set in `.env` / `.env.development` (secrets are generated at create time).
 
-| Variable              | Purpose                | Where to get                                                   |
-| --------------------- | ---------------------- | -------------------------------------------------------------- |
-| `DATABASE_URL`        | PostgreSQL connection  | Local Postgres or cloud provider dashboard → connection string |
-| `BETTER_AUTH_SECRET`  | Auth signing secret    | Auto-generated on create; rotate in production                 |
-| `BETTER_AUTH_URL`     | Server auth base URL   | Your app URL (e.g. `http://localhost:3000`)                    |
-| `NEXT_PUBLIC_APP_URL` | Client-visible app URL | Same as public site URL                                        |
+| Variable                              | Purpose                    | Where to get                                                           |
+| ------------------------------------- | -------------------------- | ---------------------------------------------------------------------- |
+| `DATABASE_URL`                        | Supabase Postgres database | Supabase Dashboard → Project Settings → Database → Connection string   |
+| `NEXT_PUBLIC_SUPABASE_URL`            | Supabase client URL        | Supabase Dashboard → Project Settings → API → Project URL              |
+| `NEXT_PUBLIC_SUPABASE_ANON_KEY`       | Supabase browser anon key  | Same page → Project API keys → `anon` `public`                         |
+| `NEXT_PUBLIC_SUPABASE_STORAGE_BUCKET` | Supabase Storage bucket    | Storage → create bucket → use bucket name (default scaffold: `public`) |
+| `BETTER_AUTH_SECRET`                  | Auth signing secret        | Auto-generated on create; rotate in production                         |
+| `BETTER_AUTH_URL`                     | Server auth base URL       | Your app URL (e.g. `http://localhost:3000`)                            |
+| `NEXT_PUBLIC_APP_URL`                 | Client-visible app URL     | Same as public site URL                                                |
 
 ### Default admin account
 
@@ -54,17 +57,9 @@ Reference for all optional modules. Matching keys are merged into `.env` when se
 
 Requires `supabase-realtime` (auto-added). Run `db:migrate` after add — chat Prisma models are appended.
 
-### Module: Supabase (`supabase`)
-
-| Variable                              | Where to get                                                           |
-| ------------------------------------- | ---------------------------------------------------------------------- |
-| `NEXT_PUBLIC_SUPABASE_URL`            | Supabase Dashboard → Project Settings → API → Project URL              |
-| `NEXT_PUBLIC_SUPABASE_ANON_KEY`       | Same page → Project API keys → `anon` `public`                         |
-| `NEXT_PUBLIC_SUPABASE_STORAGE_BUCKET` | Storage → create bucket → use bucket name (default scaffold: `public`) |
-
 ### Module: Supabase Realtime (`supabase-realtime`)
 
-Uses same Supabase URL/anon key as `supabase` module. Enable Realtime on tables in Supabase Dashboard → Database → Replication.
+Uses the base Supabase URL/anon key. Enable Realtime on tables in Supabase Dashboard → Database → Replication.
 
 ### Module: SEO pack (`seo`)
 

package/templates/next-base/package.json

@@ -27,6 +27,7 @@
     "@radix-ui/react-slot": "^1.2.3",
     "@radix-ui/react-tabs": "^1.1.13",
     "@radix-ui/react-tooltip": "^1.2.8",
+    "@supabase/supabase-js": "^2.44.2",
     "@tanstack/react-form": "^1.0.3",
     "@tanstack/react-query": "^5.56.2",
     "@tanstack/react-query-devtools": "^5.56.2",

package/templates/{features/supabase → next-base}/src/lib/supabase/client.ts

@@ -3,7 +3,4 @@ import { createClient } from "@supabase/supabase-js";
 const url = process.env.NEXT_PUBLIC_SUPABASE_URL;
 const anonKey = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY;
 
-export const supabase =
-  url && anonKey
-    ? createClient(url, anonKey)
-    : null;
+export const supabase = url && anonKey ? createClient(url, anonKey) : null;

package/templates/{features/supabase → next-base}/src/lib/supabase/storage.ts

@@ -86,10 +86,7 @@ function assertCategoryRules(
 
   const mime = contentType ?? (file instanceof File ? file.type : "");
 
-  if (
-    !mime ||
-    !allowedMimePrefixes.some((prefix) => mime.startsWith(prefix))
-  ) {
+  if (!mime || !allowedMimePrefixes.some((prefix) => mime.startsWith(prefix))) {
     throw new StorageHelperError(
       `File type "${mime || "unknown"}" is not allowed for category "${category}".`,
       "VALIDATION",