create-newt-app 0.31.0 → 0.31.1

package/dist/index.d.ts

@@ -5,7 +5,7 @@ type Extra = "anti-slop";
 declare const TESTING_CHOICES: readonly ["jest", "vitest"];
 declare const DATABASE_CHOICES: readonly ["sqlite", "postgres"];
 declare const LINTER_CHOICES: readonly ["eslint", "oxc"];
-declare const DEPLOYMENT_CHOICES: readonly ["none", "standalone", "custom-server", "spa"];
+declare const DEPLOYMENT_CHOICES: readonly ["none", "standalone", "spa"];
 type Testing = (typeof TESTING_CHOICES)[number];
 type Database = (typeof DATABASE_CHOICES)[number];
 type Linter = (typeof LINTER_CHOICES)[number];

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/templates/types.ts","../src/index.ts"],"mappings":";KA+BY;;;cCfN;cACA;cACA;cACA;KAGD,kBAAkB;KAClB,mBAAmB;KACnB,iBAAiB;KACjB,qBAAqB;KAcrB;EACH;EACA;EACA;EACA;EACA;EACA,SAAS;EACT,UAAU;EACV,QAAQ;EACR,YAAY;EACZ;EACA;EACA,iBAAiB;;iBAWG,OAAO,SAAS,UAAO"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/templates/types.ts","../src/index.ts"],"mappings":";KAgCY;;;cChBN;cACA;cACA;cACA;KAGD,kBAAkB;KAClB,mBAAmB;KACnB,iBAAiB;KACjB,qBAAqB;KAcrB;EACH;EACA;EACA;EACA;EACA;EACA,SAAS;EACT,UAAU;EACV,QAAQ;EACR,YAAY;EACZ;EACA;EACA,iBAAiB;;iBAWG,OAAO,SAAS,UAAO"}

package/dist/index.js

@@ -10,7 +10,7 @@ import ejs from "ejs";
 import { existsSync, promises } from "fs";
 import path from "path";
 //#region package.json
-var version = "0.31.0";
+var version = "0.31.1";
 var engines = { "node": ">=24.0.0" };
 //#endregion
 //#region src/templates/root/index.ts
