Revert dev infra benchmarking

.pullapprove.yml

@@ -966,17 +966,23 @@ groups:
           'docs/TOOLS.md',
           'docs/TRIAGE_AND_LABELS.md',
           'goldens/*',
+          'modules/e2e_util/e2e_util.ts',
+          'modules/e2e_util/perf_util.ts',
           'modules/*',
           'packages/*',
           'packages/examples/test-utils/**',
           'packages/private/**',
           'packages/examples/*',
           'scripts/**',
           'third_party/**',
+          'tools/brotli-cli/**',
+          'tools/browsers/**',
           'tools/build/**',
           'tools/circular_dependency_test/**',
           'tools/contributing-stats/**',
+          'tools/components/**',
           'tools/gulp-tasks/**',
+          'tools/ng_rollup_bundle/**',
           'tools/ngcontainer/**',
           'tools/npm/**',
           'tools/npm_integration_test/**',

BUILD.bazel

@@ -2,6 +2,7 @@ package(default_visibility = ["//visibility:public"])
 
 exports_files([
     "LICENSE",
+    "protractor-perf.conf.js",
     "karma-js.conf.js",
     "browser-providers.conf.js",
     "scripts/ci/track-payload-size.sh",

WORKSPACE

@@ -64,7 +64,7 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
 
 web_test_repositories()
 
-load("//dev-infra/benchmark/browsers:browser_repositories.bzl", "browser_repositories")
+load("//tools/browsers:browser_repositories.bzl", "browser_repositories")
 
 browser_repositories()
 

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",
     ],

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>"
   }
 }

modules/benchmarks/BUILD.bazel

@@ -3,4 +3,5 @@ package(default_visibility = ["//visibility:public"])
 exports_files([
     "tsconfig-build.json",
     "tsconfig-e2e.json",
+    "start-server.js",
 ])

dev-infra/benchmark/component_benchmark/benchmark_test.bzl → modules/benchmarks/benchmark_test.bzl

