Skip to content

Commit

Permalink
Merge pull request #1138 from angular/main
Browse files Browse the repository at this point in the history
Create a new pull request by comparing changes across two branches
  • Loading branch information
GulajavaMinistudio authored Feb 3, 2025
2 parents e29277c + 64a1b15 commit fa62fa8
Show file tree
Hide file tree
Showing 259 changed files with 7,407 additions and 7,733 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
# @generated
# Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
# This file should be checked into version control along with the pnpm-lock.yaml file.
.npmrc=-2023857461
package.json=857732709
pnpm-lock.yaml=252219114
pnpm-workspace.yaml=1711114604
yarn.lock=-46638791
.npmrc=-1406867100
modules/testing/builder/package.json=973445093
package.json=118967274
packages/angular/build/package.json=-1342328419
packages/angular/cli/package.json=-1785130725
packages/angular/pwa/package.json=1108903917
packages/angular/ssr/package.json=-1038366877
packages/angular_devkit/architect/package.json=-1496633956
packages/angular_devkit/architect_cli/package.json=1551210941
packages/angular_devkit/build_angular/package.json=-209671030
packages/angular_devkit/build_webpack/package.json=373950017
packages/angular_devkit/core/package.json=339935828
packages/angular_devkit/schematics/package.json=673943597
packages/angular_devkit/schematics_cli/package.json=-169616762
packages/ngtools/webpack/package.json=1373072616
packages/schematics/angular/package.json=251715148
pnpm-lock.yaml=-968241303
pnpm-workspace.yaml=-1056556036
yarn.lock=1608250888
2 changes: 2 additions & 0 deletions .bazelignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ node_modules
packages/angular/cli/node_modules
packages/angular/create/node_modules
packages/angular/pwa/node_modules
packages/angular/build/node_modules
packages/angular/ssr/node_modules
packages/angular_devkit/architect/node_modules
packages/angular_devkit/architect_cli/node_modules
Expand All @@ -14,3 +15,4 @@ packages/angular_devkit/schematics/node_modules
packages/angular_devkit/schematics_cli/node_modules
packages/ngtools/webpack/node_modules
packages/schematics/angular/node_modules
modules/testing/builder/node_modules
4 changes: 2 additions & 2 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ build --enable_runfiles
####################################################

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

####################################################
# User bazel configuration
Expand Down
8 changes: 8 additions & 0 deletions .github/codeql/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: 'Angular CLI CodeQL config'

query-filters:
# TODO(josephperrott): reevaluate if these can be reenabled.
- exclude:
id: js/bad-code-sanitization
- exclude:
id: js/regex-injection
2 changes: 1 addition & 1 deletion .github/workflows/assistant-to-the-branch-manager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
- uses: angular/dev-infra/github-actions/branch-manager@359350bbc10aab1bac85d0eec61a53377078ab82
- uses: angular/dev-infra/github-actions/branch-manager@15db94d9a481826aed42ecf761c263c981931c9c
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
44 changes: 22 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
- name: Install node modules
run: yarn install --immutable
- name: Generate JSON schema types
Expand All @@ -42,11 +42,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/bazel/configure-remote@15db94d9a481826aed42ecf761c263c981931c9c
- name: Install node modules
run: yarn install --immutable
- name: Build release targets
Expand All @@ -57,11 +57,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/bazel/configure-remote@15db94d9a481826aed42ecf761c263c981931c9c
- name: Install node modules
run: yarn install --immutable
- name: Run module and package tests
Expand Down Expand Up @@ -92,13 +92,13 @@ jobs:
- run: choco install gzip
if: ${{matrix.os == 'windows-latest'}}
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/bazel/configure-remote@15db94d9a481826aed42ecf761c263c981931c9c
- 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 }}

Expand All @@ -114,13 +114,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/bazel/configure-remote@15db94d9a481826aed42ecf761c263c981931c9c
- name: Run CLI E2E tests
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 }}

Expand All @@ -136,13 +136,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/bazel/configure-remote@15db94d9a481826aed42ecf761c263c981931c9c
- 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 }}

Expand All @@ -154,13 +154,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@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/bazel/configure-remote@15db94d9a481826aed42ecf761c263c981931c9c
- name: Run E2E Browser tests
env:
SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }}
Expand All @@ -175,7 +175,7 @@ jobs:
./scripts/saucelabs/wait-for-tunnel.sh
yarn bazel test --config=saucelabs //tests/legacy-cli:e2e.saucelabs
./scripts/saucelabs/stop-tunnel.sh
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
if: ${{ failure() }}
with:
name: sauce-connect-log
Expand All @@ -188,11 +188,11 @@ jobs:
CIRCLE_BRANCH: ${{ github.ref_name }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
- run: yarn admin snapshots --verbose
env:
SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }}
34 changes: 34 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: 'CodeQL'

on:
push:
branches: ['main', '*.*.x']
schedule:
- cron: '39 9 * * 1'

permissions: {}

jobs:
analyze:
name: Analyze
runs-on: 'ubuntu-latest'
permissions:
security-events: write
packages: read
strategy:
fail-fast: false
steps:
- name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
- name: Initialize CodeQL
uses: github/codeql-action/init@1a7989f3955e0c69f0e0ccc14aee54a387a0fd31 #v3.28.8
with:
languages: javascript-typescript
build-mode: none
config-file: .github/codeql/config.yml
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@86b04fb0e47484f7282357688f21d5d0e32175fe #v3.28.8
with:
category: '/language:javascript-typescript'
4 changes: 2 additions & 2 deletions .github/workflows/dev-infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: angular/dev-infra/github-actions/commit-message-based-labels@359350bbc10aab1bac85d0eec61a53377078ab82
- uses: angular/dev-infra/github-actions/commit-message-based-labels@15db94d9a481826aed42ecf761c263c981931c9c
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
post_approval_changes:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: angular/dev-infra/github-actions/post-approval-changes@359350bbc10aab1bac85d0eec61a53377078ab82
- uses: angular/dev-infra/github-actions/post-approval-changes@15db94d9a481826aed42ecf761c263c981931c9c
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
2 changes: 1 addition & 1 deletion .github/workflows/feature-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
if: github.repository == 'angular/angular-cli'
runs-on: ubuntu-latest
steps:
- uses: angular/dev-infra/github-actions/feature-request@359350bbc10aab1bac85d0eec61a53377078ab82
- uses: angular/dev-infra/github-actions/feature-request@15db94d9a481826aed42ecf761c263c981931c9c
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
6 changes: 3 additions & 3 deletions .github/workflows/perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
workflows: ${{ steps.workflows.outputs.workflows }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
- name: Install node modules
run: yarn install --immutable
- id: workflows
Expand All @@ -38,9 +38,9 @@ jobs:
workflow: ${{ fromJSON(needs.list.outputs.workflows) }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@15db94d9a481826aed42ecf761c263c981931c9c
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@359350bbc10aab1bac85d0eec61a53377078ab82
uses: angular/dev-infra/github-actions/bazel/setup@15db94d9a481826aed42ecf761c263c981931c9c
- name: Install node modules
run: yarn install --immutable
# We utilize the google-github-actions/auth action to allow us to get an active credential using workflow
Expand Down
Loading

0 comments on commit fa62fa8

Please sign in to comment.