Skip to content

Commit 9d21397

Browse files
GulajavaMinistudioGulajavaMinistudio
authored
Merge pull request #1122 from angular/main
Create a new pull request by comparing changes across two branches
2 parents 67967f9 + ed2aecf commit 9d21397

File tree

111 files changed

+3938
-1800
lines changed

Some content is hidden

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

111 files changed

+3938
-1800
lines changed

‎.eslintrc.json‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,24 @@
3333
"project": "tsconfig.json",
3434
"sourceType": "module"
3535
},
36-
"plugins": ["eslint-plugin-import", "header", "@typescript-eslint"],
36+
"plugins": ["@stylistic", "@typescript-eslint", "eslint-plugin-import", "header"],
3737
"rules": {
38+
"@stylistic/lines-around-comment": [
39+
"error",
40+
{
41+
"allowArrayStart": true,
42+
"allowBlockStart": true,
43+
"allowClassStart": true,
44+
"allowEnumStart": true,
45+
"allowInterfaceStart": true,
46+
"allowModuleStart": true,
47+
"allowObjectStart": true,
48+
"allowTypeStart": true,
49+
"beforeBlockComment": true,
50+
"ignorePattern": "@license"
51+
}
52+
],
53+
"@stylistic/spaced-comment": ["error", "always"],
3854
"@typescript-eslint/consistent-type-assertions": "error",
3955
"@typescript-eslint/no-explicit-any": "error",
4056
"@typescript-eslint/no-non-null-assertion": "error",

‎.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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
1717
with:
1818
persist-credentials: false
19-
- uses: angular/dev-infra/github-actions/branch-manager@18033eeb81c00d6867f980105fa503721ada7aa3
19+
- uses: angular/dev-infra/github-actions/branch-manager@12e38ba595aa3bbe4230e9568517c7309fca93bc
2020
with:
2121
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

‎.github/workflows/ci.yml‎

Lines changed: 21 additions & 21 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@18033eeb81c00d6867f980105fa503721ada7aa3
24+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@12e38ba595aa3bbe4230e9568517c7309fca93bc
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@18033eeb81c00d6867f980105fa503721ada7aa3
45+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@12e38ba595aa3bbe4230e9568517c7309fca93bc
4646
- name: Setup Bazel
47-
uses: angular/dev-infra/github-actions/bazel/setup@18033eeb81c00d6867f980105fa503721ada7aa3
47+
uses: angular/dev-infra/github-actions/bazel/setup@12e38ba595aa3bbe4230e9568517c7309fca93bc
4848
- name: Setup Bazel RBE
49-
uses: angular/dev-infra/github-actions/bazel/configure-remote@18033eeb81c00d6867f980105fa503721ada7aa3
49+
uses: angular/dev-infra/github-actions/bazel/configure-remote@12e38ba595aa3bbe4230e9568517c7309fca93bc
5050
- name: Install node modules
5151
run: yarn install --immutable
5252
- name: Build release targets
@@ -56,11 +56,11 @@ jobs:
5656
runs-on: ubuntu-latest
5757
steps:
5858
- name: Initialize environment
59-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@18033eeb81c00d6867f980105fa503721ada7aa3
59+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@12e38ba595aa3bbe4230e9568517c7309fca93bc
6060
- name: Setup Bazel
61-
uses: angular/dev-infra/github-actions/bazel/setup@18033eeb81c00d6867f980105fa503721ada7aa3
61+
uses: angular/dev-infra/github-actions/bazel/setup@12e38ba595aa3bbe4230e9568517c7309fca93bc
6262
- name: Setup Bazel RBE
63-
uses: angular/dev-infra/github-actions/bazel/configure-remote@18033eeb81c00d6867f980105fa503721ada7aa3
63+
uses: angular/dev-infra/github-actions/bazel/configure-remote@12e38ba595aa3bbe4230e9568517c7309fca93bc
6464
- name: Install node modules
6565
run: yarn install --immutable
6666
- name: Run module and package tests
@@ -90,13 +90,13 @@ jobs:
9090
runs-on: ${{ matrix.os }}
9191
steps:
9292
- name: Initialize environment
93-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@18033eeb81c00d6867f980105fa503721ada7aa3
93+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@12e38ba595aa3bbe4230e9568517c7309fca93bc
9494
- name: Install node modules
9595
run: yarn install --immutable
9696
- name: Setup Bazel
97-
uses: angular/dev-infra/github-actions/bazel/setup@18033eeb81c00d6867f980105fa503721ada7aa3
97+
uses: angular/dev-infra/github-actions/bazel/setup@12e38ba595aa3bbe4230e9568517c7309fca93bc
9898
- name: Setup Bazel RBE
99-
uses: angular/dev-infra/github-actions/bazel/configure-remote@18033eeb81c00d6867f980105fa503721ada7aa3
99+
uses: angular/dev-infra/github-actions/bazel/configure-remote@12e38ba595aa3bbe4230e9568517c7309fca93bc
100100
- name: Run CLI E2E tests
101101
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 }}
102102

