Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This file should be checked into version control along with the pnpm-lock.yaml file.
.npmrc=-1406867100
modules/testing/builder/package.json=973445093
package.json=1949244611
package.json=1365942673
packages/angular/build/package.json=-1281653665
packages/angular/cli/package.json=1263077657
packages/angular/pwa/package.json=1108903917
Expand All @@ -17,7 +17,7 @@ packages/angular_devkit/schematics/package.json=-1133510866
packages/angular_devkit/schematics_cli/package.json=-532742586
packages/ngtools/webpack/package.json=71458652
packages/schematics/angular/package.json=251715148
pnpm-lock.yaml=1657958602
pnpm-lock.yaml=1669001551
pnpm-workspace.yaml=-1264044456
tests/package.json=700948366
yarn.lock=1808197119
yarn.lock=-998454549
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@60ad70b4632945a3014cf26e045530f8ae2e6e18
- uses: angular/dev-infra/github-actions/branch-manager@f2a610b26cd7a451eddd50eb071dc495e3346a80
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@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- 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@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- 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@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Install node modules
run: yarn install --immutable
- name: Run module and package tests
Expand All @@ -81,13 +81,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Run CLI E2E tests
run: yarn bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}

Expand All @@ -102,7 +102,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Run CLI E2E tests
uses: ./.github/shared-actions/windows-bazel-test
with:
Expand All @@ -123,13 +123,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Run CLI E2E tests
run: yarn bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}

Expand All @@ -145,13 +145,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Run CLI E2E tests
run: yarn bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}

Expand All @@ -163,13 +163,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@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Run E2E Browser tests
env:
SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }}
Expand Down Expand Up @@ -197,11 +197,11 @@ jobs:
CIRCLE_BRANCH: ${{ github.ref_name }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- run: yarn admin snapshots --verbose
env:
SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }}
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@60ad70b4632945a3014cf26e045530f8ae2e6e18
- uses: angular/dev-infra/github-actions/commit-message-based-labels@f2a610b26cd7a451eddd50eb071dc495e3346a80
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@60ad70b4632945a3014cf26e045530f8ae2e6e18
- uses: angular/dev-infra/github-actions/post-approval-changes@f2a610b26cd7a451eddd50eb071dc495e3346a80
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@60ad70b4632945a3014cf26e045530f8ae2e6e18
- uses: angular/dev-infra/github-actions/feature-request@f2a610b26cd7a451eddd50eb071dc495e3346a80
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@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- 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@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- 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
36 changes: 18 additions & 18 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup ESLint Caching
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Run Validation
run: yarn admin validate
- name: Check Package Licenses
uses: angular/dev-infra/github-actions/linting/licenses@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/linting/licenses@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Check tooling setup
run: yarn check-tooling-setup
- name: Check commit message
Expand All @@ -70,11 +70,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Install node modules
run: yarn install --immutable
- name: Build release targets
Expand All @@ -91,11 +91,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Install node modules
run: yarn install --immutable
- name: Run module and package tests
Expand All @@ -115,13 +115,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Run CLI E2E tests
run: yarn bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}

Expand All @@ -130,7 +130,7 @@ jobs:
runs-on: windows-2025
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Run CLI E2E tests
uses: ./.github/shared-actions/windows-bazel-test
with:
Expand All @@ -149,13 +149,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Run CLI E2E tests
run: yarn bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}

Expand All @@ -172,12 +172,12 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@60ad70b4632945a3014cf26e045530f8ae2e6e18
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Run CLI E2E tests
run: yarn bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"devDependencies": {
"@ampproject/remapping": "2.3.0",
"@angular/animations": "20.0.0-next.1",
"@angular/bazel": "https://github.com/angular/bazel-builds.git#3422dcb650e407d2c00ac724acf560ab1506d68c",
"@angular/bazel": "https://github.com/angular/bazel-builds.git#8269ca110da4ead292163e7f2614b6407efe40ca",
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#d4727212a9d0f7eb63ae3116d73c769d9bd0bdc1",
"@angular/cdk": "20.0.0-next.0",
"@angular/common": "20.0.0-next.1",
Expand All @@ -54,7 +54,7 @@
"@angular/forms": "20.0.0-next.1",
"@angular/localize": "20.0.0-next.1",
"@angular/material": "20.0.0-next.0",
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#dbcf3afdd0b7d3bd95c71e3df43a210364d3939b",
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#cab2b0de372f97ebb025e6aff24b9ef72f586666",
"@angular/platform-browser": "20.0.0-next.1",
"@angular/platform-browser-dynamic": "20.0.0-next.1",
"@angular/platform-server": "20.0.0-next.1",
Expand Down
4 changes: 2 additions & 2 deletions patches/@angular+bazel+20.0.0-next.1.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/node_modules/@angular/bazel/src/ng_package/packager.mjs b/node_modules/@angular/bazel/src/ng_package/packager.mjs
index dd6ec61..c2a0acf 100755
index d7faa1d..c3cbd1c 100755
--- a/node_modules/@angular/bazel/src/ng_package/packager.mjs
+++ b/node_modules/@angular/bazel/src/ng_package/packager.mjs
@@ -8,7 +8,7 @@
import * as fs from 'fs';
import * as path from 'path';
import fastGlob from 'fast-glob';
import { globSync } from 'tinyglobby';
-import { analyzeFileAndEnsureNoCrossImports } from './cross_entry_points_imports';
+import { analyzeFileAndEnsureNoCrossImports } from './cross_entry_points_imports.mjs';
/**
Expand Down
Loading