@@ -1,4 +1,4 @@
-load("@npm_bazel_protractor//:index.bzl", "protractor_web_test_suite")
+load("//tools:defaults.bzl", "protractor_web_test_suite")
 
 """
   Macro that can be used to define a benchmark test. This differentiates from
@@ -10,9 +10,11 @@ load("@npm_bazel_protractor//:index.bzl", "protractor_web_test_suite")
 def benchmark_test(name, server, tags = [], **kwargs):
     protractor_web_test_suite(
         name = name,
-        browsers = ["//dev-infra/benchmark/browsers:chromium"],
-        configuration = "//dev-infra/benchmark/component_benchmark:protractor-perf.conf.js",
-        on_prepare = "//dev-infra/benchmark/component_benchmark:start-server.js",
+        configuration = "//:protractor-perf.conf.js",
+        data = [
+            "//packages/benchpress",
+        ],
+        on_prepare = "//modules/benchmarks:start-server.js",
         server = server,
         # Benchmark targets should not run on CI by default.
         tags = tags + [

modules/benchmarks/e2e_test.bzl

@@ -9,7 +9,7 @@ load("//tools:defaults.bzl", "protractor_web_test_suite")
 def e2e_test(name, server, **kwargs):
     protractor_web_test_suite(
         name = name,
-        on_prepare = "//dev-infra/benchmark/component_benchmark:start-server.js",
+        on_prepare = "//modules/benchmarks:start-server.js",
         server = server,
         **kwargs
     )

modules/benchmarks/src/change_detection/BUILD.bazel

@@ -15,7 +15,7 @@ ts_library(
     srcs = ["change_detection.perf-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "//dev-infra/benchmark/driver-utilities",
+        "//modules/e2e_util",
         "@npm//protractor",
     ],
 )
@@ -26,7 +26,7 @@ ts_library(
     srcs = ["change_detection.e2e-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "//dev-infra/benchmark/driver-utilities",
+        "//modules/e2e_util",
         "@npm//protractor",
     ],
 )

modules/benchmarks/src/change_detection/change_detection.e2e-spec.ts

@@ -8,7 +8,7 @@
 
 import {$} from 'protractor';
 
-import {openBrowser, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
+import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util';
 
 describe('change detection benchmark', () => {
   afterEach(verifyNoBrowserErrors);

modules/benchmarks/src/change_detection/change_detection.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$} from 'protractor';
-import {runBenchmark, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
+import {runBenchmark, verifyNoBrowserErrors} from '../../../e2e_util/perf_util';
 
 interface Worker {
   id: string;

modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
-load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
+load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

modules/benchmarks/src/class_bindings/BUILD.bazel

@@ -1,7 +1,7 @@
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
 
 load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
-load("//dev-infra/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("//tools/components:component_benchmark.bzl", "component_benchmark")
 
 sass_binary(
     name = "class_bindings_styles",
@@ -12,8 +12,7 @@ component_benchmark(
     name = "benchmark",
     driver = ":class_bindings.perf-spec.ts",
     driver_deps = [
-        "//dev-infra/benchmark/driver-utilities",
-        "@npm//@types/jasmine",
+        "//modules/e2e_util",
         "@npm//protractor",
     ],
     ng_deps = [

modules/benchmarks/src/class_bindings/class_bindings.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '../../../../dev-infra/benchmark/driver-utilities';
+import {runBenchmark} from '../../../e2e_util/perf_util';
 
 describe('class bindings perf', () => {
   it('should work for update', async () => {

modules/benchmarks/src/expanding_rows/BUILD.bazel

@@ -1,7 +1,7 @@
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
 
 load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver", "ts_library")
-load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
+load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 ng_module(
     name = "application_lib",
@@ -26,7 +26,7 @@ ts_library(
     srcs = ["expanding_rows.perf-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "//dev-infra/benchmark/driver-utilities",
+        "//modules/e2e_util",
         "@npm//protractor",
     ],
 )

modules/benchmarks/src/expanding_rows/expanding_rows.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '../../../../dev-infra/benchmark/driver-utilities';
+import {runBenchmark} from '../../../e2e_util/perf_util';
 
 describe('benchmarks', () => {
   it('should work for create', async () => {

modules/benchmarks/src/js-web-frameworks/BUILD.bazel

@@ -8,7 +8,7 @@ ts_library(
     srcs = ["js-web-frameworks.perf-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "//dev-infra/benchmark/driver-utilities",
+        "//modules/e2e_util",
         "@npm//protractor",
     ],
 )

modules/benchmarks/src/js-web-frameworks/js-web-frameworks.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$} from 'protractor';
-import {runBenchmark, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
+import {runBenchmark, verifyNoBrowserErrors} from '../../../e2e_util/perf_util';
 
 interface Worker {
   id: string;

modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
-load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
+load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
 

modules/benchmarks/src/largeform/BUILD.bazel

@@ -8,7 +8,7 @@ ts_library(
     srcs = ["largeform.perf-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "//dev-infra/benchmark/driver-utilities",
+        "//modules/e2e_util",
         "@npm//protractor",
     ],
 )
@@ -19,7 +19,7 @@ ts_library(
     srcs = ["largeform.e2e-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "//dev-infra/benchmark/driver-utilities",
+        "//modules/e2e_util",
         "@npm//protractor",
     ],
 )

modules/benchmarks/src/largeform/largeform.e2e-spec.ts

@@ -8,7 +8,7 @@
 
 import {$, By, element} from 'protractor';
 
-import {openBrowser, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
+import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util';
 
 describe('largeform benchmark', () => {
   afterEach(verifyNoBrowserErrors);

modules/benchmarks/src/largeform/largeform.perf-spec.ts

@@ -8,7 +8,8 @@
 
 import {$} from 'protractor';
 
-import {runBenchmark, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
+import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util';
+import {runBenchmark} from '../../../e2e_util/perf_util';
 
 interface Worker {
   id: string;

modules/benchmarks/src/largeform/ng2/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module", "ts_devserver")
-load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
+load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

modules/benchmarks/src/largetable/BUILD.bazel

@@ -15,7 +15,7 @@ ts_library(
     srcs = ["largetable.perf-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "//dev-infra/benchmark/driver-utilities",
+        "//modules/e2e_util",
         "@npm//protractor",
     ],
 )
@@ -26,7 +26,7 @@ ts_library(
     srcs = ["largetable.e2e-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "//dev-infra/benchmark/driver-utilities",
+        "//modules/e2e_util",
         "@npm//protractor",
     ],
 )