create-analog 3.0.0-beta.4 → 3.0.0-beta.40

package/files/nestjs/src/server/app.module.ts

@@ -0,0 +1,18 @@
+import { Module, OnModuleInit } from '@nestjs/common';
+import { HttpAdapterHost } from '@nestjs/core';
+import { createAnalogHandler } from '@analogjs/router/server';
+
+import { HelloController } from './hello.controller';
+import { HelloService } from './hello.service';
+
+@Module({
+  controllers: [HelloController],
+  providers: [HelloService],
+})
+export class AppModule implements OnModuleInit {
+  constructor(private readonly adapterHost: HttpAdapterHost) {}
+
+  onModuleInit(): void {
+    this.adapterHost.httpAdapter.use(createAnalogHandler());
+  }
+}

package/files/nestjs/src/server/hello.controller.ts

@@ -0,0 +1,13 @@
+import { Controller, Get } from '@nestjs/common';
+
+import { HelloService } from './hello.service';
+
+@Controller('api/v1/hello')
+export class HelloController {
+  constructor(private readonly hello: HelloService) {}
+
+  @Get()
+  get() {
+    return this.hello.greet();
+  }
+}

package/files/nestjs/src/server/hello.service.ts

@@ -0,0 +1,8 @@
+import { Injectable } from '@nestjs/common';
+
+@Injectable()
+export class HelloService {
+  greet() {
+    return { message: 'Hello World' };
+  }
+}

package/files/nestjs/src/server/main.ts

@@ -0,0 +1,30 @@
+import 'reflect-metadata';
+import { NestFactory } from '@nestjs/core';
+import type { NestExpressApplication } from '@nestjs/platform-express';
+import { fileURLToPath } from 'node:url';
+import { toFetchHandler } from 'srvx/node';
+
+import { AppModule } from './app.module';
+
+// Keeps the request body for Analog after Nest's body parsers have run.
+const app = await NestFactory.create<NestExpressApplication>(AppModule, {
+  rawBody: true,
+});
+
+// Vite serves client files in development.
+if (!import.meta.env.DEV) {
+  const clientDir = fileURLToPath(new URL('../client', import.meta.url));
+  app.useStaticAssets(clientDir, { index: false });
+}
+
+await app.init();
+const server = app.getHttpAdapter().getInstance();
+
+if (!import.meta.env.DEV) {
+  await app.listen(process.env['PORT'] ?? 3000);
+}
+
+export default {
+  fetch: toFetchHandler((req, res) => server(req, res)),
+  close: () => app.close(),
+};

package/index.js

@@ -13,6 +13,7 @@ import prompts from 'prompts';
  * @typedef {'latest' | 'blog' | 'minimal'} StarterTemplate
  * @typedef {StarterTemplate | `angular-v${number}`} Template
  * @typedef {'prismjs' | 'shiki'} HighlighterId
+ * @typedef {'nitro' | 'nestjs'} ServerId
  * @typedef {(value: string) => string} Colorizer
  *
  * @typedef {object} Variant
@@ -42,6 +43,7 @@ import prompts from 'prompts';
  * @property {Template} [variant]
  * @property {boolean} [tailwind]
  * @property {HighlighterId} [syntaxHighlighter]
+ * @property {ServerId} [server]
  *
  * @typedef {object} UserAgentPackage
  * @property {string} name
@@ -51,6 +53,7 @@ import prompts from 'prompts';
  *   _: string[];
  *   template?: string;
  *   t?: string;
+ *   server?: string;
  *   skipTailwind?: boolean | string;
  *   skipGit?: boolean | string;
  * } & Record<string, unknown>} CliArgv
@@ -60,8 +63,12 @@ const CLI_DIR = path.dirname(fileURLToPath(import.meta.url));
 const DEFAULT_TARGET_DIR = 'analog-project';
 const DEFAULT_BLOG_HIGHLIGHTER = 'prismjs';
 
+// Skips the server prompt while set. Remove it to let users choose.
+/** @type {ServerId | undefined} */
+const DEFAULT_SERVER = 'nitro';
+
 /** @type {readonly Template[]} */
