Skip to content

Commit 83c94a6

Browse files
yjaaidiyjaaidi
committed
Merge branch 'main' into feat/add-aot-option-to-karma
2 parents e46d31e + 1355d08 commit 83c94a6

File tree

418 files changed

+34486
-11454
lines changed

Some content is hidden

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

418 files changed

+34486
-11454
lines changed

‎.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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=-1406867100
5+
modules/testing/builder/package.json=973445093
6+
package.json=1699878288
7+
packages/angular/build/package.json=-2062350529
8+
packages/angular/cli/package.json=-803141029
9+
packages/angular/pwa/package.json=1108903917
10+
packages/angular/ssr/package.json=1856194341
11+
packages/angular_devkit/architect/package.json=-1496633956
12+
packages/angular_devkit/architect_cli/package.json=1551210941
13+
packages/angular_devkit/build_angular/package.json=420468135
14+
packages/angular_devkit/build_webpack/package.json=373950017
15+
packages/angular_devkit/core/package.json=339935828
16+
packages/angular_devkit/schematics/package.json=673943597
17+
packages/angular_devkit/schematics_cli/package.json=774399812
18+
packages/ngtools/webpack/package.json=1282929706
19+
packages/schematics/angular/package.json=251715148
20+
pnpm-lock.yaml=-617616317
21+
pnpm-workspace.yaml=-1056556036
22+
yarn.lock=1382132490

‎.bazelignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ node_modules
44
packages/angular/cli/node_modules
55
packages/angular/create/node_modules
66
packages/angular/pwa/node_modules
7+
packages/angular/build/node_modules
78
packages/angular/ssr/node_modules
89
packages/angular_devkit/architect/node_modules
910
packages/angular_devkit/architect_cli/node_modules
@@ -14,3 +15,4 @@ packages/angular_devkit/schematics/node_modules
1415
packages/angular_devkit/schematics_cli/node_modules
1516
packages/ngtools/webpack/node_modules
1617
packages/schematics/angular/node_modules
18+
modules/testing/builder/node_modules

‎.bazelrc‎

Lines changed: 16 additions & 6 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
@@ -160,6 +162,18 @@ build:remote-cache --google_default_credentials
160162
# Fixes use of npm paths with spaces such as some within the puppeteer module
161163
build --experimental_inprocess_symlink_creation
162164

165+
# Enable runfiles even on Windows.
166+
# Architect resolves output files from data files, and this isn't possible without runfile support.
167+
build --enable_runfiles
168+
169+
####################################################
170+
# rules_js specific flags
171+
####################################################
172+
173+
# TODO(josephperrott): investigate if this can be removed eventually.
174+
# Prevents the npm package extract from occuring or caching on RBE which overwhelms our quota
175+
build --modify_execution_info=NpmPackageExtract=+no-remote
176+
163177
####################################################
164178
# User bazel configuration
165179
# NOTE: This needs to be the *last* entry in the config.
@@ -168,7 +182,3 @@ build --experimental_inprocess_symlink_creation
168182
# Load any settings which are specific to the current user. Needs to be *last* statement
169183
# in this config, as the user configuration should be able to overwrite flags from this file.
170184
try-import .bazelrc.user
171-
172-
# Enable runfiles even on Windows.
173-
# Architect resolves output files from data files, and this isn't possible without runfile support.
174-
build --enable_runfiles

‎.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/codeql/config.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
name: 'Angular CLI CodeQL config'
2+
3+
query-filters:
4+
# TODO(josephperrott): reevaluate if these can be reenabled.
5+
- exclude:
6+
id: js/bad-code-sanitization
7+
- exclude:
8+
id: js/regex-injection

