From f5ff2068a48f60c747c2936908e848d301f4dba4 Mon Sep 17 00:00:00 2001
From: Wagner Maciel <wagnermaciel@google.com>
Date: Fri, 24 Apr 2020 10:26:32 -0700
Subject: [PATCH] revert: "build(dev-infra): update package.json and
 :npm_package (#36434)" (#36798)

This reverts commit d6f6cd0cb17efceacf1da7bf814865bd0608d4c5.

PR Close #36798
---
 dev-infra/BUILD.bazel       | 20 --------------------
 dev-infra/tmpl-package.json | 30 +-----------------------------
 dev-infra/tools/BUILD.bazel | 12 ++++++++++++
 3 files changed, 13 insertions(+), 49 deletions(-)
 create mode 100644 dev-infra/tools/BUILD.bazel

diff --git a/dev-infra/BUILD.bazel b/dev-infra/BUILD.bazel
index 1987db6e2f..57897870bf 100644
--- a/dev-infra/BUILD.bazel
+++ b/dev-infra/BUILD.bazel
@@ -34,30 +34,10 @@ genrule(
 
 pkg_npm(
     name = "npm_package",
-    srcs = [
-        "BUILD.bazel",
-        "//dev-infra/benchmark:files",
-    ],
-    substitutions = {
-        # angular/angular should not consume it's own packages, so we use
-        # substitutions to replace these in the deployed version of dev-infra.
-        "//dev-infra/": "@npm_dev_infra//",
-        "//packages/benchpress": "@npm//@angular/benchpress",
-        "//packages/bazel/src:esm5.bzl": "@npm_angular_bazel//src:esm5.bzl",
-        "//packages/zone.js/dist:zone.js": "@npm//:node_modules/zone.js/dist/zone.js",
-        "//packages/core": "@npm//@angular/core",
-        "//packages/platform-browser": "@npm//@angular/platform-browser",
-
-        # This substitution is particularly verbose because we need to make sure
-        # that only things available via Angular Bazel are imported from
-        # tools/defaults.bzl.
-        "load\(\"//tools:defaults.bzl\", \"ng_module\"\)": "load(\"@npm_angular_bazel//:index.bzl\", \"ng_module\")",
-    },
     visibility = ["//visibility:public"],
     deps = [
         ":cli",
         ":package-json",
-        "//dev-infra/benchmark/driver-utilities",
         "//dev-infra/commit-message",
         "//dev-infra/ts-circular-dependencies",
     ],
diff --git a/dev-infra/tmpl-package.json b/dev-infra/tmpl-package.json
index 55c5430117..44534e250a 100644
--- a/dev-infra/tmpl-package.json
+++ b/dev-infra/tmpl-package.json
@@ -8,42 +8,14 @@
     "ng-dev": "./cli.js",
     "ts-circular-deps": "./ts-circular-dependencies/index.js"
   },
-  "dependencies": {
-    "fs-extra": "<from-root>",
-    "node-uuid": "<from-root>"
-  },
   "peerDependencies": {
-    "@angular/bazel": "^9.0.0",
-    "@angular/core": "^9.0.0",
-    "@angular/platform-browser": "^9.0.0",
-    "@angular/benchpress": "^0.1.0",
-    "@angular-devkit/build-optimizer": "<from-root>",
-    "@bazel/protractor": "<from-root>",
-    "@bazel/terser": "<from-root>",
-    "@bazel/typescript": "<from-root>",
-    "brotli": "<from-root>",
     "chalk": "<from-root>",
     "glob": "<from-root>",
-    "json5": "<from-root>",
     "minimatch": "<from-root>",
-    "node-uuid": "<from-root>",
-    "protractor": "<from-root>",
-    "rollup": "<from-root>",
-    "rollup-plugin-commonjs": "<from-root>",
-    "rollup-plugin-node-resolve": "<from-root>",
-    "rollup-plugin-sourcemaps": "<from-root>",
-    "selenium-webdriver": "<from-root>",
     "shelljs": "<from-root>",
     "typescript": "<from-root>",
     "yaml": "<from-root>",
     "yargs": "<from-root>",
-    "tslib": "<from-root>",
-    "zone.js": "^0.10.3"
-  },
-  "bazelWorkspaces": {
-    "npm_dev_infra": {
-      "version": "0.0.0-PLACEHOLDER",
-      "rootPath": "."
-    }
+    "tslib": "<from-root>"
   }
 }
diff --git a/dev-infra/tools/BUILD.bazel b/dev-infra/tools/BUILD.bazel
new file mode 100644
index 0000000000..9feb062ead
--- /dev/null
+++ b/dev-infra/tools/BUILD.bazel
@@ -0,0 +1,12 @@
+package(default_visibility = ["//visibility:public"])
+
+# Make source files available for distribution via pkg_npm
+filegroup(
+    name = "files",
+    srcs = glob(["*"]) + [
+        "//dev-infra/benchmark/brotli-cli:files",
+        "//dev-infra/benchmark/browsers:files",
+        "//dev-infra/benchmark/component_benchmark:files",
+        "//dev-infra/benchmark/ng_rollup_bundle:files",
+    ],
+)