Skip to content
This repository was archived by the owner on Jan 19, 2023. It is now read-only.

Commit b757b13

Browse files
devversionAndrewKushnir
authored andcommitted
build: update dev-infra packages and account for build-tooling split from ng-dev (angular#46976)
The dev-infra build tooling is now decoupled from `ng-dev`. This will make it easier to update `ng-dev` without necessarily needing to upgrade the whole build system, Bazel etc. This is useful when e.g. new release tool features have been added and should also be ported to active LTS branches. PR Close angular#46976
1 parent 1fe759d commit b757b13

File tree

76 files changed

+202
-209
lines changed

Some content is hidden

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

76 files changed

+202
-209
lines changed

.bazelrc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ build:remote --cpu=k8
9696
build:remote --host_cpu=k8
9797

9898
# Toolchain and platform related flags
99-
build:remote --crosstool_top=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain_suite
100-
build:remote --extra_toolchains=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain
101-
build:remote --extra_execution_platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
102-
build:remote --host_platform=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
103-
build:remote --platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
99+
build:remote --crosstool_top=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain_suite
100+
build:remote --extra_toolchains=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain
101+
build:remote --extra_execution_platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform
102+
build:remote --host_platform=@npm//@angular/build-tooling/bazel/remote-execution:platform
103+
build:remote --platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform
104104

105105
# Remote instance and caching
106106
build:remote --remote_instance_name=projects/internal-200822/instances/primary_instance

.ng-dev/caretaker.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {CaretakerConfig} from '@angular/dev-infra-private/ng-dev';
1+
import {CaretakerConfig} from '@angular/ng-dev';
22

33
/** The configuration for `ng-dev caretaker` commands. */
44
export const caretaker: CaretakerConfig = {

.ng-dev/commit-message.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {CommitMessageConfig} from '@angular/dev-infra-private/ng-dev';
1+
import {CommitMessageConfig} from '@angular/ng-dev';
22

33
/**
44
* The configuration for `ng-dev commit-message` commands.

.ng-dev/format.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {FormatConfig} from '@angular/dev-infra-private/ng-dev';
1+
import {FormatConfig} from '@angular/ng-dev';
22

33
/**
44
* Configuration for the `ng-dev format` command.

.ng-dev/github.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {GithubConfig} from '@angular/dev-infra-private/ng-dev';
1+
import {GithubConfig} from '@angular/ng-dev';
22

33
/**
44
* Github configuration for the `ng-dev` command. This repository is used as

.ng-dev/pull-request.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {PullRequestConfig} from '@angular/dev-infra-private/ng-dev';
1+
import {PullRequestConfig} from '@angular/ng-dev';
22

33
/**
44
* Configuration for the merge tool in `ng-dev`. This sets up the labels which

.ng-dev/release.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {ReleaseConfig} from '@angular/dev-infra-private/ng-dev';
1+
import {ReleaseConfig} from '@angular/ng-dev';
22

33
/** Configuration for the `ng-dev release` command. */
44
export const release: ReleaseConfig = {

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
123123

124124
web_test_repositories()
125125

126-
load("@npm//@angular/dev-infra-private/bazel/browsers:browser_repositories.bzl", "browser_repositories")
126+
load("@npm//@angular/build-tooling/bazel/browsers:browser_repositories.bzl", "browser_repositories")
127127

128128
browser_repositories()
129129

devtools/tools/defaults.bzl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Re-export of Bazel rules with devtools-wide defaults
22

3-
load("@npm//@angular/dev-infra-private/bazel/spec-bundling:index.bzl", "spec_bundle")
4-
load("@npm//@angular/dev-infra-private/bazel/karma:index.bzl", _karma_web_test_suite = "karma_web_test_suite")
5-
load("@npm//@angular/dev-infra-private/bazel:extract_js_module_output.bzl", "extract_js_module_output")
3+
load("@npm//@angular/build-tooling/bazel/spec-bundling:index.bzl", "spec_bundle")
4+
load("@npm//@angular/build-tooling/bazel/karma:index.bzl", _karma_web_test_suite = "karma_web_test_suite")
5+
load("@npm//@angular/build-tooling/bazel:extract_js_module_output.bzl", "extract_js_module_output")
66

77
def karma_web_test_suite(name, **kwargs):
88
test_deps = kwargs.get("deps", [])
@@ -35,10 +35,10 @@ def karma_web_test_suite(name, **kwargs):
3535
if not hasattr(kwargs, "browsers"):
3636
kwargs["tags"] = ["native"] + kwargs.get("tags", [])
3737
kwargs["browsers"] = [
38-
"@npm//@angular/dev-infra-private/bazel/browsers/chromium:chromium",
38+
"@npm//@angular/build-tooling/bazel/browsers/chromium:chromium",
3939

4040
# todo(aleksanderbodurri): enable when firefox support is done
41-
# "@npm//@angular/dev-infra-private/bazel/browsers/firefox:firefox",
41+
# "@npm//@angular/build-tooling/bazel/browsers/firefox:firefox",
4242
]
4343

4444
# Default test suite with all configured browsers.

devtools/tools/esbuild/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ esbuild_config(
1313
config_file = "esbuild-esm.config.mjs",
1414
deps = [
1515
":esbuild_base",
16-
"@npm//@angular/dev-infra-private/shared-scripts/angular-linker:js_lib",
16+
"@npm//@angular/build-tooling/shared-scripts/angular-linker:js_lib",
1717
],
1818
)
1919

@@ -23,8 +23,8 @@ esbuild_config(
2323
deps = [
2424
":esbuild_base",
2525
"//packages/compiler-cli/private",
26-
"@npm//@angular/dev-infra-private/shared-scripts/angular-linker:js_lib",
27-
"@npm//@angular/dev-infra-private/shared-scripts/angular-optimization:js_lib",
26+
"@npm//@angular/build-tooling/shared-scripts/angular-linker:js_lib",
27+
"@npm//@angular/build-tooling/shared-scripts/angular-optimization:js_lib",
2828
],
2929
)
3030

@@ -42,7 +42,7 @@ esbuild_config(
4242
config_file = "esbuild-spec.config.mjs",
4343
deps = [
4444
":esbuild_base",
45-
"@npm//@angular/dev-infra-private/shared-scripts/angular-linker:js_lib",
45+
"@npm//@angular/build-tooling/shared-scripts/angular-linker:js_lib",
4646
],
4747
)
4848

0 commit comments

Comments
 (0)