@@ -102,7 +102,7 @@ dist
 		template: ``
 	},
 	{
-		when: (s) => s.deployment !== "standalone" && s.deployment !== "custom-server",
+		when: (s) => s.deployment !== "standalone",
 		filename: "turbo.json",
 		template: `{
   "$schema": "https://turborepo.dev/schema.json",
@@ -207,7 +207,7 @@ This version has breaking changes — APIs, conventions, and file structure may
 const web$1 = {
 	templates: [
 		{
-			when: (s) => !s.nestDiOnly && s.deployment !== "custom-server",
+			when: (s) => !s.nestDiOnly,
 			filename: "apps/web/package.json",
 			template: `{
   "name": "web",
@@ -350,7 +350,7 @@ export default nextConfig;`
 			template: `export { default } from "@<%= projectName %>/ui/postcss.config";`
 		},
 		{
-			when: (s) => !s.nestDiOnly && s.deployment !== "custom-server",
+			when: (s) => !s.nestDiOnly,
 			filename: "apps/web/tsconfig.json",
 			template: `{
   "extends": "@<%= projectName %>/typescript-config/nextjs.json",
@@ -751,7 +751,7 @@ export const authClient: ReturnType<typeof createAuthClient> = createAuthClient(
 //#region src/templates/api/index.ts
 const api$1 = { templates: [
 	{
-		when: (s) => !s.nestDiOnly && s.deployment !== "spa" && s.deployment !== "custom-server",
+		when: (s) => !s.nestDiOnly && s.deployment !== "spa",
 		filename: "apps/api/package.json",
 		template: `{
   "name": "api",
@@ -896,8 +896,8 @@ NestJS backend for the monorepo.
 \`\`\`sh
 pnpm dev          # watch mode
 pnpm build        # production build
-pnpm test         # unit tests
-pnpm test:e2e     # e2e tests
+pnpm test         # unit tests<% if (!nestDiOnly) { %>
+pnpm test:e2e     # e2e tests<% } %>
 \`\`\``
 	}
 ] };
@@ -10978,252 +10978,6 @@ export default nextConfig;`
 	}
 ] };
 //#endregion
-//#region src/templates/single-process-custom-server/index.ts
-const singleProcessCustomServer = { templates: [
-	{
-		filename: "apps/api/package.json",
-		template: `{
-  "name": "@<%= projectName %>/api",
-  "version": "0.0.1",
-  "description": "",
-  "author": "",
-  "private": true,
-  "license": "UNLICENSED",
-  "exports": {
-    ".": "./dist/index.js"
-  },
-  "scripts": {
-    "build": "nest build",
-    "start": "nest start",
-    "start:dev": "nest start --watch",
-    "start:debug": "nest start --debug --watch",
-    "start:prod": "node dist/main"
-  },
-  "dependencies": {
-    "@nestjs/common": "<%= versions["@nestjs/common"] %>",
-    "@nestjs/core": "<%= versions["@nestjs/core"] %>",
-    "@nestjs/platform-express": "<%= versions["@nestjs/platform-express"] %>",
-    "@<%= projectName %>/auth": "workspace:*",
-    "@<%= projectName %>/db": "workspace:*",
-    "@thallesp/nestjs-better-auth": "<%= versions["@thallesp/nestjs-better-auth"] %>",
-    "dotenv": "<%= versions.dotenv %>",
-    "reflect-metadata": "<%= versions["reflect-metadata"] %>",
-    "rxjs": "<%= versions.rxjs %>"
-  },
-  "devDependencies": {
-    "@nestjs/cli": "<%= versions["@nestjs/cli"] %>",
-    "@nestjs/schematics": "<%= versions["@nestjs/schematics"] %>",
-    "@nestjs/testing": "<%= versions["@nestjs/testing"] %>",
-    "@types/express": "<%= versions["@types/express"] %>",
-    "@types/node": "<%= versions["@types/node"] %>",
-    "@types/supertest": "<%= versions["@types/supertest"] %>",
-    "supertest": "<%= versions.supertest %>",
-    "ts-node": "<%= versions["ts-node"] %>",
-    "tsconfig-paths": "<%= versions["tsconfig-paths"] %>",
-    "typescript": "<%= versions.typescript %>"
-  }
-}`
-	},
-	{
-		filename: "apps/api/src/index.ts",
-		template: `export { AppModule } from './app.module';`
-	},
-	{
-		filename: "apps/web/server.ts",
-		template: `import 'reflect-metadata';
-import dotenv from 'dotenv';
-import { resolve } from 'path';
-
-// Load root .env first, then local .env (local takes precedence)
-dotenv.config({ path: resolve(process.cwd(), '../../.env') });
-dotenv.config({ path: resolve(process.cwd(), '.env') });
-
-import { NestFactory } from '@nestjs/core';
-import { AppModule } from '@<%= projectName %>/api';
-import next from 'next';
-import { createServer, type IncomingMessage, type ServerResponse } from 'node:http';
-
-const dev = process.env.NODE_ENV !== 'production';
-const port = parseInt(process.env.PORT ?? '3000', 10);
-
-async function main() {
-  const nextApp = next({ dev, port });
-  const handle = nextApp.getRequestHandler();
-
-  await nextApp.prepare();
-
-  const nestApp = await NestFactory.create(AppModule);
-  // apps/api/src/main.ts never runs here, so its prefix is set again
-  nestApp.setGlobalPrefix('api');
-  await nestApp.init();
-
-  const nestListener = nestApp
-    .getHttpServer()
-    .listeners('request')[0] as (req: IncomingMessage, res: ServerResponse) => void;
-
-  const server = createServer((req, res) => {
-    if (req.url?.startsWith('/api/')) {
-      nestListener(req, res);
-    } else {
-      handle(req, res);
-    }
-  });
-
-  server.listen(port, () => {
-    console.log(\`> Server ready on http://localhost:\${port}\`);
-  });
-}
-
-main().catch(console.error);`
-	},
-	{
-		filename: "apps/web/package.json",
-		template: `{
-  "name": "web",
-  "version": "0.1.0",
-  "type": "module",
-  "private": true,
-  "scripts": {
-    "dev": "tsx watch --tsconfig tsconfig.server.json server.ts",
-    "build": "next build && tsc -p tsconfig.server.json",
-    "start": "node dist/server.js",
-    "db:migrate": "better-auth migrate"
-  },
-  "dependencies": {
-    "@<%= projectName %>/api": "workspace:*",
-    "@<%= projectName %>/auth": "workspace:*",
-    "@<%= projectName %>/ui": "workspace:*",
-    "@nestjs/core": "<%= versions["@nestjs/core"] %>",
-    "@tailwindcss/postcss": "<%= versions["@tailwindcss/postcss"] %>",
-    "dotenv": "<%= versions.dotenv %>",
-    "@tanstack/react-form": "<%= versions["@tanstack/react-form"] %>",
-    "@tanstack/react-query": "<%= versions["@tanstack/react-query"] %>",
-    "better-auth": "<%= versions["better-auth"] %>",
-    "next": "<%= versions.next %>",
-    "react": "<%= versions.react %>",
-    "react-dom": "<%= versions["react-dom"] %>",
-    "reflect-metadata": "<%= versions["reflect-metadata"] %>",
-    "tailwindcss": "<%= versions.tailwindcss %>"
-  },
-  "devDependencies": {
-    "@<%= projectName %>/typescript-config": "workspace:*",
-    "@types/node": "<%= versions["@types/node"] %>",
-    "@types/react": "<%= versions["@types/react"] %>",
-    "@types/react-dom": "<%= versions["@types/react-dom"] %>",
-    "tsx": "<%= versions.tsx %>",
-    "typescript": "<%= versions.typescript %>"
-  }
-}`
-	},
-	{
-		when: (s) => !s.nestDiOnly,
-		filename: "apps/web/next.config.js",
-		template: `import dotenv from 'dotenv';
-import { resolve } from 'path';
-
-// Load root .env first, then local .env (local takes precedence)
-dotenv.config({ path: resolve(process.cwd(), '../../.env') });
-dotenv.config({ path: resolve(process.cwd(), '.env') });
-
-// No output setting: server.ts is the server, so Next runs in-process rather
-// than through its own standalone entrypoint.
-/** @type {import('next').NextConfig} */
-const nextConfig = {};
-
-export default nextConfig;`
-	},
-	{
-		filename: "apps/web/tsconfig.json",
-		template: `{
-  "extends": "@<%= projectName %>/typescript-config/nextjs.json",
-  "compilerOptions": {
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ],
-    "strictNullChecks": true,
-    "paths": {
-      "@/*": ["./*"]
-    }
-  },
-  "include": [
-    "**/*.ts",
-    "**/*.tsx",
-    "next-env.d.ts",
-    "next.config.js",
-    ".next/types/**/*.ts"
-  ],
-  "exclude": ["node_modules", "server.ts"]
-}`
-	},
-	{
-		filename: "apps/web/tsconfig.server.json",
-		template: `{
-  "compilerOptions": {
-    "module": "esnext",
-    "moduleResolution": "bundler",
-    "outDir": "dist",
-    "target": "ES2023",
-    "esModuleInterop": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowSyntheticDefaultImports": true,
-    "skipLibCheck": true,
-    "strictNullChecks": true,
-    "noImplicitAny": false
-  },
-  "include": ["server.ts"],
-  "exclude": ["node_modules"]
-}`
-	},
-	{
-		filename: "turbo.json",
-		template: `{
-  "$schema": "https://turborepo.dev/schema.json",
-  "ui": "tui",
-  "tasks": {
-    "build": {
-      "env": ["DATABASE_URL", "PORT"],
-      "dependsOn": ["^build"],
-      "inputs": ["$TURBO_DEFAULT$", ".env*"],
-      "outputs": [".next/**", "!.next/cache/**", "dist/**"]
-    },
-    "typecheck": {
-      "dependsOn": ["^build"]
-    },<% if (linter !== "oxc") { %>
-    "lint": {
-      "dependsOn": ["^lint"],
-      "env": ["NODE_ENV"]
-    },
-    "lint:check": {
-      "dependsOn": ["^lint:check"],
-      "env": ["NODE_ENV"]
-    },<% } %>
-    "test": {
-      "dependsOn": ["^build"],
-      "outputs": ["coverage/**"]
-    },
-    "dev": {
-      "env": ["DATABASE_URL", "PORT"],
-      "dependsOn": ["^migrate", "^build"],
-      "cache": false,
-      "persistent": true
-    },
-    "migrate": {
-      "env": ["DATABASE_URL"],
-      "dependsOn": ["^migrate"],
-      "cache": false
-    },
-    "generate": {
-      "env": ["DATABASE_URL"],
-      "cache": false
-    }
-  }
-}`
-	}
-] };
-//#endregion
 //#region src/templates/single-process-static-export/index.ts
 const singleProcessStaticExport = { templates: [{
 	filename: "apps/api/package.json",
@@ -11278,24 +11032,22 @@ dotenv.config({ path: resolve(process.cwd(), '.env') });
 
 const isProduction = process.env.NODE_ENV === 'production';
 
+// Static export in production — served by NestJS via ServeStaticModule.
+// rewrites() is incompatible with output: "export", so dev uses the proxy
+// and production uses the static files.
 /** @type {import('next').NextConfig} */
-const nextConfig = {
-  // Static export in production — served by NestJS via ServeStaticModule.
-  // rewrites() is incompatible with output: "export", so dev uses the proxy
-  // and production uses the static files.
-  ...(isProduction
-    ? { output: 'export' }
-    : {
-        async rewrites() {
-          return [
-            {
-              source: '/api/:path*',
-              destination: 'http://localhost:3001/api/:path*',
-            },
-          ];
-        },
-      }),
-};
+const nextConfig = isProduction
+  ? { output: 'export' }
+  : {
+      async rewrites() {
+        return [
+          {
+            source: '/api/:path*',
+            destination: 'http://localhost:3001/api/:path*',
+          },
+        ];
+      },
+    };
 
 export default nextConfig;`
 }] };
@@ -11362,7 +11114,7 @@ const nestDiOnly = { templates: [
     "noImplicitAny": false,
     "strictBindCallApply": false,
     "noFallthroughCasesInSwitch": false,
-    "types": [<% if (testing === 'jest') { %>"jest", <% } %>"node"]
+    "types": [<% if (testing === 'jest') { %>"jest", <% } %><% if (testing === 'vitest') { %>"vitest/globals", <% } %>"node"]
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]
@@ -12612,13 +12364,24 @@ fileURLToPath(staticDir);
 function getStaticFilePath(name) {
 	return fileURLToPath(new URL(`./static/${name}`, import.meta.url));
 }
+const E2E_FILES = [
+	"apps/api/test/app.e2e-spec.ts",
+	"apps/api/test/jest-e2e.json",
+	"apps/api/vitest.config.e2e.mts"
+];
 function selectModules(selection) {
 	const { deployment, nestDiOnly: nestDiOnly$1, todoExample, shadcn, database, linter, testing, extras } = selection;
-	const deploymentModule = deployment === "standalone" ? deploymentStandalone : deployment === "custom-server" ? singleProcessCustomServer : deployment === "spa" ? singleProcessStaticExport : null;
+	const deploymentModule = deployment === "standalone" ? deploymentStandalone : deployment === "spa" ? singleProcessStaticExport : null;
 	const webModule = deployment === "spa" ? {
 		...web$1,
 		templates: web$1.templates.filter((t) => t.filename !== "apps/web/app/api/auth/[...all]/route.ts")
 	} : web$1;
+	const selectedTesting = testing === "vitest" ? testingVitest : testingJest;
+	const testingModule = nestDiOnly$1 ? {
+		...selectedTesting,
+		templates: selectedTesting.templates.filter((t) => !E2E_FILES.includes(t.filename)),
+		scripts: selectedTesting.scripts?.filter((s) => s.name !== "test:e2e")
+	} : selectedTesting;
 	return [
 		root$2,
 		webModule,
@@ -12629,7 +12392,7 @@ function selectModules(selection) {
 		linter === "oxc" ? oxc : eslintConfig,
 		...extras.includes("anti-slop") ? [antiSlop] : [],
 		typescriptConfig,
-		testing === "vitest" ? testingVitest : testingJest,
+		testingModule,
 		...deploymentModule ? [deploymentModule] : [],
 		...nestDiOnly$1 ? [nestDiOnly] : [apiControllers],
 		...nestDiOnly$1 && deployment === "standalone" ? [deploymentStandaloneDi] : [],
@@ -12748,10 +12511,6 @@ function validateDeploymentCombo(deployment, nestDiOnly) {
 		valid: false,
 		error: "--deployment spa cannot be combined with --nest-di-only.\nSPA mode statically exports Next.js (output: 'export'), which cannot include the\nAPI route handlers that DI-only mode depends on. Pick one: drop --nest-di-only to\nget SPA mode with NestJS controllers, or drop --deployment spa."
 	};
-	if (deployment === "custom-server" && nestDiOnly) return {
-		valid: false,
-		error: "--deployment custom-server cannot be combined with --nest-di-only.\nDI-only keeps Next.js as the server and calls Nest in-process, so it overwrites the\nscripts that would run the custom server — apps/web/server.ts would be generated but\nnever invoked. Both already run Nest inside the Next.js process; pick one."
-	};
 	return { valid: true };
 }
 const TOOL_HINTS = {
@@ -12811,6 +12570,7 @@ async function scaffold(modules, options) {
 	}
 	const templateData = {
 		projectName: options.name,
+		nestDiOnly: options.selection.nestDiOnly,
 		testing: options.testing,
 		database: options.database,
 		deployment: options.deployment,
@@ -12858,7 +12618,6 @@ const LINTER_CHOICES = ["eslint", "oxc"];
 const DEPLOYMENT_CHOICES = [
 	"none",
 	"standalone",
-	"custom-server",
 	"spa"
 ];
 const EXTRAS_CHOICES = ["anti-slop"];
@@ -12948,10 +12707,6 @@ async function doInit(options) {
 						hint: "Dockerfiles + docker-compose.yml"
 					},
 					...results.nestDiOnly ? [] : [{
-						value: "custom-server",
-						label: "Custom Server",
-						hint: "single process, single port"
-					}, {
 						value: "spa",
 						label: "SPA Mode",
 						hint: "static export served by NestJS"
@@ -13047,7 +12802,7 @@ async function doInit(options) {
 	}
 }
 const program = new Command();
-program.name("create-newt-app").version(version).description("Create a new newt-app monorepo").argument("[name]").option("-ni, --no-install", "Skip pnpm install", true).option("-ng, --no-git", "Skip git initialization", true).option("--shadcn", "Include shadcn/ui", false).option("--testing <framework>", "Testing framework: vitest or jest", "jest").option("--database <database>", "Database: sqlite or postgres", "sqlite").option("--linter <linter>", "Linter: eslint or oxc", "eslint").option("--deployment <strategy>", "Deployment: standalone, custom-server, spa", "none").option("--nest-di-only", "Use NestJS for dependency injection only", false).option("--include-example", "Include the todo example", false).option("--extras <list>", "Extras, comma-separated: anti-slop", "").action(async (name, options, command) => {
+program.name("create-newt-app").version(version).description("Create a new newt-app monorepo").argument("[name]").option("-ni, --no-install", "Skip pnpm install", true).option("-ng, --no-git", "Skip git initialization", true).option("--shadcn", "Include shadcn/ui", false).option("--testing <framework>", "Testing framework: vitest or jest", "jest").option("--database <database>", "Database: sqlite or postgres", "sqlite").option("--linter <linter>", "Linter: eslint or oxc", "eslint").option("--deployment <strategy>", "Deployment: standalone, spa", "none").option("--nest-di-only", "Use NestJS for dependency injection only", false).option("--include-example", "Include the todo example", false).option("--extras <list>", "Extras, comma-separated: anti-slop", "").action(async (name, options, command) => {
 	intro(`Create a ${chalk.blue("newt")} app.`);
 	const nonInteractive = [
 		"shadcn",