@@ -111,13 +111,13 @@ jobs:
111111
runs-on: ${{ matrix.os }}
112112
steps:
113113
- name: Initialize environment
114-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@18033eeb81c00d6867f980105fa503721ada7aa3
114+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@12e38ba595aa3bbe4230e9568517c7309fca93bc
115115
- name: Install node modules
116116
run: yarn install --immutable
117117
- name: Setup Bazel
118-
uses: angular/dev-infra/github-actions/bazel/setup@18033eeb81c00d6867f980105fa503721ada7aa3
118+
uses: angular/dev-infra/github-actions/bazel/setup@12e38ba595aa3bbe4230e9568517c7309fca93bc
119119
- name: Setup Bazel RBE
120-
uses: angular/dev-infra/github-actions/bazel/configure-remote@18033eeb81c00d6867f980105fa503721ada7aa3
120+
uses: angular/dev-infra/github-actions/bazel/configure-remote@12e38ba595aa3bbe4230e9568517c7309fca93bc
121121
- name: Run CLI E2E tests
122122
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 }}
123123

@@ -132,13 +132,13 @@ jobs:
132132
runs-on: ${{ matrix.os }}
133133
steps:
134134
- name: Initialize environment
135-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@18033eeb81c00d6867f980105fa503721ada7aa3
135+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@12e38ba595aa3bbe4230e9568517c7309fca93bc
136136
- name: Install node modules
137137
run: yarn install --immutable
138138
- name: Setup Bazel
139-
uses: angular/dev-infra/github-actions/bazel/setup@18033eeb81c00d6867f980105fa503721ada7aa3
139+
uses: angular/dev-infra/github-actions/bazel/setup@12e38ba595aa3bbe4230e9568517c7309fca93bc
140140
- name: Setup Bazel RBE
141-
uses: angular/dev-infra/github-actions/bazel/configure-remote@18033eeb81c00d6867f980105fa503721ada7aa3
141+
uses: angular/dev-infra/github-actions/bazel/configure-remote@12e38ba595aa3bbe4230e9568517c7309fca93bc
142142
- name: Run CLI E2E tests
143143
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 }}
144144

