Elgato_dark/angular
1
0
Fork 0
mirror of https://github.com/angular/angular synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

build: update to bazel 7.6.0 (#63096)

Browse source 
Update to later version of bazel

PR Close #63096
This commit is contained in:
Joey Perrott 2025-08-11 16:12:13 +00:00 committed by Kristiyan Kostadinov
parent a59c3fe74e
commit c35c0c7f2f
52 changed files with 189 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.bazelversion
View file

@ -1 +1 @@
6.5.0
7.6.0

5
MODULE.bazel Normal file
View file

@ -0,0 +1,5 @@
# TODO: Investigate bzlmod and use it where possible.
module(
name = "angular",
)

110
MODULE.bazel.lock Normal file
View file

@ -0,0 +1,110 @@
{
"lockFileVersion": 13,
"registryFileHashes": {
"https://bcr.bazel.build/bazel_registry.json": "8a28e4aff06ee60aed2a8c281907fb8bcbf3b753c91fb5a5c57da3215d5b3497",
"https://bcr.bazel.build/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2",
"https://bcr.bazel.build/modules/abseil-cpp/20211102.0/MODULE.bazel": "70390338f7a5106231d20620712f7cccb659cd0e9d073d1991c038eb9fc57589",
"https://bcr.bazel.build/modules/abseil-cpp/20211102.0/source.json": "7e3a9adf473e9af076ae485ed649d5641ad50ec5c11718103f34de03170d94ad",
"https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel": "50341a62efbc483e8a2a6aec30994a58749bd7b885e18dd96aa8c33031e558ef",
"https://bcr.bazel.build/modules/apple_support/1.5.0/source.json": "eb98a7627c0bc486b57f598ad8da50f6625d974c8f723e9ea71bd39f709c9862",
"https://bcr.bazel.build/modules/bazel_features/1.11.0/MODULE.bazel": "f9382337dd5a474c3b7d334c2f83e50b6eaedc284253334cf823044a26de03e8",
"https://bcr.bazel.build/modules/bazel_features/1.11.0/source.json": "c9320aa53cd1c441d24bd6b716da087ad7e4ff0d9742a9884587596edfe53015",
"https://bcr.bazel.build/modules/bazel_skylib/1.0.3/MODULE.bazel": "bcb0fd896384802d1ad283b4e4eb4d718eebd8cb820b0a2c3a347fb971afd9d8",
"https://bcr.bazel.build/modules/bazel_skylib/1.2.1/MODULE.bazel": "f35baf9da0efe45fa3da1696ae906eea3d615ad41e2e3def4aeb4e8bc0ef9a7a",
"https://bcr.bazel.build/modules/bazel_skylib/1.3.0/MODULE.bazel": "20228b92868bf5cfc41bda7afc8a8ba2a543201851de39d990ec957b513579c5",
"https://bcr.bazel.build/modules/bazel_skylib/1.6.1/MODULE.bazel": "8fdee2dbaace6c252131c00e1de4b165dc65af02ea278476187765e1a617b917",
"https://bcr.bazel.build/modules/bazel_skylib/1.6.1/source.json": "082ed5f9837901fada8c68c2f3ddc958bb22b6d654f71dd73f3df30d45d4b749",
"https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84",
"https://bcr.bazel.build/modules/buildozer/7.1.2/source.json": "c9028a501d2db85793a6996205c8de120944f50a0d570438fcae0457a5f9d1f8",
"https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4",
"https://bcr.bazel.build/modules/googletest/1.11.0/source.json": "c73d9ef4268c91bd0c1cd88f1f9dfa08e814b1dbe89b5f594a9f08ba0244d206",
"https://bcr.bazel.build/modules/platforms/0.0.4/MODULE.bazel": "9b328e31ee156f53f3c416a64f8491f7eb731742655a47c9eec4703a71644aee",
"https://bcr.bazel.build/modules/platforms/0.0.5/MODULE.bazel": "5733b54ea419d5eaf7997054bb55f6a1d0b5ff8aedf0176fef9eea44f3acda37",
"https://bcr.bazel.build/modules/platforms/0.0.6/MODULE.bazel": "ad6eeef431dc52aefd2d77ed20a4b353f8ebf0f4ecdd26a807d2da5aa8cd0615",
"https://bcr.bazel.build/modules/platforms/0.0.7/MODULE.bazel": "72fd4a0ede9ee5c021f6a8dd92b503e089f46c227ba2813ff183b71616034814",
"https://bcr.bazel.build/modules/platforms/0.0.9/MODULE.bazel": "4a87a60c927b56ddd67db50c89acaa62f4ce2a1d2149ccb63ffd871d5ce29ebc",
"https://bcr.bazel.build/modules/platforms/0.0.9/source.json": "cd74d854bf16a9e002fb2ca7b1a421f4403cda29f824a765acd3a8c56f8d43e6",
"https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel": "a5a29bb89544f9b97edce05642fac225a808b5b7be74038ea3640fae2f8e66a7",
"https://bcr.bazel.build/modules/protobuf/21.7/source.json": "bbe500720421e582ff2d18b0802464205138c06056f443184de39fbb8187b09b",
"https://bcr.bazel.build/modules/protobuf/3.19.0/MODULE.bazel": "6b5fbb433f760a99a22b18b6850ed5784ef0e9928a72668b66e4d7ccd47db9b0",
"https://bcr.bazel.build/modules/protobuf/3.19.6/MODULE.bazel": "9233edc5e1f2ee276a60de3eaa47ac4132302ef9643238f23128fea53ea12858",
"https://bcr.bazel.build/modules/rules_cc/0.0.1/MODULE.bazel": "cb2aa0747f84c6c3a78dad4e2049c154f08ab9d166b1273835a8174940365647",
"https://bcr.bazel.build/modules/rules_cc/0.0.2/MODULE.bazel": "6915987c90970493ab97393024c156ea8fb9f3bea953b2f3ec05c34f19b5695c",
"https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e",
"https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5",
"https://bcr.bazel.build/modules/rules_cc/0.0.9/source.json": "1f1ba6fea244b616de4a554a0f4983c91a9301640c8fe0dd1d410254115c8430",
"https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74",
"https://bcr.bazel.build/modules/rules_java/7.6.5/MODULE.bazel": "481164be5e02e4cab6e77a36927683263be56b7e36fef918b458d7a8a1ebadb1",
"https://bcr.bazel.build/modules/rules_java/7.6.5/source.json": "a805b889531d1690e3c72a7a7e47a870d00323186a9904b36af83aa3d053ee8d",
"https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7",
"https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/source.json": "a075731e1b46bc8425098512d038d416e966ab19684a10a34f4741295642fc35",
"https://bcr.bazel.build/modules/rules_license/0.0.3/MODULE.bazel": "627e9ab0247f7d1e05736b59dbb1b6871373de5ad31c3011880b4133cafd4bd0",
"https://bcr.bazel.build/modules/rules_license/0.0.7/MODULE.bazel": "088fbeb0b6a419005b89cf93fe62d9517c0a2b8bb56af3244af65ecfe37e7d5d",
"https://bcr.bazel.build/modules/rules_license/0.0.7/source.json": "355cc5737a0f294e560d52b1b7a6492d4fff2caf0bef1a315df5a298fca2d34a",
"https://bcr.bazel.build/modules/rules_pkg/0.7.0/MODULE.bazel": "df99f03fc7934a4737122518bb87e667e62d780b610910f0447665a7e2be62dc",
"https://bcr.bazel.build/modules/rules_pkg/0.7.0/source.json": "c2557066e0c0342223ba592510ad3d812d4963b9024831f7f66fd0584dd8c66c",
"https://bcr.bazel.build/modules/rules_proto/4.0.0/MODULE.bazel": "a7a7b6ce9bee418c1a760b3d84f83a299ad6952f9903c67f19e4edd964894e06",
"https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/MODULE.bazel": "e8dff86b0971688790ae75528fe1813f71809b5afd57facb44dad9e8eca631b7",
"https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/source.json": "d57902c052424dfda0e71646cb12668d39c4620ee0544294d9d941e7d12bc3a9",
"https://bcr.bazel.build/modules/rules_python/0.10.2/MODULE.bazel": "cc82bc96f2997baa545ab3ce73f196d040ffb8756fd2d66125a530031cd90e5f",
"https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel": "26114f0c0b5e93018c0c066d6673f1a2c3737c7e90af95eff30cfee38d0bbac7",
"https://bcr.bazel.build/modules/rules_python/0.22.1/source.json": "57226905e783bae7c37c2dd662be078728e48fa28ee4324a7eabcafb5a43d014",
"https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c",
"https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8",
"https://bcr.bazel.build/modules/stardoc/0.5.1/source.json": "a96f95e02123320aa015b956f29c00cb818fa891ef823d55148e1a362caacf29",
"https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43",
"https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/source.json": "f1ef7d3f9e0e26d4b23d1c39b5f5de71f584dd7d1b4ef83d9bbba6ec7a6a6459",
"https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0",
"https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27",
"https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/MODULE.bazel": "af322bc08976524477c79d1e45e241b6efbeb918c497e8840b8ab116802dda79",
"https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/source.json": "2be409ac3c7601245958cd4fcdff4288be79ed23bd690b4b951f500d54ee6e7d"
},
"selectedYankedVersions": {},
"moduleExtensions": {
"@@apple_support~//crosstool:setup.bzl%apple_cc_configure_extension": {
"general": {
"bzlTransitiveDigest": "PjIds3feoYE8SGbbIq2SFTZy3zmxeO2tQevJZNDo7iY=",
"usagesDigest": "+hz7IHWN6A1oVJJWNDB6yZRG+RYhF76wAYItpAeIUIg=",
"recordedFileInputs": {},
"recordedDirentsInputs": {},
"envVariables": {},
"generatedRepoSpecs": {
"local_config_apple_cc_toolchains": {
"bzlFile": "@@apple_support~//crosstool:setup.bzl",
"ruleClassName": "_apple_cc_autoconf_toolchains",
"attributes": {}
},
"local_config_apple_cc": {
"bzlFile": "@@apple_support~//crosstool:setup.bzl",
"ruleClassName": "_apple_cc_autoconf",
"attributes": {}
}
},
"recordedRepoMappingEntries": [
[
"apple_support~",
"bazel_tools",
"bazel_tools"
]
]
}
},
"@@platforms//host:extension.bzl%host_platform": {
"general": {
"bzlTransitiveDigest": "xelQcPZH8+tmuOHVjL9vDxMnnQNMlwj0SlvgoqBkm4U=",
"usagesDigest": "pCYpDQmqMbmiiPI1p2Kd3VLm5T48rRAht5WdW0X2GlA=",
"recordedFileInputs": {},
"recordedDirentsInputs": {},
"envVariables": {},
"generatedRepoSpecs": {
"host_platform": {
"bzlFile": "@@platforms//host:extension.bzl",
"ruleClassName": "host_platform_repo",
"attributes": {}
}
},
"recordedRepoMappingEntries": []
}
}
}
}

2
adev/shared-docs/pipeline/guides/mermaid/index.mts
View file

@ -33,7 +33,7 @@ function getMermaidScriptTagData() {
}
return (mermaidScriptTagData = {
path: resolve(join(runfilesDir, 'angular/adev/node_modules/mermaid/dist/mermaid.js')),
path: resolve(join(runfilesDir, '_main/adev/node_modules/mermaid/dist/mermaid.js')),
});
}

