@schematics/angular 17.0.0-rc.2 → 17.0.0-rc.3

package/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template

@@ -11,14 +11,12 @@ import { CommonModule } from '@angular/common';<% } %>
     </p>
   `<% } else { %>
   templateUrl: './<%= dasherize(name) %><%= type ? '.' + dasherize(type): '' %>.html'<% } if(inlineStyle) { %>,
-  styles: [<% if(displayBlock){ %>
-    `
-      :host {
-        display: block;
-      }
-    `<% } %>
-  ]<% } else if (style !== 'none') { %>,
-  styleUrls: ['./<%= dasherize(name) %><%= type ? '.' + dasherize(type): '' %>.<%= style %>']<% } %><% if(!!viewEncapsulation) { %>,
+  styles: `<% if(displayBlock){ %>
+    :host {
+      display: block;
+    }
+  <% } %>`<% } else if (style !== 'none') { %>,
+  styleUrl: './<%= dasherize(name) %><%= type ? '.' + dasherize(type): '' %>.<%= style %>'<% } %><% if(!!viewEncapsulation) { %>,
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
   changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %>
 })

package/migrations/update-17/replace-nguniversal-engines.js

@@ -7,6 +7,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const utility_1 = require("../../utility");
 const dependencies_1 = require("../../utility/dependencies");
@@ -69,17 +70,34 @@ function default_1() {
                             }
                         }
                     }
-                    // Replace server file
+                    // Replace all import specifiers in all files.
+                    let hasExpressTokens = false;
+                    const root = project.sourceRoot ?? `${project.root}/src`;
+                    const tokensFilePath = `/${root}/express.tokens.ts`;
+                    for (const file of visit(tree.getDir(root))) {
+                        const [path, content] = file;
+                        let updatedContent = content;
+                        // Check if file is importing tokens
+                        if (content.includes('@nguniversal/express-engine/tokens')) {
+                            hasExpressTokens ||= true;
+                            let tokensFileRelativePath = (0, core_1.relative)((0, core_1.dirname)((0, core_1.normalize)(path)), (0, core_1.normalize)(tokensFilePath));
+                            if (tokensFileRelativePath.charAt(0) !== '.') {
+                                tokensFileRelativePath = './' + tokensFileRelativePath;
+                            }
+                            updatedContent = updatedContent.replaceAll('@nguniversal/express-engine/tokens', tokensFileRelativePath.slice(0, -3));
+                        }
+                        updatedContent = updatedContent.replaceAll(NGUNIVERSAL_PACKAGE_REGEXP, '@angular/ssr');
+                        tree.overwrite(path, updatedContent);
+                    }
+                    // Replace server file and add tokens file if needed
                     for (const [path, outputPath] of serverMainFiles.entries()) {
                         tree.rename(path, path + '.bak');
-                        tree.create(path, getServerFileContents(outputPath));
+                        tree.create(path, getServerFileContents(outputPath, hasExpressTokens));
+                        if (hasExpressTokens) {
+                            tree.create(tokensFilePath, TOKENS_FILE_CONTENT);
+                        }
                     }
                 }
-                // Replace all import specifiers in all files.
-                for (const file of visit(tree.root)) {
-                    const [path, content] = file;
-                    tree.overwrite(path, content.replaceAll(NGUNIVERSAL_PACKAGE_REGEXP, '@angular/ssr'));
-                }
                 // Remove universal packages from deps.
                 for (const name of UNIVERSAL_PACKAGES) {
                     (0, dependencies_1.removePackageJsonDependency)(tree, name);
@@ -90,8 +108,15 @@ function default_1() {
     };
 }
 exports.default = default_1;
-function getServerFileContents(outputPath) {
-    return `
+const TOKENS_FILE_CONTENT = `
+import { InjectionToken } from '@angular/core';
+import { Request, Response } from 'express';
+
+export const REQUEST = new InjectionToken<Request>('REQUEST');
+export const RESPONSE = new InjectionToken<Response>('RESPONSE');
+`;
+function getServerFileContents(outputPath, hasExpressTokens) {
+    return (`
 import 'zone.js/node';
 
 import { APP_BASE_HREF } from '@angular/common';
@@ -99,7 +124,9 @@ import { CommonEngine } from '@angular/ssr';
 import * as express from 'express';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import bootstrap from './src/main.server';
+import bootstrap from './src/main.server';` +
+        (hasExpressTokens ? `\nimport { REQUEST, RESPONSE } from './src/express.tokens';` : '') +
+        `
 
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
@@ -131,7 +158,12 @@ export function app(): express.Express {
         documentFilePath: indexHtml,
         url: \`\${protocol}://\${headers.host}\${originalUrl}\`,
         publicPath: distFolder,
-        providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
+        providers: [
+          { provide: APP_BASE_HREF, useValue: baseUrl },` +
+        (hasExpressTokens
+            ? '\n          { provide: RESPONSE, useValue: res },\n          { provide: REQUEST, useValue: req }\n'
+            : '') +
+        `],
       })
       .then((html) => res.send(html))
       .catch((err) => next(err));
@@ -161,5 +193,5 @@ if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
 }
 
 export default bootstrap;
-`;
+`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "17.0.0-rc.2",
+  "version": "17.0.0-rc.3",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -23,8 +23,8 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "17.0.0-rc.2",
-    "@angular-devkit/schematics": "17.0.0-rc.2",
+    "@angular-devkit/core": "17.0.0-rc.3",
+    "@angular-devkit/schematics": "17.0.0-rc.3",
     "jsonc-parser": "3.2.0"
   },
   "repository": {
@@ -32,7 +32,7 @@
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": ">=18.13.0",
+    "node": "^18.13.0 || >=20.9.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   },

package/utility/latest-versions.js

@@ -14,6 +14,6 @@ exports.latestVersions = {
     ...require('./latest-versions/package.json')['dependencies'],
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
     Angular: '^17.0.0-next.0',
-    DevkitBuildAngular: '^17.0.0-rc.2',
-    AngularSSR: '^17.0.0-rc.2',
+    DevkitBuildAngular: '^17.0.0-rc.3',
+    AngularSSR: '^17.0.0-rc.3',
 };

package/workspace/files/tsconfig.json.template

@@ -9,7 +9,7 @@
     "noPropertyAccessFromIndexSignature": true,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,<% } %>
-    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
     "sourceMap": true,
     "declaration": false,
     "downlevelIteration": true,