diff --git a/WORKSPACE b/WORKSPACE index 111c31ba93a..341bd61914e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -105,7 +105,7 @@ yarn_install( "//:scripts/puppeteer-chromedriver-versions.js", "//:scripts/webdriver-manager-update.js", "//tools:postinstall-patches.js", - "//tools/esm-interop:patches/npm/@angular+build-tooling+0.0.0-96fdaaa056f1cfa7ffbc4c69b7e9007279f76c94.patch", + "//tools/esm-interop:patches/npm/@angular+build-tooling+0.0.0-2fe6d743f60e2e1ba91f9e49c417927a46dcd90f.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/rxjs+6.6.7.patch", diff --git a/aio/package.json b/aio/package.json index 5a91ab7f135..930a458ef3b 100644 --- a/aio/package.json +++ b/aio/package.json @@ -86,7 +86,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#8bfc7e1aca9125487c1d52a5a2c09cc9e134e421", + "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#558babc9c5ca06bedb01cce505fe7036fe8805f7", "@angular/cli": "15.1.0-next.2", "@angular/compiler-cli": "15.1.0-next.2", "@bazel/bazelisk": "^1.7.5", diff --git a/aio/yarn.lock b/aio/yarn.lock index 9edfa27fc8e..427928d19d0 100644 --- a/aio/yarn.lock +++ b/aio/yarn.lock @@ -188,14 +188,15 @@ "@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#8bfc7e1aca9125487c1d52a5a2c09cc9e134e421": - version "0.0.0-96fdaaa056f1cfa7ffbc4c69b7e9007279f76c94" - resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#8bfc7e1aca9125487c1d52a5a2c09cc9e134e421" +"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#558babc9c5ca06bedb01cce505fe7036fe8805f7": + version "0.0.0-2fe6d743f60e2e1ba91f9e49c417927a46dcd90f" + resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#558babc9c5ca06bedb01cce505fe7036fe8805f7" dependencies: "@angular-devkit/build-angular" "15.1.0-next.2" "@angular/benchpress" "0.3.0" "@babel/core" "^7.16.0" "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/plugin-proposal-async-generator-functions" "^7.20.1" "@bazel/buildifier" "5.1.0" "@bazel/concatjs" "5.7.3" "@bazel/esbuild" "5.7.3" diff --git a/package.json b/package.json index 11ed7448ddf..1cbc49bdace 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,7 @@ }, "// 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#8bfc7e1aca9125487c1d52a5a2c09cc9e134e421", + "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#e1aec534818208328b29a76cfe9892c2a031ed94", "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#05278122c48e06eff8e5398d59c49ed6688c949b", "@bazel/bazelisk": "^1.7.5", "@bazel/buildifier": "^5.0.0", diff --git a/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-96fdaaa056f1cfa7ffbc4c69b7e9007279f76c94.patch b/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-2fe6d743f60e2e1ba91f9e49c417927a46dcd90f.patch similarity index 68% rename from tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-96fdaaa056f1cfa7ffbc4c69b7e9007279f76c94.patch rename to tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-2fe6d743f60e2e1ba91f9e49c417927a46dcd90f.patch index a977b6834ef..db96ea32bab 100644 --- a/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-96fdaaa056f1cfa7ffbc4c69b7e9007279f76c94.patch +++ b/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-2fe6d743f60e2e1ba91f9e49c417927a46dcd90f.patch @@ -1,36 +1,31 @@ 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 618bbc5..96c6c92 100755 +index dde2164..772c153 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,9 +9,9 @@ +@@ -9,7 +9,7 @@ import * as path from 'path'; import {createEsbuildAngularOptimizePlugin} from '@angular/build-tooling/shared-scripts/angular-optimization/esbuild-plugin.mjs'; --import {createEs2015LinkerPlugin} from '@angular/compiler-cli/linker/babel'; --import {ConsoleLogger, NodeJSFileSystem, LogLevel} from '@angular/compiler-cli'; -import {GLOBAL_DEFS_FOR_TERSER_WITH_AOT} from '@angular/compiler-cli/private/tooling'; -+import {createEs2015LinkerPlugin} from '@angular/compiler-cli/linker/babel/index.js'; -+import {ConsoleLogger, NodeJSFileSystem, LogLevel} from '@angular/compiler-cli/index.mjs'; -+import {GLOBAL_DEFS_FOR_TERSER_WITH_AOT} from '@angular/compiler-cli/private/tooling.js'; ++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 -index 1edd96d..b1c2ed1 100755 +index 1edd96d..3d423f4 100755 --- a/node_modules/@angular/build-tooling/bazel/app-bundling/index.bzl +++ b/node_modules/@angular/build-tooling/bazel/app-bundling/index.bzl -@@ -64,7 +64,8 @@ def app_bundle( +@@ -64,7 +64,7 @@ def app_bundle( name = "%s_esbuild_config" % name, config_file = ":%s_config_file" % name, deps = [ - "@npm//@angular/compiler-cli", -+ "@angular//packages/compiler-cli", -+ "@angular//packages/compiler-cli/linker/babel", ++ "@angular//packages/compiler-cli/private", "@npm//@angular/build-tooling/shared-scripts/angular-optimization:js_lib", ], **common_base_attributes 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..7c0abd3 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 @@ @@ -58,36 +53,36 @@ index 6213703..7c0abd3 100755 # scope and to make it easier to replace this dependency inside the `angular/angular` # repository with its corresponding source target that does not come with any typings. - ng_bundle_deps.append("@npm//zone.js") -+ ng_bundle_deps.append("//packages/zone.js/dist:zone") ++ 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/shared-scripts/angular-linker/BUILD.bazel b/node_modules/@angular/build-tooling/shared-scripts/angular-linker/BUILD.bazel -index b14dbdb..eb21619 100755 ---- a/node_modules/@angular/build-tooling/shared-scripts/angular-linker/BUILD.bazel -+++ b/node_modules/@angular/build-tooling/shared-scripts/angular-linker/BUILD.bazel -@@ -19,7 +19,8 @@ js_library( - package_name = "@angular/build-tooling/shared-scripts/angular-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 ++++ b/node_modules/@angular/build-tooling/shared-scripts/angular-optimization/BUILD.bazel +@@ -43,7 +43,8 @@ js_library( srcs = [":js_lib_files"], deps = [ + ":angular_devkit_plugins", - "@npm//@angular/compiler-cli", + "@angular//packages/compiler-cli", + "@angular//packages/compiler-cli/linker/babel", "@npm//@babel/core", + "@npm//@babel/plugin-proposal-async-generator-functions", ], - ) -diff --git a/node_modules/@angular/build-tooling/shared-scripts/angular-linker/esbuild-plugin.mjs b/node_modules/@angular/build-tooling/shared-scripts/angular-linker/esbuild-plugin.mjs -index 965a10e..175aa92 100755 ---- a/node_modules/@angular/build-tooling/shared-scripts/angular-linker/esbuild-plugin.mjs -+++ b/node_modules/@angular/build-tooling/shared-scripts/angular-linker/esbuild-plugin.mjs -@@ -7,8 +7,8 @@ - */ +diff --git 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 +index fbaf182..e690328 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 - import fs from 'fs'; --import {NodeJSFileSystem, ConsoleLogger, LogLevel} from '@angular/compiler-cli'; --import {createEs2015LinkerPlugin} from '@angular/compiler-cli/linker/babel'; -+import {NodeJSFileSystem, ConsoleLogger, LogLevel} from '@angular/compiler-cli/index.mjs'; -+import {createEs2015LinkerPlugin} from '@angular/compiler-cli/linker/babel/index.mjs'; - import babel from '@babel/core'; + if (opts.enableLinker) { + linkerCreator = { +- compiler: await import('@angular/compiler-cli'), +- babel: await import('@angular/compiler-cli/linker/babel'), ++ compiler: await import('@angular/compiler-cli/index.mjs'), ++ babel: await import('@angular/compiler-cli/linker/babel/index.mjs'), + }; + } - /** Naively checks whether this node path resolves to an Angular declare invocation. */ diff --git a/yarn.lock b/yarn.lock index 0f2d5dcb0b4..6e2d92a0443 100644 --- a/yarn.lock +++ b/yarn.lock @@ -149,15 +149,15 @@ "@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#8bfc7e1aca9125487c1d52a5a2c09cc9e134e421": - version "0.0.0-96fdaaa056f1cfa7ffbc4c69b7e9007279f76c94" - uid "8bfc7e1aca9125487c1d52a5a2c09cc9e134e421" - resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#8bfc7e1aca9125487c1d52a5a2c09cc9e134e421" +"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#e1aec534818208328b29a76cfe9892c2a031ed94": + version "0.0.0-30acfb31077ddc552b6be501516833ec234ce5c1" + resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#e1aec534818208328b29a76cfe9892c2a031ed94" dependencies: "@angular-devkit/build-angular" "15.1.0-next.2" "@angular/benchpress" "0.3.0" "@babel/core" "^7.16.0" "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/plugin-proposal-async-generator-functions" "^7.20.1" "@bazel/buildifier" "5.1.0" "@bazel/concatjs" "5.7.3" "@bazel/esbuild" "5.7.3" @@ -305,7 +305,6 @@ "@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#05278122c48e06eff8e5398d59c49ed6688c949b": version "0.0.0-96fdaaa056f1cfa7ffbc4c69b7e9007279f76c94" - uid "05278122c48e06eff8e5398d59c49ed6688c949b" resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#05278122c48e06eff8e5398d59c49ed6688c949b" dependencies: "@yarnpkg/lockfile" "^1.1.0"