Skip to content

Commit 797f480

Browse files
Merge pull request #1135 from angular/main
Create a new pull request by comparing changes across two branches
2 parents 8e35272 + c40d726 commit 797f480

File tree

212 files changed

+29924
-7718
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+29924
-7718
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# @generated
2+
# Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
3+
# This file should be checked into version control along with the pnpm-lock.yaml file.
4+
.npmrc=-2023857461
5+
package.json=1733430966
6+
pnpm-lock.yaml=-703346517
7+
pnpm-workspace.yaml=1711114604
8+
yarn.lock=-931254131

.bazelrc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Disable NG CLI TTY mode
22
build --action_env=NG_FORCE_TTY=false
33

4+
# Required by `rules_ts`.
5+
common --@aspect_rules_ts//ts:skipLibCheck=always
6+
common --@aspect_rules_ts//ts:default_to_tsc_transpiler
7+
48
# Make TypeScript compilation fast, by keeping a few copies of the compiler
59
# running as daemons, and cache SourceFile AST's to reduce parse time.
610
build --strategy=TypeScriptCompile=worker
@@ -129,8 +133,6 @@ build:remote --jobs=150
129133

130134
# Setup the toolchain and platform for the remote build execution. The platform
131135
# is provided by the shared dev-infra package and targets k8 remote containers.
132-
build:remote --crosstool_top=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain_suite
133-
build:remote --extra_toolchains=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain
134136
build:remote --extra_execution_platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
135137
build:remote --host_platform=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
136138
build:remote --platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.4.1
1+
6.5.0

.eslintrc.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
"import/newline-after-import": "error",
7676
"import/no-absolute-path": "error",
7777
"import/no-duplicates": "error",
78-
"import/no-extraneous-dependencies": ["off", { "devDependencies": false }],
7978
"import/no-unassigned-import": ["error", { "allow": ["symbol-observable"] }],
8079
"import/order": [
8180
"error",
@@ -142,7 +141,6 @@
142141
{
143142
"files": ["!packages/**", "**/*_spec.ts"],
144143
"rules": {
145-
"import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
146144
"max-lines-per-function": "off",
147145
"no-case-declarations": "off",
148146
"no-console": "off"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717
with:
1818
persist-credentials: false
19-
- uses: angular/dev-infra/github-actions/branch-manager@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
19+
- uses: angular/dev-infra/github-actions/branch-manager@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
2020
with:
2121
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

.github/workflows/ci.yml

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Initialize environment
24-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
24+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
2525
- name: Install node modules
2626
run: yarn install --immutable
2727
- name: Generate JSON schema types
@@ -42,31 +42,35 @@ jobs:
4242
runs-on: ubuntu-latest
4343
steps:
4444
- name: Initialize environment
45-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
45+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
4646
- name: Setup Bazel
47-
uses: angular/dev-infra/github-actions/bazel/setup@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
47+
uses: angular/dev-infra/github-actions/bazel/setup@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
4848
- name: Setup Bazel RBE
49-
uses: angular/dev-infra/github-actions/bazel/configure-remote@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
49+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
5050
- name: Install node modules
5151
run: yarn install --immutable
5252
- name: Build release targets
5353
run: yarn ng-dev release build
5454

5555
test:
56+
needs: build
5657
runs-on: ubuntu-latest
5758
steps:
5859
- name: Initialize environment
59-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
60+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
6061
- name: Setup Bazel
61-
uses: angular/dev-infra/github-actions/bazel/setup@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
62+
uses: angular/dev-infra/github-actions/bazel/setup@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
6263
- name: Setup Bazel RBE
63-
uses: angular/dev-infra/github-actions/bazel/configure-remote@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
64+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
6465
- name: Install node modules
6566
run: yarn install --immutable
6667
- name: Run module and package tests
6768
run: yarn bazel test //modules/... //packages/...
69+
env:
70+
ASPECT_RULES_JS_FROZEN_PNPM_LOCK: '1'
6871

6972
e2e:
73+
needs: test
7074
strategy:
7175
fail-fast: false
7276
matrix:
@@ -75,12 +79,6 @@ jobs:
7579
subset: [npm, esbuild]
7680
shard: [0, 1, 2, 3, 4, 5]
7781
exclude:
78-
# Skip yarn subset on Windows
79-
- os: windows-latest
80-
subset: yarn
81-
# Skip pnpm subset on Windows
82-
- os: windows-latest
83-
subset: pnpm
8482
# Skip Node.js v18 tests on Windows
8583
- os: windows-latest
8684
node: 18
@@ -89,18 +87,23 @@ jobs:
8987
node: 20
9088
runs-on: ${{ matrix.os }}
9189
steps:
90+
# Workaround for: https://github.com/bazel-contrib/bazel-lib/issues/968.
91+
# TODO(devversion): Remove when Aspect lib issue is fixed.
92+
- run: choco install gzip
93+
if: ${{matrix.os == 'windows-latest'}}
9294
- name: Initialize environment
93-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
95+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
9496
- name: Install node modules
9597
run: yarn install --immutable
9698
- name: Setup Bazel
97-
uses: angular/dev-infra/github-actions/bazel/setup@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
99+
uses: angular/dev-infra/github-actions/bazel/setup@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
98100
- name: Setup Bazel RBE
99-
uses: angular/dev-infra/github-actions/bazel/configure-remote@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
101+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
100102
- name: Run CLI E2E tests
101103
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 }}
102104

103105
e2e-package-managers:
106+
needs: test
104107
strategy:
105108
fail-fast: false
106109
matrix:
@@ -111,17 +114,18 @@ jobs:
111114
runs-on: ${{ matrix.os }}
112115
steps:
113116
- name: Initialize environment
114-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
117+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
115118
- name: Install node modules
116119
run: yarn install --immutable
117120
- name: Setup Bazel
118-
uses: angular/dev-infra/github-actions/bazel/setup@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
121+
uses: angular/dev-infra/github-actions/bazel/setup@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
119122
- name: Setup Bazel RBE
120-
uses: angular/dev-infra/github-actions/bazel/configure-remote@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
123+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
121124
- name: Run CLI E2E tests
122125
run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
123126

124127
e2e-snapshots:
128+
needs: test
125129
strategy:
126130
fail-fast: false
127131
matrix:
@@ -132,30 +136,31 @@ jobs:
132136
runs-on: ${{ matrix.os }}
133137
steps:
134138
- name: Initialize environment
135-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
139+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
136140
- name: Install node modules
137141
run: yarn install --immutable
138142
- name: Setup Bazel
139-
uses: angular/dev-infra/github-actions/bazel/setup@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
143+
uses: angular/dev-infra/github-actions/bazel/setup@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
140144
- name: Setup Bazel RBE
141-
uses: angular/dev-infra/github-actions/bazel/configure-remote@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
145+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
142146
- name: Run CLI E2E tests
143147
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 }}
144148

