revert: "revert: "feat(dev-infra): exposed new rule 'component_benchmark' via dev_infra (angular#36434)" (angular#36798)" (angular#36800)

This reverts commit ad8c4cd.

PR Close angular#36800

Author: wagnermaciel

.pullapprove.yml

@@ -968,23 +968,17 @@ 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,7 +2,6 @@ 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("//tools/browsers:browser_repositories.bzl", "browser_repositories")
+load("//dev-infra/benchmark/browsers:browser_repositories.bzl", "browser_repositories")
 
 browser_repositories()
 

dev-infra/benchmark/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",
+    ],
+)

dev-infra/benchmark/brotli-cli/BUILD.bazel

@@ -0,0 +1,19 @@
+package(default_visibility = ["//visibility:public"])
+
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
+
+nodejs_binary(
+    name = "brotli-cli",
+    data = [
+        "cli.js",
+        "@npm//brotli",
+    ],
+    entry_point = ":cli.js",
+    visibility = ["//visibility:public"],
+)
+
+# Make source files available for distribution via pkg_npm
+filegroup(
+    name = "files",
+    srcs = glob(["*"]),
+)

tools/brotli-cli/cli.js renamed to dev-infra/benchmark/brotli-cli/cli.js

@@ -14,6 +14,8 @@
 #
 ################################################################################
 #
+package(default_visibility = ["//visibility:public"])
+
 load("@io_bazel_rules_webtesting//web:web.bzl", "browser", "web_test_archive")
 
 # Override of chromium web_test_archive so that the archive is selected based on platform
@@ -31,7 +33,7 @@ web_test_archive(
         "@io_bazel_rules_webtesting//common/conditions:mac": {"CHROMIUM": "chrome-mac/Chromium.app/Contents/MacOS/chromium"},
         "@io_bazel_rules_webtesting//common/conditions:windows": {"CHROMIUM": "chrome-win/chrome.exe"},
     }),
-    visibility = ["//tools/browsers:__subpackages__"],
+    visibility = ["//dev-infra/benchmark/browsers:__subpackages__"],
 )
 
 # Override of chromedriver web_test_archive so that the archive is selected based on platform
@@ -55,7 +57,7 @@ web_test_archive(
             "CHROMEDRIVER": "chromedriver_win32/chromedriver.exe",
         },
     }),
-    visibility = ["//tools/browsers:__subpackages__"],
+    visibility = ["//dev-infra/benchmark/browsers:__subpackages__"],
 )
 
 browser(
@@ -68,3 +70,9 @@ browser(
         "@io_bazel_rules_webtesting//go/wsl",
     ],
 )
+
+# Make source files available for distribution via pkg_npm
+filegroup(
+    name = "files",
+    srcs = glob(["*"]),
+)

tools/browsers/BUILD.bazel renamed to dev-infra/benchmark/browsers/BUILD.bazel

@@ -0,0 +1,12 @@
+package(default_visibility = ["//visibility:public"])
+
+exports_files([
+    "protractor-perf.conf.js",
+    "start-server.js",
+])
+
+# Make source files available for distribution via pkg_npm
+filegroup(
+    name = "files",
+    srcs = glob(["*"]) + ["//dev-infra/benchmark/component_benchmark/defaults:files"],
+)

tools/browsers/browser_repositories.bzl renamed to dev-infra/benchmark/browsers/browser_repositories.bzl

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

tools/browsers/chromium.json renamed to dev-infra/benchmark/browsers/chromium.json

@@ -1,17 +1,19 @@
-load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver", "ts_library")
-load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
+load("//dev-infra/benchmark/ng_rollup_bundle:ng_rollup_bundle.bzl", "ng_rollup_bundle")
+load("//tools:defaults.bzl", "ng_module")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver", "ts_library")
+load(":benchmark_test.bzl", "benchmark_test")
 
 def copy_default_file(origin, destination):
     """
-    Copies a file from tools/components/defaults to the destination.
+    Copies a file from /defaults to the destination.
 
     Args:
         origin: The name of a file in benchpress/defaults to be copied.
         destination: Where the original file will be clopied to.
     """
     native.genrule(
         name = "copy_default_" + origin + "_file_genrule",
-        srcs = ["//tools/components/defaults:" + origin],
+        srcs = ["//dev-infra/benchmark/component_benchmark/defaults:" + origin],
         outs = [destination],
         cmd = "cat $(SRCS) >> $@",
     )
@@ -105,6 +107,7 @@ def component_benchmark(
         # Creates ngFactory and ngSummary to be imported by the app's entry point.
         generate_ve_shims = True,
         deps = ng_deps,
+        tsconfig = "//dev-infra/benchmark/component_benchmark:tsconfig-e2e.json",
     )
 
     # Bundle the application (needed by ts_devserver).