2
devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-providers/BUILD.bazel
View file

@ -5,7 +5,7 @@ package(default_visibility = ["//visibility:public"])
sass_binary(
name = "injector_providers_component_styles",
src = "injector-providers.component.scss",
include_paths = ["external/angular/node_modules"],
include_paths = ["external/_main/node_modules"],
deps = ["//devtools/projects/ng-devtools/src/styles:typography"],
)

2
devtools/projects/shell-browser/src/BUILD.bazel
View file

@ -5,7 +5,7 @@ package(default_visibility = ["//visibility:public"])
sass_binary(
name = "shell_common_styles",
src = "styles.scss",
include_paths = ["external/angular/node_modules"],
include_paths = ["external/_main/node_modules"],
sourcemap = False,
deps = ["//devtools/projects/ng-devtools/src/styles:global"],
)

3
integration/ng-modules-importability/index.mts
View file

@ -6,6 +6,9 @@ import ts from 'typescript';
import {findAllEntryPointsAndExportedModules} from './find-all-modules.mjs';
async function main() {
// Touch the TEST_SHARD_FILE to mark for bazel that sharding is supported.
await fs.writeFile(process.env.TEST_SHARD_STATUS_FILE!, '', {encoding: 'utf-8'});
const [configPath] = process.argv.slice(2);
const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'ng-module-test-'));
const config = JSON.parse(await fs.readFile(configPath, 'utf8')) as {

2
karma-js.conf.js
View file

@ -62,7 +62,7 @@ module.exports = function (config) {
// Bazel inter-op: Allow tests to request resources from either
// /base/node_modules/path/to/thing
// or
// /base/angular/node_modules/path/to/thing
// /base/_main/node_modules/path/to/thing
// This can be removed when all karma tests are run under Bazel, then we
// don't need this entire config file.
proxies: {

2
modules/benchmarks/src/change_detection/transplanted_views/index.html
View file

@ -27,7 +27,7 @@
</div>
<!-- BEGIN-EXTERNAL -->
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<!-- END-EXTERNAL -->
<!-- Needs to be named `app_bundle` for sync into Google. -->

2
modules/benchmarks/src/defer/baseline/index.html
View file

@ -30,7 +30,7 @@
</div>
<!-- BEGIN-EXTERNAL -->
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<!-- END-EXTERNAL -->
<!-- Needs to be named `app_bundle` for sync into Google. -->

2
modules/benchmarks/src/defer/main/index.html
View file

@ -30,7 +30,7 @@
</div>
<!-- BEGIN-EXTERNAL -->
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<!-- END-EXTERNAL -->
<!-- Needs to be named `app_bundle` for sync into Google. -->

2
modules/benchmarks/src/expanding_rows/index.html
View file

@ -12,7 +12,7 @@
<benchmark-root>Loading...</benchmark-root>
<!-- BEGIN-EXTERNAL -->
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<!-- END-EXTERNAL -->
<!-- Needs to be named `app_bundle` for sync into Google. -->

2
modules/benchmarks/src/hydration/baseline/index.html
View file

@ -32,7 +32,7 @@
</div>
<!-- BEGIN-EXTERNAL -->
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<!-- END-EXTERNAL -->
<div id="table"></div>

2
modules/benchmarks/src/hydration/main/index.html
View file

@ -32,7 +32,7 @@
</div>
<!-- BEGIN-EXTERNAL -->
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<!-- END-EXTERNAL -->
<div id="table"></div>

2
modules/benchmarks/src/largeform/ng2/index.html
View file

@ -21,7 +21,7 @@
</div>
<!-- BEGIN-EXTERNAL -->
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<!-- END-EXTERNAL --
<!-- Needs to be named `app_bundle` for sync into Google. -->

2
modules/benchmarks/src/largetable/ng2/index.html
View file

@ -29,7 +29,7 @@
</div>
<!-- BEGIN-EXTERNAL -->
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<!-- END-EXTERNAL -->
<!-- Needs to be named `app_bundle` for sync into Google. -->

2
modules/benchmarks/src/largetable/ng2_switch/index.html
View file

@ -29,7 +29,7 @@
</div>
<!-- BEGIN-EXTERNAL -->
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<!-- END-EXTERNAL -->
<!-- Needs to be named `app_bundle` for sync into Google. -->

2
modules/benchmarks/src/ng_template_outlet_context/ng2/index.html
View file

@ -10,7 +10,7 @@
<app-component>Loading...</app-component>
</div>
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/bundle.debug.min.js"></script>
</body>
</html>

2
modules/benchmarks/src/styling/ng2/index.html
View file

@ -50,7 +50,7 @@
</div>
<!-- BEGIN-EXTERNAL -->
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<!-- END-EXTERNAL -->
<!-- Needs to be named `app_bundle` for sync into Google. -->

2
modules/benchmarks/src/tree/ng2/index.html
View file

@ -29,7 +29,7 @@
</div>
<!-- BEGIN-EXTERNAL -->
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<!-- END-EXTERNAL -->
<!-- Needs to be named `app_bundle` for sync into Google. -->

4
modules/benchmarks/src/tree/ng2_static/index.html
View file

@ -26,8 +26,8 @@
</div>
<!-- BEGIN-EXTERNAL -->
<script src="/angular/modules/node_modules/reflect-metadata/Reflect.js"></script>
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/reflect-metadata/Reflect.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<!-- END-EXTERNAL -->
<!-- Needs to be named `app_bundle` for sync into Google. -->

2
modules/benchmarks/src/tree/ng2_switch/index.html
View file

@ -26,7 +26,7 @@
</div>
<!-- BEGIN-EXTERNAL -->
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<!-- END-EXTERNAL -->
<!-- Needs to be named `app_bundle` for sync into Google. -->

2
modules/playground/src/animate/index.html
View file

@ -16,6 +16,6 @@
<body>
<animate-app>Loading...</animate-app>
</body>
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script type="module" src="/app_bundle.js"></script>
</html>

2
modules/playground/src/async/index.html
View file

@ -7,7 +7,7 @@
<body>
<async-app> Loading... </async-app>
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script type="module" src="/app_bundle.js"></script>
</body>
</html>

2
modules/playground/src/hello_world/index.html
View file

@ -4,7 +4,7 @@
<body>
<hello-app> Loading... </hello-app>
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script type="module" src="/app_bundle.js"></script>
</body>
</html>

2
modules/playground/src/http/index.html
View file

@ -4,7 +4,7 @@
<body>
<http-app> Loading... </http-app>
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script type="module" src="/app_bundle.js"></script>
</body>
</html>

2
modules/playground/src/jsonp/index.html
View file

@ -4,7 +4,7 @@
<body>
<jsonp-app> Loading... </jsonp-app>
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script type="module" src="/app_bundle.js"></script>
</body>
</html>

2
modules/playground/src/key_events/index.html
View file

@ -19,7 +19,7 @@
<body>
<key-events-app> Loading... </key-events-app>
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script type="module" src="/app_bundle.js"></script>
</body>
</html>

2
modules/playground/src/sourcemap/index.html
View file

@ -6,7 +6,7 @@
<p>Please look into the console and check whether the stack trace is mapped via source maps!</p>
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script type="module" src="/app_bundle.js"></script>
</body>
</html>

2
modules/playground/src/svg/index.html
View file

@ -4,7 +4,7 @@
<body>
<svg-app> Loading... </svg-app>
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script type="module" src="/app_bundle.js"></script>
</body>
</html>

2
modules/playground/src/template_driven_forms/index.html
View file

@ -12,7 +12,7 @@
<body>
<template-driven-forms> Loading... </template-driven-forms>
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script type="module" src="/app_bundle.js"></script>
</body>
</html>

2
modules/playground/src/todo/index.html
View file

@ -8,7 +8,7 @@
Loading...
</todo-app>
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script type="module" src="/app_bundle.js"></script>
</body>
</html>

6
modules/playground/src/upgrade/index.html
View file

@ -17,9 +17,9 @@
<span class="greeting">Greetings from {{name}}!</span>
</upgrade-app>
<script src="/angular/modules/node_modules/reflect-metadata/Reflect.js"></script>
<script src="/angular/modules/node_modules/angular-1.8/angular.js"></script>
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/reflect-metadata/Reflect.js"></script>
<script src="/_main/modules/node_modules/angular-1.8/angular.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script type="module" src="/app_bundle.js"></script>
</body>
</html>

2
modules/playground/src/zippy_component/index.html
View file

@ -4,7 +4,7 @@
<body>
<zippy-app> Loading... </zippy-app>
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
<script type="module" src="/app_bundle.js"></script>
</body>
</html>

2
packages/compiler-cli/src/ngtsc/incremental/semantic_graph/src/graph.ts
View file

@ -54,7 +54,7 @@ export class SemanticDepGraph {
// Note: the explicit type annotation is used to work around a CI failure on Windows:
// error TS2742: The inferred type of 'symbolByDecl' cannot be named without a reference to
// '../../../../../../../external/angular/node_modules/typescript/lib/typescript'. This is likely
// '../../../../../../../external/_main/node_modules/typescript/lib/typescript'. This is likely
// not portable. A type annotation is necessary.
readonly symbolByDecl: Map<ClassDeclaration, SemanticSymbol> = new Map<
ClassDeclaration,

10
packages/compiler-cli/src/ngtsc/testing/src/mock_file_loading.ts
View file

@ -40,11 +40,11 @@ class CachedFolder {
}
const typescriptFolder = new CachedFolder(() =>
loadFolder(resolveFromRunfiles('angular/node_modules/typescript')),
loadFolder(resolveFromRunfiles('_main/node_modules/typescript')),
);
const angularFolder = new CachedFolder(loadAngularFolder);
const rxjsFolder = new CachedFolder(() =>
loadFolder(resolveFromRunfiles('angular/node_modules/rxjs')),
loadFolder(resolveFromRunfiles('_main/node_modules/rxjs')),
);
export function loadStandardTestFiles({
@ -74,7 +74,7 @@ export function loadStandardTestFiles({
export function loadTsLib(fs: FileSystem, basePath: string = '/') {
loadTestDirectory(
fs,
resolveFromRunfiles('angular/node_modules/tslib'),
resolveFromRunfiles('_main/node_modules/tslib'),
fs.resolve(basePath, 'node_modules/tslib'),
);
}
@ -82,7 +82,7 @@ export function loadTsLib(fs: FileSystem, basePath: string = '/') {
export function loadFakeCommon(fs: FileSystem, basePath: string = '/') {
loadTestDirectory(
fs,
resolveFromRunfiles('angular/packages/compiler-cli/src/ngtsc/testing/fake_common/npm_package'),
resolveFromRunfiles('_main/packages/compiler-cli/src/ngtsc/testing/fake_common/npm_package'),
fs.resolve(basePath, 'node_modules/@angular/common'),
);
}
@ -90,7 +90,7 @@ export function loadFakeCommon(fs: FileSystem, basePath: string = '/') {
export function loadAngularCore(fs: FileSystem, basePath: string = '/') {
loadTestDirectory(
fs,
resolveFromRunfiles('angular/packages/core/npm_package'),
resolveFromRunfiles('_main/packages/core/npm_package'),
fs.resolve(basePath, 'node_modules/@angular/core'),
);
}

6
packages/compiler-cli/src/ngtsc/testing/src/runfile_helpers.ts
View file

@ -22,7 +22,7 @@ export function getAngularPackagesFromRunfiles() {
const runfilesManifestPath = process.env['RUNFILES_MANIFEST_FILE'];
if (!runfilesManifestPath) {
const packageRunfilesDir = path.join(process.env['RUNFILES']!, 'angular/packages');
const packageRunfilesDir = path.join(process.env['RUNFILES']!, '_main/packages');
return fs
.readdirSync(packageRunfilesDir)
@ -34,9 +34,9 @@ export function getAngularPackagesFromRunfiles() {
.readFileSync(runfilesManifestPath, 'utf8')
.split('\n')
.map((mapping) => mapping.split(' '))
.filter(([runfilePath]) => runfilePath.match(/^angular\/packages\/[\w-]+\/npm_package$/))
.filter(([runfilePath]) => runfilePath.match(/^_main\/packages\/[\w-]+\/npm_package$/))
.map(([runfilePath, realPath]) => ({
name: path.relative('angular/packages', runfilePath).split(path.sep)[0],
name: path.relative('_main/packages', runfilePath).split(path.sep)[0],
pkgPath: realPath,
}));
}

2
packages/compiler-cli/src/ngtsc/typecheck/testing/index.ts
View file

@ -170,7 +170,7 @@ export function angularCoreDtsFiles(): TestFile[] {
return _angularCoreDts;
}
const directory = resolveFromRunfiles('angular/packages/core/npm_package');
const directory = resolveFromRunfiles('_main/packages/core/npm_package');
const dtsFiles = globSync('**/*.d.ts', {cwd: directory});
return (_angularCoreDts = dtsFiles.map((fileName) => ({

4
packages/compiler-cli/test/test_support.ts
View file

@ -131,14 +131,14 @@ export function setupBazelTo(tmpDirPath: string) {
});
// Link typescript
const typeScriptSource = resolveFromRunfiles('angular/node_modules/typescript');
const typeScriptSource = resolveFromRunfiles('_main/node_modules/typescript');
const typescriptDest = path.join(nodeModulesPath, 'typescript');
fs.symlinkSync(typeScriptSource, typescriptDest, 'junction');
// Link "rxjs" if it has been set up as a runfile. "rxjs" is linked optionally because
// not all compiler-cli tests need "rxjs" set up.
try {
const rxjsSource = resolveFromRunfiles('angular/node_modules/rxjs');
const rxjsSource = resolveFromRunfiles('_main/node_modules/rxjs');
const rxjsDest = path.join(nodeModulesPath, 'rxjs');
fs.symlinkSync(rxjsSource, rxjsDest, 'junction');
} catch (e: any) {

2
packages/core/test/bundling/image-directive/index.html
View file

@ -10,7 +10,7 @@
<app-root></app-root>
<script src="/angular/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="bundle.js"></script>
</body>
</html>

2
packages/examples/common/BUILD.bazel
View file

@ -48,7 +48,7 @@ esbuild(
http_server(
name = "devserver",
srcs = ["//packages/examples:index.html"],
additional_root_paths = ["angular/packages/examples"],
additional_root_paths = ["_main/packages/examples"],
deps = [":app_bundle"],
)

2
packages/examples/core/BUILD.bazel
View file

@ -65,7 +65,7 @@ esbuild(
http_server(
name = "devserver",
srcs = ["//packages/examples:index.html"],
additional_root_paths = ["angular/packages/examples"],
additional_root_paths = ["_main/packages/examples"],
deps = [":app_bundle"],
)

2
packages/examples/forms/BUILD.bazel
View file

@ -48,7 +48,7 @@ esbuild(
http_server(
name = "devserver",
srcs = ["//packages/examples:index.html"],
additional_root_paths = ["angular/packages/examples"],
additional_root_paths = ["_main/packages/examples"],
deps = [":app_bundle"],
)

2
packages/examples/router/activated-route/BUILD.bazel
View file

@ -33,7 +33,7 @@ esbuild(
http_server(
name = "devserver",
srcs = ["//packages/examples:index.html"],
additional_root_paths = ["angular/packages/examples"],
additional_root_paths = ["_main/packages/examples"],
deps = [":app_bundle"],
)

2
packages/examples/service-worker/push/BUILD.bazel
View file

@ -49,7 +49,7 @@ http_server(
"ngsw-worker.js",
"//packages/examples:index.html",
],
additional_root_paths = ["angular/packages/examples"],
additional_root_paths = ["_main/packages/examples"],
deps = [":app_bundle"],
)

2
packages/examples/service-worker/registration-options/BUILD.bazel
View file

@ -49,7 +49,7 @@ http_server(
"ngsw-worker.js",
"//packages/examples:index.html",
],
additional_root_paths = ["angular/packages/examples"],
additional_root_paths = ["_main/packages/examples"],
deps = [":app_bundle"],
)

6
packages/examples/upgrade/index.html
View file

@ -12,9 +12,9 @@
<body>
<example-app>Loading...</example-app>
<script src="/angular/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/angular/node_modules/angular-1.8/angular.js"></script>
<script src="/angular/node_modules/reflect-metadata/Reflect.js"></script>
<script src="/_main/node_modules/zone.js/bundles/zone.umd.js"></script>
<script src="/_main/node_modules/angular-1.8/angular.js"></script>
<script src="/_main/node_modules/reflect-metadata/Reflect.js"></script>
<script src="/app_bundle.js"></script>
</body>
</html>

2
packages/examples/upgrade/upgrade_example.bzl
View file

@ -49,7 +49,7 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_point, assets = [
http_server(
name = "devserver",
additional_root_paths = ["angular/packages/examples/upgrade"],
additional_root_paths = ["_main/packages/examples/upgrade"],
srcs = [
"//packages/examples/upgrade:index.html",
"//:node_modules/zone.js",

2
packages/language-service/test/legacy/mock_host.ts
View file

@ -33,7 +33,7 @@ const logger: ts.server.Logger = {
export const TEST_SRCDIR = process.env['TEST_SRCDIR']!;
export const PROJECT_DIR: string = join(
TEST_SRCDIR,
'angular',
'_main',
'packages',
'language-service',
'test',

14
packages/language-service/test/legacy/mock_host_spec.ts
View file

@ -30,7 +30,7 @@ describe('mock host', () => {
expect(project).toBeInstanceOf(ts.server.ConfiguredProject);
const configPath = (project as ts.server.ConfiguredProject).getConfigFilePath();
expect(configPath.substring(TEST_SRCDIR.length)).toBe(
'/angular/packages/language-service/test/legacy/project/tsconfig.json',
'/_main/packages/language-service/test/legacy/project/tsconfig.json',
);
const program = tsLS.getProgram();
expect(program).toBeDefined();
@ -44,13 +44,13 @@ describe('mock host', () => {
expect(sourceFiles).toEqual(
jasmine.arrayContaining([
// This shows that module resolution works
'/angular/packages/common/src/common.d.ts',
'/angular/packages/core/src/core.d.ts',
'/angular/packages/forms/src/forms.d.ts',
'/_main/packages/common/src/common.d.ts',
'/_main/packages/core/src/core.d.ts',
'/_main/packages/forms/src/forms.d.ts',
// This shows that project files are present
'/angular/packages/language-service/test/legacy/project/app/app.component.ts',
'/angular/packages/language-service/test/legacy/project/app/main.ts',
'/angular/packages/language-service/test/legacy/project/app/parsing-cases.ts',
'/_main/packages/language-service/test/legacy/project/app/app.component.ts',
'/_main/packages/language-service/test/legacy/project/app/main.ts',
'/_main/packages/language-service/test/legacy/project/app/parsing-cases.ts',
]),
);
});

10
packages/zone.js/test/main.ts
View file

@ -36,11 +36,11 @@ if (typeof __karma__ !== 'undefined') {
System.config({
defaultJSExtensions: true,
map: {
'rxjs': 'base/angular/node_modules/rxjs/index',
'rxjs/operators': 'base/angular/node_modules/rxjs/operators/index',
'core-js/features/set': 'base/angular/node_modules/core-js/es6/set',
'core-js/features/map': 'base/angular/node_modules/core-js/es6/map',
'es6-promise': 'base/angular/node_modules/es6-promise/dist/es6-promise',
'rxjs': 'base/_main/node_modules/rxjs/index',
'rxjs/operators': 'base/_main/node_modules/rxjs/operators/index',
'core-js/features/set': 'base/_main/node_modules/core-js/es6/set',
'core-js/features/map': 'base/_main/node_modules/core-js/es6/map',
'es6-promise': 'base/_main/node_modules/es6-promise/dist/es6-promise',
},
});

2
tools/bazel/node_loader/hooks.mjs
View file

@ -26,7 +26,7 @@ const nonModuleImportRe = /^[.\/]/;
const runfilesRoot = process.env.JS_BINARY__RUNFILES;
const tsconfigPath = path.join(runfilesRoot, 'angular/packages/tsconfig-build.json');
const tsconfigPath = path.join(runfilesRoot, '_main/packages/tsconfig-build.json');
const tsconfig = parseTsconfig(tsconfigPath);
const pathMappingMatcher = createPathsMatcher({config: tsconfig, path: tsconfigPath});