skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
docs-developer-preview-fix
angular__angular/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-56d0b1f597b9e4b5d99f289f6904a220802164c1.patch
T
Alan Agius 72108bad4d build: update cross-repo angular dependencies (#55654) 
See associated pull request for more information.

PR Close #55654
2024-05-03 08:04:40 -07:00

254 lines
12 KiB
Diff
Raw Permalink Blame History

diff --git a/node_modules/@angular/build-tooling/bazel/api-gen/extraction/BUILD.bazel b/node_modules/@angular/build-tooling/bazel/api-gen/extraction/BUILD.bazel
index bde72eb..50912e9 100755
--- a/node_modules/@angular/build-tooling/bazel/api-gen/extraction/BUILD.bazel
+++ b/node_modules/@angular/build-tooling/bazel/api-gen/extraction/BUILD.bazel
@@ -1,5 +1,5 @@
load("@npm//@bazel/concatjs:index.bzl", "ts_library")
-load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
+load("@angular//tools/esm-interop:index.bzl", "nodejs_binary")
load("@npm//@angular/build-tooling/bazel/esbuild:index.bzl", "esbuild")
package(default_visibility = ["@npm//@angular/build-tooling/bazel/api-gen:__subpackages__"])
@@ -17,7 +17,7 @@ esbuild(
target = "es2022",
deps = [
":extract_api_to_json_lib",
- "@npm//@angular/compiler-cli",
+ "@angular//packages/compiler-cli",
"@npm//typescript",
],
)
@@ -28,8 +28,8 @@ ts_library(
devmode_module = "commonjs",
tsconfig = "@npm//@angular/build-tooling:tsconfig.json",
deps = [
- "@npm//@angular/compiler",
- "@npm//@angular/compiler-cli",
+ "@angular//packages/compiler",
+ "@angular//packages/compiler-cli",
"@npm//@bazel/runfiles",
"@npm//@types/node",
"@npm//typescript",
@@ -41,8 +41,8 @@ nodejs_binary(
name = "extract_api_to_json",
data = [
":bin",
- "@npm//@angular/compiler",
- "@npm//@angular/compiler-cli",
+ "@angular//packages/compiler",
+ "@angular//packages/compiler-cli",
"@npm//typescript",
],
entry_point = "bin.mjs",
diff --git a/node_modules/@angular/build-tooling/bazel/api-gen/manifest/BUILD.bazel b/node_modules/@angular/build-tooling/bazel/api-gen/manifest/BUILD.bazel
index 26563a7..f7bc080 100755
--- a/node_modules/@angular/build-tooling/bazel/api-gen/manifest/BUILD.bazel
+++ b/node_modules/@angular/build-tooling/bazel/api-gen/manifest/BUILD.bazel
@@ -15,7 +15,7 @@ esbuild_esm_bundle(
target = "es2022",
deps = [
":generate_api_manifest_lib",
- "@npm//@angular/compiler-cli",
+ "@angular//packages/compiler-cli",
],
)
@@ -25,7 +25,7 @@ ts_library(
devmode_module = "commonjs",
tsconfig = "@npm//@angular/build-tooling:tsconfig.json",
deps = [
- "@npm//@angular/compiler-cli",
+ "@angular//packages/compiler-cli",
"@npm//@bazel/runfiles",
"@npm//@types/node",
],
@@ -36,7 +36,7 @@ nodejs_binary(
name = "generate_api_manifest",
data = [
":bin",
- "@npm//@angular/compiler-cli",
+ "@angular//packages/compiler-cli",
],
entry_point = "bin.mjs",
# Note: Using the linker here as we need it for ESM. The linker is not
diff --git a/node_modules/@angular/build-tooling/bazel/api-gen/rendering/BUILD.bazel b/node_modules/@angular/build-tooling/bazel/api-gen/rendering/BUILD.bazel
index f5e01df..1698016 100755
--- a/node_modules/@angular/build-tooling/bazel/api-gen/rendering/BUILD.bazel
+++ b/node_modules/@angular/build-tooling/bazel/api-gen/rendering/BUILD.bazel
@@ -1,5 +1,5 @@
load("@npm//@bazel/concatjs:index.bzl", "ts_library")
-load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
+load("@angular//tools/esm-interop:index.bzl", "nodejs_binary")
package(default_visibility = ["@npm//@angular/build-tooling/bazel/api-gen:__subpackages__"])
diff --git a/node_modules/@angular/build-tooling/bazel/api-golden/index.bzl b/node_modules/@angular/build-tooling/bazel/api-golden/index.bzl
index 6cee158..815a55d 100755
--- a/node_modules/@angular/build-tooling/bazel/api-golden/index.bzl
+++ b/node_modules/@angular/build-tooling/bazel/api-golden/index.bzl
@@ -1,5 +1,5 @@
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
index 1c27a95..c239203 100755
--- a/node_modules/@angular/build-tooling/bazel/app-bundling/BUILD.bazel
+++ b/node_modules/@angular/build-tooling/bazel/app-bundling/BUILD.bazel
@@ -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 81e67de..d1c1ac0 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
@@ -7,7 +7,7 @@
*/
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';
import * as path from 'path';
/** Root path pointing to the app bundle source entry-point file. */
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 d6249b8..761d50a 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,7 @@ def app_bundle(
name = "%s_esbuild_config" % name,
config_file = ":%s_config_file" % name,
deps = [
- "@npm//@angular/compiler-cli",
+ "@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/benchmark_test.bzl b/node_modules/@angular/build-tooling/bazel/benchmark/component_benchmark/benchmark_test.bzl
index 8bfab84..175cc9d 100755
--- a/node_modules/@angular/build-tooling/bazel/benchmark/component_benchmark/benchmark_test.bzl
+++ b/node_modules/@angular/build-tooling/bazel/benchmark/component_benchmark/benchmark_test.bzl
@@ -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(
name = name,
browsers = ["@npm//@angular/build-tooling/bazel/browsers/chromium:chromium"],
@@ -20,6 +20,7 @@ def benchmark_test(name, server, tags = [], **kwargs):
"manual",
"no-remote-exec",
],
+ data = data + ["@angular//packages/benchpress"],
test_suite_tags = [
"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..0c1d70f 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 @@
load("@npm//@angular/build-tooling/bazel/app-bundling:index.bzl", "app_bundle")
load("@npm//@angular/build-tooling/bazel/http-server:index.bzl", "http_server")
load("@npm//@angular/build-tooling/bazel:expand_template.bzl", "expand_template")
-load("@npm//@angular/bazel:index.bzl", "ng_module")
+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,
ng_deps = [
- "@npm//@angular/core",
- "@npm//@angular/platform-browser",
+ "@angular//packages/core",
+ "@angular//packages/platform-browser",
],
ng_assets = [],
assets = None,
@@ -108,7 +108,7 @@ def component_benchmark(
# checked by TypeScript. We add the dependency only for bundling to reduce the compilation
# 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("@angular//packages/zone.js:npm_package")
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
index 04cc755..ec01017 100755
--- a/node_modules/@angular/build-tooling/bazel/http-server/BUILD.bazel
+++ b/node_modules/@angular/build-tooling/bazel/http-server/BUILD.bazel
@@ -1,4 +1,4 @@
-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 6f99d65..1bd5183 100755
--- a/node_modules/@angular/build-tooling/bazel/integration/index.bzl
+++ b/node_modules/@angular/build-tooling/bazel/integration/index.bzl
@@ -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
index af0f305..ce46302 100755
--- a/node_modules/@angular/build-tooling/bazel/map-size-tracking/index.bzl
+++ b/node_modules/@angular/build-tooling/bazel/map-size-tracking/index.bzl
@@ -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 b2729ad..80ab926 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
@@ -24,7 +24,8 @@ js_library(
srcs = [":js_lib_files"],
deps = [
"@npm//@angular/build",
- "@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-optimization/esbuild-plugin.mjs b/node_modules/@angular/build-tooling/shared-scripts/angular-optimization/esbuild-plugin.mjs
index e79184b..da9e479 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
@@ -29,8 +29,8 @@ export async function createEsbuildAngularOptimizePlugin(opts, additionalBabelPl
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'),
};
}
Reference in New Issue View Git Blame Copy Permalink