Merge pull request #1126 from angular/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

.github/workflows/ci.yml

@@ -170,7 +170,7 @@ jobs:
           ./scripts/saucelabs/wait-for-tunnel.sh
           yarn bazel test --config=saucelabs //tests/legacy-cli:e2e.saucelabs
           ./scripts/saucelabs/stop-tunnel.sh
-      - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
+      - uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097 # v4.4.2
         if: ${{ failure() }}
         with:
           name: sauce-connect-log

.github/workflows/pr.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@46771fcd70e08e7ba3c30f4ee9ebf9971b7fdb5c
       - name: Setup ESLint Caching
-        uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
+        uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
         with:
           path: .eslintcache
           key: ${{ runner.os }}-${{ hashFiles('.eslintrc.json') }}
@@ -80,7 +80,7 @@ jobs:
       - name: Build release targets
         run: yarn ng-dev release build
       - name: Store PR release packages
-        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
+        uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097 # v4.4.2
         with:
           name: packages
           path: dist/releases/*.tgz

.github/workflows/scorecard.yml

@@ -38,7 +38,7 @@ jobs:
 
       # Upload the results as artifacts.
       - name: 'Upload artifact'
-        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
+        uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097 # v4.4.2
         with:
           name: SARIF file
           path: results.sarif

CHANGELOG.md

@@ -1,3 +1,60 @@
+<a name="19.0.0-next.10"></a>
+
+# 19.0.0-next.10 (2024-10-09)
+
+## Breaking Changes
+
+### @schematics/angular
+
+- The app-shell schematic is no longer compatible with Webpack-based builders.
+
+### @schematics/angular
+
+| Commit                                                                                              | Type | Description                                                           |
+| --------------------------------------------------------------------------------------------------- | ---- | --------------------------------------------------------------------- |
+| [292a4b7c2](https://github.com/angular/angular-cli/commit/292a4b7c2f62828606c42258db524341f4a6391e) | feat | update app-shell and ssr schematics to adopt new Server Rendering API |
+| [6dbfc770b](https://github.com/angular/angular-cli/commit/6dbfc770b2d2f72dbc73e39e763f0773435825c6) | fix  | add validation for component and directive class name                 |
+| [7de93e593](https://github.com/angular/angular-cli/commit/7de93e593a9b6439b2f33d0c25c371e14a0e9e38) | fix  | include `index.csr.html` in resources asset group                     |
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description       |
+| --------------------------------------------------------------------------------------------------- | ---- | ----------------- |
+| [ab6e19e1f](https://github.com/angular/angular-cli/commit/ab6e19e1f9a8781334821048522abe86b149c9c3) | fix  | handle main field |
+
+### @angular/build
+
+| Commit                                                                                              | Type | Description                                                                      |
+| --------------------------------------------------------------------------------------------------- | ---- | -------------------------------------------------------------------------------- |
+| [549c20a93](https://github.com/angular/angular-cli/commit/549c20a9396b33ae2e6708a8a9a7c77f0167b276) | fix  | `Ctrl + C` not terminating dev-server with SSR                                   |
+| [1d9db138f](https://github.com/angular/angular-cli/commit/1d9db138f34132f62fd008c9b8597489b08018e6) | fix  | always generate a new hash for optimized chunk                                   |
+| [7c50ba9e2](https://github.com/angular/angular-cli/commit/7c50ba9e2faca445c196c69e972ac313547dda54) | fix  | ensure `index.csr.html` is always generated when prerendering or SSR are enabled |
+| [1bb68ba68](https://github.com/angular/angular-cli/commit/1bb68ba6812236a135c1599031bf7e1b7e0d1d79) | fix  | move lmdb to optionalDependencies                                                |
+| [9233e5ef4](https://github.com/angular/angular-cli/commit/9233e5ef471e851a173827df7f74a581381c6373) | fix  | show error message when error stack is undefined                                 |
+| [6c618d495](https://github.com/angular/angular-cli/commit/6c618d495c54394eb2b87aee36ba5436c06557bd) | fix  | update logic to support both internal and external SSR middlewares               |
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="18.2.8"></a>
+
+# 18.2.8 (2024-10-09)
+
+### @schematics/angular
+
+| Commit                                                                                              | Type | Description                                           |
+| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------- |
+| [b522002ff](https://github.com/angular/angular-cli/commit/b522002fff763cda2ae1c746efcb2638d0099184) | fix  | add validation for component and directive class name |
+| [dfd2d5c05](https://github.com/angular/angular-cli/commit/dfd2d5c0500777fa5aea91519f6657aed7f3b7d7) | fix  | include `index.csr.html` in resources asset group     |
+
+### @angular/build
+
+| Commit                                                                                              | Type | Description                                    |
+| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------------------------- |
+| [9445916f9](https://github.com/angular/angular-cli/commit/9445916f9b5b9da69623bf86735264d8a5f26fb3) | fix  | `Ctrl + C` not terminating dev-server with SSR |
+| [9b5cfaa8c](https://github.com/angular/angular-cli/commit/9b5cfaa8ce9d12bf450e7527d479ce7a879ea1b8) | fix  | always generate a new hash for optimized chunk |
+
+<!-- CHANGELOG SPLIT MARKER -->
+
 <a name="19.0.0-next.9"></a>
 
 # 19.0.0-next.9 (2024-10-02)

modules/testing/builder/src/dev_prod_mode.ts

@@ -0,0 +1,54 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+
+import { BuilderHarness } from './builder-harness';
+
+export const GOOD_TARGET = './src/good.js';
+export const BAD_TARGET = './src/bad.js';
+
+/** Setup project for use of conditional imports. */
+export async function setupConditionImport(harness: BuilderHarness<unknown>) {
+  // Files that can be used as targets for the conditional import.
+  await harness.writeFile('src/good.ts', `export const VALUE = 'good-value';`);
+  await harness.writeFile('src/bad.ts', `export const VALUE = 'bad-value';`);
+
+  // Simple application file that accesses conditional code.
+  await harness.writeFile(
+    'src/main.ts',
+    `import {VALUE} from '#target';
+console.log(VALUE);
+export default 42 as any;
+`,
+  );
+
+  // Ensure that good/bad can be resolved from tsconfig.
+  const tsconfig = JSON.parse(harness.readFile('src/tsconfig.app.json')) as TypeScriptConfig;
+  tsconfig.compilerOptions.moduleResolution = 'bundler';
+  tsconfig.files.push('good.ts', 'bad.ts');
+  await harness.writeFile('src/tsconfig.app.json', JSON.stringify(tsconfig));
+}
+
+/** Update package.json with the given mapping for #target. */
+export async function setTargetMapping(harness: BuilderHarness<unknown>, mapping: unknown) {
+  await harness.writeFile(
+    'package.json',
+    JSON.stringify({
+      name: 'ng-test-app',
+      imports: {
+        '#target': mapping,
+      },
+    }),
+  );
+}
+
+interface TypeScriptConfig {
+  compilerOptions: {
+    moduleResolution: string;
+  };
+  files: string[];
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/devkit-repo",
-  "version": "19.0.0-next.9",
+  "version": "19.0.0-next.10",
   "private": true,
   "description": "Software Development Kit for Angular",
   "keywords": [
@@ -138,7 +138,7 @@
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.31.0",
-    "express": "4.21.0",
+    "express": "4.21.1",
     "fast-glob": "3.3.2",
     "http-proxy": "^1.18.1",
     "http-proxy-middleware": "3.0.3",
@@ -199,8 +199,8 @@
     "tree-kill": "1.2.2",
     "ts-node": "^10.9.1",
     "tslib": "2.7.0",
-    "typescript": "5.6.2",
-    "undici": "6.19.8",
+    "typescript": "5.6.3",
+    "undici": "6.20.0",
     "unenv": "^1.10.0",
     "verdaccio": "6.0.0",
     "verdaccio-auth-memory": "^10.0.0",
@@ -225,6 +225,6 @@
   },
   "resolutions": {
     "@bazel/concatjs@npm:5.8.1": "patch:@bazel/concatjs@npm%3A5.8.1#~/.yarn/patches/@bazel-concatjs-npm-5.8.1-1bf81df846.patch",
-    "@microsoft/api-extractor/typescript": "5.6.2"
+    "@microsoft/api-extractor/typescript": "5.6.3"
   }
 }