-const H3_TEMPLATES = ['latest', 'blog', 'minimal'];
+const H3_TEMPLATES = ['latest', 'blog', 'minimal', 'angular-v20'];
 const VERSIONED_TEMPLATE = /^angular-v\d+$/;
 
 // Avoids autoconversion to number of the project name by defining that the args
@@ -114,6 +121,21 @@ const HIGHLIGHTERS = {
   },
 };
 
+/** @type {Readonly<Record<ServerId, string>>} */
+const SERVERS = {
+  nitro: 'Nitro (prerendering, static sites, deployment presets)',
+  nestjs: 'NestJS',
+};
+
+const NESTJS_DEPENDENCIES = {
+  '@nestjs/common': '^12.3.2',
+  '@nestjs/core': '^12.3.2',
+  '@nestjs/platform-express': '^12.3.2',
+  h3: '^1.13.0',
+  'reflect-metadata': '^0.2.2',
+  srvx: '^1.0.8',
+};
+
 /** @type {Readonly<Record<string, string>>} */
 const renameFiles = {
   _gitignore: '.gitignore',
@@ -130,6 +152,7 @@ async function init() {
   let targetDir = formatTargetDir(argv._[0]);
   let template = resolveTemplate(argv.template ?? argv.t);
   let skipTailwind = fromBoolArg(argv.skipTailwind);
+  let server = resolveServer(argv.server) ?? DEFAULT_SERVER;
   const skipGit = fromBoolArg(argv.skipGit ?? argv['skip-git']) ?? false;
 
   // Internal flag (no prompt): when set, strip the `overrides` block that
@@ -209,6 +232,18 @@ async function init() {
               ),
             initial: 1,
           },
+          {
+            type: (_, values) =>
+              server || (values.variant ?? template) !== 'latest'
+                ? null
+                : 'select',
+            name: 'server',
+            message: reset('Which server would you like to use?'),
+            choices: Object.entries(SERVERS).map(([value, title]) => ({
+              title,
+              value,
+            })),
+          },
           {
             type: skipTailwind === undefined ? 'confirm' : null,
             name: 'tailwind',
@@ -235,6 +270,13 @@ async function init() {
     throw new Error('A project template must be selected.');
   }
 
+  server = result.server ?? server ?? 'nitro';
+  if (server === 'nestjs' && template !== 'latest') {
+    throw new Error(
+      'The NestJS server is only available for the Full-stack Application (latest) template.',
+    );
+  }
+
   const highlighter =
     syntaxHighlighter ??
     (template === 'blog' ? DEFAULT_BLOG_HIGHLIGHTER : undefined);
@@ -281,7 +323,12 @@ async function init() {
     write('postcss.config.mjs', TAILWIND_POSTCSS_CONFIG);
   }
 
+  if (server === 'nestjs') {
+    addNestServer(root, filesDir);
+  }
+
   replacePlaceholders(root, 'vite.config.ts', {
+    ...getServerPlaceholders(template, server),
     __TAILWIND_IMPORT__: !skipTailwind
       ? "import tailwindcss from '@tailwindcss/vite';\n"
       : '',
@@ -305,6 +352,10 @@ async function init() {
     ensureSyntaxHighlighter(root, pkg, highlighter);
   }
 
+  if (server === 'nestjs') {
+    addNestDependencies(pkg);
+  }
+
   if (!skipTailwind) {
     addTailwindDependencies(pkg);
   }
@@ -497,13 +548,65 @@ function addTailwindDependencies(pkg) {
   pkg.devDependencies['@tailwindcss/vite'] = '^4.2.2';
 }
 
+/**
+ * @param {string} root
+ * @param {string} filesDir
+ * @returns {void}
+ */
+function addNestServer(root, filesDir) {
+  fs.rmSync(path.join(root, 'src/server/routes'), {
+    recursive: true,
+    force: true,
+  });
+  copyDir(path.join(filesDir, 'nestjs'), root);
+
+  const tsconfigPath = path.join(root, 'tsconfig.json');
+  const tsconfig = JSON.parse(fs.readFileSync(tsconfigPath, 'utf-8'));
+  tsconfig.compilerOptions.experimentalDecorators = true;
+  tsconfig.compilerOptions.emitDecoratorMetadata = true;
+  fs.writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2) + '\n');
+}
+
+/**
+ * @param {Template} template
+ * @param {ServerId} server
+ * @returns {Record<string, string>}
+ */
+function getServerPlaceholders(template, server) {
+  if (template !== 'latest') {
+    return {};
+  }
+
+  return server === 'nestjs'
+    ? {
+        __NITRO_IMPORT__: '',
+        __ANALOG_OPTIONS__: "{ server: { entry: 'src/server/main.ts' } }",
+        __NITRO_PLUGIN__: '',
+      }
+    : {
+        __NITRO_IMPORT__: "import nitro from '@analogjs/vite-plugin-nitro';\n",
+        __ANALOG_OPTIONS__: '',
+        __NITRO_PLUGIN__: '    nitro(),\n',
+      };
+}
+
+/**
+ * @param {PackageJson} pkg
+ * @returns {void}
+ */
+function addNestDependencies(pkg) {
+  Object.assign(pkg.dependencies, NESTJS_DEPENDENCIES);
+  delete pkg.devDependencies['@analogjs/vite-plugin-nitro'];
+  pkg.scripts.preview = 'node dist/server/main.js';
+}
+
 /**
  * @param {PackageJson} pkg
  * @param {Template} template
  * @returns {void}
  */
 function addYarnDevDependencies(pkg, template) {
-  if (H3_TEMPLATES.includes(template)) {
+  if (H3_TEMPLATES.includes(template) && !pkg.dependencies?.h3) {
     pkg.devDependencies ??= {};
     pkg.devDependencies.h3 = '^1.13.0';
   }
@@ -612,6 +715,20 @@ function fromBoolArg(arg) {
   return arg === '' || arg === 'true';
 }
 
+/**
+ * @param {string | undefined} value
+ * @returns {ServerId | undefined}
+ */
+function resolveServer(value) {
+  if (value === undefined || Object.hasOwn(SERVERS, value)) {
+    return /** @type {ServerId | undefined} */ (value);
+  }
+
+  throw new Error(
+    `Unknown server "${value}". Use one of: ${Object.keys(SERVERS).join(', ')}.`,
+  );
+}
+
 /**
  * @param {string | undefined} value
  * @returns {Template | undefined}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-analog",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.40",
   "type": "module",
   "license": "MIT",
   "author": "Brandon Roberts",
@@ -39,9 +39,9 @@
     "prompts": "^2.4.2"
   },
   "devDependencies": {
-    "@analogjs/platform": "3.0.0-beta.4",
-    "@analogjs/vite-plugin-angular": "3.0.0-beta.4",
-    "@analogjs/vite-plugin-nitro": "3.0.0-beta.4",
+    "@analogjs/platform": "3.0.0-beta.40",
+    "@analogjs/vite-plugin-angular": "3.0.0-beta.40",
+    "@analogjs/vite-plugin-nitro": "3.0.0-beta.40",
     "h3": "^1.15.11"
   },
   "publishConfig": {

package/template-angular-v20/package.json

@@ -16,8 +16,8 @@
   },
   "private": true,
   "dependencies": {
-    "@analogjs/content": "^3.0.0-beta.4",
-    "@analogjs/router": "^3.0.0-beta.4",
+    "@analogjs/content": "^3.0.0-beta.40",
+    "@analogjs/router": "^3.0.0-beta.40",
     "@angular/animations": "^20.0.0",
     "@angular/common": "^20.0.0",
     "@angular/compiler": "^20.0.0",
@@ -37,15 +37,16 @@
     "zone.js": "~0.15.0"
   },
   "devDependencies": {
-    "@analogjs/platform": "^3.0.0-beta.4",
-    "@analogjs/vite-plugin-angular": "^3.0.0-beta.4",
-    "@analogjs/vitest-angular": "^3.0.0-beta.4",
+    "@analogjs/platform": "^3.0.0-beta.40",
+    "@analogjs/vite-plugin-angular": "^3.0.0-beta.40",
+    "@analogjs/vite-plugin-nitro": "^3.0.0-beta.40",
+    "@analogjs/vitest-angular": "^3.0.0-beta.40",
     "@angular-devkit/build-angular": "^20.0.0",
     "@angular/build": "^20.0.0",
     "@angular/cli": "^20.0.0",
     "@angular/compiler-cli": "^20.0.0",
     "jsdom": "^22.0.0",
-    "typescript": "6.0.2",
+    "typescript": "~5.9.0",
     "vite": "^7.0.0",
     "vite-tsconfig-paths": "^6.1.1",
     "vitest": "^5.0.0"

package/template-angular-v20/src/server/routes/api/v1/hello.ts

@@ -1,3 +1,3 @@
-import { defineHandler } from 'nitro/h3';
+import { defineEventHandler } from 'h3';
 
-export default defineHandler(() => ({ message: 'Hello World' }));
+export default defineEventHandler(() => ({ message: 'Hello World' }));

package/template-angular-v20/vite.config.ts

@@ -2,6 +2,8 @@
 
 import { defineConfig } from 'vite';
 __TAILWIND_IMPORT__import analog from '@analogjs/platform';
+import angular from '@analogjs/vite-plugin-angular';
+import nitro from '@analogjs/vite-plugin-nitro';
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => ({
@@ -12,8 +14,10 @@ export default defineConfig(({ mode }) => ({
     mainFields: ['module'],
   },
   plugins: [
-__TAILWIND_PLUGIN__    analog(),
-  ],
+    analog(),
+    angular(),
+    nitro(),
+__TAILWIND_PLUGIN__  ],
   test: {
     globals: true,
     environment: 'jsdom',

package/template-angular-v21/package.json

@@ -16,8 +16,8 @@
   },
   "private": true,
   "dependencies": {
-    "@analogjs/content": "^3.0.0-beta.4",
-    "@analogjs/router": "^3.0.0-beta.4",
+    "@analogjs/content": "^3.0.0-beta.40",
+    "@analogjs/router": "^3.0.0-beta.40",
     "@angular/animations": "^21.0.0",
     "@angular/common": "^21.0.0",
     "@angular/compiler": "^21.0.0",
@@ -36,9 +36,9 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@analogjs/platform": "^3.0.0-beta.4",
-    "@analogjs/vite-plugin-angular": "^3.0.0-beta.4",
-    "@analogjs/vitest-angular": "^3.0.0-beta.4",
+    "@analogjs/platform": "^3.0.0-beta.40",
+    "@analogjs/vite-plugin-angular": "^3.0.0-beta.40",
+    "@analogjs/vitest-angular": "^3.0.0-beta.40",
     "@angular/build": "^21.0.0",
     "@angular/cli": "^21.0.0",
     "@angular/compiler-cli": "^21.0.0",

package/template-blog/package.json

@@ -16,8 +16,8 @@
   },
   "private": true,
   "dependencies": {
-    "@analogjs/content": "^3.0.0-beta.4",
-    "@analogjs/router": "^3.0.0-beta.4",
+    "@analogjs/content": "^3.0.0-beta.40",
+    "@analogjs/router": "^3.0.0-beta.40",
     "@angular/animations": "^22.0.0",
     "@angular/common": "^22.0.0",
     "@angular/compiler": "^22.0.0",
@@ -35,10 +35,10 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@analogjs/platform": "^3.0.0-beta.4",
-    "@analogjs/vite-plugin-angular": "^3.0.0-beta.4",
-    "@analogjs/vite-plugin-nitro": "^3.0.0-beta.4",
-    "@analogjs/vitest-angular": "^3.0.0-beta.4",
+    "@analogjs/platform": "^3.0.0-beta.40",
+    "@analogjs/vite-plugin-angular": "^3.0.0-beta.40",
+    "@analogjs/vite-plugin-nitro": "^3.0.0-beta.40",
+    "@analogjs/vitest-angular": "^3.0.0-beta.40",
     "@angular/build": "^22.0.0",
     "@angular/cli": "^22.0.0",
     "@angular/compiler-cli": "^22.0.0",

package/template-latest/README.md

@@ -12,7 +12,7 @@ Run `npm start` for a dev server. Navigate to `http://localhost:5173/`. The appl
 
 ## Build
 
-Run `npm run build` to build the client/server project. The client build artifacts are located in the `dist/analog/public` directory. The server for the API build artifacts are located in the `dist/analog/server` directory.
+Run `npm run build` to build the client and server, and `npm run preview` to start the production server.
 
 ## Test
 

package/template-latest/package.json

@@ -16,8 +16,8 @@
   },
   "private": true,
   "dependencies": {
-    "@analogjs/content": "^3.0.0-beta.4",
-    "@analogjs/router": "^3.0.0-beta.4",
+    "@analogjs/content": "^3.0.0-beta.40",
+    "@analogjs/router": "^3.0.0-beta.40",
     "@angular/animations": "^22.0.0",
     "@angular/common": "^22.0.0",
     "@angular/compiler": "^22.0.0",
@@ -36,10 +36,10 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@analogjs/platform": "^3.0.0-beta.4",
-    "@analogjs/vite-plugin-angular": "^3.0.0-beta.4",
-    "@analogjs/vite-plugin-nitro": "^3.0.0-beta.4",
-    "@analogjs/vitest-angular": "^3.0.0-beta.4",
+    "@analogjs/platform": "^3.0.0-beta.40",
+    "@analogjs/vite-plugin-angular": "^3.0.0-beta.40",
+    "@analogjs/vite-plugin-nitro": "^3.0.0-beta.40",
+    "@analogjs/vitest-angular": "^3.0.0-beta.40",
     "@angular/build": "^22.0.0",
     "@angular/cli": "^22.0.0",
     "@angular/compiler-cli": "^22.0.0",

package/template-latest/vite.config.ts

@@ -3,8 +3,7 @@
 import { defineConfig } from 'vite';
 __TAILWIND_IMPORT__import analog from '@analogjs/platform';
 import angular from '@analogjs/vite-plugin-angular';
-import nitro from '@analogjs/vite-plugin-nitro';
-
+__NITRO_IMPORT__
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => ({
   build: {
@@ -14,10 +13,9 @@ export default defineConfig(({ mode }) => ({
     mainFields: ['module'],
   },
   plugins: [
-    analog(),
+    analog(__ANALOG_OPTIONS__),
     angular(),
-    nitro(),
-__TAILWIND_PLUGIN__  ],
+__NITRO_PLUGIN____TAILWIND_PLUGIN__  ],
   test: {
     globals: true,
     environment: 'jsdom',

package/template-minimal/package.json

@@ -16,8 +16,8 @@
   },
   "private": true,
   "dependencies": {
-    "@analogjs/content": "^3.0.0-beta.4",
-    "@analogjs/router": "^3.0.0-beta.4",
+    "@analogjs/content": "^3.0.0-beta.40",
+    "@analogjs/router": "^3.0.0-beta.40",
     "@angular/animations": "^22.0.0",
     "@angular/common": "^22.0.0",
     "@angular/compiler": "^22.0.0",
@@ -36,10 +36,10 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@analogjs/platform": "^3.0.0-beta.4",
-    "@analogjs/vite-plugin-angular": "^3.0.0-beta.4",
-    "@analogjs/vite-plugin-nitro": "^3.0.0-beta.4",
-    "@analogjs/vitest-angular": "^3.0.0-beta.4",
+    "@analogjs/platform": "^3.0.0-beta.40",
+    "@analogjs/vite-plugin-angular": "^3.0.0-beta.40",
+    "@analogjs/vite-plugin-nitro": "^3.0.0-beta.40",
+    "@analogjs/vitest-angular": "^3.0.0-beta.40",
     "@angular/build": "^22.0.0",
     "@angular/cli": "^22.0.0",
     "@angular/compiler-cli": "^22.0.0",