From 4f9f1f4026eca780f3b1d107b7d60d74bef0f1d9 Mon Sep 17 00:00:00 2001 From: Jan Martin Date: Tue, 15 Oct 2024 11:10:30 -0700 Subject: [PATCH 1/2] fix(@schematics/angular): explicitly set standalone:false --- .../files/module-files/src/app/app.component.ts.template | 3 ++- .../__name@dasherize__.__type@dasherize__.ts.template | 4 +++- .../__name@dasherize__.directive.ts.template | 3 ++- .../__name@dasherize__.pipe.ts.template | 3 ++- tests/legacy-cli/e2e/tests/test/test-scripts.ts | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/schematics/angular/application/files/module-files/src/app/app.component.ts.template b/packages/schematics/angular/application/files/module-files/src/app/app.component.ts.template index 119e756c110e..793876b3af5c 100644 --- a/packages/schematics/angular/application/files/module-files/src/app/app.component.ts.template +++ b/packages/schematics/angular/application/files/module-files/src/app/app.component.ts.template @@ -9,7 +9,8 @@ import { Component } from '@angular/core'; %><% } %> `,<% } else { %> - templateUrl: './app.component.html',<% } if(inlineStyle) { %> + templateUrl: './app.component.html',<% } %> + standalone: false,<% if(inlineStyle) { %> styles: []<% } else { %> styleUrl: './app.component.<%= style %>'<% } %> }) diff --git a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template index 4a420ef9a866..f9c46669b327 100644 --- a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template +++ b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template @@ -3,7 +3,9 @@ import { <% if(changeDetection !== 'Default') { %>ChangeDetectionStrategy, <% }% @Component({<% if(!skipSelector) {%> selector: '<%= selector %>',<%}%><% if(standalone) {%> standalone: true, - imports: [],<%}%><% if(inlineTemplate) { %> + imports: [],<%} else { %> + standalone: false, + <% }%><% if(inlineTemplate) { %> template: `