packages/angular/build/package.json

@@ -33,7 +33,6 @@
     "https-proxy-agent": "7.0.5",
     "istanbul-lib-instrument": "6.0.3",
     "listr2": "8.2.5",
-    "lmdb": "3.1.3",
     "magic-string": "0.30.11",
     "mrmime": "2.0.0",
     "parse5-html-rewriting-stream": "7.0.0",
@@ -45,6 +44,9 @@
     "vite": "5.4.8",
     "watchpack": "2.4.2"
   },
+  "optionalDependencies": {
+    "lmdb": "3.1.3"
+  },
   "peerDependencies": {
     "@angular/compiler": "^19.0.0-next.0",
     "@angular/compiler-cli": "^19.0.0-next.0",

packages/angular/build/src/builders/application/execute-post-bundle.ts

@@ -29,7 +29,7 @@ import {
 } from '../../utils/server-rendering/models';
 import { prerenderPages } from '../../utils/server-rendering/prerender';
 import { augmentAppWithServiceWorkerEsbuild } from '../../utils/service-worker';
-import { INDEX_HTML_SERVER, NormalizedApplicationBuildOptions } from './options';
+import { INDEX_HTML_CSR, INDEX_HTML_SERVER, NormalizedApplicationBuildOptions } from './options';
 import { OutputMode } from './schema';
 
 /**
@@ -154,7 +154,15 @@ export async function executePostBundleSteps(
       // Update the index contents with the app shell under these conditions:
       // - Replace 'index.html' with the app shell only if it hasn't been prerendered yet.
       // - Always replace 'index.csr.html' with the app shell.
-      const filePath = appShellRoute && !indexHasBeenPrerendered ? indexHtmlOptions.output : path;
+      let filePath = path;
+      if (appShellRoute && !indexHasBeenPrerendered) {
+        if (outputMode !== OutputMode.Server && indexHtmlOptions.output === INDEX_HTML_CSR) {
+          filePath = 'index.html';
+        } else {
+          filePath = indexHtmlOptions.output;
+        }
+      }
+
       additionalHtmlOutputFiles.set(
         filePath,
         createOutputFile(filePath, content, BuildOutputFileType.Browser),

packages/angular/build/src/builders/application/options.ts

@@ -27,6 +27,7 @@ import {
 import { urlJoin } from '../../utils/url';
 import {
   Schema as ApplicationBuilderOptions,
+  ExperimentalPlatform,
   I18NTranslation,
   OutputHashing,
   OutputMode,
@@ -264,10 +265,11 @@ export async function normalizeOptions(
   if (options.ssr === true) {
     ssrOptions = {};
   } else if (typeof options.ssr === 'object') {
-    const { entry } = options.ssr;
+    const { entry, experimentalPlatform = ExperimentalPlatform.Node } = options.ssr;
 
     ssrOptions = {
       entry: entry && path.join(workspaceRoot, entry),
+      platform: experimentalPlatform,
     };
   }
 

packages/angular/build/src/builders/application/schema.json

@@ -518,6 +518,11 @@
             "entry": {
               "type": "string",
               "description": "The server entry-point that when executed will spawn the web server."
+            },
+            "experimentalPlatform": {
+              "description": "Specifies the platform for which the server bundle is generated. This affects the APIs and modules available in the server-side code. \n\n- `node`:  (Default) Generates a bundle optimized for Node.js environments. \n- `neutral`: Generates a platform-neutral bundle suitable for environments like edge workers, and other serverless platforms. This option avoids using Node.js-specific APIs, making the bundle more portable. \n\nPlease note that this feature does not provide polyfills for Node.js modules. Additionally, it is experimental, and the schematics may undergo changes in future versions.",
+              "default": "node",
+              "enum": ["node", "neutral"]
             }
           },
           "additionalProperties": false