From b7f2a033df47080084e73340f25286c8ec1a419a Mon Sep 17 00:00:00 2001 From: Wagner Maciel Date: Wed, 22 Apr 2020 09:41:04 -0700 Subject: [PATCH] feat(dev-infra): exposed new rule 'component_benchmark' via dev_infra (#36434) * Move tools/brotli-cli, tools/browsers, tools/components, tools/ng_rollup_bundle, and modules/e2e_util to dev-infra/benchmarking * Fix imports and references to moved folders and files * Set up BUILD.bazel files for moved folders so they can be packaged with dev-infra's :npm_package PR Close #36434 --- .pullapprove.yml | 6 ------ BUILD.bazel | 1 - WORKSPACE | 2 +- dev-infra/benchmark/BUILD.bazel | 12 ++++++++++++ dev-infra/benchmark/brotli-cli/BUILD.bazel | 19 +++++++++++++++++++ .../benchmark}/brotli-cli/cli.js | 0 .../benchmark}/browsers/BUILD.bazel | 12 ++++++++++-- .../browsers/browser_repositories.bzl | 0 .../benchmark}/browsers/chromium.json | 0 .../benchmark/component_benchmark/BUILD.bazel | 12 ++++++++++++ .../component_benchmark}/benchmark_test.bzl | 10 ++++------ .../component_benchmark.bzl | 16 ++++++++++------ .../component_benchmark}/defaults/BUILD.bazel | 6 ++++++ .../component_benchmark}/defaults/index.html | 0 .../component_benchmark}/defaults/index.ts | 0 .../component_benchmark}/defaults/styles.css | 0 .../protractor-perf.conf.js | 0 .../component_benchmark}/start-server.js | 0 .../component_benchmark/tsconfig-e2e.json | 6 ++++++ .../benchmark/driver-utilities}/BUILD.bazel | 11 ++++++----- .../benchmark/driver-utilities}/e2e_util.ts | 0 dev-infra/benchmark/driver-utilities/index.ts | 9 +++++++++ .../benchmark/driver-utilities}/perf_util.ts | 0 .../benchmark}/ng_rollup_bundle/BUILD.bazel | 6 ++++++ .../ng_rollup_bundle/ng_rollup_bundle.bzl | 10 +++++----- .../ng_rollup_bundle/rollup.config.js | 0 .../ng_rollup_bundle/terser_config.json | 0 dev-infra/tools/BUILD.bazel | 12 ++++++++++++ modules/benchmarks/BUILD.bazel | 1 - modules/benchmarks/e2e_test.bzl | 2 +- .../src/change_detection/BUILD.bazel | 4 ++-- .../change_detection.e2e-spec.ts | 2 +- .../change_detection.perf-spec.ts | 2 +- .../transplanted_views/BUILD.bazel | 2 +- .../class_bindings.perf-spec.ts | 2 +- .../benchmarks/src/expanding_rows/BUILD.bazel | 4 ++-- .../expanding_rows.perf-spec.ts | 2 +- .../src/js-web-frameworks/BUILD.bazel | 2 +- .../js-web-frameworks.perf-spec.ts | 2 +- .../src/js-web-frameworks/ng2/BUILD.bazel | 2 +- modules/benchmarks/src/largeform/BUILD.bazel | 4 ++-- .../src/largeform/largeform.e2e-spec.ts | 2 +- .../src/largeform/largeform.perf-spec.ts | 3 +-- .../benchmarks/src/largeform/ng2/BUILD.bazel | 2 +- modules/benchmarks/src/largetable/BUILD.bazel | 4 ++-- .../src/largetable/baseline/BUILD.bazel | 2 +- .../largetable/incremental_dom/BUILD.bazel | 2 +- .../benchmarks/src/largetable/iv/BUILD.bazel | 2 +- .../src/largetable/largetable.e2e-spec.ts | 2 +- .../src/largetable/largetable.perf-spec.ts | 2 +- .../benchmarks/src/largetable/ng2/BUILD.bazel | 2 +- .../src/largetable/ng2_switch/BUILD.bazel | 2 +- .../src/largetable/render3/BUILD.bazel | 2 +- modules/benchmarks/src/styling/BUILD.bazel | 2 +- .../benchmarks/src/styling/ng2/BUILD.bazel | 2 +- .../src/styling/styling_perf.spec.ts | 3 +-- modules/benchmarks/src/tree/BUILD.bazel | 2 +- .../benchmarks/src/tree/baseline/BUILD.bazel | 2 +- .../src/tree/incremental_dom/BUILD.bazel | 2 +- modules/benchmarks/src/tree/iv/BUILD.bazel | 2 +- modules/benchmarks/src/tree/ng1/BUILD.bazel | 2 +- modules/benchmarks/src/tree/ng2/BUILD.bazel | 2 +- .../benchmarks/src/tree/ng2_next/BUILD.bazel | 2 +- .../src/tree/ng2_static/BUILD.bazel | 2 +- .../src/tree/ng2_switch/BUILD.bazel | 2 +- .../benchmarks/src/tree/render3/BUILD.bazel | 2 +- .../src/tree/render3_function/BUILD.bazel | 2 +- modules/benchmarks/src/tree/test_utils.ts | 3 +-- modules/benchmarks/tsconfig.json | 5 +++-- .../playground/e2e_test/async/async_spec.ts | 2 +- modules/playground/e2e_test/example_test.bzl | 2 +- .../e2e_test/hello_world/hello_world_spec.ts | 2 +- modules/playground/e2e_test/http/http_spec.ts | 2 +- .../playground/e2e_test/jsonp/jsonp_spec.ts | 2 +- .../e2e_test/key_events/key_events_spec.ts | 2 +- .../model_driven_forms_spec.ts | 2 +- .../order_management/order_management_spec.ts | 2 +- .../person_management_spec.ts | 2 +- .../e2e_test/relative_assets/assets_spec.ts | 2 +- .../e2e_test/routing/routing_spec.ts | 2 +- modules/playground/e2e_test/svg/svg_spec.ts | 2 +- .../template_driven_forms_spec.ts | 2 +- .../e2e_test/upgrade/upgrade_spec.ts | 2 +- .../web_workers/animations/animations_spec.ts | 2 +- .../e2e_test/web_workers/input/input_spec.ts | 2 +- .../kitchen_sink/kitchen_sink_spec.ts | 2 +- .../message_broker/message_broker_spec.ts | 2 +- .../web_workers/router/router_spec.ts | 2 +- .../e2e_test/web_workers/todo/todo_spec.ts | 2 +- .../e2e_test/zippy_component/zippy_spec.ts | 2 +- modules/tsconfig.json | 1 - packages/language-service/bundles/BUILD.bazel | 2 +- packages/tsconfig.json | 3 +-- packages/zone.js/test/karma_test.bzl | 4 ++-- tools/brotli-cli/BUILD.bazel | 11 ----------- tools/components/BUILD.bazel | 4 ---- tools/defaults.bzl | 6 +++--- tools/gulp-tasks/format.js | 1 - 98 files changed, 192 insertions(+), 127 deletions(-) create mode 100644 dev-infra/benchmark/BUILD.bazel create mode 100644 dev-infra/benchmark/brotli-cli/BUILD.bazel rename {tools => dev-infra/benchmark}/brotli-cli/cli.js (100%) rename {tools => dev-infra/benchmark}/browsers/BUILD.bazel (90%) rename {tools => dev-infra/benchmark}/browsers/browser_repositories.bzl (100%) rename {tools => dev-infra/benchmark}/browsers/chromium.json (100%) create mode 100644 dev-infra/benchmark/component_benchmark/BUILD.bazel rename {modules/benchmarks => dev-infra/benchmark/component_benchmark}/benchmark_test.bzl (68%) rename {tools/components => dev-infra/benchmark/component_benchmark}/component_benchmark.bzl (87%) rename {tools/components => dev-infra/benchmark/component_benchmark}/defaults/BUILD.bazel (51%) rename {tools/components => dev-infra/benchmark/component_benchmark}/defaults/index.html (100%) rename {tools/components => dev-infra/benchmark/component_benchmark}/defaults/index.ts (100%) rename {tools/components => dev-infra/benchmark/component_benchmark}/defaults/styles.css (100%) rename protractor-perf.conf.js => dev-infra/benchmark/component_benchmark/protractor-perf.conf.js (100%) rename {modules/benchmarks => dev-infra/benchmark/component_benchmark}/start-server.js (100%) create mode 100644 dev-infra/benchmark/component_benchmark/tsconfig-e2e.json rename {modules/e2e_util => dev-infra/benchmark/driver-utilities}/BUILD.bazel (56%) rename {modules/e2e_util => dev-infra/benchmark/driver-utilities}/e2e_util.ts (100%) create mode 100644 dev-infra/benchmark/driver-utilities/index.ts rename {modules/e2e_util => dev-infra/benchmark/driver-utilities}/perf_util.ts (100%) rename {tools => dev-infra/benchmark}/ng_rollup_bundle/BUILD.bazel (81%) rename {tools => dev-infra/benchmark}/ng_rollup_bundle/ng_rollup_bundle.bzl (98%) rename {tools => dev-infra/benchmark}/ng_rollup_bundle/rollup.config.js (100%) rename {tools => dev-infra/benchmark}/ng_rollup_bundle/terser_config.json (100%) create mode 100644 dev-infra/tools/BUILD.bazel delete mode 100644 tools/brotli-cli/BUILD.bazel delete mode 100644 tools/components/BUILD.bazel diff --git a/.pullapprove.yml b/.pullapprove.yml index cfebec27fa..96fc749d04 100644 --- a/.pullapprove.yml +++ b/.pullapprove.yml @@ -966,8 +966,6 @@ 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/**', @@ -975,14 +973,10 @@ groups: '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/**', diff --git a/BUILD.bazel b/BUILD.bazel index 7de233d906..7a97832224 100644 --- a/BUILD.bazel +++ b/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", diff --git a/WORKSPACE b/WORKSPACE index 15fc0c3b37..ea8b423a05 100644 --- a/WORKSPACE +++ b/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() diff --git a/dev-infra/benchmark/BUILD.bazel b/dev-infra/benchmark/BUILD.bazel new file mode 100644 index 0000000000..9feb062ead --- /dev/null +++ b/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", + ], +) diff --git a/dev-infra/benchmark/brotli-cli/BUILD.bazel b/dev-infra/benchmark/brotli-cli/BUILD.bazel new file mode 100644 index 0000000000..a97d1f5e19 --- /dev/null +++ b/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(["*"]), +) diff --git a/tools/brotli-cli/cli.js b/dev-infra/benchmark/brotli-cli/cli.js similarity index 100% rename from tools/brotli-cli/cli.js rename to dev-infra/benchmark/brotli-cli/cli.js diff --git a/tools/browsers/BUILD.bazel b/dev-infra/benchmark/browsers/BUILD.bazel similarity index 90% rename from tools/browsers/BUILD.bazel rename to dev-infra/benchmark/browsers/BUILD.bazel index 96aa00190d..a0bba3d5b0 100644 --- a/tools/browsers/BUILD.bazel +++ b/dev-infra/benchmark/browsers/BUILD.bazel @@ -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(["*"]), +) diff --git a/tools/browsers/browser_repositories.bzl b/dev-infra/benchmark/browsers/browser_repositories.bzl similarity index 100% rename from tools/browsers/browser_repositories.bzl rename to dev-infra/benchmark/browsers/browser_repositories.bzl diff --git a/tools/browsers/chromium.json b/dev-infra/benchmark/browsers/chromium.json similarity index 100% rename from tools/browsers/chromium.json rename to dev-infra/benchmark/browsers/chromium.json diff --git a/dev-infra/benchmark/component_benchmark/BUILD.bazel b/dev-infra/benchmark/component_benchmark/BUILD.bazel new file mode 100644 index 0000000000..4a4596f070 --- /dev/null +++ b/dev-infra/benchmark/component_benchmark/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"], +) diff --git a/modules/benchmarks/benchmark_test.bzl b/dev-infra/benchmark/component_benchmark/benchmark_test.bzl similarity index 68% rename from modules/benchmarks/benchmark_test.bzl rename to dev-infra/benchmark/component_benchmark/benchmark_test.bzl index a6d6442004..67c097a838 100644 --- a/modules/benchmarks/benchmark_test.bzl +++ b/dev-infra/benchmark/component_benchmark/benchmark_test.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 + [ diff --git a/tools/components/component_benchmark.bzl b/dev-infra/benchmark/component_benchmark/component_benchmark.bzl similarity index 87% rename from tools/components/component_benchmark.bzl rename to dev-infra/benchmark/component_benchmark/component_benchmark.bzl index 40f8788d44..9e4cfa0a26 100644 --- a/tools/components/component_benchmark.bzl +++ b/dev-infra/benchmark/component_benchmark/component_benchmark.bzl @@ -1,9 +1,11 @@ -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. @@ -11,7 +13,7 @@ def copy_default_file(origin, destination): """ 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. diff --git a/tools/components/defaults/BUILD.bazel b/dev-infra/benchmark/component_benchmark/defaults/BUILD.bazel similarity index 51% rename from tools/components/defaults/BUILD.bazel rename to dev-infra/benchmark/component_benchmark/defaults/BUILD.bazel index 3445ea83fe..0eb8038377 100644 --- a/tools/components/defaults/BUILD.bazel +++ b/dev-infra/benchmark/component_benchmark/defaults/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", diff --git a/tools/components/defaults/index.html b/dev-infra/benchmark/component_benchmark/defaults/index.html similarity index 100% rename from tools/components/defaults/index.html rename to dev-infra/benchmark/component_benchmark/defaults/index.html diff --git a/tools/components/defaults/index.ts b/dev-infra/benchmark/component_benchmark/defaults/index.ts similarity index 100% rename from tools/components/defaults/index.ts rename to dev-infra/benchmark/component_benchmark/defaults/index.ts diff --git a/tools/components/defaults/styles.css b/dev-infra/benchmark/component_benchmark/defaults/styles.css similarity index 100% rename from tools/components/defaults/styles.css rename to dev-infra/benchmark/component_benchmark/defaults/styles.css diff --git a/protractor-perf.conf.js b/dev-infra/benchmark/component_benchmark/protractor-perf.conf.js similarity index 100% rename from protractor-perf.conf.js rename to dev-infra/benchmark/component_benchmark/protractor-perf.conf.js diff --git a/modules/benchmarks/start-server.js b/dev-infra/benchmark/component_benchmark/start-server.js similarity index 100% rename from modules/benchmarks/start-server.js rename to dev-infra/benchmark/component_benchmark/start-server.js diff --git a/dev-infra/benchmark/component_benchmark/tsconfig-e2e.json b/dev-infra/benchmark/component_benchmark/tsconfig-e2e.json new file mode 100644 index 0000000000..ec8572b587 --- /dev/null +++ b/dev-infra/benchmark/component_benchmark/tsconfig-e2e.json @@ -0,0 +1,6 @@ +{ + "compilerOptions": { + "lib": ["es2015", "dom"], + "types": ["node", "jasmine"] + } +} diff --git a/modules/e2e_util/BUILD.bazel b/dev-infra/benchmark/driver-utilities/BUILD.bazel similarity index 56% rename from modules/e2e_util/BUILD.bazel rename to dev-infra/benchmark/driver-utilities/BUILD.bazel index 0fa699b43b..aac2c6a5fd 100644 --- a/modules/e2e_util/BUILD.bazel +++ b/dev-infra/benchmark/driver-utilities/BUILD.bazel @@ -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", diff --git a/modules/e2e_util/e2e_util.ts b/dev-infra/benchmark/driver-utilities/e2e_util.ts similarity index 100% rename from modules/e2e_util/e2e_util.ts rename to dev-infra/benchmark/driver-utilities/e2e_util.ts diff --git a/dev-infra/benchmark/driver-utilities/index.ts b/dev-infra/benchmark/driver-utilities/index.ts new file mode 100644 index 0000000000..3afa6dbf48 --- /dev/null +++ b/dev-infra/benchmark/driver-utilities/index.ts @@ -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'; diff --git a/modules/e2e_util/perf_util.ts b/dev-infra/benchmark/driver-utilities/perf_util.ts similarity index 100% rename from modules/e2e_util/perf_util.ts rename to dev-infra/benchmark/driver-utilities/perf_util.ts diff --git a/tools/ng_rollup_bundle/BUILD.bazel b/dev-infra/benchmark/ng_rollup_bundle/BUILD.bazel similarity index 81% rename from tools/ng_rollup_bundle/BUILD.bazel rename to dev-infra/benchmark/ng_rollup_bundle/BUILD.bazel index 9c7960d932..0b7900ba98 100644 --- a/tools/ng_rollup_bundle/BUILD.bazel +++ b/dev-infra/benchmark/ng_rollup_bundle/BUILD.bazel @@ -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(["*"]), +) diff --git a/tools/ng_rollup_bundle/ng_rollup_bundle.bzl b/dev-infra/benchmark/ng_rollup_bundle/ng_rollup_bundle.bzl similarity index 98% rename from tools/ng_rollup_bundle/ng_rollup_bundle.bzl rename to dev-infra/benchmark/ng_rollup_bundle/ng_rollup_bundle.bzl index db5c17a265..cb18880229 100644 --- a/tools/ng_rollup_bundle/ng_rollup_bundle.bzl +++ b/dev-infra/benchmark/ng_rollup_bundle/ng_rollup_bundle.bzl @@ -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 = [ diff --git a/tools/ng_rollup_bundle/rollup.config.js b/dev-infra/benchmark/ng_rollup_bundle/rollup.config.js similarity index 100% rename from tools/ng_rollup_bundle/rollup.config.js rename to dev-infra/benchmark/ng_rollup_bundle/rollup.config.js diff --git a/tools/ng_rollup_bundle/terser_config.json b/dev-infra/benchmark/ng_rollup_bundle/terser_config.json similarity index 100% rename from tools/ng_rollup_bundle/terser_config.json rename to dev-infra/benchmark/ng_rollup_bundle/terser_config.json 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", + ], +) diff --git a/modules/benchmarks/BUILD.bazel b/modules/benchmarks/BUILD.bazel index 7159d1f14b..609b2f207c 100644 --- a/modules/benchmarks/BUILD.bazel +++ b/modules/benchmarks/BUILD.bazel @@ -3,5 +3,4 @@ package(default_visibility = ["//visibility:public"]) exports_files([ "tsconfig-build.json", "tsconfig-e2e.json", - "start-server.js", ]) diff --git a/modules/benchmarks/e2e_test.bzl b/modules/benchmarks/e2e_test.bzl index 0f405654dc..bbcad88335 100644 --- a/modules/benchmarks/e2e_test.bzl +++ b/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 = "//modules/benchmarks:start-server.js", + on_prepare = "//dev-infra/benchmark/component_benchmark:start-server.js", server = server, **kwargs ) diff --git a/modules/benchmarks/src/change_detection/BUILD.bazel b/modules/benchmarks/src/change_detection/BUILD.bazel index ccf0bdbe59..4b2449f7f9 100644 --- a/modules/benchmarks/src/change_detection/BUILD.bazel +++ b/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 = [ - "//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", ], ) diff --git a/modules/benchmarks/src/change_detection/change_detection.e2e-spec.ts b/modules/benchmarks/src/change_detection/change_detection.e2e-spec.ts index 33ba44bce5..db4d8c4b93 100644 --- a/modules/benchmarks/src/change_detection/change_detection.e2e-spec.ts +++ b/modules/benchmarks/src/change_detection/change_detection.e2e-spec.ts @@ -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); diff --git a/modules/benchmarks/src/change_detection/change_detection.perf-spec.ts b/modules/benchmarks/src/change_detection/change_detection.perf-spec.ts index f450dc5bc8..1c4015b86f 100644 --- a/modules/benchmarks/src/change_detection/change_detection.perf-spec.ts +++ b/modules/benchmarks/src/change_detection/change_detection.perf-spec.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; diff --git a/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel b/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel index 2ddcf16392..4d21624b04 100644 --- a/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel +++ b/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("//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__"]) diff --git a/modules/benchmarks/src/class_bindings/class_bindings.perf-spec.ts b/modules/benchmarks/src/class_bindings/class_bindings.perf-spec.ts index e21d27dadf..b942b47aba 100644 --- a/modules/benchmarks/src/class_bindings/class_bindings.perf-spec.ts +++ b/modules/benchmarks/src/class_bindings/class_bindings.perf-spec.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 () => { diff --git a/modules/benchmarks/src/expanding_rows/BUILD.bazel b/modules/benchmarks/src/expanding_rows/BUILD.bazel index 1969ca038b..4e0aad1457 100644 --- a/modules/benchmarks/src/expanding_rows/BUILD.bazel +++ b/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("//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", ], ) diff --git a/modules/benchmarks/src/expanding_rows/expanding_rows.perf-spec.ts b/modules/benchmarks/src/expanding_rows/expanding_rows.perf-spec.ts index 316de6c5ab..67b6689f16 100644 --- a/modules/benchmarks/src/expanding_rows/expanding_rows.perf-spec.ts +++ b/modules/benchmarks/src/expanding_rows/expanding_rows.perf-spec.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('benchmarks', () => { it('should work for create', async () => { diff --git a/modules/benchmarks/src/js-web-frameworks/BUILD.bazel b/modules/benchmarks/src/js-web-frameworks/BUILD.bazel index 4889b86f71..dedd600ee5 100644 --- a/modules/benchmarks/src/js-web-frameworks/BUILD.bazel +++ b/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 = [ - "//modules/e2e_util", + "//dev-infra/benchmark/driver-utilities", "@npm//protractor", ], ) diff --git a/modules/benchmarks/src/js-web-frameworks/js-web-frameworks.perf-spec.ts b/modules/benchmarks/src/js-web-frameworks/js-web-frameworks.perf-spec.ts index 200590588e..fe8d2fbb06 100644 --- a/modules/benchmarks/src/js-web-frameworks/js-web-frameworks.perf-spec.ts +++ b/modules/benchmarks/src/js-web-frameworks/js-web-frameworks.perf-spec.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; diff --git a/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel b/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel index 925325fe0a..66c9de654c 100644 --- a/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel +++ b/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("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") +load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/largeform/BUILD.bazel b/modules/benchmarks/src/largeform/BUILD.bazel index a6eb8b4679..81273b7146 100644 --- a/modules/benchmarks/src/largeform/BUILD.bazel +++ b/modules/benchmarks/src/largeform/BUILD.bazel @@ -8,7 +8,7 @@ ts_library( srcs = ["largeform.perf-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig-e2e.json", deps = [ - "//modules/e2e_util", + "//dev-infra/benchmark/driver-utilities", "@npm//protractor", ], ) @@ -19,7 +19,7 @@ ts_library( srcs = ["largeform.e2e-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig-e2e.json", deps = [ - "//modules/e2e_util", + "//dev-infra/benchmark/driver-utilities", "@npm//protractor", ], ) diff --git a/modules/benchmarks/src/largeform/largeform.e2e-spec.ts b/modules/benchmarks/src/largeform/largeform.e2e-spec.ts index de55e16002..e441e67d4c 100644 --- a/modules/benchmarks/src/largeform/largeform.e2e-spec.ts +++ b/modules/benchmarks/src/largeform/largeform.e2e-spec.ts @@ -8,7 +8,7 @@ import {$, By, element} from 'protractor'; -import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {openBrowser, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; describe('largeform benchmark', () => { afterEach(verifyNoBrowserErrors); diff --git a/modules/benchmarks/src/largeform/largeform.perf-spec.ts b/modules/benchmarks/src/largeform/largeform.perf-spec.ts index ccab69f065..fd6adebb48 100644 --- a/modules/benchmarks/src/largeform/largeform.perf-spec.ts +++ b/modules/benchmarks/src/largeform/largeform.perf-spec.ts @@ -8,8 +8,7 @@ import {$} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; -import {runBenchmark} from '../../../e2e_util/perf_util'; +import {runBenchmark, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; interface Worker { id: string; diff --git a/modules/benchmarks/src/largeform/ng2/BUILD.bazel b/modules/benchmarks/src/largeform/ng2/BUILD.bazel index 51db615c78..3cc1d9e7f7 100644 --- a/modules/benchmarks/src/largeform/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largeform/ng2/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module", "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__"]) diff --git a/modules/benchmarks/src/largetable/BUILD.bazel b/modules/benchmarks/src/largetable/BUILD.bazel index 766394d453..68bc416fe2 100644 --- a/modules/benchmarks/src/largetable/BUILD.bazel +++ b/modules/benchmarks/src/largetable/BUILD.bazel @@ -15,7 +15,7 @@ ts_library( srcs = ["largetable.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 = ["largetable.e2e-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig-e2e.json", deps = [ - "//modules/e2e_util", + "//dev-infra/benchmark/driver-utilities", "@npm//protractor", ], ) diff --git a/modules/benchmarks/src/largetable/baseline/BUILD.bazel b/modules/benchmarks/src/largetable/baseline/BUILD.bazel index 8c8398db7e..297ab4eabf 100644 --- a/modules/benchmarks/src/largetable/baseline/BUILD.bazel +++ b/modules/benchmarks/src/largetable/baseline/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_devserver", "ts_library") -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__"]) diff --git a/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel index 6d63f067d3..c37bf4e258 100644 --- a/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel +++ b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_devserver", "ts_library") -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__"]) diff --git a/modules/benchmarks/src/largetable/iv/BUILD.bazel b/modules/benchmarks/src/largetable/iv/BUILD.bazel index 841a298e6c..4ade284237 100644 --- a/modules/benchmarks/src/largetable/iv/BUILD.bazel +++ b/modules/benchmarks/src/largetable/iv/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "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__"]) diff --git a/modules/benchmarks/src/largetable/largetable.e2e-spec.ts b/modules/benchmarks/src/largetable/largetable.e2e-spec.ts index 3b6da53085..5f0ad91064 100644 --- a/modules/benchmarks/src/largetable/largetable.e2e-spec.ts +++ b/modules/benchmarks/src/largetable/largetable.e2e-spec.ts @@ -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('largetable benchmark', () => { afterEach(verifyNoBrowserErrors); diff --git a/modules/benchmarks/src/largetable/largetable.perf-spec.ts b/modules/benchmarks/src/largetable/largetable.perf-spec.ts index ffd96ece13..e69fba3ec1 100644 --- a/modules/benchmarks/src/largetable/largetable.perf-spec.ts +++ b/modules/benchmarks/src/largetable/largetable.perf-spec.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; diff --git a/modules/benchmarks/src/largetable/ng2/BUILD.bazel b/modules/benchmarks/src/largetable/ng2/BUILD.bazel index b52ad6b173..4f692c40e3 100644 --- a/modules/benchmarks/src/largetable/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2/BUILD.bazel @@ -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__"]) diff --git a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel index 555ecab562..dac90bfdfc 100644 --- a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module", "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__"]) diff --git a/modules/benchmarks/src/largetable/render3/BUILD.bazel b/modules/benchmarks/src/largetable/render3/BUILD.bazel index ab6f33646d..54109654bb 100644 --- a/modules/benchmarks/src/largetable/render3/BUILD.bazel +++ b/modules/benchmarks/src/largetable/render3/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility = ["//visibility:public"]) 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") ng_module( diff --git a/modules/benchmarks/src/styling/BUILD.bazel b/modules/benchmarks/src/styling/BUILD.bazel index 4a77b559f2..a31bef8341 100644 --- a/modules/benchmarks/src/styling/BUILD.bazel +++ b/modules/benchmarks/src/styling/BUILD.bazel @@ -8,7 +8,7 @@ ts_library( srcs = ["styling_perf.spec.ts"], tsconfig = "//modules/benchmarks:tsconfig-e2e.json", deps = [ - "//modules/e2e_util", + "//dev-infra/benchmark/driver-utilities", "@npm//protractor", ], ) diff --git a/modules/benchmarks/src/styling/ng2/BUILD.bazel b/modules/benchmarks/src/styling/ng2/BUILD.bazel index 4f077ae02b..2c94d73a16 100644 --- a/modules/benchmarks/src/styling/ng2/BUILD.bazel +++ b/modules/benchmarks/src/styling/ng2/BUILD.bazel @@ -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") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/styling/styling_perf.spec.ts b/modules/benchmarks/src/styling/styling_perf.spec.ts index 779ef33bf8..5eb195d73e 100644 --- a/modules/benchmarks/src/styling/styling_perf.spec.ts +++ b/modules/benchmarks/src/styling/styling_perf.spec.ts @@ -7,8 +7,7 @@ */ import {$, by, element} from 'protractor'; -import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; -import {runBenchmark} from '../../../e2e_util/perf_util'; +import {openBrowser, runBenchmark, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; /** List of possible scenarios that should be tested. */ const SCENARIOS = [ diff --git a/modules/benchmarks/src/tree/BUILD.bazel b/modules/benchmarks/src/tree/BUILD.bazel index 2394677a61..7a7b4a59fc 100644 --- a/modules/benchmarks/src/tree/BUILD.bazel +++ b/modules/benchmarks/src/tree/BUILD.bazel @@ -15,7 +15,7 @@ ts_library( srcs = ["test_utils.ts"], tsconfig = "//modules/benchmarks:tsconfig-e2e.json", deps = [ - "//modules/e2e_util", + "//dev-infra/benchmark/driver-utilities", "@npm//protractor", ], ) diff --git a/modules/benchmarks/src/tree/baseline/BUILD.bazel b/modules/benchmarks/src/tree/baseline/BUILD.bazel index 7a6b37ef3d..5392ffe227 100644 --- a/modules/benchmarks/src/tree/baseline/BUILD.bazel +++ b/modules/benchmarks/src/tree/baseline/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_devserver", "ts_library") -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__"]) diff --git a/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel index b99a6d5839..45ad6220e6 100644 --- a/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel +++ b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_devserver", "ts_library") -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__"]) diff --git a/modules/benchmarks/src/tree/iv/BUILD.bazel b/modules/benchmarks/src/tree/iv/BUILD.bazel index f7efff307a..fe253e0398 100644 --- a/modules/benchmarks/src/tree/iv/BUILD.bazel +++ b/modules/benchmarks/src/tree/iv/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "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__"]) diff --git a/modules/benchmarks/src/tree/ng1/BUILD.bazel b/modules/benchmarks/src/tree/ng1/BUILD.bazel index b9d4a71f66..7656053b08 100644 --- a/modules/benchmarks/src/tree/ng1/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng1/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_devserver", "ts_library") -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__"]) diff --git a/modules/benchmarks/src/tree/ng2/BUILD.bazel b/modules/benchmarks/src/tree/ng2/BUILD.bazel index 9765e5b1ea..4f479c0f09 100644 --- a/modules/benchmarks/src/tree/ng2/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2/BUILD.bazel @@ -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__"]) diff --git a/modules/benchmarks/src/tree/ng2_next/BUILD.bazel b/modules/benchmarks/src/tree/ng2_next/BUILD.bazel index a678099e4d..54cbeaaf18 100644 --- a/modules/benchmarks/src/tree/ng2_next/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_next/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_devserver", "ts_library") -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__"]) diff --git a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel index 99167f1cb1..0af1f9111d 100644 --- a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_devserver", "ts_library") -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__"]) diff --git a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel index 4c1e8cb933..5f849591fc 100644 --- a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module", "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__"]) diff --git a/modules/benchmarks/src/tree/render3/BUILD.bazel b/modules/benchmarks/src/tree/render3/BUILD.bazel index ecfad4e8b9..c58f47baf4 100644 --- a/modules/benchmarks/src/tree/render3/BUILD.bazel +++ b/modules/benchmarks/src/tree/render3/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility = ["//modules/benchmarks:__subpackages__"]) 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") ng_module( diff --git a/modules/benchmarks/src/tree/render3_function/BUILD.bazel b/modules/benchmarks/src/tree/render3_function/BUILD.bazel index da9ec7ecb2..09020c76c9 100644 --- a/modules/benchmarks/src/tree/render3_function/BUILD.bazel +++ b/modules/benchmarks/src/tree/render3_function/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_devserver", "ts_library") -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__"]) diff --git a/modules/benchmarks/src/tree/test_utils.ts b/modules/benchmarks/src/tree/test_utils.ts index 0cabe67103..f7d0a35be2 100644 --- a/modules/benchmarks/src/tree/test_utils.ts +++ b/modules/benchmarks/src/tree/test_utils.ts @@ -8,8 +8,7 @@ import {browser} from 'protractor'; -import {openBrowser} from '../../../e2e_util/e2e_util'; -import {runBenchmark} from '../../../e2e_util/perf_util'; +import {openBrowser, runBenchmark} from '../../../../dev-infra/benchmark/driver-utilities'; export function runTreeBenchmark({id, prepare, setup, work}: { id: string; prepare ? () : void; setup ? () : void; work(): void; diff --git a/modules/benchmarks/tsconfig.json b/modules/benchmarks/tsconfig.json index 2a5b97245d..04e445884a 100644 --- a/modules/benchmarks/tsconfig.json +++ b/modules/benchmarks/tsconfig.json @@ -14,7 +14,7 @@ "rxjs/*": ["../../node_modules/rxjs/*"], "@angular/*": ["../../packages/*"], "zone.js/*": ["../../packages/zone.js/*"], - "e2e_util/*": ["../e2e_util/*"] + "dev_infra/*": ["../../dev-infra/*"] }, "rootDir": ".", "inlineSourceMap": true, @@ -31,5 +31,6 @@ "no-floating-promises": true, "no-unused-expression": true, "no-unused-variable": true - } + }, + "include": ["../../dev-infra/benchmark/driver-utilities/"] } diff --git a/modules/playground/e2e_test/async/async_spec.ts b/modules/playground/e2e_test/async/async_spec.ts index c67993f581..073d914e7f 100644 --- a/modules/playground/e2e_test/async/async_spec.ts +++ b/modules/playground/e2e_test/async/async_spec.ts @@ -9,7 +9,7 @@ import {$, browser} from 'protractor'; import {promise} from 'selenium-webdriver'; -import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; describe('async', () => { const URL = '/'; diff --git a/modules/playground/e2e_test/example_test.bzl b/modules/playground/e2e_test/example_test.bzl index 45781f923c..41fdc97a35 100644 --- a/modules/playground/e2e_test/example_test.bzl +++ b/modules/playground/e2e_test/example_test.bzl @@ -7,7 +7,7 @@ def example_test(name, srcs, server, data = [], **kwargs): srcs = srcs, tsconfig = "//modules/playground:tsconfig-e2e.json", deps = [ - "//modules/e2e_util", + "//dev-infra/benchmark/driver-utilities", "//packages/private/testing", "@npm//@types/jasminewd2", "@npm//@types/selenium-webdriver", diff --git a/modules/playground/e2e_test/hello_world/hello_world_spec.ts b/modules/playground/e2e_test/hello_world/hello_world_spec.ts index 2d167fec74..536ca619e8 100644 --- a/modules/playground/e2e_test/hello_world/hello_world_spec.ts +++ b/modules/playground/e2e_test/hello_world/hello_world_spec.ts @@ -8,7 +8,7 @@ import {browser} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; describe('hello world', function() { afterEach(verifyNoBrowserErrors); diff --git a/modules/playground/e2e_test/http/http_spec.ts b/modules/playground/e2e_test/http/http_spec.ts index f5a5618b3f..4820b01aec 100644 --- a/modules/playground/e2e_test/http/http_spec.ts +++ b/modules/playground/e2e_test/http/http_spec.ts @@ -8,7 +8,7 @@ import {browser} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; describe('http', function() { afterEach(verifyNoBrowserErrors); diff --git a/modules/playground/e2e_test/jsonp/jsonp_spec.ts b/modules/playground/e2e_test/jsonp/jsonp_spec.ts index 72f1003a5f..5c56f56cf7 100644 --- a/modules/playground/e2e_test/jsonp/jsonp_spec.ts +++ b/modules/playground/e2e_test/jsonp/jsonp_spec.ts @@ -8,7 +8,7 @@ import {browser} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; describe('jsonp', function() { afterEach(verifyNoBrowserErrors); diff --git a/modules/playground/e2e_test/key_events/key_events_spec.ts b/modules/playground/e2e_test/key_events/key_events_spec.ts index 898950d8c5..47d2d4df7a 100644 --- a/modules/playground/e2e_test/key_events/key_events_spec.ts +++ b/modules/playground/e2e_test/key_events/key_events_spec.ts @@ -8,7 +8,7 @@ import {browser, by, element, protractor} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; const Key = protractor.Key; diff --git a/modules/playground/e2e_test/model_driven_forms/model_driven_forms_spec.ts b/modules/playground/e2e_test/model_driven_forms/model_driven_forms_spec.ts index 25c96ee92c..b0c3f04dd4 100644 --- a/modules/playground/e2e_test/model_driven_forms/model_driven_forms_spec.ts +++ b/modules/playground/e2e_test/model_driven_forms/model_driven_forms_spec.ts @@ -8,7 +8,7 @@ import {browser, by, element} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; describe('Model-Driven Forms', function() { afterEach(verifyNoBrowserErrors); diff --git a/modules/playground/e2e_test/order_management/order_management_spec.ts b/modules/playground/e2e_test/order_management/order_management_spec.ts index 970f71ae9f..462025bacb 100644 --- a/modules/playground/e2e_test/order_management/order_management_spec.ts +++ b/modules/playground/e2e_test/order_management/order_management_spec.ts @@ -8,7 +8,7 @@ import {browser} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; describe('Order Management CRUD', function() { const URL = '/'; diff --git a/modules/playground/e2e_test/person_management/person_management_spec.ts b/modules/playground/e2e_test/person_management/person_management_spec.ts index 3fddf0638e..678bf2e9db 100644 --- a/modules/playground/e2e_test/person_management/person_management_spec.ts +++ b/modules/playground/e2e_test/person_management/person_management_spec.ts @@ -8,7 +8,7 @@ import {browser} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; describe('Person Management CRUD', function() { const URL = '/'; diff --git a/modules/playground/e2e_test/relative_assets/assets_spec.ts b/modules/playground/e2e_test/relative_assets/assets_spec.ts index eb57cfe5c3..00808d0d20 100644 --- a/modules/playground/e2e_test/relative_assets/assets_spec.ts +++ b/modules/playground/e2e_test/relative_assets/assets_spec.ts @@ -8,7 +8,7 @@ import {$, browser, by, element, ExpectedConditions} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; function waitForElement(selector: string) { // Waits for the element with id 'abc' to be present on the dom. diff --git a/modules/playground/e2e_test/routing/routing_spec.ts b/modules/playground/e2e_test/routing/routing_spec.ts index f71e7eed8c..efe6fcc3b9 100644 --- a/modules/playground/e2e_test/routing/routing_spec.ts +++ b/modules/playground/e2e_test/routing/routing_spec.ts @@ -8,7 +8,7 @@ import {$, browser, by, element, ExpectedConditions} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; function waitForElement(selector: string) { // Waits for the element with id 'abc' to be present on the dom. diff --git a/modules/playground/e2e_test/svg/svg_spec.ts b/modules/playground/e2e_test/svg/svg_spec.ts index 7cbeb29b98..7df5be26eb 100644 --- a/modules/playground/e2e_test/svg/svg_spec.ts +++ b/modules/playground/e2e_test/svg/svg_spec.ts @@ -8,7 +8,7 @@ import {browser, by, element} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; describe('SVG', function() { const URL = '/'; diff --git a/modules/playground/e2e_test/template_driven_forms/template_driven_forms_spec.ts b/modules/playground/e2e_test/template_driven_forms/template_driven_forms_spec.ts index 96f0efc869..ffb93a7eb9 100644 --- a/modules/playground/e2e_test/template_driven_forms/template_driven_forms_spec.ts +++ b/modules/playground/e2e_test/template_driven_forms/template_driven_forms_spec.ts @@ -8,7 +8,7 @@ import {browser, by, element} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; describe('Template-Driven Forms', function() { afterEach(verifyNoBrowserErrors); diff --git a/modules/playground/e2e_test/upgrade/upgrade_spec.ts b/modules/playground/e2e_test/upgrade/upgrade_spec.ts index 0a568a1a30..af48a3df91 100644 --- a/modules/playground/e2e_test/upgrade/upgrade_spec.ts +++ b/modules/playground/e2e_test/upgrade/upgrade_spec.ts @@ -8,7 +8,7 @@ import {browser, by, element} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; describe('ngUpgrade', function() { const URL = '/'; diff --git a/modules/playground/e2e_test/web_workers/animations/animations_spec.ts b/modules/playground/e2e_test/web_workers/animations/animations_spec.ts index 9e148d5d63..3f0476051e 100644 --- a/modules/playground/e2e_test/web_workers/animations/animations_spec.ts +++ b/modules/playground/e2e_test/web_workers/animations/animations_spec.ts @@ -8,7 +8,7 @@ import {browser, by, element, protractor} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../../dev-infra/benchmark/driver-utilities'; // Disabled because with ViewEngine animations within webworkers is not supported. diff --git a/modules/playground/e2e_test/web_workers/input/input_spec.ts b/modules/playground/e2e_test/web_workers/input/input_spec.ts index bd73b09ccf..2f94fa346e 100644 --- a/modules/playground/e2e_test/web_workers/input/input_spec.ts +++ b/modules/playground/e2e_test/web_workers/input/input_spec.ts @@ -8,7 +8,7 @@ import {browser, by, element, ExpectedConditions, protractor} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../../dev-infra/benchmark/driver-utilities'; describe('WebWorkers Input', function() { afterEach(() => { diff --git a/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts b/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts index ecb474a84f..e8a555f6e7 100644 --- a/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts +++ b/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts @@ -8,7 +8,7 @@ import {browser, by, element, ExpectedConditions, protractor} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../../dev-infra/benchmark/driver-utilities'; describe('WebWorkers Kitchen Sink', function() { afterEach(() => { diff --git a/modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts b/modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts index 23d59484ad..51438ceab6 100644 --- a/modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts +++ b/modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts @@ -8,7 +8,7 @@ import {browser, by, element, ExpectedConditions, protractor} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../../dev-infra/benchmark/driver-utilities'; const URL = '/'; diff --git a/modules/playground/e2e_test/web_workers/router/router_spec.ts b/modules/playground/e2e_test/web_workers/router/router_spec.ts index 752687c20c..88bfcfee4c 100644 --- a/modules/playground/e2e_test/web_workers/router/router_spec.ts +++ b/modules/playground/e2e_test/web_workers/router/router_spec.ts @@ -8,7 +8,7 @@ import {browser, by, element, protractor} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../../dev-infra/benchmark/driver-utilities'; describe('WebWorker Router', () => { beforeEach(() => { diff --git a/modules/playground/e2e_test/web_workers/todo/todo_spec.ts b/modules/playground/e2e_test/web_workers/todo/todo_spec.ts index 2af60cf400..f67d044a1b 100644 --- a/modules/playground/e2e_test/web_workers/todo/todo_spec.ts +++ b/modules/playground/e2e_test/web_workers/todo/todo_spec.ts @@ -8,7 +8,7 @@ import {browser, by, element, protractor} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../../dev-infra/benchmark/driver-utilities'; describe('WebWorkers Todo', function() { afterEach(() => { diff --git a/modules/playground/e2e_test/zippy_component/zippy_spec.ts b/modules/playground/e2e_test/zippy_component/zippy_spec.ts index 6e66e4049b..ae83c971e4 100644 --- a/modules/playground/e2e_test/zippy_component/zippy_spec.ts +++ b/modules/playground/e2e_test/zippy_component/zippy_spec.ts @@ -8,7 +8,7 @@ import {browser, by, element} from 'protractor'; -import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; describe('Zippy Component', function() { afterEach(verifyNoBrowserErrors); diff --git a/modules/tsconfig.json b/modules/tsconfig.json index 03c7961d56..d7a5fd5ad6 100644 --- a/modules/tsconfig.json +++ b/modules/tsconfig.json @@ -23,7 +23,6 @@ "types": ["angular"] }, "exclude": [ - "benchmarks_external", "payload_tests", "playground/", "benchmarks/" diff --git a/packages/language-service/bundles/BUILD.bazel b/packages/language-service/bundles/BUILD.bazel index 027480e3c1..da80ab8229 100644 --- a/packages/language-service/bundles/BUILD.bazel +++ b/packages/language-service/bundles/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools/ng_rollup_bundle:ng_rollup_bundle.bzl", "ls_rollup_bundle") +load("//dev-infra/benchmark/ng_rollup_bundle:ng_rollup_bundle.bzl", "ls_rollup_bundle") ls_rollup_bundle( name = "language-service", diff --git a/packages/tsconfig.json b/packages/tsconfig.json index 96ae6af801..8e9f5153b6 100644 --- a/packages/tsconfig.json +++ b/packages/tsconfig.json @@ -19,8 +19,7 @@ "selenium-webdriver": ["./node_modules/@types/selenium-webdriver/index.d.ts"], "rxjs/*": ["./node_modules/rxjs/*"], "@angular/*": ["./packages/*"], - "zone.js/*": ["./packages/zone.js/*"], - "e2e_util/*": ["./modules/e2e_util/*"] + "zone.js/*": ["./packages/zone.js/*"] }, "rootDir": ".", "inlineSourceMap": true, diff --git a/packages/zone.js/test/karma_test.bzl b/packages/zone.js/test/karma_test.bzl index bc0ac35306..4685af3eae 100644 --- a/packages/zone.js/test/karma_test.bzl +++ b/packages/zone.js/test/karma_test.bzl @@ -70,7 +70,7 @@ def karma_test(name, env_srcs, env_deps, env_entry_point, test_srcs, test_deps, ":" + name + "_env_rollup.umd", ] + bootstrap + _karma_test_required_dist_files, - browsers = ["//tools/browsers:chromium"], + browsers = ["//dev-infra/benchmark/browsers:chromium"], static_files = [ ":assets/sample.json", ":assets/worker.js", @@ -93,7 +93,7 @@ def karma_test(name, env_srcs, env_deps, env_entry_point, test_srcs, test_deps, ":" + name + "_env_rollup.umd", "//packages/zone.js/dist:zone-testing-bundle.min.js", ] + _karma_test_required_dist_files, - browsers = ["//tools/browsers:chromium"], + browsers = ["//dev-infra/benchmark/browsers:chromium"], config_file = "//:karma-js.conf.js", configuration_env_vars = ["KARMA_WEB_TEST_MODE"], data = [ diff --git a/tools/brotli-cli/BUILD.bazel b/tools/brotli-cli/BUILD.bazel deleted file mode 100644 index 4a0ecc6f93..0000000000 --- a/tools/brotli-cli/BUILD.bazel +++ /dev/null @@ -1,11 +0,0 @@ -load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") - -nodejs_binary( - name = "brotli-cli", - data = [ - "cli.js", - "@npm//brotli", - ], - entry_point = ":cli.js", - visibility = ["//:__subpackages__"], -) diff --git a/tools/components/BUILD.bazel b/tools/components/BUILD.bazel deleted file mode 100644 index af563485d7..0000000000 --- a/tools/components/BUILD.bazel +++ /dev/null @@ -1,4 +0,0 @@ -# This BUILD file exists to mark //tools/components as a package. -# -# Without this, using component_benchmark.bzl would throw an error saying: -# Label '//tools/components:component_benchmark.bzl' is invalid because 'tools/components' is not a package diff --git a/tools/defaults.bzl b/tools/defaults.bzl index 0b164ad215..743c52bd70 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -10,7 +10,7 @@ load("@npm_bazel_typescript//:index.bzl", _ts_devserver = "ts_devserver", _ts_li load("@npm_bazel_protractor//:index.bzl", _protractor_web_test_suite = "protractor_web_test_suite") load("@npm//typescript:index.bzl", "tsc") load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package") -load("//tools/ng_rollup_bundle:ng_rollup_bundle.bzl", _ng_rollup_bundle = "ng_rollup_bundle") +load("//dev-infra/benchmark/ng_rollup_bundle:ng_rollup_bundle.bzl", _ng_rollup_bundle = "ng_rollup_bundle") load("//tools:ng_benchmark.bzl", _ng_benchmark = "ng_benchmark") load("//tools/ts-api-guardian:index.bzl", _ts_api_guardian_test = "ts_api_guardian_test", _ts_api_guardian_test_npm_package = "ts_api_guardian_test_npm_package") @@ -245,7 +245,7 @@ def karma_web_test_suite(name, **kwargs): runtime_deps = runtime_deps, bootstrap = bootstrap, deps = deps, - browsers = ["//tools/browsers:chromium"], + browsers = ["//dev-infra/benchmark/browsers:chromium"], data = data, tags = tags, **kwargs @@ -282,7 +282,7 @@ def protractor_web_test_suite(**kwargs): """Default values for protractor_web_test_suite""" _protractor_web_test_suite( - browsers = ["//tools/browsers:chromium"], + browsers = ["//dev-infra/benchmark/browsers:chromium"], **kwargs ) diff --git a/tools/gulp-tasks/format.js b/tools/gulp-tasks/format.js index a9d168f535..61fd8d94e4 100644 --- a/tools/gulp-tasks/format.js +++ b/tools/gulp-tasks/format.js @@ -18,7 +18,6 @@ const srcsToFmt = [ `!${I18N_FOLDER}/currencies.ts`, `!${I18N_FOLDER}/locale_en.ts`, 'modules/benchmarks/**/*.{js,ts}', - 'modules/e2e_util/**/*.{js,ts}', 'modules/playground/**/*.{js,ts}', 'tools/**/*.{js,ts}', '!tools/gulp-tasks/cldr/extract.js',