Merge pull request #879 from angular/main

Create a new pull request by comparing changes across two branches
GulajavaMinistudio · Mar 18, 2024 · bdfe820 · bdfe820
2 parents 009665c + c452531
commit bdfe820
Show file tree

Hide file tree

Showing 49 changed files with 532 additions and 487 deletions.
diff --git a/.github/workflows/assistant-to-the-branch-manager.yml b/.github/workflows/assistant-to-the-branch-manager.yml
@@ -16,6 +16,6 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           persist-credentials: false
-      - uses: angular/dev-infra/github-actions/branch-manager@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+      - uses: angular/dev-infra/github-actions/branch-manager@2214a4943d30e2b555bf97070ccdf8358012416e
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Setup ESLint Caching
         uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
         with:
@@ -75,11 +75,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/bazel/setup@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Install node modules
         run: yarn install --frozen-lockfile
       - name: Build release targets
@@ -96,11 +96,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/bazel/setup@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Install node modules
         run: yarn install --frozen-lockfile
       - name: Run tests
@@ -128,13 +128,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Install node modules
         run: yarn install --frozen-lockfile
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/bazel/setup@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Run CLI E2E tests
         run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
 
@@ -151,13 +151,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Install node modules
         run: yarn install --frozen-lockfile
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/bazel/setup@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Run CLI E2E tests
         run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
 
@@ -169,13 +169,13 @@ jobs:
       SAUCE_TUNNEL_IDENTIFIER: angular-cli-${{ github.workflow }}-${{ github.run_number }}
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Install node modules
         run: yarn install --frozen-lockfile
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/bazel/setup@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Run E2E Browser tests
         env:
           SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }}
@@ -203,11 +203,11 @@ jobs:
       CIRCLE_BRANCH: ${{ github.ref_name }}
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@2214a4943d30e2b555bf97070ccdf8358012416e
       - name: Install node modules
         run: yarn install --frozen-lockfile
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+        uses: angular/dev-infra/github-actions/bazel/setup@2214a4943d30e2b555bf97070ccdf8358012416e
       - run: yarn admin snapshots --verbose
         env:
           SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }}
diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml
@@ -13,13 +13,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: angular/dev-infra/github-actions/commit-message-based-labels@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+      - uses: angular/dev-infra/github-actions/commit-message-based-labels@2214a4943d30e2b555bf97070ccdf8358012416e
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
   post_approval_changes:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: angular/dev-infra/github-actions/post-approval-changes@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+      - uses: angular/dev-infra/github-actions/post-approval-changes@2214a4943d30e2b555bf97070ccdf8358012416e
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
diff --git a/.github/workflows/feature-requests.yml b/.github/workflows/feature-requests.yml
@@ -16,6 +16,6 @@ jobs:
     if: github.repository == 'angular/angular-cli'
     runs-on: ubuntu-latest
     steps:
-      - uses: angular/dev-infra/github-actions/feature-request@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9
+      - uses: angular/dev-infra/github-actions/feature-request@2214a4943d30e2b555bf97070ccdf8358012416e
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
diff --git a/goldens/public-api/angular_devkit/build_angular/index.md b/goldens/public-api/angular_devkit/build_angular/index.md
@@ -4,8 +4,6 @@
 
 ```ts
 
-/// <reference types="@types/node/http" />
-/// <reference types="@types/node/ts4.8/http" />
 /// <reference types="node" />
 
 import { BuilderContext } from '@angular-devkit/architect';

diff --git a/goldens/public-api/angular_devkit/core/node/index.md b/goldens/public-api/angular_devkit/core/node/index.md
@@ -4,8 +4,6 @@
 
 ```ts
 
-/// <reference types="@types/node/fs" />
-/// <reference types="@types/node/ts4.8/fs" />
 /// <reference types="node" />
 
 import { Observable } from 'rxjs';

diff --git a/goldens/public-api/angular_devkit/core/node/testing/index.md b/goldens/public-api/angular_devkit/core/node/testing/index.md
@@ -4,8 +4,6 @@
 
 ```ts
 
-/// <reference types="@types/node/fs" />
-/// <reference types="@types/node/ts4.8/fs" />
 /// <reference types="node" />
 
 import * as fs from 'fs';

diff --git a/goldens/public-api/angular_devkit/schematics/index.md b/goldens/public-api/angular_devkit/schematics/index.md
@@ -4,8 +4,7 @@
 
 ```ts
 
-/// <reference types="@types/node/ts4.8/url" />
-/// <reference types="@types/node/url" />
+/// <reference types="node" />
 
 import { BaseException } from '@angular-devkit/core';
 import { JsonValue } from '@angular-devkit/core';