<%= dasherize(name) %> works! diff --git a/packages/schematics/angular/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.ts.template b/packages/schematics/angular/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.ts.template index fcd41053e96b..2506adaad78b 100644 --- a/packages/schematics/angular/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.ts.template +++ b/packages/schematics/angular/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.ts.template @@ -2,7 +2,8 @@ import { Directive } from '@angular/core'; @Directive({ selector: '[<%= selector %>]'<% if(standalone) {%>, - standalone: true<%}%> + standalone: true<%} else {%>, + standalone: false<%}%> }) export class <%= classify(name) %>Directive { diff --git a/packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts.template b/packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts.template index 548764ac4f1e..b0c070a7508b 100644 --- a/packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts.template +++ b/packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts.template @@ -2,7 +2,8 @@ import { Pipe, PipeTransform } from '@angular/core'; @Pipe({ name: '<%= camelize(name) %>'<% if(standalone) {%>, - standalone: true<%}%> + standalone: true<%} else {%>, + standalone: false<%}%> }) export class <%= classify(name) %>Pipe implements PipeTransform { diff --git a/tests/legacy-cli/e2e/tests/test/test-scripts.ts b/tests/legacy-cli/e2e/tests/test/test-scripts.ts index 15caeea875de..dc1d6734905a 100644 --- a/tests/legacy-cli/e2e/tests/test/test-scripts.ts +++ b/tests/legacy-cli/e2e/tests/test/test-scripts.ts @@ -19,7 +19,7 @@ export default async function () { 'src/app/app.component.ts': ` import { Component } from '@angular/core'; - @Component({ selector: 'app-root', template: '' }) + @Component({ selector: 'app-root', template: '', standalone: false }) export class AppComponent { stringScriptGlobalProp = stringScriptGlobal; inputScriptGlobalProp = inputScriptGlobal; From b1ff31c370c2bed0a3f93663dca861f9a4a7f3b0 Mon Sep 17 00:00:00 2001 From: Angular Robot Date: Tue, 15 Oct 2024 20:09:08 +0000 Subject: [PATCH 2/2] build: update angular --- .../assistant-to-the-branch-manager.yml | 2 +- .github/workflows/ci.yml | 42 ++++++------- .github/workflows/dev-infra.yml | 4 +- .github/workflows/feature-requests.yml | 2 +- .github/workflows/pr.yml | 34 +++++------ package.json | 4 +- tests/legacy-cli/e2e/ng-snapshot/package.json | 32 +++++----- yarn.lock | 60 ++++++++++++------- 8 files changed, 97 insertions(+), 83 deletions(-) diff --git a/.github/workflows/assistant-to-the-branch-manager.yml b/.github/workflows/assistant-to-the-branch-manager.yml index 6a1903269b0d..12cdf9d94c76 100644 --- a/.github/workflows/assistant-to-the-branch-manager.yml +++ b/.github/workflows/assistant-to-the-branch-manager.yml @@ -16,6 +16,6 @@ jobs: - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: persist-credentials: false - - uses: angular/dev-infra/github-actions/branch-manager@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + - uses: angular/dev-infra/github-actions/branch-manager@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e9b27449c3e..cbb3bbe6b774 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Install node modules run: yarn install --immutable - name: Generate JSON schema types @@ -42,11 +42,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/setup@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/configure-remote@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Install node modules run: yarn install --immutable - name: Build release targets @@ -56,11 +56,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/setup@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/configure-remote@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Install node modules run: yarn install --immutable - name: Run module and package tests @@ -90,13 +90,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/setup@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/configure-remote@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - 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 }} @@ -111,13 +111,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/setup@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/configure-remote@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - 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 }} @@ -132,13 +132,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/setup@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/configure-remote@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - 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 }} @@ -149,13 +149,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@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/setup@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/configure-remote@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Run E2E Browser tests env: SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }} @@ -182,11 +182,11 @@ jobs: CIRCLE_BRANCH: ${{ github.ref_name }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/setup@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - run: yarn admin snapshots --verbose env: SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }} diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml index d1adb4a883d2..f224086d5bbc 100644 --- a/.github/workflows/dev-infra.yml +++ b/.github/workflows/dev-infra.yml @@ -13,13 +13,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - - uses: angular/dev-infra/github-actions/commit-message-based-labels@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + - uses: angular/dev-infra/github-actions/commit-message-based-labels@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} post_approval_changes: runs-on: ubuntu-latest steps: - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - - uses: angular/dev-infra/github-actions/post-approval-changes@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + - uses: angular/dev-infra/github-actions/post-approval-changes@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/feature-requests.yml b/.github/workflows/feature-requests.yml index f668bdea292f..763861dc9120 100644 --- a/.github/workflows/feature-requests.yml +++ b/.github/workflows/feature-requests.yml @@ -16,6 +16,6 @@ jobs: if: github.repository == 'angular/angular-cli' runs-on: ubuntu-latest steps: - - uses: angular/dev-infra/github-actions/feature-request@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + - uses: angular/dev-infra/github-actions/feature-request@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7fd0f7776edd..2d967efc2baa 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup ESLint Caching uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 with: @@ -54,7 +54,7 @@ jobs: - name: Run Validation run: yarn admin validate - name: Check Package Licenses - uses: angular/dev-infra/github-actions/linting/licenses@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/linting/licenses@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Check tooling setup run: yarn check-tooling-setup - name: Check commit message @@ -70,11 +70,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/setup@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/configure-remote@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Install node modules run: yarn install --immutable - name: Build release targets @@ -90,11 +90,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/setup@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/configure-remote@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Install node modules run: yarn install --immutable - name: Run module and package tests @@ -111,13 +111,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/setup@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/configure-remote@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - 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 }} @@ -132,13 +132,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/setup@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/configure-remote@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - 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 }} @@ -155,12 +155,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/setup@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 + uses: angular/dev-infra/github-actions/bazel/configure-remote@6a7bc4b11c49adc81d7137fe9eff02ac6818b85d - 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 }} diff --git a/package.json b/package.json index 596dfe4dc77e..ef59d0641a6c 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@ampproject/remapping": "2.3.0", "@angular/animations": "19.0.0-next.9", "@angular/bazel": "patch:@angular/bazel@https%3A//github.com/angular/bazel-builds.git%23commit=07617f0f8540d27f8895b1820a6f994e1e5b7277#~/.yarn/patches/@angular-bazel-https-9848736cf4.patch", - "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#0716bad6f23806efa2bf458215038f803f7e1b1a", + "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#b30ce317c1c6dd183258fff554777e8582d6f505", "@angular/cdk": "19.0.0-next.8", "@angular/common": "19.0.0-next.9", "@angular/compiler": "19.0.0-next.9", @@ -63,7 +63,7 @@ "@angular/forms": "19.0.0-next.9", "@angular/localize": "19.0.0-next.9", "@angular/material": "19.0.0-next.8", - "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#683ea7c55e4f12120251e063a509a1f8d15b7c55", + "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#978df41c469f0d853ec8cd7fc9289e67b001b38d", "@angular/platform-browser": "19.0.0-next.9", "@angular/platform-browser-dynamic": "19.0.0-next.9", "@angular/platform-server": "19.0.0-next.9", diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json index b996be35b49a..d461d2294de5 100644 --- a/tests/legacy-cli/e2e/ng-snapshot/package.json +++ b/tests/legacy-cli/e2e/ng-snapshot/package.json @@ -2,21 +2,21 @@ "description": "snapshot versions of Angular for e2e testing", "private": true, "dependencies": { - "@angular/animations": "github:angular/animations-builds#110379b6c61d56d096bb8e0ca6beb72daa09fe0b", - "@angular/cdk": "github:angular/cdk-builds#dbb6e0374940ee7c750df2de4d39807efa96c175", - "@angular/common": "github:angular/common-builds#d779857c076d55f63cbbdda43f52a76e6511b130", - "@angular/compiler": "github:angular/compiler-builds#179b80a040165f60004b1e5ce64bca4e73618683", - "@angular/compiler-cli": "github:angular/compiler-cli-builds#0d061ea242af52a1247eb6cb666e6bd772fe161b", - "@angular/core": "github:angular/core-builds#d592b417be6035c3202e688533b7920f701efe90", - "@angular/forms": "github:angular/forms-builds#439385d1ec795eb135ccdb7fb45edeb18d32a488", - "@angular/language-service": "github:angular/language-service-builds#4fcb25322225d4d33876ea32b4cc66a999e30de7", - "@angular/localize": "github:angular/localize-builds#dd3af7a6aced1506bb86eaa6d82a82d36d30fed8", - "@angular/material": "github:angular/material-builds#c14884df0c3c50384fb5d08b54822333c75408e2", - "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#62d4c862caa19cd81e2b0e5fb9711b8e676799bb", - "@angular/platform-browser": "github:angular/platform-browser-builds#4fa216587869c1c9b46038b67e5af77c1aad02eb", - "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#f2d20c4f56743bf0066ddf61d374d0faaaa00128", - "@angular/platform-server": "github:angular/platform-server-builds#7e5d61f59e9592125fe885ebbdd8f40ed2439176", - "@angular/router": "github:angular/router-builds#971591fb278191cdc7636b2e5c800eeb7a630c12", - "@angular/service-worker": "github:angular/service-worker-builds#afe96c8b6a6f8d047d522f721391002c0c051bd3" + "@angular/animations": "github:angular/animations-builds#916a84ecf30c081d91cefa845f96f6223463704f", + "@angular/cdk": "github:angular/cdk-builds#1627ab2cebd5fa60f42c9d0d87a404f67b01e9fc", + "@angular/common": "github:angular/common-builds#532408857412fd40e439f61ddada9ca7d15e0595", + "@angular/compiler": "github:angular/compiler-builds#fe3e44a1edf686b89f9dd656d1b68b7f419c7095", + "@angular/compiler-cli": "github:angular/compiler-cli-builds#68b112a241a475b6deab8b4f57f1df29834c9179", + "@angular/core": "github:angular/core-builds#ca92b989b1c50a9bcd56837b7e76fd8ac51e3010", + "@angular/forms": "github:angular/forms-builds#b75ad20d1df655e8e22bee88cd7a7482a4c07c40", + "@angular/language-service": "github:angular/language-service-builds#83fb535fe6bef828ce965525d743fd62ec60c36d", + "@angular/localize": "github:angular/localize-builds#473d924e9d2f452456b4d050ccb7433a34b31340", + "@angular/material": "github:angular/material-builds#8bf18c89ad6247cb7f0406e1c9581e77923e2a56", + "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#69d246e37d5195c26e82f8e1b1d5bb16bedab74f", + "@angular/platform-browser": "github:angular/platform-browser-builds#f6884c7ee4922a08cafbea1ba88830ca41f14976", + "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#4f4f74097da5447c52bbb523cfee51266be96b7b", + "@angular/platform-server": "github:angular/platform-server-builds#e0b359a6383b0a2127fb4c710d193dcdb499bccc", + "@angular/router": "github:angular/router-builds#7798b448cfe9f35d36cbf596551df2a619c22349", + "@angular/service-worker": "github:angular/service-worker-builds#e1c58c6d7f4a60e2bea4c8e1a4ed35c8d3596d4a" } } diff --git a/yarn.lock b/yarn.lock index 04b5d57666cc..31e2728fafab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -324,9 +324,9 @@ __metadata: languageName: node linkType: hard -"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#0716bad6f23806efa2bf458215038f803f7e1b1a": - version: 0.0.0-37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 - resolution: "@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#commit=0716bad6f23806efa2bf458215038f803f7e1b1a" +"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#b30ce317c1c6dd183258fff554777e8582d6f505": + version: 0.0.0-6a7bc4b11c49adc81d7137fe9eff02ac6818b85d + resolution: "@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#commit=b30ce317c1c6dd183258fff554777e8582d6f505" dependencies: "@angular/benchpress": "npm:0.3.0" "@angular/build": "npm:19.0.0-next.10" @@ -340,7 +340,7 @@ __metadata: "@bazel/runfiles": "npm:5.8.1" "@bazel/terser": "npm:5.8.1" "@bazel/typescript": "npm:5.8.1" - "@microsoft/api-extractor": "npm:7.47.9" + "@microsoft/api-extractor": "npm:7.47.10" "@types/browser-sync": "npm:^2.26.3" "@types/minimatch": "npm:^5.1.2" "@types/node": "npm:^18.19.21" @@ -366,7 +366,7 @@ __metadata: dependenciesMeta: re2: built: false - checksum: 10c0/b7b9c55eda97a8a96867f6ca2b3fd38878724047b3f34f55f8685b335aee6ea88601bf56cd4bf2eef8517aeb71e1ea8539b8808fc74e41f86c1249f6446e30cb + checksum: 10c0/b138eed00daf5fcaf6707c96946f40cd2d55813aaedcf7528ec86ddedd17bbfed4080f1ae6eefc94d7197feb65233125c876191e3b46f42e4d5476a5fc03e5bc languageName: node linkType: hard @@ -632,7 +632,7 @@ __metadata: "@ampproject/remapping": "npm:2.3.0" "@angular/animations": "npm:19.0.0-next.9" "@angular/bazel": "patch:@angular/bazel@https%3A//github.com/angular/bazel-builds.git%23commit=07617f0f8540d27f8895b1820a6f994e1e5b7277#~/.yarn/patches/@angular-bazel-https-9848736cf4.patch" - "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#0716bad6f23806efa2bf458215038f803f7e1b1a" + "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#b30ce317c1c6dd183258fff554777e8582d6f505" "@angular/cdk": "npm:19.0.0-next.8" "@angular/common": "npm:19.0.0-next.9" "@angular/compiler": "npm:19.0.0-next.9" @@ -641,7 +641,7 @@ __metadata: "@angular/forms": "npm:19.0.0-next.9" "@angular/localize": "npm:19.0.0-next.9" "@angular/material": "npm:19.0.0-next.8" - "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#683ea7c55e4f12120251e063a509a1f8d15b7c55" + "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#978df41c469f0d853ec8cd7fc9289e67b001b38d" "@angular/platform-browser": "npm:19.0.0-next.9" "@angular/platform-browser-dynamic": "npm:19.0.0-next.9" "@angular/platform-server": "npm:19.0.0-next.9" @@ -850,9 +850,9 @@ __metadata: languageName: node linkType: hard -"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#683ea7c55e4f12120251e063a509a1f8d15b7c55": - version: 0.0.0-37d6ab618e98067d6a9c73ddbca79beb5e15a6f5 - resolution: "@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#commit=683ea7c55e4f12120251e063a509a1f8d15b7c55" +"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#978df41c469f0d853ec8cd7fc9289e67b001b38d": + version: 0.0.0-6a7bc4b11c49adc81d7137fe9eff02ac6818b85d + resolution: "@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#commit=978df41c469f0d853ec8cd7fc9289e67b001b38d" dependencies: "@octokit/rest": "npm:21.0.2" "@types/semver": "npm:^7.3.6" @@ -863,10 +863,10 @@ __metadata: supports-color: "npm:9.4.0" typed-graphqlify: "npm:^3.1.1" typescript: "npm:~4.9.0" - yaml: "npm:2.5.1" + yaml: "npm:2.6.0" bin: ng-dev: ./bundles/cli.mjs - checksum: 10c0/fcdb19d9bf1ac6379d8631381e51ae2584d403e82db3cac9b899b87c45a096177ef1086b584378508b8b3f3d274459b1e7a625a402761f71ca3bf6e841177138 + checksum: 10c0/ea68fdd750e1a6d3fc055d3a4b9320ba4bdb386169b3e21b98d2c63890ed7f734b8156a5dab994837cd3655d132abe11e115270c2c934010d1709a691e4fc9a0 languageName: node linkType: hard @@ -3189,7 +3189,30 @@ __metadata: languageName: node linkType: hard -"@microsoft/api-extractor@npm:7.47.9, @microsoft/api-extractor@npm:^7.24.2": +"@microsoft/api-extractor@npm:7.47.10": + version: 7.47.10 + resolution: "@microsoft/api-extractor@npm:7.47.10" + dependencies: + "@microsoft/api-extractor-model": "npm:7.29.8" + "@microsoft/tsdoc": "npm:~0.15.0" + "@microsoft/tsdoc-config": "npm:~0.17.0" + "@rushstack/node-core-library": "npm:5.9.0" + "@rushstack/rig-package": "npm:0.5.3" + "@rushstack/terminal": "npm:0.14.2" + "@rushstack/ts-command-line": "npm:4.22.8" + lodash: "npm:~4.17.15" + minimatch: "npm:~3.0.3" + resolve: "npm:~1.22.1" + semver: "npm:~7.5.4" + source-map: "npm:~0.6.1" + typescript: "npm:5.4.2" + bin: + api-extractor: bin/api-extractor + checksum: 10c0/c9b34183e8d4360d06c3093d11f49a119e42d61702d18b4852470082374eb7c3c4afca471629a791856babb5213541f8b0470888579aebbe8c57988f3d20753f + languageName: node + linkType: hard + +"@microsoft/api-extractor@npm:^7.24.2": version: 7.47.9 resolution: "@microsoft/api-extractor@npm:7.47.9" dependencies: @@ -18455,16 +18478,7 @@ __metadata: languageName: node linkType: hard -"yaml@npm:2.5.1": - version: 2.5.1 - resolution: "yaml@npm:2.5.1" - bin: - yaml: bin.mjs - checksum: 10c0/40fba5682898dbeeb3319e358a968fe886509fab6f58725732a15f8dda3abac509f91e76817c708c9959a15f786f38ff863c1b88062d7c1162c5334a7d09cb4a - languageName: node - linkType: hard - -"yaml@npm:^2.4.1": +"yaml@npm:2.6.0, yaml@npm:^2.4.1": version: 2.6.0 resolution: "yaml@npm:2.6.0" bin: