@schematics/angular 19.0.0-next.0 → 19.0.0-next.10

package/server/index.js

@@ -83,11 +83,12 @@ function updateConfigFileApplicationBuilder(options) {
             return;
         }
         const buildTarget = project.targets.get('build');
-        if (buildTarget?.builder !== workspace_models_1.Builders.Application) {
-            throw new schematics_1.SchematicsException(`This schematic requires "${workspace_models_1.Builders.Application}" to be used as a build builder.`);
+        if (!buildTarget) {
+            return;
         }
         buildTarget.options ??= {};
         buildTarget.options['server'] = node_path_1.posix.join(project.sourceRoot ?? node_path_1.posix.join(project.root, 'src'), serverMainEntryName);
+        buildTarget.options['outputMode'] = 'static';
     });
 }
 function updateTsConfigFile(tsConfigPath) {
@@ -111,6 +112,10 @@ function addDependencies(skipInstall) {
         }
         const install = skipInstall ? utility_1.InstallBehavior.None : utility_1.InstallBehavior.Auto;
         return (0, schematics_1.chain)([
+            (0, utility_1.addDependency)('@angular/ssr', latest_versions_1.latestVersions.AngularSSR, {
+                type: utility_1.DependencyType.Default,
+                install,
+            }),
             (0, utility_1.addDependency)('@angular/platform-server', coreDep.version, {
                 type: utility_1.DependencyType.Default,
                 install,
@@ -123,7 +128,7 @@ function addDependencies(skipInstall) {
     };
 }
 function default_1(options) {
-    return async (host, context) => {
+    return async (host) => {
         const workspace = await (0, workspace_1.getWorkspace)(host);
         const clientProject = workspace.projects.get(options.project);
         if (clientProject?.extensions.projectType !== 'application') {
@@ -133,7 +138,8 @@ function default_1(options) {
         if (!clientBuildTarget) {
             throw (0, project_targets_1.targetBuildNotFoundError)();
         }
-        const isUsingApplicationBuilder = clientBuildTarget.builder === workspace_models_1.Builders.Application;
+        const isUsingApplicationBuilder = clientBuildTarget.builder === workspace_models_1.Builders.Application ||
+            clientBuildTarget.builder === workspace_models_1.Builders.BuildApplication;
         if (clientProject.targets.has('server') ||
             (isUsingApplicationBuilder && clientBuildTarget.options?.server !== undefined)) {
             // Server has already been added.
@@ -142,12 +148,15 @@ function default_1(options) {
         const clientBuildOptions = clientBuildTarget.options;
         const browserEntryPoint = await (0, util_1.getMainFilePath)(host, options.project);
         const isStandalone = (0, ng_ast_utils_1.isStandaloneApp)(host, browserEntryPoint);
-        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)(isStandalone ? './files/standalone-src' : './files/src'), [
+        const sourceRoot = clientProject.sourceRoot ?? (0, core_1.join)((0, core_1.normalize)(clientProject.root), 'src');
+        let filesUrl = `./files/${isUsingApplicationBuilder ? 'application-builder/' : 'server-builder/'}`;
+        filesUrl += isStandalone ? 'standalone-src' : 'ngmodule-src';
+        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)(filesUrl), [
             (0, schematics_1.applyTemplates)({
                 ...schematics_1.strings,
                 ...options,
             }),
-            (0, schematics_1.move)((0, core_1.join)((0, core_1.normalize)(clientProject.root), 'src')),
+            (0, schematics_1.move)(sourceRoot),
         ]);
         const clientTsConfig = (0, core_1.normalize)(clientBuildOptions.tsConfig);
         const tsConfigExtends = (0, core_1.basename)(clientTsConfig);
@@ -160,7 +169,7 @@ function default_1(options) {
                     updateTsConfigFile(clientBuildOptions.tsConfig),
                 ]
                 : [
-                    (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files/root'), [
+                    (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files/server-builder/root'), [
                         (0, schematics_1.applyTemplates)({
                             ...schematics_1.strings,
                             ...options,
@@ -174,7 +183,7 @@ function default_1(options) {
                     updateConfigFileBrowserBuilder(options, tsConfigDirectory),
                 ]),
             addDependencies(options.skipInstall),
-            (0, utility_1.addRootProvider)(options.project, ({ code, external }) => code `${external('provideClientHydration', '@angular/platform-browser')}()`),
+            (0, utility_1.addRootProvider)(options.project, ({ code, external }) => code `${external('provideClientHydration', '@angular/platform-browser')}(${external('withEventReplay', '@angular/platform-browser')}())`),
         ]);
     };
 }

package/service-worker/files/ngsw-config.json.template

@@ -8,6 +8,7 @@
       "resources": {
         "files": [
           "/favicon.ico",
+          "/index.csr.html",
           "/index.html",
           "/manifest.webmanifest",
           "/*.css",

package/ssr/files/application-builder/server.ts.template

@@ -1,57 +1,49 @@
-import { APP_BASE_HREF } from '@angular/common';
-import { CommonEngine } from '@angular/ssr';
+import {
+  AngularNodeAppEngine,
+  createNodeRequestHandler,
+  isMainModule,
+  writeResponseToNodeResponse,
+} from '@angular/ssr/node';
 import express from 'express';
+import { dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { dirname, join, resolve } from 'node:path';
-import <% if (isStandalone) { %>bootstrap<% } else { %>AppServerModule<% } %> from './src/main.server';
 
-// The Express app is exported so that it can be used by serverless Functions.
-export function app(): express.Express {
-  const server = express();
-  const serverDistFolder = dirname(fileURLToPath(import.meta.url));
-  const browserDistFolder = resolve(serverDistFolder, '../<%= browserDistDirectory %>');
-  const indexHtml = join(serverDistFolder, 'index.server.html');
+const serverDistFolder = dirname(fileURLToPath(import.meta.url));
+const browserDistFolder = resolve(serverDistFolder, '../<%= browserDistDirectory %>');
 
-  const commonEngine = new CommonEngine();
+const app = express();
+const angularApp = new AngularNodeAppEngine();
 
-  server.set('view engine', 'html');
-  server.set('views', browserDistFolder);
+// Example Express Rest API endpoints
+// app.get('/api/**', (req, res) => { });
 
-  // Example Express Rest API endpoints
-  // server.get('/api/**', (req, res) => { });
-  // Serve static files from /<%= browserDistDirectory %>
-  server.get('**', express.static(browserDistFolder, {
+// Serve static files from /<%= browserDistDirectory %>
+app.get(
+  '**',
+  express.static(browserDistFolder, {
     maxAge: '1y',
     index: 'index.html',
-  }));
-
-  // All regular routes use the Angular engine
-  server.get('**', (req, res, next) => {
-    const { protocol, originalUrl, baseUrl, headers } = req;
-
-    commonEngine
-      .render({
-        <% if (isStandalone) { %>bootstrap<% } else { %>bootstrap: AppServerModule<% } %>,
-        documentFilePath: indexHtml,
-        url: `${protocol}://${headers.host}${originalUrl}`,
-        publicPath: browserDistFolder,
-        providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
-      })
-      .then((html) => res.send(html))
-      .catch((err) => next(err));
-  });
-
-  return server;
-}
-
-function run(): void {
+    setHeaders: (res) => {
+      const headers = angularApp.getPrerenderHeaders(res.req);
+      for (const [key, value] of headers) {
+        res.setHeader(key, value);
+      }
+    },
+  }),
+);
+
+app.get('**', (req, res, next) => {
+  angularApp
+    .render(req)
+    .then((response) => (response ? writeResponseToNodeResponse(response, res) : next()))
+    .catch(next);
+});
+
+if (isMainModule(import.meta.url)) {
   const port = process.env['PORT'] || 4000;
-
-  // Start up the Node server
-  const server = app();
-  server.listen(port, () => {
+  app.listen(port, () => {
     console.log(`Node Express server listening on http://localhost:${port}`);
   });
 }
 
-run();
+export default createNodeRequestHandler(app);

package/ssr/files/server-builder/server.ts.template

@@ -1,11 +1,11 @@
 import 'zone.js/node';
 
 import { APP_BASE_HREF } from '@angular/common';
-import { CommonEngine } from '@angular/ssr';
+import { CommonEngine } from '@angular/ssr/node';
 import * as express from 'express';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import <% if (isStandalone) { %>bootstrap<% } else { %>AppServerModule<% } %> from './src/main.server';
+import <% if (isStandalone) { %>bootstrap<% } else { %>AppServerModule<% } %> from './main.server';
 
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {

package/ssr/index.js

@@ -108,15 +108,14 @@ function updateApplicationBuilderTsConfigRule(options) {
             // No tsconfig path
             return;
         }
-        const tsConfig = new json_file_1.JSONFile(host, tsConfigPath);
-        const filesAstNode = tsConfig.get(['files']);
-        const serverFilePath = 'server.ts';
-        if (Array.isArray(filesAstNode) && !filesAstNode.some(({ text }) => text === serverFilePath)) {
-            tsConfig.modify(['files'], [...filesAstNode, serverFilePath]);
-        }
+        const json = new json_file_1.JSONFile(host, tsConfigPath);
+        const filesPath = ['files'];
+        const files = new Set(json.get(filesPath) ?? []);
+        files.add('src/server.ts');
+        json.modify(filesPath, [...files]);
     };
 }
-function updateApplicationBuilderWorkspaceConfigRule(projectRoot, options, { logger }) {
+function updateApplicationBuilderWorkspaceConfigRule(projectSourceRoot, options, { logger }) {
     return (0, utility_1.updateWorkspace)((workspace) => {
         const buildTarget = workspace.projects.get(options.project)?.targets.get('build');
         if (!buildTarget) {
@@ -140,14 +139,14 @@ function updateApplicationBuilderWorkspaceConfigRule(projectRoot, options, { log
         buildTarget.options = {
             ...buildTarget.options,
             outputPath,
-            prerender: true,
+            outputMode: 'server',
             ssr: {
-                entry: (0, core_1.join)((0, core_1.normalize)(projectRoot), 'server.ts'),
+                entry: (0, core_1.join)((0, core_1.normalize)(projectSourceRoot), 'server.ts'),
             },
         };
     });
 }
-function updateWebpackBuilderWorkspaceConfigRule(options) {
+function updateWebpackBuilderWorkspaceConfigRule(projectSourceRoot, options) {
     return (0, utility_1.updateWorkspace)((workspace) => {
         const projectName = options.project;
         const project = workspace.projects.get(projectName);
@@ -156,7 +155,7 @@ function updateWebpackBuilderWorkspaceConfigRule(options) {
         }
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const serverTarget = project.targets.get('server');
-        (serverTarget.options ??= {}).main = (0, core_1.join)((0, core_1.normalize)(project.root), 'server.ts');
+        (serverTarget.options ??= {}).main = node_path_1.posix.join(projectSourceRoot, 'server.ts');
         const serveSSRTarget = project.targets.get(SERVE_SSR_TARGET_NAME);
         if (serveSSRTarget) {
             return;
@@ -216,7 +215,7 @@ function updateWebpackBuilderServerTsConfigRule(options) {
         }
         const tsConfig = new json_file_1.JSONFile(host, tsConfigPath);
         const filesAstNode = tsConfig.get(['files']);
-        const serverFilePath = 'server.ts';
+        const serverFilePath = 'src/server.ts';
         if (Array.isArray(filesAstNode) && !filesAstNode.some(({ text }) => text === serverFilePath)) {
             tsConfig.modify(['files'], [...filesAstNode, serverFilePath]);
         }
@@ -225,10 +224,6 @@ function updateWebpackBuilderServerTsConfigRule(options) {
 function addDependencies({ skipInstall }, isUsingApplicationBuilder) {
     const install = skipInstall ? utility_1.InstallBehavior.None : utility_1.InstallBehavior.Auto;
     const rules = [
-        (0, utility_1.addDependency)('@angular/ssr', latest_versions_1.latestVersions.AngularSSR, {
-            type: utility_1.DependencyType.Default,
-            install,
-        }),
         (0, utility_1.addDependency)('express', latest_versions_1.latestVersions['express'], {
             type: utility_1.DependencyType.Default,
             install,
@@ -246,7 +241,7 @@ function addDependencies({ skipInstall }, isUsingApplicationBuilder) {
     }
     return (0, schematics_1.chain)(rules);
 }
-function addServerFile(options, isStandalone) {
+function addServerFile(projectSourceRoot, options, isStandalone) {
     return async (host) => {
         const projectName = options.project;
         const workspace = await (0, utility_1.readWorkspace)(host);
@@ -265,7 +260,7 @@ function addServerFile(options, isStandalone) {
                 browserDistDirectory,
                 isStandalone,
             }),
-            (0, schematics_1.move)(project.root),
+            (0, schematics_1.move)(projectSourceRoot),
         ]));
     };
 }
@@ -279,6 +274,7 @@ function default_1(options) {
             throw (0, project_targets_1.targetBuildNotFoundError)();
         }
         const isUsingApplicationBuilder = usingApplicationBuilder(clientProject);
+        const sourceRoot = clientProject.sourceRoot ?? node_path_1.posix.join(clientProject.root, 'src');
         return (0, schematics_1.chain)([
             (0, schematics_1.schematic)('server', {
                 ...options,
@@ -286,14 +282,14 @@ function default_1(options) {
             }),
             ...(isUsingApplicationBuilder
                 ? [
-                    updateApplicationBuilderWorkspaceConfigRule(clientProject.root, options, context),
+                    updateApplicationBuilderWorkspaceConfigRule(sourceRoot, options, context),
                     updateApplicationBuilderTsConfigRule(options),
                 ]
                 : [
                     updateWebpackBuilderServerTsConfigRule(options),
-                    updateWebpackBuilderWorkspaceConfigRule(options),
+                    updateWebpackBuilderWorkspaceConfigRule(sourceRoot, options),
                 ]),
-            addServerFile(options, isStandalone),
+            addServerFile(sourceRoot, options, isStandalone),
             addScriptsRule(options, isUsingApplicationBuilder),
             addDependencies(options, isUsingApplicationBuilder),
         ]);