Skip to content

Commit 00ee53a

Browse files
devversiondevversion
authored
build: account for new dev-infra packages @angular/ng-dev and @angular/build-tooling (#25345)
We split the dev-infra-private packagve to decouple the ng-dev tool from the build tooling. This allows us to easily update ng-dev e.g. in LTS branches without needing to update Bazel. It is important that ng-dev can be updated as much as possilbe in all branches to ensure the release IPC reliably works.
1 parent 73c0c60 commit 00ee53a

74 files changed

Lines changed: 160 additions & 156 deletions

File tree

Some content is hidden

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

‎.bazelrc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ build:remote --google_default_credentials=true
8383

8484
# Setup the toolchain and platform for the remote build execution. The platform
8585
# is provided by the shared dev-infra package and targets k8 remote containers.
86-
build:remote --crosstool_top=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain_suite
87-
build:remote --extra_toolchains=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain
88-
build:remote --extra_execution_platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform_with_network
89-
build:remote --host_platform=@npm//@angular/dev-infra-private/bazel/remote-execution:platform_with_network
90-
build:remote --platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform_with_network
86+
build:remote --crosstool_top=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain_suite
87+
build:remote --extra_toolchains=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain
88+
build:remote --extra_execution_platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
89+
build:remote --host_platform=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
90+
build:remote --platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
9191

9292
################################
9393
# Sandbox settings #

‎.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. We currently only use the buildifier

‎.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 pull request commands in `ng-dev`. This includes the

‎.ng-dev/release.mts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import semver from 'semver';
2-
import {ReleaseConfig} from '@angular/dev-infra-private/ng-dev';
2+
import {ReleaseConfig} from '@angular/ng-dev';
33
import {assertValidFrameworkPeerDependency} from '../tools/release-checks/check-framework-peer-dependency.mjs';
44
import {assertValidUpdateMigrationCollections} from '../tools/release-checks/check-migration-collections.mjs';
55
import {assertValidNpmPackageOutput} from '../tools/release-checks/npm-package-output/index.mjs';

‎WORKSPACE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ sass_repositories(
109109

110110
# Setup repositories for browsers provided by the shared dev-infra package.
111111
load(
112-
"@npm//@angular/dev-infra-private/bazel/browsers:browser_repositories.bzl",
112+
"@npm//@angular/build-tooling/bazel/browsers:browser_repositories.bzl",
113113
_dev_infra_browser_repositories = "browser_repositories",
114114
)
115115

‎integration/size-test/index.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm//@angular/dev-infra-private/bazel:expand_template.bzl", "expand_template")
1+
load("@npm//@angular/build-tooling/bazel:expand_template.bzl", "expand_template")
22
load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary", "nodejs_test")
33
load("@bazel_skylib//lib:paths.bzl", "paths")
44
load("@npm//@bazel/esbuild:index.bzl", "esbuild")

‎package.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"scripts": {
1717
"postinstall": "node tools/postinstall/apply-patches.js",
18-
"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",
18+
"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",
1919
"build": "ts-node --esm --project scripts/tsconfig.json ./scripts/build-packages-dist-main.mts",
2020
"build-docs-content": "ts-node --esm --project scripts/tsconfig.json ./scripts/build-docs-content-main.mts",
2121
"build-and-check-release-output": "ts-node --esm --project scripts/tsconfig.json scripts/build-and-check-release-output.mts",
@@ -75,10 +75,11 @@
7575
"@angular-devkit/core": "^14.0.1",
7676
"@angular-devkit/schematics": "^14.0.1",
7777
"@angular/bazel": "^14.0.1",
78+
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#1addc303bef0b6acc0dca0961e9e642629f3a5cd",
7879
"@angular/cli": "^14.0.1",
7980
"@angular/compiler-cli": "^14.0.1",
80-
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#c1b330bfbd79adf076039c872b966cfef76c5781",
8181
"@angular/localize": "^14.0.1",
82+
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#865c7687cdca2bd512040330e1677eecaa26e46a",
8283
"@angular/platform-browser-dynamic": "^14.0.1",
8384
"@angular/platform-server": "^14.0.1",
8485
"@angular/router": "^14.0.1",
@@ -224,7 +225,8 @@
224225
"zx": "^6.2.4"
225226
},
226227
"resolutions": {
227-
"@angular/dev-infra-private/typescript": "~4.7.2",
228+
"@angular/build-tooling/typescript": "~4.7.2",
229+
"@angular/ng-dev/typescript": "~4.7.2",
228230
"browser-sync-client": "2.26.13",
229231
"dgeni-packages/typescript": "~4.7.2",
230232
"**/https-proxy-agent": "5.0.0"

0 commit comments

Comments
 (0)