Merge pull request #1131 from angular/main

Create a new pull request by comparing changes across two branches

.github/workflows/assistant-to-the-branch-manager.yml

@@ -13,7 +13,7 @@ jobs:
   assistant_to_the_branch_manager:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - uses: angular/dev-infra/github-actions/branch-manager@a3d0749c4d64959e85843fbeb54507e830be0f44

.github/workflows/dev-infra.yml

@@ -12,14 +12,14 @@ jobs:
   labels:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: angular/dev-infra/github-actions/commit-message-based-labels@a3d0749c4d64959e85843fbeb54507e830be0f44
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
   post_approval_changes:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: angular/dev-infra/github-actions/post-approval-changes@a3d0749c4d64959e85843fbeb54507e830be0f44
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

.github/workflows/pr.yml

@@ -20,7 +20,7 @@ jobs:
     outputs:
       snapshots: ${{ steps.filter.outputs.snapshots }}
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
@@ -36,7 +36,7 @@ jobs:
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@a3d0749c4d64959e85843fbeb54507e830be0f44
       - name: Setup ESLint Caching
-        uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
         with:
           path: .eslintcache
           key: ${{ runner.os }}-${{ hashFiles('.eslintrc.json') }}

.github/workflows/scorecard.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: 'Checkout code'
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
@@ -46,6 +46,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: 'Upload to code-scanning'
-        uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
         with:
           sarif_file: results.sarif

.yarn/patches/rollup-license-plugin-npm-3.0.0-038e5f6edc.patch

