Skip to content

Commit 170034e

Browse files
wagnermacielprofanis
authored andcommitted
revert: "revert: "build(dev-infra): update package.json and :npm_package (angular#36434)" (angular#36798)" (angular#36800)
This reverts commit f5ff206. PR Close angular#36800
1 parent aa68276 commit 170034e

File tree

3 files changed

+47
-13
lines changed

3 files changed

+47
-13
lines changed

dev-infra/BUILD.bazel

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,30 @@ genrule(
3737

3838
pkg_npm(
3939
name = "npm_package",
40+
srcs = [
41+
"BUILD.bazel",
42+
"//dev-infra/benchmark:files",
43+
],
44+
substitutions = {
45+
# angular/angular should not consume it's own packages, so we use
46+
# substitutions to replace these in the deployed version of dev-infra.
47+
"//dev-infra/": "@npm_dev_infra//",
48+
"//packages/benchpress": "@npm//@angular/benchpress",
49+
"//packages/bazel/src:esm5.bzl": "@npm_angular_bazel//src:esm5.bzl",
50+
"//packages/zone.js/dist:zone.js": "@npm//:node_modules/zone.js/dist/zone.js",
51+
"//packages/core": "@npm//@angular/core",
52+
"//packages/platform-browser": "@npm//@angular/platform-browser",
53+
54+
# This substitution is particularly verbose because we need to make sure
55+
# that only things available via Angular Bazel are imported from
56+
# tools/defaults.bzl.
57+
"load\(\"//tools:defaults.bzl\", \"ng_module\"\)": "load(\"@npm_angular_bazel//:index.bzl\", \"ng_module\")",
58+
},
4059
visibility = ["//visibility:public"],
4160
deps = [
4261
":cli",
4362
":package-json",
63+
"//dev-infra/benchmark/driver-utilities",
4464
"//dev-infra/commit-message",
4565
"//dev-infra/ts-circular-dependencies",
4666
],

dev-infra/tmpl-package.json

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,52 @@
1212
"@octokit/graphql": "<from-root>",
1313
"chalk": "<from-root>",
1414
"cli-progress": "<from-root>",
15+
"fs-extra": "<from-root>",
1516
"glob": "<from-root>",
1617
"inquirer": "<from-root>",
1718
"minimatch": "<from-root>",
1819
"multimatch": "<from-root>",
20+
"node-uuid": "<from-root>",
1921
"semver": "<from-root>",
2022
"shelljs": "<from-root>",
2123
"typed-graphqlify": "<from-root>",
2224
"yaml": "<from-root>",
2325
"yargs": "<from-root>"
2426
},
2527
"peerDependencies": {
28+
"@angular/bazel": "^9.0.0",
29+
"@angular/core": "^9.0.0",
30+
"@angular/platform-browser": "^9.0.0",
31+
"@angular/benchpress": "^0.1.0",
32+
"@angular-devkit/build-optimizer": "<from-root>",
2633
"@bazel/buildifier": "<from-root>",
34+
"@bazel/protractor": "<from-root>",
35+
"@bazel/terser": "<from-root>",
36+
"@bazel/typescript": "<from-root>",
37+
"brotli": "<from-root>",
2738
"clang-format": "<from-root>",
39+
"cli-progress": "<from-root>",
40+
"json5": "<from-root>",
41+
"protractor": "<from-root>",
42+
"rollup": "<from-root>",
43+
"rollup-plugin-commonjs": "<from-root>",
44+
"rollup-plugin-node-resolve": "<from-root>",
45+
"rollup-plugin-sourcemaps": "<from-root>",
46+
"selenium-webdriver": "<from-root>",
2847
"ts-node": "<from-root>",
2948
"tslib": "<from-root>",
30-
"typescript": "<from-root>"
49+
"typescript": "<from-root>",
50+
"zone.js": "^0.10.3"
3151
},
3252
"peerDependenciesMeta": {
3353
"ts-node": {
3454
"optional": true
3555
}
56+
},
57+
"bazelWorkspaces": {
58+
"npm_dev_infra": {
59+
"version": "0.0.0-PLACEHOLDER",
60+
"rootPath": "."
61+
}
3662
}
3763
}

dev-infra/tools/BUILD.bazel

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)