Skip to content

Commit f5ff206

Browse files
wagnermacielAndrewKushnir
authored andcommitted
revert: "build(dev-infra): update package.json and :npm_package (angular#36434)" (angular#36798)
This reverts commit d6f6cd0. PR Close angular#36798
1 parent 90a2796 commit f5ff206

File tree

3 files changed

+13
-49
lines changed

3 files changed

+13
-49
lines changed

dev-infra/BUILD.bazel

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

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

dev-infra/tmpl-package.json

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,14 @@
88
"ng-dev": "./cli.js",
99
"ts-circular-deps": "./ts-circular-dependencies/index.js"
1010
},
11-
"dependencies": {
12-
"fs-extra": "<from-root>",
13-
"node-uuid": "<from-root>"
14-
},
1511
"peerDependencies": {
16-
"@angular/bazel": "^9.0.0",
17-
"@angular/core": "^9.0.0",
18-
"@angular/platform-browser": "^9.0.0",
19-
"@angular/benchpress": "^0.1.0",
20-
"@angular-devkit/build-optimizer": "<from-root>",
21-
"@bazel/protractor": "<from-root>",
22-
"@bazel/terser": "<from-root>",
23-
"@bazel/typescript": "<from-root>",
24-
"brotli": "<from-root>",
2512
"chalk": "<from-root>",
2613
"glob": "<from-root>",
27-
"json5": "<from-root>",
2814
"minimatch": "<from-root>",
29-
"node-uuid": "<from-root>",
30-
"protractor": "<from-root>",
31-
"rollup": "<from-root>",
32-
"rollup-plugin-commonjs": "<from-root>",
33-
"rollup-plugin-node-resolve": "<from-root>",
34-
"rollup-plugin-sourcemaps": "<from-root>",
35-
"selenium-webdriver": "<from-root>",
3615
"shelljs": "<from-root>",
3716
"typescript": "<from-root>",
3817
"yaml": "<from-root>",
3918
"yargs": "<from-root>",
40-
"tslib": "<from-root>",
41-
"zone.js": "^0.10.3"
42-
},
43-
"bazelWorkspaces": {
44-
"npm_dev_infra": {
45-
"version": "0.0.0-PLACEHOLDER",
46-
"rootPath": "."
47-
}
19+
"tslib": "<from-root>"
4820
}
4921
}

dev-infra/tools/BUILD.bazel

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package(default_visibility = ["//visibility:public"])
2+
3+
# Make source files available for distribution via pkg_npm
4+
filegroup(
5+
name = "files",
6+
srcs = glob(["*"]) + [
7+
"//dev-infra/benchmark/brotli-cli:files",
8+
"//dev-infra/benchmark/browsers:files",
9+
"//dev-infra/benchmark/component_benchmark:files",
10+
"//dev-infra/benchmark/ng_rollup_bundle:files",
11+
],
12+
)

0 commit comments

Comments
 (0)