@@ -117,7 +120,7 @@ def component_benchmark(
     # The ts_library for the driver that runs tests against the benchmark app.
     ts_library(
         name = benchmark_driver,
-        tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
+        tsconfig = "//dev-infra/benchmark/component_benchmark:tsconfig-e2e.json",
         testonly = True,
         srcs = [driver],
         deps = driver_deps,
@@ -130,7 +133,8 @@ def component_benchmark(
         port = 4200,
         static_files = assets + styles,
         deps = [":" + app_main + ".min_debug.es2015.js"],
-        additional_root_paths = ["tools/components/defaults"],
+        additional_root_paths = ["//dev-infra/benchmark/component_benchmark/defaults"],
+        serving_path = "/app_bundle.js",
     )
 
     # Runs a protractor test that's set up to use @angular/benchpress.

dev-infra/benchmark/component_benchmark/BUILD.bazel

@@ -1,5 +1,11 @@
 package(default_visibility = ["//visibility:public"])
 
+# Make source files available for distribution via pkg_npm
+filegroup(
+    name = "files",
+    srcs = glob(["*"]),
+)
+
 exports_files([
     "index.html",
     "index.ts",

modules/benchmarks/benchmark_test.bzl renamed to dev-infra/benchmark/component_benchmark/benchmark_test.bzl

@@ -0,0 +1,6 @@
+{
+  "compilerOptions": {
+    "lib": ["es2015", "dom"],
+    "types": ["node", "jasmine"]
+  }
+}

tools/components/component_benchmark.bzl renamed to dev-infra/benchmark/component_benchmark/component_benchmark.bzl

@@ -1,15 +1,16 @@
-load("//tools:defaults.bzl", "ts_library")
-
 package(default_visibility = ["//visibility:public"])
 
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
+
 ts_library(
-    name = "e2e_util",
-    testonly = 1,
+    name = "driver-utilities",
     srcs = glob(["*.ts"]),
+    module_name = "@angular/dev-infra/benchmark/driver-utilities",
+    tsconfig = "//dev-infra/benchmark/component_benchmark:tsconfig-e2e.json",
     deps = [
-        "//packages:types",
         "//packages/benchpress",
         "@npm//@types/fs-extra",
+        "@npm//@types/node",
         "@npm//@types/selenium-webdriver",
         "@npm//fs-extra",
         "@npm//node-uuid",

tools/components/defaults/BUILD.bazel renamed to dev-infra/benchmark/component_benchmark/defaults/BUILD.bazel

@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export {openBrowser, verifyNoBrowserErrors} from './e2e_util';
+export {runBenchmark} from './perf_util';

tools/components/defaults/index.html renamed to dev-infra/benchmark/component_benchmark/defaults/index.html

@@ -18,3 +18,9 @@ nodejs_binary(
     ],
     entry_point = "@npm//:node_modules/rollup/dist/bin/rollup",
 )
+
+# Make source files available for distribution via pkg_npm
+filegroup(
+    name = "files",
+    srcs = glob(["*"]),
+)

tools/components/defaults/index.ts renamed to dev-infra/benchmark/component_benchmark/defaults/index.ts

@@ -175,10 +175,10 @@ _NG_ROLLUP_BUNDLE_ATTRS = {
     "_rollup": attr.label(
         executable = True,
         cfg = "host",
-        default = Label("//tools/ng_rollup_bundle:rollup_with_build_optimizer"),
+        default = Label("//dev-infra/benchmark/ng_rollup_bundle:rollup_with_build_optimizer"),
     ),
     "_rollup_config_tmpl": attr.label(
-        default = Label("//tools/ng_rollup_bundle:rollup.config.js"),
+        default = Label("//dev-infra/benchmark/ng_rollup_bundle:rollup.config.js"),
         allow_single_file = True,
     ),
 }
@@ -392,7 +392,7 @@ def ng_rollup_bundle(name, **kwargs):
         # maintain the comments off behavior. We pass the --comments flag with
         # a regex that always evaluates to false to do this.
         "args": ["--comments", "/bogus_string_to_suppress_all_comments^/"],
-        "config_file": "//tools/ng_rollup_bundle:terser_config.json",
+        "config_file": "//dev-infra/benchmark/ng_rollup_bundle:terser_config.json",
         "sourcemap": False,
     }
 
@@ -413,7 +413,7 @@ def ng_rollup_bundle(name, **kwargs):
     native.filegroup(name = name + ".min_debug.js", srcs = [name + ".min_debug"], visibility = visibility)
     npm_package_bin(
         name = "_%s_brotli" % name,
-        tool = "//tools/brotli-cli",
+        tool = "//dev-infra/benchmark/brotli-cli",
         data = [name + ".min.js"],
         outs = [name + ".min.js.br"],
         args = [
@@ -436,7 +436,7 @@ def ng_rollup_bundle(name, **kwargs):
     native.filegroup(name = name + ".min_debug.es2015.js", srcs = [name + ".min_debug.es2015"], visibility = visibility)
     npm_package_bin(
         name = "_%s_es2015_brotli" % name,
-        tool = "//tools/brotli-cli",
+        tool = "//dev-infra/benchmark/brotli-cli",
         data = [name + ".min.es2015.js"],
         outs = [name + ".min.es2015.js.br"],
         args = [

tools/components/defaults/styles.css renamed to dev-infra/benchmark/component_benchmark/defaults/styles.css

@@ -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",
+    ],
+)

protractor-perf.conf.js renamed to dev-infra/benchmark/component_benchmark/protractor-perf.conf.js

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

modules/benchmarks/start-server.js renamed to dev-infra/benchmark/component_benchmark/start-server.js

@@ -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 = "//modules/benchmarks:start-server.js",
+        on_prepare = "//dev-infra/benchmark/component_benchmark:start-server.js",
         server = server,
         **kwargs
     )

dev-infra/benchmark/component_benchmark/tsconfig-e2e.json

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

modules/e2e_util/BUILD.bazel renamed to dev-infra/benchmark/driver-utilities/BUILD.bazel

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

modules/e2e_util/e2e_util.ts renamed to dev-infra/benchmark/driver-utilities/e2e_util.ts

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

dev-infra/benchmark/driver-utilities/index.ts

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

modules/e2e_util/perf_util.ts renamed to dev-infra/benchmark/driver-utilities/perf_util.ts

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

tools/ng_rollup_bundle/BUILD.bazel renamed to dev-infra/benchmark/ng_rollup_bundle/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("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
+load("//dev-infra/benchmark/component_benchmark: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 = [
-        "//modules/e2e_util",
+        "//dev-infra/benchmark/driver-utilities",
         "@npm//protractor",
     ],
 )