diff --git a/.github/workflows/aio-preview-build.yml b/.github/workflows/aio-preview-build.yml index edcb3d768e8..152b8cdddde 100644 --- a/.github/workflows/aio-preview-build.yml +++ b/.github/workflows/aio-preview-build.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - uses: ./.github/actions/yarn-install - - uses: angular/dev-infra/github-actions/setup-bazel-remote-exec@07b0f6423e0c5266b3792d8f4af43b8fd3f3d41b + - uses: angular/dev-infra/github-actions/setup-bazel-remote-exec@7770251c68b543840bdc78039e67ebc085ce9fdc with: bazelrc: ./.bazelrc.user @@ -34,7 +34,7 @@ jobs: # the number of concurrent actions is determined based on the host resources. - run: bazel build //aio:build --jobs=32 --announce_rc --verbose_failures - - uses: angular/dev-infra/github-actions/deploy-previews/pack-and-upload-artifact@07b0f6423e0c5266b3792d8f4af43b8fd3f3d41b + - uses: angular/dev-infra/github-actions/deploy-previews/pack-and-upload-artifact@7770251c68b543840bdc78039e67ebc085ce9fdc with: workflow-artifact-name: 'aio' pull-number: '${{github.event.pull_request.number}}' diff --git a/.github/workflows/aio-preview-deploy.yml b/.github/workflows/aio-preview-deploy.yml index be9635ec10c..03cc4a389ab 100644 --- a/.github/workflows/aio-preview-deploy.yml +++ b/.github/workflows/aio-preview-deploy.yml @@ -34,7 +34,7 @@ jobs: npx -y firebase-tools@latest target:clear --project ${{env.PREVIEW_PROJECT}} hosting aio npx -y firebase-tools@latest target:apply --project ${{env.PREVIEW_PROJECT}} hosting aio ${{env.PREVIEW_SITE}} - - uses: angular/dev-infra/github-actions/deploy-previews/upload-artifacts-to-firebase@07b0f6423e0c5266b3792d8f4af43b8fd3f3d41b + - uses: angular/dev-infra/github-actions/deploy-previews/upload-artifacts-to-firebase@7770251c68b543840bdc78039e67ebc085ce9fdc with: github-token: '${{secrets.GITHUB_TOKEN}}' workflow-artifact-name: 'aio' diff --git a/.github/workflows/assistant-to-the-branch-manager.yml b/.github/workflows/assistant-to-the-branch-manager.yml index 6abdaf76f10..2bc3d19fcfa 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@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 with: persist-credentials: false - - uses: angular/dev-infra/github-actions/branch-manager@07b0f6423e0c5266b3792d8f4af43b8fd3f3d41b + - uses: angular/dev-infra/github-actions/branch-manager@7770251c68b543840bdc78039e67ebc085ce9fdc with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml index 318f425d9e2..987b784a44a 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@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - - uses: angular/dev-infra/github-actions/commit-message-based-labels@07b0f6423e0c5266b3792d8f4af43b8fd3f3d41b + - uses: angular/dev-infra/github-actions/commit-message-based-labels@7770251c68b543840bdc78039e67ebc085ce9fdc with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} post_approval_changes: runs-on: ubuntu-latest steps: - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - - uses: angular/dev-infra/github-actions/post-approval-changes@07b0f6423e0c5266b3792d8f4af43b8fd3f3d41b + - uses: angular/dev-infra/github-actions/post-approval-changes@7770251c68b543840bdc78039e67ebc085ce9fdc with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/feature-requests.yml b/.github/workflows/feature-requests.yml index 2a3e7cfc923..3cbf42db98d 100644 --- a/.github/workflows/feature-requests.yml +++ b/.github/workflows/feature-requests.yml @@ -14,6 +14,6 @@ jobs: if: github.repository == 'angular/angular' runs-on: ubuntu-latest steps: - - uses: angular/dev-infra/github-actions/feature-request@07b0f6423e0c5266b3792d8f4af43b8fd3f3d41b + - uses: angular/dev-infra/github-actions/feature-request@7770251c68b543840bdc78039e67ebc085ce9fdc with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/google-internal-tests.yml b/.github/workflows/google-internal-tests.yml index fa680acc32d..517f936fb63 100644 --- a/.github/workflows/google-internal-tests.yml +++ b/.github/workflows/google-internal-tests.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - - uses: angular/dev-infra/github-actions/google-internal-tests@07b0f6423e0c5266b3792d8f4af43b8fd3f3d41b + - uses: angular/dev-infra/github-actions/google-internal-tests@7770251c68b543840bdc78039e67ebc085ce9fdc with: run-tests-guide-url: http://go/angular/g3sync github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml index 133801e7d09..3677d5531a0 100644 --- a/.github/workflows/lock-closed.yml +++ b/.github/workflows/lock-closed.yml @@ -14,6 +14,6 @@ jobs: if: github.repository == 'angular/angular' runs-on: ubuntu-latest steps: - - uses: angular/dev-infra/github-actions/lock-closed@07b0f6423e0c5266b3792d8f4af43b8fd3f3d41b + - uses: angular/dev-infra/github-actions/lock-closed@7770251c68b543840bdc78039e67ebc085ce9fdc with: lock-bot-key: ${{ secrets.LOCK_BOT_PRIVATE_KEY }} diff --git a/.github/workflows/merge-ready-status.yml b/.github/workflows/merge-ready-status.yml index 6f920fe0a84..ceefd33ca36 100644 --- a/.github/workflows/merge-ready-status.yml +++ b/.github/workflows/merge-ready-status.yml @@ -9,6 +9,6 @@ jobs: status: runs-on: ubuntu-latest steps: - - uses: angular/dev-infra/github-actions/unified-status-check@07b0f6423e0c5266b3792d8f4af43b8fd3f3d41b + - uses: angular/dev-infra/github-actions/unified-status-check@7770251c68b543840bdc78039e67ebc085ce9fdc with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/update-cli-help.yml b/.github/workflows/update-cli-help.yml index febe1f39c7b..2ccb4525ff7 100644 --- a/.github/workflows/update-cli-help.yml +++ b/.github/workflows/update-cli-help.yml @@ -32,7 +32,7 @@ jobs: env: ANGULAR_CLI_BUILDS_READONLY_GITHUB_TOKEN: ${{ secrets.ANGULAR_CLI_BUILDS_READONLY_GITHUB_TOKEN }} - name: Create a PR (if necessary) - uses: angular/dev-infra/github-actions/create-pr-for-changes@07b0f6423e0c5266b3792d8f4af43b8fd3f3d41b + uses: angular/dev-infra/github-actions/create-pr-for-changes@7770251c68b543840bdc78039e67ebc085ce9fdc with: branch-prefix: update-cli-help pr-title: 'docs: update Angular CLI help [${{github.ref_name}}]' diff --git a/.github/workflows/update-events.yml b/.github/workflows/update-events.yml index 722945d4a4f..56b1ea095b8 100644 --- a/.github/workflows/update-events.yml +++ b/.github/workflows/update-events.yml @@ -35,7 +35,7 @@ jobs: - name: Generate `events.json` run: node aio/scripts/generate-events/index.mjs --ignore-invalid-dates - name: Create a PR (if necessary) - uses: angular/dev-infra/github-actions/create-pr-for-changes@07b0f6423e0c5266b3792d8f4af43b8fd3f3d41b + uses: angular/dev-infra/github-actions/create-pr-for-changes@7770251c68b543840bdc78039e67ebc085ce9fdc with: branch-prefix: docs-update-events pr-title: 'docs: update events' diff --git a/WORKSPACE b/WORKSPACE index 04c58391e02..1e2673a2c63 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -77,7 +77,7 @@ yarn_install( YARN_LABEL, "//:.yarnrc", "//tools:postinstall-patches.js", - "//tools/esm-interop:patches/npm/@angular+build-tooling+0.0.0-246cebbf2a78566ff1fe9b88fdde2459606568dc.patch", + "//tools/esm-interop:patches/npm/@angular+build-tooling+0.0.0-e859696da7af56c811b6589f1ae888222d93d797.patch", "//tools/esm-interop:patches/npm/@bazel+concatjs+5.7.1.patch", "//tools/esm-interop:patches/npm/@bazel+esbuild+5.7.1.patch", "//tools/esm-interop:patches/npm/@bazel+protractor+5.7.1.patch", diff --git a/aio/package.json b/aio/package.json index 1e3cc9f0cca..1a97701bce7 100644 --- a/aio/package.json +++ b/aio/package.json @@ -85,7 +85,7 @@ "@angular-eslint/eslint-plugin": "^15.0.0", "@angular-eslint/eslint-plugin-template": "^15.0.0", "@angular-eslint/template-parser": "^15.0.0", - "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#f7d26a0b0d6bd2043f2d32c2a99db903539d0c07", + "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#e859696da7af56c811b6589f1ae888222d93d797", "@angular/cli": "15.2.0-next.4", "@angular/compiler-cli": "15.2.0-next.4", "@bazel/bazelisk": "^1.7.5", diff --git a/aio/yarn.lock b/aio/yarn.lock index 729b8b13823..b65e8e57afc 100644 --- a/aio/yarn.lock +++ b/aio/yarn.lock @@ -282,9 +282,10 @@ "@angular/core" "^13.0.0 || ^14.0.0-0" reflect-metadata "^0.1.13" -"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#f7d26a0b0d6bd2043f2d32c2a99db903539d0c07": - version "0.0.0-07b0f6423e0c5266b3792d8f4af43b8fd3f3d41b" - resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#f7d26a0b0d6bd2043f2d32c2a99db903539d0c07" +"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#e859696da7af56c811b6589f1ae888222d93d797": + version "0.0.0-7770251c68b543840bdc78039e67ebc085ce9fdc" + uid e859696da7af56c811b6589f1ae888222d93d797 + resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#e859696da7af56c811b6589f1ae888222d93d797" dependencies: "@angular-devkit/build-angular" "15.2.0-next.3" "@angular/benchpress" "0.3.0" diff --git a/package.json b/package.json index e2ddfc7b715..f860a07643a 100644 --- a/package.json +++ b/package.json @@ -174,8 +174,8 @@ }, "// 2": "devDependencies are not used under Bazel. Many can be removed after test.sh is deleted.", "devDependencies": { - "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#f7d26a0b0d6bd2043f2d32c2a99db903539d0c07", - "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#8aa60413b3e14daf2f33a29fe9d09faa3e5bcb75", + "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#e859696da7af56c811b6589f1ae888222d93d797", + "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#812783e85373008ddf426c88495e6f8a8414f129", "@bazel/bazelisk": "^1.7.5", "@bazel/buildifier": "^5.0.0", "@bazel/ibazel": "^0.16.0", diff --git a/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-246cebbf2a78566ff1fe9b88fdde2459606568dc.patch b/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-e859696da7af56c811b6589f1ae888222d93d797.patch similarity index 99% rename from tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-246cebbf2a78566ff1fe9b88fdde2459606568dc.patch rename to tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-e859696da7af56c811b6589f1ae888222d93d797.patch index 8b4c7f57ce0..4ed22ddf1d5 100644 --- a/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-246cebbf2a78566ff1fe9b88fdde2459606568dc.patch +++ b/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-e859696da7af56c811b6589f1ae888222d93d797.patch @@ -6,7 +6,7 @@ index 6cee158..815a55d 100755 load("@npm//@angular/build-tooling/bazel:extract_types.bzl", "extract_types") -load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary", "nodejs_test") +load("@angular//tools/esm-interop:index.bzl", "nodejs_binary", "nodejs_test") - + nodejs_test_args = [ # Needed so that node doesn't walk back to the source directory. diff --git a/node_modules/@angular/build-tooling/bazel/app-bundling/BUILD.bazel b/node_modules/@angular/build-tooling/bazel/app-bundling/BUILD.bazel @@ -16,20 +16,20 @@ index 1c27a95..c239203 100755 @@ -1,4 +1,4 @@ -load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") +load("@angular//tools/esm-interop:index.bzl", "nodejs_binary") - + package(default_visibility = ["//visibility:public"]) - + diff --git a/node_modules/@angular/build-tooling/bazel/app-bundling/esbuild.config-tmpl.mjs b/node_modules/@angular/build-tooling/bazel/app-bundling/esbuild.config-tmpl.mjs index e4410ba..33d75cd 100755 --- a/node_modules/@angular/build-tooling/bazel/app-bundling/esbuild.config-tmpl.mjs +++ b/node_modules/@angular/build-tooling/bazel/app-bundling/esbuild.config-tmpl.mjs @@ -9,7 +9,7 @@ import * as path from 'path'; - + import {createEsbuildAngularOptimizePlugin} from '@angular/build-tooling/shared-scripts/angular-optimization/esbuild-plugin.mjs'; -import {GLOBAL_DEFS_FOR_TERSER_WITH_AOT} from '@angular/compiler-cli/private/tooling'; +import {GLOBAL_DEFS_FOR_TERSER_WITH_AOT} from '@angular/compiler-cli/private/tooling.mjs'; - + /** Root path pointing to the app bundle source entry-point file. */ const entryPointSourceRootPath = path.normalize(`TMPL_ENTRY_POINT_ROOTPATH`); diff --git a/node_modules/@angular/build-tooling/bazel/app-bundling/index.bzl b/node_modules/@angular/build-tooling/bazel/app-bundling/index.bzl @@ -52,13 +52,13 @@ index d36afe6..fbdc9bb 100755 @@ -1,4 +1,4 @@ -load("@npm//@bazel/protractor:index.bzl", "protractor_web_test_suite") +load("@angular//tools:defaults.bzl", "protractor_web_test_suite") - + """ Macro that can be used to define a benchmark test. This differentiates from @@ -7,7 +7,7 @@ load("@npm//@bazel/protractor:index.bzl", "protractor_web_test_suite") unless explicitly requested. """ - + -def benchmark_test(name, server, tags = [], **kwargs): +def benchmark_test(name, server, tags = [], data = [], **kwargs): protractor_web_test_suite( @@ -73,7 +73,7 @@ index d36afe6..fbdc9bb 100755 "manual", "no-remote-exec", diff --git a/node_modules/@angular/build-tooling/bazel/benchmark/component_benchmark/component_benchmark.bzl b/node_modules/@angular/build-tooling/bazel/benchmark/component_benchmark/component_benchmark.bzl -index 6213703..8f1ec71 100755 +index 6213703..4d91aa3 100755 --- a/node_modules/@angular/build-tooling/bazel/benchmark/component_benchmark/component_benchmark.bzl +++ b/node_modules/@angular/build-tooling/bazel/benchmark/component_benchmark/component_benchmark.bzl @@ -1,7 +1,7 @@ @@ -84,7 +84,7 @@ index 6213703..8f1ec71 100755 +load("@angular//tools:defaults.bzl", "ng_module") load("@npm//@bazel/concatjs:index.bzl", "ts_library") load(":benchmark_test.bzl", "benchmark_test") - + @@ -37,8 +37,8 @@ def component_benchmark( driver_deps, ng_srcs, @@ -102,7 +102,7 @@ index 6213703..8f1ec71 100755 # repository with its corresponding source target that does not come with any typings. - ng_bundle_deps.append("@npm//zone.js") + ng_bundle_deps.append("@angular//packages/zone.js/dist:zone") - + if not assets: html = prefix + "index.html" diff --git a/node_modules/@angular/build-tooling/bazel/http-server/BUILD.bazel b/node_modules/@angular/build-tooling/bazel/http-server/BUILD.bazel @@ -113,7 +113,7 @@ index 04cc755..ec01017 100755 -load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") +load("@angular//tools/esm-interop:index.bzl", "nodejs_binary") load("@npm//@bazel/concatjs:index.bzl", "ts_library") - + package(default_visibility = ["//visibility:public"]) diff --git a/node_modules/@angular/build-tooling/bazel/integration/index.bzl b/node_modules/@angular/build-tooling/bazel/integration/index.bzl index 662272d..9fc6330 100755 @@ -122,7 +122,7 @@ index 662272d..9fc6330 100755 @@ -1,4 +1,4 @@ -load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_test") +load("@angular//tools/esm-interop:index.bzl", "nodejs_test") - + def _serialize_file(file): """Serializes a file into a struct that matches the `BazelFileInfo` type in the diff --git a/node_modules/@angular/build-tooling/bazel/map-size-tracking/index.bzl b/node_modules/@angular/build-tooling/bazel/map-size-tracking/index.bzl @@ -132,12 +132,12 @@ index 47f54aa..0fe449c 100755 @@ -3,7 +3,7 @@ # Use of this source code is governed by an MIT-style license that can be # found in the LICENSE file at https://angular.io/license - + -load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary", "nodejs_test") +load("@angular//tools/esm-interop:index.bzl", "nodejs_binary", "nodejs_test") - + nodejs_args = ["--nobazel_run_linker"] - + diff --git a/node_modules/@angular/build-tooling/shared-scripts/angular-optimization/BUILD.bazel b/node_modules/@angular/build-tooling/shared-scripts/angular-optimization/BUILD.bazel index 79afcb8..ebbb37b 100755 --- a/node_modules/@angular/build-tooling/shared-scripts/angular-optimization/BUILD.bazel @@ -157,7 +157,7 @@ index f5908b9..d5fac4f 100755 --- a/node_modules/@angular/build-tooling/shared-scripts/angular-optimization/esbuild-plugin.mjs +++ b/node_modules/@angular/build-tooling/shared-scripts/angular-optimization/esbuild-plugin.mjs @@ -54,8 +54,8 @@ export async function createEsbuildAngularOptimizePlugin(opts, additionalBabelPl - + if (opts.enableLinker) { linkerCreator = { - compiler: await import('@angular/compiler-cli'), @@ -166,4 +166,4 @@ index f5908b9..d5fac4f 100755 + babel: await import('@angular/compiler-cli/linker/babel/index.mjs'), }; } - + diff --git a/yarn.lock b/yarn.lock index a0dd950802a..52ebfbe3a1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -234,9 +234,9 @@ "@angular/core" "^13.0.0 || ^14.0.0-0" reflect-metadata "^0.1.13" -"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#f7d26a0b0d6bd2043f2d32c2a99db903539d0c07": - version "0.0.0-07b0f6423e0c5266b3792d8f4af43b8fd3f3d41b" - resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#f7d26a0b0d6bd2043f2d32c2a99db903539d0c07" +"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#e859696da7af56c811b6589f1ae888222d93d797": + version "0.0.0-7770251c68b543840bdc78039e67ebc085ce9fdc" + resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#e859696da7af56c811b6589f1ae888222d93d797" dependencies: "@angular-devkit/build-angular" "15.2.0-next.3" "@angular/benchpress" "0.3.0" @@ -388,9 +388,9 @@ "@material/typography" "15.0.0-canary.684e33d25.0" tslib "^2.3.0" -"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#8aa60413b3e14daf2f33a29fe9d09faa3e5bcb75": - version "0.0.0-07b0f6423e0c5266b3792d8f4af43b8fd3f3d41b" - resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#8aa60413b3e14daf2f33a29fe9d09faa3e5bcb75" +"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#812783e85373008ddf426c88495e6f8a8414f129": + version "0.0.0-7770251c68b543840bdc78039e67ebc085ce9fdc" + resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#812783e85373008ddf426c88495e6f8a8414f129" dependencies: "@yarnpkg/lockfile" "^1.1.0" typescript "~4.9.0" @@ -15893,17 +15893,7 @@ terser@5.16.2: commander "^2.20.0" source-map-support "~0.5.20" -terser@5.16.3: - version "5.16.3" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.3.tgz#3266017a9b682edfe019b8ecddd2abaae7b39c6b" - integrity sha512-v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q== - dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" - -terser@^5.0.0, terser@^5.7.2, terser@^5.8.0: +terser@5.16.3, terser@^5.0.0, terser@^5.7.2, terser@^5.8.0: version "5.16.3" resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.3.tgz#3266017a9b682edfe019b8ecddd2abaae7b39c6b" integrity sha512-v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q==