Skip to content

Commit 087ab46

Browse files
devversionalan-agius4
devversion
authored and
alan-agius4
committed
build: update dev-infra packages and account for build-tooling split from ng-dev
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.
1 parent 9b75c7c commit 087ab46

File tree

18 files changed

+63
-56
lines changed

18 files changed

+63
-56
lines changed

‎.bazelrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ build:remote --jobs=150
118118

119119
# Setup the toolchain and platform for the remote build execution. The platform
120120
# is provided by the shared dev-infra package and targets k8 remote containers.
121-
build:remote --crosstool_top=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain_suite
122-
build:remote --extra_toolchains=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain
121+
build:remote --crosstool_top=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain_suite
122+
build:remote --extra_toolchains=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain
123123
build:remote --extra_execution_platforms=//tools:rbe_platform_with_network_access
124124
build:remote --host_platform=//tools:rbe_platform_with_network_access
125125
build:remote --platforms=//tools:rbe_platform_with_network_access

‎.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
import packages from '../lib/packages.js';
33

44
/**

‎.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

‎.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,6 +1,6 @@
11
import '../lib/bootstrap-local.js';
22

3-
import { ReleaseConfig } from '@angular/dev-infra-private/ng-dev';
3+
import { ReleaseConfig } from '@angular/ng-dev';
44
import packages from '../lib/packages.js';
55
import buildPackages from '../scripts/build.js';
66

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"build:bazel": "node ./bin/devkit-admin build-bazel",
2525
"build-tsc": "tsc -p tsconfig.json",
2626
"lint": "eslint --cache --max-warnings=0 \"**/*.ts\"",
27-
"ng-dev": "cross-env TS_NODE_PROJECT=$PWD/.ng-dev/tsconfig.json TS_NODE_TRANSPILE_ONLY=1 node --no-warnings --loader ts-node/esm node_modules/@angular/dev-infra-private/ng-dev/bundles/cli.mjs",
27+
"ng-dev": "cross-env TS_NODE_PROJECT=$PWD/.ng-dev/tsconfig.json TS_NODE_TRANSPILE_ONLY=1 node --no-warnings --loader ts-node/esm node_modules/@angular/ng-dev/bundles/cli.mjs",
2828
"templates": "node ./bin/devkit-admin templates",
2929
"validate": "node ./bin/devkit-admin validate",
3030
"postinstall": "yarn webdriver-update && yarn husky install",
@@ -66,15 +66,16 @@
6666
"devDependencies": {
6767
"@ampproject/remapping": "2.2.0",
6868
"@angular/animations": "14.1.0",
69+
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#1addc303bef0b6acc0dca0961e9e642629f3a5cd",
6970
"@angular/cdk": "14.1.0",
7071
"@angular/common": "14.1.0",
7172
"@angular/compiler": "14.1.0",
7273
"@angular/compiler-cli": "14.1.0",
7374
"@angular/core": "14.1.0",
74-
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#b2da73b3dddddd6a253ee8ea48ef387b20f5aedf",
7575
"@angular/forms": "14.1.0",
7676
"@angular/localize": "14.1.0",
7777
"@angular/material": "14.1.0",
78+
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#865c7687cdca2bd512040330e1677eecaa26e46a",
7879
"@angular/platform-browser": "14.1.0",
7980
"@angular/platform-browser-dynamic": "14.1.0",
8081
"@angular/platform-server": "14.1.0",

‎packages/angular_devkit/architect/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ load("//tools:defaults.bzl", "pkg_npm", "ts_library")
88

99
# @external_begin
1010
load("//tools:ts_json_schema.bzl", "ts_json_schema")
11-
load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
11+
load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
1212
# @external_end
1313

1414
licenses(["notice"]) # MIT

‎packages/angular_devkit/build_angular/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
77
load("//tools:defaults.bzl", "pkg_npm", "ts_library")
88
load("//tools:ts_json_schema.bzl", "ts_json_schema")
9-
load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
9+
load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
1010

1111
licenses(["notice"]) # MIT
1212

0 commit comments

Comments
 (0)