Skip to content

Commit fa62fa8

Browse files
GulajavaMinistudioGulajavaMinistudio
authored
Merge pull request #1138 from angular/main
Create a new pull request by comparing changes across two branches
2 parents e29277c + 64a1b15 commit fa62fa8

File tree

259 files changed

+7407
-7733
lines changed

Some content is hidden

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

259 files changed

+7407
-7733
lines changed

‎.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
11
# @generated
22
# Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
33
# This file should be checked into version control along with the pnpm-lock.yaml file.
4-
.npmrc=-2023857461
5-
package.json=857732709
6-
pnpm-lock.yaml=252219114
7-
pnpm-workspace.yaml=1711114604
8-
yarn.lock=-46638791
4+
.npmrc=-1406867100
5+
modules/testing/builder/package.json=973445093
6+
package.json=118967274
7+
packages/angular/build/package.json=-1342328419
8+
packages/angular/cli/package.json=-1785130725
9+
packages/angular/pwa/package.json=1108903917
10+
packages/angular/ssr/package.json=-1038366877
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=-209671030
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=-169616762
18+
packages/ngtools/webpack/package.json=1373072616
19+
packages/schematics/angular/package.json=251715148
20+
pnpm-lock.yaml=-968241303
21+
pnpm-workspace.yaml=-1056556036
22+
yarn.lock=1608250888

‎.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ build --enable_runfiles
171171
####################################################
172172

173173
# TODO(josephperrott): investigate if this can be removed eventually.
174-
# Prevents the npm package extract from occuring on RBE which overwhelms our quota
175-
build --modify_execution_info=NpmPackageExtract=+no-remote-exec
174+
# Prevents the npm package extract from occuring or caching on RBE which overwhelms our quota
175+
build --modify_execution_info=NpmPackageExtract=+no-remote
176176

177177
####################################################
178178
# User bazel configuration

‎.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@359350bbc10aab1bac85d0eec61a53377078ab82
19+
- uses: angular/dev-infra/github-actions/branch-manager@15db94d9a481826aed42ecf761c263c981931c9c
2020
with:
2121
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

‎.github/workflows/ci.yml‎

Lines changed: 22 additions & 22 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@359350bbc10aab1bac85d0eec61a53377078ab82
24+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
2525
- name: Install node modules
2626
run: yarn install --immutable
2727
- name: Generate JSON schema types
@@ -42,11 +42,11 @@ jobs:
4242
runs-on: ubuntu-latest
4343
steps:
4444
- name: Initialize environment
45-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
45+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
4646
- name: Setup Bazel
47-
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
47+
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
4848
- name: Setup Bazel RBE
49-
uses: angular/dev-infra/github-actions/bazel/configure-remote@359350bbc10aab1bac85d0eec61a53377078ab82
49+
uses: angular/dev-infra/github-actions/bazel/configure-remote@15db94d9a481826aed42ecf761c263c981931c9c
5050
- name: Install node modules
5151
run: yarn install --immutable
5252
- name: Build release targets
@@ -57,11 +57,11 @@ jobs:
5757
runs-on: ubuntu-latest
5858
steps:
5959
- name: Initialize environment
60-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
60+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
6161
- name: Setup Bazel
62-
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
62+
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
6363
- name: Setup Bazel RBE
64-
uses: angular/dev-infra/github-actions/bazel/configure-remote@359350bbc10aab1bac85d0eec61a53377078ab82
64+
uses: angular/dev-infra/github-actions/bazel/configure-remote@15db94d9a481826aed42ecf761c263c981931c9c
6565
- name: Install node modules
6666
run: yarn install --immutable
6767
- name: Run module and package tests
@@ -92,13 +92,13 @@ jobs:
9292
- run: choco install gzip
9393
if: ${{matrix.os == 'windows-latest'}}
9494
- name: Initialize environment
95-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
95+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
9696
- name: Install node modules
9797
run: yarn install --immutable
9898
- name: Setup Bazel
99-
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
99+
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
100100
- name: Setup Bazel RBE
101-
uses: angular/dev-infra/github-actions/bazel/configure-remote@359350bbc10aab1bac85d0eec61a53377078ab82
101+
uses: angular/dev-infra/github-actions/bazel/configure-remote@15db94d9a481826aed42ecf761c263c981931c9c
102102
- name: Run CLI E2E tests
103103
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 }}
104104