145149
browsers:
150+
needs: build
146151
runs-on: ubuntu-latest
147152
name: Browser Compatibility Tests
148153
env:
149154
SAUCE_TUNNEL_IDENTIFIER: angular-cli-${{ github.workflow }}-${{ github.run_number }}
150155
steps:
151156
- name: Initialize environment
152-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
157+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
153158
- name: Install node modules
154159
run: yarn install --immutable
155160
- name: Setup Bazel
156-
uses: angular/dev-infra/github-actions/bazel/setup@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
161+
uses: angular/dev-infra/github-actions/bazel/setup@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
157162
- name: Setup Bazel RBE
158-
uses: angular/dev-infra/github-actions/bazel/configure-remote@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
163+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
159164
- name: Run E2E Browser tests
160165
env:
161166
SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }}
@@ -170,23 +175,24 @@ jobs:
170175
./scripts/saucelabs/wait-for-tunnel.sh
171176
yarn bazel test --config=saucelabs //tests/legacy-cli:e2e.saucelabs
172177
./scripts/saucelabs/stop-tunnel.sh
173-
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
178+
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
174179
if: ${{ failure() }}
175180
with:
176181
name: sauce-connect-log
177182
path: ${{ env.SAUCE_CONNECT_DIR_IN_HOST }}/sauce-connect.log
178183

179184
publish-snapshots:
185+
needs: build
180186
runs-on: ubuntu-latest
181187
env:
182188
CIRCLE_BRANCH: ${{ github.ref_name }}
183189
steps:
184190
- name: Initialize environment
185-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
191+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
186192
- name: Install node modules
187193
run: yarn install --immutable
188194
- name: Setup Bazel
189-
uses: angular/dev-infra/github-actions/bazel/setup@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
195+
uses: angular/dev-infra/github-actions/bazel/setup@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
190196
- run: yarn admin snapshots --verbose
191197
env:
192198
SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }}

.github/workflows/dev-infra.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16-
- uses: angular/dev-infra/github-actions/commit-message-based-labels@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
16+
- uses: angular/dev-infra/github-actions/commit-message-based-labels@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
1717
with:
1818
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
1919
post_approval_changes:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
23-
- uses: angular/dev-infra/github-actions/post-approval-changes@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
23+
- uses: angular/dev-infra/github-actions/post-approval-changes@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
2424
with:
2525
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

.github/workflows/feature-requests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
if: github.repository == 'angular/angular-cli'
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: angular/dev-infra/github-actions/feature-request@910c72bbcc1bf1ae2b22c48d41b2f0e8eeda520d
19+
- uses: angular/dev-infra/github-actions/feature-request@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
2020
with:
2121
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

.github/workflows/perf.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Performance Tracking
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
# Run workflows for all releasable branches
8+
- '[0-9]+.[0-9]+.x'
9+
10+
permissions:
11+
contents: 'read'
12+
id-token: 'write'
13+
14+
defaults:
15+
run:
16+
shell: bash
17+
18+
jobs:
19+
list:
20+
timeout-minutes: 3
21+
runs-on: ubuntu-latest
22+
outputs:
23+
workflows: ${{ steps.workflows.outputs.workflows }}
24+
steps:
25+
- name: Initialize environment
26+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
27+
- name: Install node modules
28+
run: yarn install --immutable
29+
- id: workflows
30+
run: echo "workflows=$(yarn ng-dev perf workflows --list)" >> "$GITHUB_OUTPUT"
31+
32+
workflow:
33+
timeout-minutes: 30
34+
runs-on: ubuntu-latest
35+
needs: list
36+
strategy:
37+
matrix:
38+
workflow: ${{ fromJSON(needs.list.outputs.workflows) }}
39+
steps:
40+
- name: Initialize environment
41+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
42+
- name: Setup Bazel
43+
uses: angular/dev-infra/github-actions/bazel/setup@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
44+
- name: Install node modules
45+
run: yarn install --immutable
46+
# We utilize the google-github-actions/auth action to allow us to get an active credential using workflow
47+
# identity federation. This allows us to request short lived credentials on demand, rather than storing
48+
# credentials in secrets long term. More information can be found at:
49+
# https://docs.github.com/en/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-google-cloud-platform
50+
- uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
51+
with:
52+
project_id: 'internal-200822'
53+
workload_identity_provider: 'projects/823469418460/locations/global/workloadIdentityPools/measurables-tracking/providers/angular'
54+
service_account: '[email protected]'
55+
- run: yarn ng-dev perf workflows --name ${{ matrix.workflow }} --commit-sha ${{github.sha}}

0 commit comments

Comments
 (0)