@@ -149,13 +149,13 @@ jobs:
149149
SAUCE_TUNNEL_IDENTIFIER: angular-cli-${{ github.workflow }}-${{ github.run_number }}
150150
steps:
151151
- name: Initialize environment
152-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@18033eeb81c00d6867f980105fa503721ada7aa3
152+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@12e38ba595aa3bbe4230e9568517c7309fca93bc
153153
- name: Install node modules
154154
run: yarn install --immutable
155155
- name: Setup Bazel
156-
uses: angular/dev-infra/github-actions/bazel/setup@18033eeb81c00d6867f980105fa503721ada7aa3
156+
uses: angular/dev-infra/github-actions/bazel/setup@12e38ba595aa3bbe4230e9568517c7309fca93bc
157157
- name: Setup Bazel RBE
158-
uses: angular/dev-infra/github-actions/bazel/configure-remote@18033eeb81c00d6867f980105fa503721ada7aa3
158+
uses: angular/dev-infra/github-actions/bazel/configure-remote@12e38ba595aa3bbe4230e9568517c7309fca93bc
159159
- name: Run E2E Browser tests
160160
env:
161161
SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }}
@@ -182,11 +182,11 @@ jobs:
182182
CIRCLE_BRANCH: ${{ github.ref_name }}
183183
steps:
184184
- name: Initialize environment
185-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@18033eeb81c00d6867f980105fa503721ada7aa3
185+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@12e38ba595aa3bbe4230e9568517c7309fca93bc
186186
- name: Install node modules
187187
run: yarn install --immutable
188188
- name: Setup Bazel
189-
uses: angular/dev-infra/github-actions/bazel/setup@18033eeb81c00d6867f980105fa503721ada7aa3
189+
uses: angular/dev-infra/github-actions/bazel/setup@12e38ba595aa3bbe4230e9568517c7309fca93bc
190190
- run: yarn admin snapshots --verbose
191191
env:
192192
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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
16-
- uses: angular/dev-infra/github-actions/commit-message-based-labels@18033eeb81c00d6867f980105fa503721ada7aa3
16+
- uses: angular/dev-infra/github-actions/commit-message-based-labels@12e38ba595aa3bbe4230e9568517c7309fca93bc
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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
23-
- uses: angular/dev-infra/github-actions/post-approval-changes@18033eeb81c00d6867f980105fa503721ada7aa3
23+
- uses: angular/dev-infra/github-actions/post-approval-changes@12e38ba595aa3bbe4230e9568517c7309fca93bc
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@18033eeb81c00d6867f980105fa503721ada7aa3
19+
- uses: angular/dev-infra/github-actions/feature-request@12e38ba595aa3bbe4230e9568517c7309fca93bc
2020
with:
2121
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

‎.github/workflows/pr.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535
steps:
3636
- name: Initialize environment
37-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@18033eeb81c00d6867f980105fa503721ada7aa3
37+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@12e38ba595aa3bbe4230e9568517c7309fca93bc
3838
- name: Setup ESLint Caching
3939
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
4040
with:
@@ -54,7 +54,7 @@ jobs:
5454
- name: Run Validation
5555
run: yarn admin validate
5656
- name: Check Package Licenses
57-
uses: angular/dev-infra/github-actions/linting/licenses@18033eeb81c00d6867f980105fa503721ada7aa3
57+
uses: angular/dev-infra/github-actions/linting/licenses@12e38ba595aa3bbe4230e9568517c7309fca93bc
5858
- name: Check tooling setup
5959
run: yarn check-tooling-setup
6060
- name: Check commit message
@@ -70,11 +70,11 @@ jobs:
7070
runs-on: ubuntu-latest
7171
steps:
7272
- name: Initialize environment
73-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@18033eeb81c00d6867f980105fa503721ada7aa3
73+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@12e38ba595aa3bbe4230e9568517c7309fca93bc
7474
- name: Setup Bazel
75-
uses: angular/dev-infra/github-actions/bazel/setup@18033eeb81c00d6867f980105fa503721ada7aa3
75+
uses: angular/dev-infra/github-actions/bazel/setup@12e38ba595aa3bbe4230e9568517c7309fca93bc
7676
- name: Setup Bazel RBE
77-
uses: angular/dev-infra/github-actions/bazel/configure-remote@18033eeb81c00d6867f980105fa503721ada7aa3
77+
uses: angular/dev-infra/github-actions/bazel/configure-remote@12e38ba595aa3bbe4230e9568517c7309fca93bc
7878
- name: Install node modules
7979
run: yarn install --immutable
8080
- name: Build release targets
@@ -90,11 +90,11 @@ jobs:
9090
runs-on: ubuntu-latest
9191
steps:
9292
- name: Initialize environment
93-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@18033eeb81c00d6867f980105fa503721ada7aa3
93+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@12e38ba595aa3bbe4230e9568517c7309fca93bc
9494
- name: Setup Bazel
95-
uses: angular/dev-infra/github-actions/bazel/setup@18033eeb81c00d6867f980105fa503721ada7aa3
95+
uses: angular/dev-infra/github-actions/bazel/setup@12e38ba595aa3bbe4230e9568517c7309fca93bc
9696
- name: Setup Bazel RBE
97-
uses: angular/dev-infra/github-actions/bazel/configure-remote@18033eeb81c00d6867f980105fa503721ada7aa3
97+
uses: angular/dev-infra/github-actions/bazel/configure-remote@12e38ba595aa3bbe4230e9568517c7309fca93bc
9898
- name: Install node modules
9999
run: yarn install --immutable
100100
- name: Run module and package tests
@@ -111,13 +111,13 @@ jobs:
111111
runs-on: ${{ matrix.os }}
112112
steps:
113113
- name: Initialize environment
114-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@18033eeb81c00d6867f980105fa503721ada7aa3
114+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@12e38ba595aa3bbe4230e9568517c7309fca93bc
115115
- name: Install node modules
116116
run: yarn install --immutable
117117
- name: Setup Bazel
118-
uses: angular/dev-infra/github-actions/bazel/setup@18033eeb81c00d6867f980105fa503721ada7aa3
118+
uses: angular/dev-infra/github-actions/bazel/setup@12e38ba595aa3bbe4230e9568517c7309fca93bc
119119
- name: Setup Bazel RBE
120-
uses: angular/dev-infra/github-actions/bazel/configure-remote@18033eeb81c00d6867f980105fa503721ada7aa3
120+
uses: angular/dev-infra/github-actions/bazel/configure-remote@12e38ba595aa3bbe4230e9568517c7309fca93bc
121121
- name: Run CLI E2E tests
122122
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 }}
123123