@@ -0,0 +1,13 @@
+diff --git a/dist/index.js b/dist/index.js
+index 9baea0c8023c03d19b1494f818e1e11578f05b32..8f1a7a6050980d88e050423e63ef041195011fcc 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -101,7 +101,7 @@ function createRollupLicensePlugin(pluginOptions = {}, pluginName = "rollup-lice
+       Object.entries(chunk.modules).filter(
+         ([path, module]) => Boolean(path.match(/node_modules/)) && module.renderedLength > 0
+       ).map(
+-        ([path]) => path.startsWith("\0") ? path.replace(/^\0/, "") : path
++        ([path]) => (path.startsWith("\0") ? path.replace(/^\0/, "") : path).replace(/\\/g, '/')
+       ).map((path) => [path, path.split("node_modules").pop()]).map(([path, filePath]) => {
+         const segments = filePath.replace(/^\//, "").split("/");
+         const packageName = segments[0].startsWith("@") ? `${segments[0]}/${segments[1]}` : segments[0];

CHANGELOG.md

@@ -1,3 +1,81 @@
+<a name="19.0.0-next.13"></a>
+
+# 19.0.0-next.13 (2024-10-23)
+
+### @angular/build
+
+| Commit                                                                                              | Type | Description                                                          |
+| --------------------------------------------------------------------------------------------------- | ---- | -------------------------------------------------------------------- |
+| [efb434136](https://github.com/angular/angular-cli/commit/efb434136d8c8df207747ab8fd87b7e2116b7106) | feat | Auto-CSP support as a part of angular.json schema                    |
+| [cc345b02d](https://github.com/angular/angular-cli/commit/cc345b02d814a37bb23d6c3f1baca9595130d010) | fix  | Address build issue in Node.js LTS versions with prerendering or SSR |
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="18.2.10"></a>
+
+# 18.2.10 (2024-10-23)
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                               |
+| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------- |
+| [7b775f4e0](https://github.com/angular/angular-cli/commit/7b775f4e008652777bbe7b788dabed02bcc70cc7) | fix  | update `http-proxy-middleware` to `3.0.3` |
+
+### @angular/build
+
+| Commit                                                                                              | Type | Description                                                          |
+| --------------------------------------------------------------------------------------------------- | ---- | -------------------------------------------------------------------- |
+| [b1e5f51f9](https://github.com/angular/angular-cli/commit/b1e5f51f9111d7da56ebe64cad51936ad659782d) | fix  | Address build issue in Node.js LTS versions with prerendering or SSR |
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="17.3.11"></a>
+
+# 17.3.11 (2024-10-23)
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                               |
+| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------- |
+| [8bad9cee0](https://github.com/angular/angular-cli/commit/8bad9cee08982fffa5ce8244148b491e66191ed8) | fix  | update `http-proxy-middleware` to `2.0.7` |
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="19.0.0-next.12"></a>
+
+# 19.0.0-next.12 (2024-10-21)
+
+## Breaking Changes
+
+### @angular-devkit/build-angular
+
+- Protractor is no longer supported.
+
+  Protractor was marked end-of-life in August 2023 (see https://protractortest.org/). Projects still relying on Protractor should consider migrating to another E2E testing framework, several support solid migration paths from Protractor.
+
+  - https://angular.dev/tools/cli/end-to-end
+  - https://blog.angular.dev/the-state-of-end-to-end-testing-with-angular-d175f751cb9c
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type     | Description                              |
+| --------------------------------------------------------------------------------------------------- | -------- | ---------------------------------------- |
+| [62877bdf2](https://github.com/angular/angular-cli/commit/62877bdf2b0449d8c12a167c59d0c24c77467f37) | refactor | remove Protractor builder and schematics |
+
+### @angular/build
+
+| Commit                                                                                              | Type | Description                                           |
+| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------- |
+| [1654acf0f](https://github.com/angular/angular-cli/commit/1654acf0ff3010b619a22d11f17eec9975d8e2a2) | fix  | relax constraints on external stylesheet component id |
+
+### @angular/ssr
+
+| Commit                                                                                              | Type | Description                           |
+| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------- |
+| [44077f54e](https://github.com/angular/angular-cli/commit/44077f54e9a95afa5c1f85cf198aaa3412ee08d8) | fix  | designate package as side-effect free |
+
+<!-- CHANGELOG SPLIT MARKER -->
+
 <a name="19.0.0-next.11"></a>
 
 # 19.0.0-next.11 (2024-10-16)

WORKSPACE

@@ -131,9 +131,9 @@ yarn_install(
 
 http_archive(
     name = "aspect_bazel_lib",
-    sha256 = "0e31778f1fd574d2c05d238bfc4c785fa4b7e50a5ef38b506e01cfd8ec2fccb3",
-    strip_prefix = "bazel-lib-2.9.2",
-    url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.9.2/bazel-lib-v2.9.2.tar.gz",
+    sha256 = "a272d79bb0ac6b6965aa199b1f84333413452e87f043b53eca7f347a23a478e8",
+    strip_prefix = "bazel-lib-2.9.3",
+    url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.9.3/bazel-lib-v2.9.3.tar.gz",
 )
 
 load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies", "aspect_bazel_lib_register_toolchains")

goldens/circular-deps/packages.json

@@ -3,6 +3,13 @@
     "packages/angular_devkit/build_angular/src/builders/dev-server/builder.ts",
     "packages/angular_devkit/build_angular/src/builders/dev-server/options.ts"
   ],
+  [
+    "packages/angular/build/src/tools/esbuild/angular/component-stylesheets.ts",
+    "packages/angular/build/src/tools/esbuild/bundler-context.ts",
+    "packages/angular/build/src/tools/esbuild/utils.ts",
+    "packages/angular/build/src/utils/server-rendering/manifest.ts",
+    "packages/angular/build/src/tools/esbuild/bundler-execution-result.ts"
+  ],
   [
     "packages/angular/build/src/tools/esbuild/bundler-context.ts",
     "packages/angular/build/src/tools/esbuild/utils.ts"

goldens/public-api/angular/build/index.api.md

@@ -48,6 +48,7 @@ export interface ApplicationBuilderOptions {
     preserveSymlinks?: boolean;
     progress?: boolean;
     scripts?: ScriptElement[];
+    security?: Security;
     server?: string;
     serviceWorker?: ServiceWorker_2;
     sourceMap?: SourceMapUnion;

goldens/public-api/angular/ssr/index.api.md

@@ -5,7 +5,6 @@
 ```ts
 
 import { EnvironmentProviders } from '@angular/core';
-import { InjectionToken } from '@angular/core';
 
 // @public
 export class AngularAppEngine {
@@ -35,15 +34,6 @@ export enum RenderMode {
     Server = 1
 }
 
-// @public
-export const REQUEST: InjectionToken<Request>;
-
-// @public
-export const REQUEST_CONTEXT: InjectionToken<unknown>;
-
-// @public
-export const RESPONSE_INIT: InjectionToken<ResponseInit>;
-
 // @public
 export type ServerRoute = ServerRouteAppShell | ServerRouteClient | ServerRoutePrerender | ServerRoutePrerenderWithParams | ServerRouteServer;
 

goldens/public-api/angular/ssr/tokens/index.api.md

@@ -0,0 +1,20 @@
+## API Report File for "@angular/ssr_tokens"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { InjectionToken } from '@angular/core';
+
+// @public
+export const REQUEST: InjectionToken<Request>;
+
+// @public
+export const REQUEST_CONTEXT: InjectionToken<unknown>;
+
+// @public
+export const RESPONSE_INIT: InjectionToken<ResponseInit>;
+
+// (No @packageDocumentation comment for this package)
+
+```

modules/testing/builder/projects/hello-world-app/angular.json

@@ -178,7 +178,7 @@
       "projectType": "application",
       "targets": {
         "e2e": {
-          "builder": "@angular-devkit/build-angular:protractor",
+          "builder": "@angular-devkit/build-angular:private-protractor",
           "options": {
             "protractorConfig": "protractor.conf.js",
             "devServerTarget": "app:serve",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/devkit-repo",
-  "version": "19.0.0-next.11",
+  "version": "19.1.0-next.0",
   "private": true,
   "description": "Software Development Kit for Angular",
   "keywords": [
@@ -52,42 +52,44 @@
   },
   "devDependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular/animations": "19.0.0-next.10",
+    "@angular/animations": "19.0.0-next.11",
     "@angular/bazel": "patch:@angular/bazel@https%3A//github.com/angular/bazel-builds.git%23commit=07617f0f8540d27f8895b1820a6f994e1e5b7277#~/.yarn/patches/@angular-bazel-https-9848736cf4.patch",
     "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#2692c81ef1068e15c7b7eaf3ecc7a65cbdd25c9f",
-    "@angular/cdk": "19.0.0-next.9",
-    "@angular/common": "19.0.0-next.10",
-    "@angular/compiler": "19.0.0-next.10",
-    "@angular/compiler-cli": "19.0.0-next.10",
-    "@angular/core": "19.0.0-next.10",
-    "@angular/forms": "19.0.0-next.10",
-    "@angular/localize": "19.0.0-next.10",
-    "@angular/material": "19.0.0-next.9",
+    "@angular/cdk": "19.0.0-next.10",
+    "@angular/common": "19.0.0-next.11",
+    "@angular/compiler": "19.0.0-next.11",
+    "@angular/compiler-cli": "19.0.0-next.11",
+    "@angular/core": "19.0.0-next.11",
+    "@angular/forms": "19.0.0-next.11",
+    "@angular/localize": "19.0.0-next.11",
+    "@angular/material": "19.0.0-next.10",
     "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#2659cef857ffd127dbbbcbb28bb2dc4ca8625b50",
-    "@angular/platform-browser": "19.0.0-next.10",
-    "@angular/platform-browser-dynamic": "19.0.0-next.10",
-    "@angular/platform-server": "19.0.0-next.10",
-    "@angular/router": "19.0.0-next.10",
-    "@angular/service-worker": "19.0.0-next.10",
-    "@babel/core": "7.25.8",
-    "@babel/generator": "7.25.7",
-    "@babel/helper-annotate-as-pure": "7.25.7",
+    "@angular/platform-browser": "19.0.0-next.11",
+    "@angular/platform-browser-dynamic": "19.0.0-next.11",
+    "@angular/platform-server": "19.0.0-next.11",
+    "@angular/router": "19.0.0-next.11",
+    "@angular/service-worker": "19.0.0-next.11",
+    "@babel/core": "7.26.0",
+    "@babel/generator": "7.26.0",
+    "@babel/helper-annotate-as-pure": "7.25.9",
     "@babel/helper-split-export-declaration": "7.24.7",
-    "@babel/plugin-syntax-import-attributes": "7.25.7",
-    "@babel/plugin-transform-async-generator-functions": "7.25.8",
-    "@babel/plugin-transform-async-to-generator": "7.25.7",
-    "@babel/plugin-transform-runtime": "7.25.7",
-    "@babel/preset-env": "7.25.8",
-    "@babel/runtime": "7.25.7",
-    "@bazel/bazelisk": "1.22.0",
+    "@babel/plugin-syntax-import-attributes": "7.26.0",
+    "@babel/plugin-transform-async-generator-functions": "7.25.9",
+    "@babel/plugin-transform-async-to-generator": "7.25.9",
+    "@babel/plugin-transform-runtime": "7.25.9",
+    "@babel/preset-env": "7.26.0",
+    "@babel/runtime": "7.26.0",
+    "@bazel/bazelisk": "1.22.1",
     "@bazel/buildifier": "7.3.1",
     "@bazel/concatjs": "patch:@bazel/concatjs@npm%3A5.8.1#~/.yarn/patches/@bazel-concatjs-npm-5.8.1-1bf81df846.patch",
     "@bazel/jasmine": "patch:@bazel/jasmine@npm%3A5.8.1#~/.yarn/patches/@bazel-jasmine-npm-5.8.1-3370fee155.patch",
+    "@bazel/rollup": "^5.8.1",
     "@bazel/runfiles": "^5.8.1",
-    "@discoveryjs/json-ext": "0.6.2",
-    "@inquirer/confirm": "5.0.0",
-    "@inquirer/prompts": "7.0.0",
+    "@discoveryjs/json-ext": "0.6.3",
+    "@inquirer/confirm": "5.0.1",
+    "@inquirer/prompts": "7.0.1",
     "@listr2/prompt-adapter-inquirer": "2.0.17",
+    "@rollup/plugin-alias": "^5.1.1",
     "@rollup/plugin-commonjs": "^28.0.0",
     "@rollup/plugin-node-resolve": "^13.0.5",
     "@stylistic/eslint-plugin": "^2.8.0",
@@ -114,8 +116,8 @@
     "@types/yargs": "^17.0.20",
     "@types/yargs-parser": "^21.0.0",
     "@types/yarnpkg__lockfile": "^1.1.5",
-    "@typescript-eslint/eslint-plugin": "8.10.0",
-    "@typescript-eslint/parser": "8.10.0",
+    "@typescript-eslint/eslint-plugin": "8.12.0",
+    "@typescript-eslint/parser": "8.12.0",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "@web/test-runner": "^0.19.0",
     "@yarnpkg/lockfile": "1.1.0",
@@ -124,12 +126,12 @@
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.20",
     "babel-loader": "9.2.1",
+    "beasties": "0.1.0",
     "browser-sync": "3.0.3",
     "browserslist": "^4.21.5",
     "buffer": "6.0.3",
     "chokidar": "4.0.1",
     "copy-webpack-plugin": "12.0.2",
-    "critters": "0.0.25",
     "css-loader": "7.1.2",
     "debug": "^4.1.1",
     "esbuild": "0.24.0",
@@ -166,7 +168,7 @@
     "magic-string": "0.30.12",
     "mini-css-extract-plugin": "2.9.1",
     "mrmime": "2.0.0",
-    "ng-packagr": "19.0.0-next.6",
+    "ng-packagr": "19.0.0-next.7",
     "npm": "^10.8.1",
     "npm-package-arg": "12.0.0",
     "npm-pick-manifest": "10.0.0",
@@ -183,10 +185,11 @@
     "puppeteer": "18.2.1",
     "quicktype-core": "23.0.170",
     "resolve-url-loader": "5.0.0",
-    "rollup": "4.24.0",
+    "rollup": "4.24.2",
+    "rollup-license-plugin": "patch:rollup-license-plugin@npm%3A3.0.0#~/.yarn/patches/rollup-license-plugin-npm-3.0.0-038e5f6edc.patch",
     "rollup-plugin-sourcemaps": "^0.6.0",
     "rxjs": "7.8.1",
-    "sass": "1.80.2",
+    "sass": "1.80.4",
     "sass-loader": "16.0.2",
     "semver": "7.6.3",
     "shelljs": "^0.8.5",
@@ -204,7 +207,7 @@
     "unenv": "^1.10.0",
     "verdaccio": "6.0.1",
     "verdaccio-auth-memory": "^10.0.0",
-    "vite": "5.4.9",
+    "vite": "5.4.10",
     "watchpack": "2.4.2",
     "webpack": "5.95.0",
     "webpack-dev-middleware": "7.4.2",

packages/angular/build/BUILD.bazel

@@ -78,8 +78,8 @@ ts_library(
         "@npm//@types/semver",
         "@npm//@types/watchpack",
         "@npm//@vitejs/plugin-basic-ssl",
+        "@npm//beasties",
         "@npm//browserslist",
-        "@npm//critters",
         "@npm//esbuild",
         "@npm//esbuild-wasm",
         "@npm//fast-glob",