‎.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@1694163487c2ccb7f70660249a545ebc73559654
19+
- uses: angular/dev-infra/github-actions/branch-manager@06c699a0574071728a3405e372573176faeed949
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@1694163487c2ccb7f70660249a545ebc73559654
24+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@06c699a0574071728a3405e372573176faeed949
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@1694163487c2ccb7f70660249a545ebc73559654
45+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@06c699a0574071728a3405e372573176faeed949
4646
- name: Setup Bazel
47-
uses: angular/dev-infra/github-actions/bazel/setup@1694163487c2ccb7f70660249a545ebc73559654
47+
uses: angular/dev-infra/github-actions/bazel/setup@06c699a0574071728a3405e372573176faeed949
4848
- name: Setup Bazel RBE
49-
uses: angular/dev-infra/github-actions/bazel/configure-remote@1694163487c2ccb7f70660249a545ebc73559654
49+
uses: angular/dev-infra/github-actions/bazel/configure-remote@06c699a0574071728a3405e372573176faeed949
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@1694163487c2ccb7f70660249a545ebc73559654
60+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@06c699a0574071728a3405e372573176faeed949
6061
- name: Setup Bazel
61-
uses: angular/dev-infra/github-actions/bazel/setup@1694163487c2ccb7f70660249a545ebc73559654
62+
uses: angular/dev-infra/github-actions/bazel/setup@06c699a0574071728a3405e372573176faeed949
6263
- name: Setup Bazel RBE
63-
uses: angular/dev-infra/github-actions/bazel/configure-remote@1694163487c2ccb7f70660249a545ebc73559654
64+
uses: angular/dev-infra/github-actions/bazel/configure-remote@06c699a0574071728a3405e372573176faeed949
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@1694163487c2ccb7f70660249a545ebc73559654
95+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@06c699a0574071728a3405e372573176faeed949
9496
- name: Install node modules
9597
run: yarn install --immutable
9698
- name: Setup Bazel
97-
uses: angular/dev-infra/github-actions/bazel/setup@1694163487c2ccb7f70660249a545ebc73559654
99+
uses: angular/dev-infra/github-actions/bazel/setup@06c699a0574071728a3405e372573176faeed949
98100
- name: Setup Bazel RBE
99-
uses: angular/dev-infra/github-actions/bazel/configure-remote@1694163487c2ccb7f70660249a545ebc73559654
101+
uses: angular/dev-infra/github-actions/bazel/configure-remote@06c699a0574071728a3405e372573176faeed949
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@1694163487c2ccb7f70660249a545ebc73559654
117+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@06c699a0574071728a3405e372573176faeed949
115118
- name: Install node modules
116119
run: yarn install --immutable
117120
- name: Setup Bazel
118-
uses: angular/dev-infra/github-actions/bazel/setup@1694163487c2ccb7f70660249a545ebc73559654
121+
uses: angular/dev-infra/github-actions/bazel/setup@06c699a0574071728a3405e372573176faeed949
119122
- name: Setup Bazel RBE
120-
uses: angular/dev-infra/github-actions/bazel/configure-remote@1694163487c2ccb7f70660249a545ebc73559654
123+
uses: angular/dev-infra/github-actions/bazel/configure-remote@06c699a0574071728a3405e372573176faeed949
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@1694163487c2ccb7f70660249a545ebc73559654
139+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@06c699a0574071728a3405e372573176faeed949
136140
- name: Install node modules
137141
run: yarn install --immutable
138142
- name: Setup Bazel
139-
uses: angular/dev-infra/github-actions/bazel/setup@1694163487c2ccb7f70660249a545ebc73559654
143+
uses: angular/dev-infra/github-actions/bazel/setup@06c699a0574071728a3405e372573176faeed949
140144
- name: Setup Bazel RBE
141-
uses: angular/dev-infra/github-actions/bazel/configure-remote@1694163487c2ccb7f70660249a545ebc73559654
145+
uses: angular/dev-infra/github-actions/bazel/configure-remote@06c699a0574071728a3405e372573176faeed949
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@1694163487c2ccb7f70660249a545ebc73559654
157+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@06c699a0574071728a3405e372573176faeed949
153158
- name: Install node modules
154159
run: yarn install --immutable
155160
- name: Setup Bazel
156-
uses: angular/dev-infra/github-actions/bazel/setup@1694163487c2ccb7f70660249a545ebc73559654
161+
uses: angular/dev-infra/github-actions/bazel/setup@06c699a0574071728a3405e372573176faeed949
157162
- name: Setup Bazel RBE
158-
uses: angular/dev-infra/github-actions/bazel/configure-remote@1694163487c2ccb7f70660249a545ebc73559654
163+
uses: angular/dev-infra/github-actions/bazel/configure-remote@06c699a0574071728a3405e372573176faeed949
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@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.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@1694163487c2ccb7f70660249a545ebc73559654
191+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@06c699a0574071728a3405e372573176faeed949
186192
- name: Install node modules
187193
run: yarn install --immutable
188194
- name: Setup Bazel
189-
uses: angular/dev-infra/github-actions/bazel/setup@1694163487c2ccb7f70660249a545ebc73559654
195+
uses: angular/dev-infra/github-actions/bazel/setup@06c699a0574071728a3405e372573176faeed949
190196
- run: yarn admin snapshots --verbose
191197
env:
192198
SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }}

‎.github/workflows/codeql.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: 'CodeQL'
2+
3+
on:
4+
push:
5+
branches: ['main', '*.*.x']
6+
schedule:
7+
- cron: '39 9 * * 1'
8+
9+
permissions: {}
10+
11+
jobs:
12+
analyze:
13+
name: Analyze
14+
runs-on: 'ubuntu-latest'
15+
permissions:
16+
security-events: write
17+
packages: read
18+
strategy:
19+
fail-fast: false
20+
steps:
21+
- name: Checkout repository
22+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
23+
with:
24+
persist-credentials: false
25+
- name: Initialize CodeQL
26+
uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
27+
with:
28+
languages: javascript-typescript
29+
build-mode: none
30+
config-file: .github/codeql/config.yml
31+
- name: Perform CodeQL Analysis
32+
uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
33+
with:
34+
category: '/language:javascript-typescript'

‎.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@1694163487c2ccb7f70660249a545ebc73559654
16+
- uses: angular/dev-infra/github-actions/commit-message-based-labels@06c699a0574071728a3405e372573176faeed949
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@1694163487c2ccb7f70660249a545ebc73559654
23+
- uses: angular/dev-infra/github-actions/post-approval-changes@06c699a0574071728a3405e372573176faeed949
2424
with:
2525
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

0 commit comments

Comments
 (0)