diff --git a/goldens/public-api/angular_devkit/schematics/tasks/index.md b/goldens/public-api/angular_devkit/schematics/tasks/index.md
@@ -4,8 +4,7 @@
 
 ```ts
 
-/// <reference types="@types/node/ts4.8/url" />
-/// <reference types="@types/node/url" />
+/// <reference types="node" />
 
 // @public (undocumented)
 export class NodePackageInstallTask implements TaskConfigurationGenerator<NodePackageTaskOptions> {

diff --git a/goldens/public-api/angular_devkit/schematics/testing/index.md b/goldens/public-api/angular_devkit/schematics/testing/index.md
@@ -4,8 +4,7 @@
 
 ```ts
 
-/// <reference types="@types/node/ts4.8/url" />
-/// <reference types="@types/node/url" />
+/// <reference types="node" />
 
 import { JsonValue } from '@angular-devkit/core';
 import { logging } from '@angular-devkit/core';

diff --git a/goldens/public-api/angular_devkit/schematics/tools/index.md b/goldens/public-api/angular_devkit/schematics/tools/index.md
@@ -4,8 +4,7 @@
 
 ```ts
 
-/// <reference types="@types/node/ts4.8/url" />
-/// <reference types="@types/node/url" />
+/// <reference types="node" />
 
 import { BaseException } from '@angular-devkit/core';
 import { JsonObject } from '@angular-devkit/core';

diff --git a/package.json b/package.json
@@ -3,12 +3,6 @@
   "version": "18.0.0-next.0",
   "private": true,
   "description": "Software Development Kit for Angular",
-  "bin": {
-    "architect": "./bin/architect",
-    "devkit-admin": "./bin/devkit-admin",
-    "ng": "./bin/ng",
-    "schematics": "./bin/schematics"
-  },
   "keywords": [
     "angular",
     "Angular CLI",
@@ -57,23 +51,23 @@
   },
   "devDependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular/animations": "17.3.0",
-    "@angular/bazel": "https://github.com/angular/bazel-builds.git#29907b8e69dee270e2ec15eaa378c80d507af77b",
-    "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#b2884ef38d4259cca64c70d38a75f4de1e881531",
-    "@angular/cdk": "17.3.0-rc.0",
-    "@angular/common": "17.3.0",
-    "@angular/compiler": "17.3.0",
-    "@angular/compiler-cli": "17.3.0",
-    "@angular/core": "17.3.0",
-    "@angular/forms": "17.3.0",
-    "@angular/localize": "17.3.0",
-    "@angular/material": "17.3.0-rc.0",
-    "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#56510c47d45c616826d46d0e259db8b0295334bd",
-    "@angular/platform-browser": "17.3.0",
-    "@angular/platform-browser-dynamic": "17.3.0",
-    "@angular/platform-server": "17.3.0",
-    "@angular/router": "17.3.0",
-    "@angular/service-worker": "17.3.0",
+    "@angular/animations": "18.0.0-next.0",
+    "@angular/bazel": "https://github.com/angular/bazel-builds.git#e952e5709106a60e3ee491902d72901335324509",
+    "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#aad3a442cff18b0e0f36d06d105c680fe1b6b688",
+    "@angular/cdk": "18.0.0-next.0",
+    "@angular/common": "18.0.0-next.0",
+    "@angular/compiler": "18.0.0-next.0",
+    "@angular/compiler-cli": "18.0.0-next.0",
+    "@angular/core": "18.0.0-next.0",
+    "@angular/forms": "18.0.0-next.0",
+    "@angular/localize": "18.0.0-next.0",
+    "@angular/material": "18.0.0-next.0",
+    "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#24824410e16183890cdba234f89f0db73600982b",
+    "@angular/platform-browser": "18.0.0-next.0",
+    "@angular/platform-browser-dynamic": "18.0.0-next.0",
+    "@angular/platform-server": "18.0.0-next.0",
+    "@angular/router": "18.0.0-next.0",
+    "@angular/service-worker": "18.0.0-next.0",
     "@babel/core": "7.24.0",
     "@babel/generator": "7.23.6",
     "@babel/helper-annotate-as-pure": "7.22.5",
@@ -138,8 +132,8 @@
     "critters": "0.0.22",
     "css-loader": "6.10.0",
     "debug": "^4.1.1",
-    "esbuild": "0.20.1",
-    "esbuild-wasm": "0.20.1",
+    "esbuild": "0.20.2",
+    "esbuild-wasm": "0.20.2",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-header": "3.1.1",
@@ -172,7 +166,7 @@
     "magic-string": "0.30.8",
     "mini-css-extract-plugin": "2.8.1",
     "mrmime": "2.0.0",
-    "ng-packagr": "17.3.0",
+    "ng-packagr": "18.0.0-next.0",
     "npm": "^8.11.0",
     "npm-package-arg": "11.0.1",
     "open": "8.4.2",
@@ -204,18 +198,18 @@
     "spdx-satisfies": "^5.0.0",
     "symbol-observable": "4.0.0",
     "tar": "^6.1.6",
-    "terser": "5.29.1",
+    "terser": "5.29.2",
     "tree-kill": "1.2.2",
     "ts-node": "^10.9.1",
     "tslib": "2.6.2",
     "typescript": "5.4.2",
-    "undici": "6.8.0",
+    "undici": "6.9.0",
     "verdaccio": "5.29.2",
     "verdaccio-auth-memory": "^10.0.0",
     "vite": "5.1.6",
     "watchpack": "2.4.1",
     "webpack": "5.90.3",
-    "webpack-dev-middleware": "6.1.1",
+    "webpack-dev-middleware": "7.0.0",
     "webpack-dev-server": "5.0.3",
     "webpack-merge": "5.10.0",
     "webpack-subresource-integrity": "5.1.0",

diff --git a/packages/angular/cli/src/command-builder/utilities/schematic-workflow.ts b/packages/angular/cli/src/command-builder/utilities/schematic-workflow.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { logging, tags } from '@angular-devkit/core';
+import { logging } from '@angular-devkit/core';
 import { NodeWorkflow } from '@angular-devkit/schematics/tools';
 import { colors } from '../../utilities/color';
 
@@ -33,15 +33,11 @@ export function subscribeToWorkflow(
         logger.error(`ERROR! ${eventPath} ${desc}.`);
         break;
       case 'update':
-        logs.push(tags.oneLine`
-              ${colors.cyan('UPDATE')} ${eventPath} (${event.content.length} bytes)
-            `);
+        logs.push(`${colors.cyan('UPDATE')} ${eventPath} (${event.content.length} bytes)`);
         files.add(eventPath);
         break;
       case 'create':
-        logs.push(tags.oneLine`
-              ${colors.green('CREATE')} ${eventPath} (${event.content.length} bytes)
-            `);
+        logs.push(`${colors.green('CREATE')} ${eventPath} (${event.content.length} bytes)`);
         files.add(eventPath);
         break;
       case 'delete':

diff --git a/packages/angular/cli/src/commands/add/cli.ts b/packages/angular/cli/src/commands/add/cli.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { tags } from '@angular-devkit/core';
 import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';
 import { createRequire } from 'module';
 import npa from 'npm-package-arg';
@@ -397,10 +396,10 @@ export default class AddCommandModule
       });
     } catch (e) {
       if (e instanceof NodePackageDoesNotSupportSchematics) {
-        this.context.logger.error(tags.oneLine`
-          The package that you are trying to add does not support schematics. You can try using
-          a different version of the package or contact the package author to add ng-add support.
-        `);
+        this.context.logger.error(
+          'The package that you are trying to add does not support schematics.' +
+            'You can try using a different version of the package or contact the package author to add ng-add support.',
+        );
 
         return 1;
       }

diff --git a/packages/angular/cli/src/commands/update/schematic/index.ts b/packages/angular/cli/src/commands/update/schematic/index.ts
@@ -6,12 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { logging, tags } from '@angular-devkit/core';
+import { logging } from '@angular-devkit/core';
 import { Rule, SchematicContext, SchematicsException, Tree } from '@angular-devkit/schematics';
 import * as npa from 'npm-package-arg';
 import type { Manifest } from 'pacote';
 import * as semver from 'semver';
-import { assertIsError } from '../../../utilities/error';
 import {
   NgPackageManifestProperties,
   NpmRepositoryPackageJson,
@@ -249,9 +248,11 @@ function _validateUpdatePackages(
   });
 
   if (!force && peerErrors) {
-    throw new SchematicsException(tags.stripIndents`Incompatible peer dependencies found.
-      Peer dependency warnings when installing dependencies means that those dependencies might not work correctly together.
-      You can use the '--force' option to ignore incompatible peer dependencies and instead address these warnings later.`);
+    throw new SchematicsException(
+      'Incompatible peer dependencies found.\n' +
+        'Peer dependency warnings when installing dependencies means that those dependencies might not work correctly together.\n' +
+        `You can use the '--force' option to ignore incompatible peer dependencies and instead address these warnings later.`,
+    );
   }
 }
 

diff --git a/packages/angular/pwa/package.json b/packages/angular/pwa/package.json
@@ -17,7 +17,7 @@
     "parse5-html-rewriting-stream": "7.0.0"
   },
   "peerDependencies": {
-    "@angular/cli": "^17.0.0 || ^17.3.0-next.0 || ^18.0.0-next.0"
+    "@angular/cli": "^18.0.0-next.0"
   },
   "peerDependenciesMeta": {
     "@angular/cli": {

diff --git a/packages/angular/ssr/package.json b/packages/angular/ssr/package.json
@@ -17,8 +17,8 @@
     "tslib": "^2.3.0"
   },
   "peerDependencies": {
-    "@angular/common": "^17.0.0 || ^17.3.0-next.0 || ^18.0.0-next.0",
-    "@angular/core": "^17.0.0 || ^17.3.0-next.0 || ^18.0.0-next.0"
+    "@angular/common": "^18.0.0-next.0",
+    "@angular/core": "^18.0.0-next.0"
   },
   "schematics": "./schematics/collection.json",
   "repository": {