Skip to content

Commit a6a2e38

Browse files
josephperrottcrisbeto
authored andcommitted
build: update to bazel 7.6.0 (#63096)
Update to later version of bazel PR Close #63096
1 parent 2faed63 commit a6a2e38

File tree

52 files changed

+189
-71
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+189
-71
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.5.0
1+
7.6.0

MODULE.bazel

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# TODO: Investigate bzlmod and use it where possible.
2+
3+
module(
4+
name = "angular",
5+
)

MODULE.bazel.lock

Lines changed: 110 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adev/shared-docs/pipeline/guides/mermaid/index.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function getMermaidScriptTagData() {
3333
}
3434

3535
return (mermaidScriptTagData = {
36-
path: resolve(join(runfilesDir, 'angular/adev/node_modules/mermaid/dist/mermaid.js')),
36+
path: resolve(join(runfilesDir, '_main/adev/node_modules/mermaid/dist/mermaid.js')),
3737
});
3838
}
3939

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package(default_visibility = ["//visibility:public"])
55
sass_binary(
66
name = "injector_providers_component_styles",
77
src = "injector-providers.component.scss",
8-
include_paths = ["external/angular/node_modules"],
8+
include_paths = ["external/_main/node_modules"],
99
deps = ["//devtools/projects/ng-devtools/src/styles:typography"],
1010
)
1111

devtools/projects/shell-browser/src/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package(default_visibility = ["//visibility:public"])
55
sass_binary(
66
name = "shell_common_styles",
77
src = "styles.scss",
8-
include_paths = ["external/angular/node_modules"],
8+
include_paths = ["external/_main/node_modules"],
99
sourcemap = False,
1010
deps = ["//devtools/projects/ng-devtools/src/styles:global"],
1111
)

integration/ng-modules-importability/index.mts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ import ts from 'typescript';
66
import {findAllEntryPointsAndExportedModules} from './find-all-modules.mjs';
77

88
async function main() {
9+
// Touch the TEST_SHARD_FILE to mark for bazel that sharding is supported.
10+
await fs.writeFile(process.env.TEST_SHARD_STATUS_FILE!, '', {encoding: 'utf-8'});
11+
912
const [configPath] = process.argv.slice(2);
1013
const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'ng-module-test-'));
1114
const config = JSON.parse(await fs.readFile(configPath, 'utf8')) as {

karma-js.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ module.exports = function (config) {
6262
// Bazel inter-op: Allow tests to request resources from either
6363
// /base/node_modules/path/to/thing
6464
// or
65-
// /base/angular/node_modules/path/to/thing
65+
// /base/_main/node_modules/path/to/thing
6666
// This can be removed when all karma tests are run under Bazel, then we
6767
// don't need this entire config file.
6868
proxies: {

modules/benchmarks/src/change_detection/transplanted_views/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h2>Render3 Transplanted View Benchmark</h2>
2727
</div>
2828

2929
<!-- BEGIN-EXTERNAL -->
30-
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
30+
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
3131
<!-- END-EXTERNAL -->
3232

3333
<!-- Needs to be named `app_bundle` for sync into Google. -->

modules/benchmarks/src/defer/baseline/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h2>Defer Benchmark (baseline)</h2>
3030
</div>
3131

3232
<!-- BEGIN-EXTERNAL -->
33-
<script src="/angular/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
33+
<script src="/_main/modules/node_modules/zone.js/bundles/zone.umd.js"></script>
3434
<!-- END-EXTERNAL -->
3535

3636
<!-- Needs to be named `app_bundle` for sync into Google. -->

0 commit comments

Comments
 (0)