@@ -132,13 +132,13 @@ jobs:
132132
runs-on: ${{ matrix.os }}
133133
steps:
134134
- name: Initialize environment
135-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@18033eeb81c00d6867f980105fa503721ada7aa3
135+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@12e38ba595aa3bbe4230e9568517c7309fca93bc
136136
- name: Install node modules
137137
run: yarn install --immutable
138138
- name: Setup Bazel
139-
uses: angular/dev-infra/github-actions/bazel/setup@18033eeb81c00d6867f980105fa503721ada7aa3
139+
uses: angular/dev-infra/github-actions/bazel/setup@12e38ba595aa3bbe4230e9568517c7309fca93bc
140140
- name: Setup Bazel RBE
141-
uses: angular/dev-infra/github-actions/bazel/configure-remote@18033eeb81c00d6867f980105fa503721ada7aa3
141+
uses: angular/dev-infra/github-actions/bazel/configure-remote@12e38ba595aa3bbe4230e9568517c7309fca93bc
142142
- name: Run CLI E2E tests
143143
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 }}
144144

@@ -155,12 +155,12 @@ jobs:
155155
runs-on: ${{ matrix.os }}
156156
steps:
157157
- name: Initialize environment
158-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@18033eeb81c00d6867f980105fa503721ada7aa3
158+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@12e38ba595aa3bbe4230e9568517c7309fca93bc
159159
- name: Install node modules
160160
run: yarn install --immutable
161161
- name: Setup Bazel
162-
uses: angular/dev-infra/github-actions/bazel/setup@18033eeb81c00d6867f980105fa503721ada7aa3
162+
uses: angular/dev-infra/github-actions/bazel/setup@12e38ba595aa3bbe4230e9568517c7309fca93bc
163163
- name: Setup Bazel RBE
164-
uses: angular/dev-infra/github-actions/bazel/configure-remote@18033eeb81c00d6867f980105fa503721ada7aa3
164+
uses: angular/dev-infra/github-actions/bazel/configure-remote@12e38ba595aa3bbe4230e9568517c7309fca93bc
165165
- name: Run CLI E2E tests
166166
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 }}

‎.github/workflows/scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ jobs:
4646

4747
# Upload the results to GitHub's code scanning dashboard.
4848
- name: 'Upload to code-scanning'
49-
uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
49+
uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
5050
with:
5151
sarif_file: results.sarif

0 commit comments

Comments
 (0)