Skip to content

Commit 98878bc

Browse files
authored
build: update to latest version of the ng-dev shared package (#23627)
Updates to the latest version of the shared dev-infra package. It contains various improvements for the release tool.
1 parent f282bd6 commit 98878bc

File tree

5 files changed

+175
-103
lines changed

5 files changed

+175
-103
lines changed

.ng-dev/config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {format} from './format';
22
import {github} from './github';
3-
import {merge} from './merge';
3+
import {pullRequest} from './pull-request';
44
import {commitMessage} from './commit-message';
55
import {caretaker} from './caretaker';
66
import {release} from './release';
@@ -9,7 +9,7 @@ module.exports = {
99
commitMessage,
1010
format,
1111
github,
12-
merge,
12+
pullRequest,
1313
caretaker,
1414
release,
1515
};

.ng-dev/merge.ts renamed to .ng-dev/pull-request.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import {MergeConfig} from '@angular/dev-infra-private/ng-dev/pr/merge/config';
1+
import {PullRequestConfig} from '@angular/dev-infra-private/ng-dev/pr/config';
22

33
/**
4-
* Configuration for the merge tool in `ng-dev`. This sets up the labels which
5-
* are respected by the merge script (e.g. the target labels).
4+
* Configuration for the pull request commands in `ng-dev`. This includes the
5+
* setup for the merge command.
66
*/
7-
export const merge: MergeConfig = {
7+
export const pullRequest: PullRequestConfig = {
88
// By default, the merge script merges locally with `git cherry-pick` and autosquash.
99
// This has the downside of pull requests showing up as `Closed` instead of `Merged`.
1010
// In the components repository, since we don't use fixup or squash commits, we can

WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
88
# Add NodeJS rules
99
http_archive(
1010
name = "build_bazel_rules_nodejs",
11-
sha256 = "b32a4713b45095e9e1921a7fcb1adf584bc05959f3336e7351bcf77f015a2d7c",
12-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.1.0/rules_nodejs-4.1.0.tar.gz"],
11+
sha256 = "4e1a5633267a0ca1d550cced2919dd4148575c0bafd47608b88aea79c41b5ca3",
12+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.2.0/rules_nodejs-4.2.0.tar.gz"],
1313
)
1414

1515
# Add sass rules

package.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"@angular-devkit/schematics": "13.0.0-next.1",
7575
"@angular/bazel": "13.0.0-next.2",
7676
"@angular/compiler-cli": "13.0.0-next.2",
77-
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#16ccdd6316d72bfdaa9f95148b6918d22c0a3471",
77+
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#5744e8e7ca5b3dfa76ad73b7b0eff271a108a737",
7878
"@angular/localize": "13.0.0-next.2",
7979
"@angular/platform-browser-dynamic": "13.0.0-next.2",
8080
"@angular/platform-server": "13.0.0-next.2",
@@ -84,15 +84,15 @@
8484
"@babel/traverse": "^7.13.0",
8585
"@bazel/bazelisk": "1.10.1",
8686
"@bazel/buildifier": "4.2.1",
87-
"@bazel/concatjs": "4.0.0",
88-
"@bazel/esbuild": "4.1.0",
87+
"@bazel/concatjs": "4.2.0",
88+
"@bazel/esbuild": "4.2.0",
8989
"@bazel/ibazel": "0.15.10",
90-
"@bazel/jasmine": "4.1.0",
91-
"@bazel/protractor": "4.1.0",
92-
"@bazel/rollup": "4.1.0",
93-
"@bazel/runfiles": "4.1.0",
94-
"@bazel/terser": "4.1.0",
95-
"@bazel/typescript": "4.1.0",
90+
"@bazel/jasmine": "4.2.0",
91+
"@bazel/protractor": "4.2.0",
92+
"@bazel/rollup": "4.2.0",
93+
"@bazel/runfiles": "4.2.0",
94+
"@bazel/terser": "4.2.0",
95+
"@bazel/typescript": "4.2.0",
9696
"@firebase/app-types": "^0.6.1",
9797
"@material/animation": "13.0.0-canary.860ad06a1.0",
9898
"@material/auto-init": "13.0.0-canary.860ad06a1.0",
@@ -144,6 +144,7 @@
144144
"@octokit/rest": "18.3.5",
145145
"@rollup/plugin-babel": "^5.3.0",
146146
"@rollup/plugin-commonjs": "^18.0.0",
147+
"@rollup/plugin-node-resolve": "^13.0.5",
147148
"@schematics/angular": "13.0.0-next.1",
148149
"@types/browser-sync": "^2.26.1",
149150
"@types/fs-extra": "^9.0.5",

0 commit comments

Comments
 (0)