@@ -114,13 +114,13 @@ jobs:
114114
runs-on: ${{ matrix.os }}
115115
steps:
116116
- name: Initialize environment
117-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
117+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
118118
- name: Install node modules
119119
run: yarn install --immutable
120120
- name: Setup Bazel
121-
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
121+
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
122122
- name: Setup Bazel RBE
123-
uses: angular/dev-infra/github-actions/bazel/configure-remote@359350bbc10aab1bac85d0eec61a53377078ab82
123+
uses: angular/dev-infra/github-actions/bazel/configure-remote@15db94d9a481826aed42ecf761c263c981931c9c
124124
- name: Run CLI E2E tests
125125
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 }}
126126

@@ -136,13 +136,13 @@ jobs:
136136
runs-on: ${{ matrix.os }}
137137
steps:
138138
- name: Initialize environment
139-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
139+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
140140
- name: Install node modules
141141
run: yarn install --immutable
142142
- name: Setup Bazel
143-
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
143+
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
144144
- name: Setup Bazel RBE
145-
uses: angular/dev-infra/github-actions/bazel/configure-remote@359350bbc10aab1bac85d0eec61a53377078ab82
145+
uses: angular/dev-infra/github-actions/bazel/configure-remote@15db94d9a481826aed42ecf761c263c981931c9c
146146
- name: Run CLI E2E tests
147147
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 }}
148148

@@ -154,13 +154,13 @@ jobs:
154154
SAUCE_TUNNEL_IDENTIFIER: angular-cli-${{ github.workflow }}-${{ github.run_number }}
155155
steps:
156156
- name: Initialize environment
157-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
157+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
158158
- name: Install node modules
159159
run: yarn install --immutable
160160
- name: Setup Bazel
161-
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
161+
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
162162
- name: Setup Bazel RBE
163-
uses: angular/dev-infra/github-actions/bazel/configure-remote@359350bbc10aab1bac85d0eec61a53377078ab82
163+
uses: angular/dev-infra/github-actions/bazel/configure-remote@15db94d9a481826aed42ecf761c263c981931c9c
164164
- name: Run E2E Browser tests
165165
env:
166166
SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }}
@@ -175,7 +175,7 @@ jobs:
175175
./scripts/saucelabs/wait-for-tunnel.sh
176176
yarn bazel test --config=saucelabs //tests/legacy-cli:e2e.saucelabs
177177
./scripts/saucelabs/stop-tunnel.sh
178-
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
178+
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
179179
if: ${{ failure() }}
180180
with:
181181
name: sauce-connect-log
@@ -188,11 +188,11 @@ jobs:
188188
CIRCLE_BRANCH: ${{ github.ref_name }}
189189
steps:
190190
- name: Initialize environment
191-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
191+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
192192
- name: Install node modules
193193
run: yarn install --immutable
194194
- name: Setup Bazel
195-
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
195+
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
196196
- run: yarn admin snapshots --verbose
197197
env:
198198
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@1a7989f3955e0c69f0e0ccc14aee54a387a0fd31 #v3.28.8
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@86b04fb0e47484f7282357688f21d5d0e32175fe #v3.28.8
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@359350bbc10aab1bac85d0eec61a53377078ab82
16+
- uses: angular/dev-infra/github-actions/commit-message-based-labels@15db94d9a481826aed42ecf761c263c981931c9c
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@359350bbc10aab1bac85d0eec61a53377078ab82
23+
- uses: angular/dev-infra/github-actions/post-approval-changes@15db94d9a481826aed42ecf761c263c981931c9c
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@359350bbc10aab1bac85d0eec61a53377078ab82
19+
- uses: angular/dev-infra/github-actions/feature-request@15db94d9a481826aed42ecf761c263c981931c9c
2020
with:
2121
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

‎.github/workflows/perf.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
workflows: ${{ steps.workflows.outputs.workflows }}
2424
steps:
2525
- name: Initialize environment
26-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
26+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
2727
- name: Install node modules
2828
run: yarn install --immutable
2929
- id: workflows
@@ -38,9 +38,9 @@ jobs:
3838
workflow: ${{ fromJSON(needs.list.outputs.workflows) }}
3939
steps:
4040
- name: Initialize environment
41-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
41+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
4242
- name: Setup Bazel
43-
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
43+
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
4444
- name: Install node modules
4545
run: yarn install --immutable
4646
# We utilize the google-github-actions/auth action to allow us to get an active credential using workflow

0 commit comments

Comments
 (0)