From 34e83ed697410884f5fb54fbc9bcd05bc688c0b4 Mon Sep 17 00:00:00 2001 From: Wagner Maciel Date: Fri, 24 Apr 2020 10:26:24 -0700 Subject: [PATCH 1/3] revert: "build(core): use dev-infra's component_benchmark to show PoC (#36434)" This reverts commit e6161ca307be01eb1142092b53cbd7ddbd33312a. --- modules/benchmarks/src/class_bindings/BUILD.bazel | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/benchmarks/src/class_bindings/BUILD.bazel b/modules/benchmarks/src/class_bindings/BUILD.bazel index 48c3cdec70221..dbf1d0b0384e5 100644 --- a/modules/benchmarks/src/class_bindings/BUILD.bazel +++ b/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 = [ From fc6dba50e37ba22e0cb156fb46646847a51c7be0 Mon Sep 17 00:00:00 2001 From: Wagner Maciel Date: Fri, 24 Apr 2020 10:26:32 -0700 Subject: [PATCH 2/3] revert: "build(dev-infra): update package.json and :npm_package (#36434)" This reverts commit d6f6cd0cb17efceacf1da7bf814865bd0608d4c5. --- dev-infra/BUILD.bazel | 20 -------------------- dev-infra/tmpl-package.json | 30 +----------------------------- dev-infra/tools/BUILD.bazel | 12 ++++++++++++ 3 files changed, 13 insertions(+), 49 deletions(-) create mode 100644 dev-infra/tools/BUILD.bazel diff --git a/dev-infra/BUILD.bazel b/dev-infra/BUILD.bazel index 1987db6e2fde3..57897870bff31 100644 --- a/dev-infra/BUILD.bazel +++ b/dev-infra/BUILD.bazel @@ -34,30 +34,10 @@ genrule( pkg_npm( name = "npm_package", - srcs = [ - "BUILD.bazel", - "//dev-infra/benchmark:files", - ], - substitutions = { - # angular/angular should not consume it's own packages, so we use - # substitutions to replace these in the deployed version of dev-infra. - "//dev-infra/": "@npm_dev_infra//", - "//packages/benchpress": "@npm//@angular/benchpress", - "//packages/bazel/src:esm5.bzl": "@npm_angular_bazel//src:esm5.bzl", - "//packages/zone.js/dist:zone.js": "@npm//:node_modules/zone.js/dist/zone.js", - "//packages/core": "@npm//@angular/core", - "//packages/platform-browser": "@npm//@angular/platform-browser", - - # This substitution is particularly verbose because we need to make sure - # that only things available via Angular Bazel are imported from - # tools/defaults.bzl. - "load\(\"//tools:defaults.bzl\", \"ng_module\"\)": "load(\"@npm_angular_bazel//:index.bzl\", \"ng_module\")", - }, visibility = ["//visibility:public"], deps = [ ":cli", ":package-json", - "//dev-infra/benchmark/driver-utilities", "//dev-infra/commit-message", "//dev-infra/ts-circular-dependencies", ], diff --git a/dev-infra/tmpl-package.json b/dev-infra/tmpl-package.json index 55c5430117351..44534e250a236 100644 --- a/dev-infra/tmpl-package.json +++ b/dev-infra/tmpl-package.json @@ -8,42 +8,14 @@ "ng-dev": "./cli.js", "ts-circular-deps": "./ts-circular-dependencies/index.js" }, - "dependencies": { - "fs-extra": "", - "node-uuid": "" - }, "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": "", - "@bazel/protractor": "", - "@bazel/terser": "", - "@bazel/typescript": "", - "brotli": "", "chalk": "", "glob": "", - "json5": "", "minimatch": "", - "node-uuid": "", - "protractor": "", - "rollup": "", - "rollup-plugin-commonjs": "", - "rollup-plugin-node-resolve": "", - "rollup-plugin-sourcemaps": "", - "selenium-webdriver": "", "shelljs": "", "typescript": "", "yaml": "", "yargs": "", - "tslib": "", - "zone.js": "^0.10.3" - }, - "bazelWorkspaces": { - "npm_dev_infra": { - "version": "0.0.0-PLACEHOLDER", - "rootPath": "." - } + "tslib": "" } } diff --git a/dev-infra/tools/BUILD.bazel b/dev-infra/tools/BUILD.bazel new file mode 100644 index 0000000000000..9feb062eadd8f --- /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", + ], +) From e996829de45b3ebfc4e3ea49f930b4a8a95152b9 Mon Sep 17 00:00:00 2001 From: Wagner Maciel Date: Fri, 24 Apr 2020 10:26:36 -0700 Subject: [PATCH 3/3] revert: "feat(dev-infra): exposed new rule 'component_benchmark' via dev_infra (#36434)" This reverts commit b7f2a033df47080084e73340f25286c8ec1a419a. --- .pullapprove.yml | 6 ++++++ BUILD.bazel | 1 + WORKSPACE | 2 +- dev-infra/benchmark/BUILD.bazel | 12 ------------ dev-infra/benchmark/brotli-cli/BUILD.bazel | 19 ------------------- .../benchmark/component_benchmark/BUILD.bazel | 12 ------------ .../component_benchmark/tsconfig-e2e.json | 6 ------ dev-infra/benchmark/driver-utilities/index.ts | 9 --------- dev-infra/tools/BUILD.bazel | 12 ------------ modules/benchmarks/BUILD.bazel | 1 + .../benchmarks}/benchmark_test.bzl | 10 ++++++---- 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 ++- .../benchmarks}/start-server.js | 0 modules/benchmarks/tsconfig.json | 5 ++--- .../e2e_util}/BUILD.bazel | 11 +++++------ .../e2e_util}/e2e_util.ts | 0 .../e2e_util}/perf_util.ts | 0 .../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 ++-- ...or-perf.conf.js => protractor-perf.conf.js | 0 tools/brotli-cli/BUILD.bazel | 11 +++++++++++ .../benchmark => tools}/brotli-cli/cli.js | 0 .../benchmark => tools}/browsers/BUILD.bazel | 12 ++---------- .../browsers/browser_repositories.bzl | 0 .../browsers/chromium.json | 0 tools/components/BUILD.bazel | 4 ++++ .../components}/component_benchmark.bzl | 16 ++++++---------- .../components}/defaults/BUILD.bazel | 6 ------ .../components}/defaults/index.html | 0 .../components}/defaults/index.ts | 0 .../components}/defaults/styles.css | 0 tools/defaults.bzl | 6 +++--- tools/gulp-tasks/format.js | 1 + .../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 98 files changed, 127 insertions(+), 192 deletions(-) delete mode 100644 dev-infra/benchmark/BUILD.bazel delete mode 100644 dev-infra/benchmark/brotli-cli/BUILD.bazel delete mode 100644 dev-infra/benchmark/component_benchmark/BUILD.bazel delete mode 100644 dev-infra/benchmark/component_benchmark/tsconfig-e2e.json delete mode 100644 dev-infra/benchmark/driver-utilities/index.ts delete mode 100644 dev-infra/tools/BUILD.bazel rename {dev-infra/benchmark/component_benchmark => modules/benchmarks}/benchmark_test.bzl (68%) rename {dev-infra/benchmark/component_benchmark => modules/benchmarks}/start-server.js (100%) rename {dev-infra/benchmark/driver-utilities => modules/e2e_util}/BUILD.bazel (56%) rename {dev-infra/benchmark/driver-utilities => modules/e2e_util}/e2e_util.ts (100%) rename {dev-infra/benchmark/driver-utilities => modules/e2e_util}/perf_util.ts (100%) rename dev-infra/benchmark/component_benchmark/protractor-perf.conf.js => protractor-perf.conf.js (100%) create mode 100644 tools/brotli-cli/BUILD.bazel rename {dev-infra/benchmark => tools}/brotli-cli/cli.js (100%) rename {dev-infra/benchmark => tools}/browsers/BUILD.bazel (90%) rename {dev-infra/benchmark => tools}/browsers/browser_repositories.bzl (100%) rename {dev-infra/benchmark => tools}/browsers/chromium.json (100%) create mode 100644 tools/components/BUILD.bazel rename {dev-infra/benchmark/component_benchmark => tools/components}/component_benchmark.bzl (87%) rename {dev-infra/benchmark/component_benchmark => tools/components}/defaults/BUILD.bazel (51%) rename {dev-infra/benchmark/component_benchmark => tools/components}/defaults/index.html (100%) rename {dev-infra/benchmark/component_benchmark => tools/components}/defaults/index.ts (100%) rename {dev-infra/benchmark/component_benchmark => tools/components}/defaults/styles.css (100%) rename {dev-infra/benchmark => tools}/ng_rollup_bundle/BUILD.bazel (81%) rename {dev-infra/benchmark => tools}/ng_rollup_bundle/ng_rollup_bundle.bzl (98%) rename {dev-infra/benchmark => tools}/ng_rollup_bundle/rollup.config.js (100%) rename {dev-infra/benchmark => tools}/ng_rollup_bundle/terser_config.json (100%) diff --git a/.pullapprove.yml b/.pullapprove.yml index 2c922dbabb3d1..29ae27c3557f1 100644 --- a/.pullapprove.yml +++ b/.pullapprove.yml @@ -966,6 +966,8 @@ 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/**', @@ -973,10 +975,14 @@ 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 7a97832224c2a..7de233d906c63 100644 --- a/BUILD.bazel +++ b/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", diff --git a/WORKSPACE b/WORKSPACE index ea8b423a05235..15fc0c3b37b1b 100644 --- a/WORKSPACE +++ b/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() diff --git a/dev-infra/benchmark/BUILD.bazel b/dev-infra/benchmark/BUILD.bazel deleted file mode 100644 index 9feb062eadd8f..0000000000000 --- a/dev-infra/benchmark/BUILD.bazel +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index a97d1f5e19c1b..0000000000000 --- a/dev-infra/benchmark/brotli-cli/BUILD.bazel +++ /dev/null @@ -1,19 +0,0 @@ -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/dev-infra/benchmark/component_benchmark/BUILD.bazel b/dev-infra/benchmark/component_benchmark/BUILD.bazel deleted file mode 100644 index 4a4596f070feb..0000000000000 --- a/dev-infra/benchmark/component_benchmark/BUILD.bazel +++ /dev/null @@ -1,12 +0,0 @@ -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/dev-infra/benchmark/component_benchmark/tsconfig-e2e.json b/dev-infra/benchmark/component_benchmark/tsconfig-e2e.json deleted file mode 100644 index ec8572b587b5c..0000000000000 --- a/dev-infra/benchmark/component_benchmark/tsconfig-e2e.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "compilerOptions": { - "lib": ["es2015", "dom"], - "types": ["node", "jasmine"] - } -} diff --git a/dev-infra/benchmark/driver-utilities/index.ts b/dev-infra/benchmark/driver-utilities/index.ts deleted file mode 100644 index 3afa6dbf48128..0000000000000 --- a/dev-infra/benchmark/driver-utilities/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * @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/dev-infra/tools/BUILD.bazel b/dev-infra/tools/BUILD.bazel deleted file mode 100644 index 9feb062eadd8f..0000000000000 --- a/dev-infra/tools/BUILD.bazel +++ /dev/null @@ -1,12 +0,0 @@ -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 609b2f207c43b..7159d1f14b51a 100644 --- a/modules/benchmarks/BUILD.bazel +++ b/modules/benchmarks/BUILD.bazel @@ -3,4 +3,5 @@ package(default_visibility = ["//visibility:public"]) exports_files([ "tsconfig-build.json", "tsconfig-e2e.json", + "start-server.js", ]) diff --git a/dev-infra/benchmark/component_benchmark/benchmark_test.bzl b/modules/benchmarks/benchmark_test.bzl similarity index 68% rename from dev-infra/benchmark/component_benchmark/benchmark_test.bzl rename to modules/benchmarks/benchmark_test.bzl index 67c097a8382ea..a6d64420046dc 100644 --- a/dev-infra/benchmark/component_benchmark/benchmark_test.bzl +++ b/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 + [ diff --git a/modules/benchmarks/e2e_test.bzl b/modules/benchmarks/e2e_test.bzl index bbcad88335af7..0f405654dc786 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 = "//dev-infra/benchmark/component_benchmark:start-server.js", + on_prepare = "//modules/benchmarks: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 4b2449f7f96bb..ccf0bdbe5925e 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 = [ - "//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", ], ) 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 db4d8c4b93f93..33ba44bce599f 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; 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 1c4015b86f067..f450dc5bc8e1c 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {runBenchmark, verifyNoBrowserErrors} from '../../../e2e_util/perf_util'; 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 4d21624b04cf2..2ddcf1639203c 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("//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__"]) 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 b942b47aba3ca..e21d27dadf2a8 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {runBenchmark} from '../../../e2e_util/perf_util'; 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 4e0aad1457102..1969ca038bcfd 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("//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", ], ) 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 67b6689f166ca..316de6c5abd49 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {runBenchmark} from '../../../e2e_util/perf_util'; 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 dedd600ee50cc..4889b86f71ed0 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 = [ - "//dev-infra/benchmark/driver-utilities", + "//modules/e2e_util", "@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 fe8d2fbb060b6..200590588e9bd 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {runBenchmark, verifyNoBrowserErrors} from '../../../e2e_util/perf_util'; 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 66c9de654cf6b..925325fe0a0fd 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("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test") +load("//modules/benchmarks: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 81273b7146c98..a6eb8b4679797 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 = [ - "//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", ], ) diff --git a/modules/benchmarks/src/largeform/largeform.e2e-spec.ts b/modules/benchmarks/src/largeform/largeform.e2e-spec.ts index e441e67d4cf80..de55e1600263a 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; 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 fd6adebb481b1..ccab69f06521d 100644 --- a/modules/benchmarks/src/largeform/largeform.perf-spec.ts +++ b/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; diff --git a/modules/benchmarks/src/largeform/ng2/BUILD.bazel b/modules/benchmarks/src/largeform/ng2/BUILD.bazel index 3cc1d9e7f7027..51db615c78c33 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("//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__"]) diff --git a/modules/benchmarks/src/largetable/BUILD.bazel b/modules/benchmarks/src/largetable/BUILD.bazel index 68bc416fe25c2..766394d453233 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 = [ - "//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", ], ) diff --git a/modules/benchmarks/src/largetable/baseline/BUILD.bazel b/modules/benchmarks/src/largetable/baseline/BUILD.bazel index 297ab4eabf609..8c8398db7e914 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("//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__"]) diff --git a/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel index c37bf4e258916..6d63f067d3291 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("//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__"]) diff --git a/modules/benchmarks/src/largetable/iv/BUILD.bazel b/modules/benchmarks/src/largetable/iv/BUILD.bazel index 4ade284237497..841a298e6c4bb 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("//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__"]) diff --git a/modules/benchmarks/src/largetable/largetable.e2e-spec.ts b/modules/benchmarks/src/largetable/largetable.e2e-spec.ts index 5f0ad91064a5c..3b6da53085fa0 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; 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 e69fba3ec1e09..ffd96ece13c65 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {runBenchmark, verifyNoBrowserErrors} from '../../../e2e_util/perf_util'; interface Worker { id: string; diff --git a/modules/benchmarks/src/largetable/ng2/BUILD.bazel b/modules/benchmarks/src/largetable/ng2/BUILD.bazel index 4f692c40e3b74..b52ad6b173553 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("//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__"]) diff --git a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel index dac90bfdfc9b6..555ecab562459 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("//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__"]) diff --git a/modules/benchmarks/src/largetable/render3/BUILD.bazel b/modules/benchmarks/src/largetable/render3/BUILD.bazel index 54109654bb14f..ab6f33646d477 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("//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") ng_module( diff --git a/modules/benchmarks/src/styling/BUILD.bazel b/modules/benchmarks/src/styling/BUILD.bazel index a31bef834128b..4a77b559f2263 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 = [ - "//dev-infra/benchmark/driver-utilities", + "//modules/e2e_util", "@npm//protractor", ], ) diff --git a/modules/benchmarks/src/styling/ng2/BUILD.bazel b/modules/benchmarks/src/styling/ng2/BUILD.bazel index 2c94d73a16576..4f077ae02b5dc 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("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test") +load("//modules/benchmarks: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 5eb195d73efee..779ef33bf8c70 100644 --- a/modules/benchmarks/src/styling/styling_perf.spec.ts +++ b/modules/benchmarks/src/styling/styling_perf.spec.ts @@ -7,7 +7,8 @@ */ import {$, by, element} from 'protractor'; -import {openBrowser, runBenchmark, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities'; +import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; +import {runBenchmark} from '../../../e2e_util/perf_util'; /** 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 7a7b4a59fc418..2394677a61af7 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 = [ - "//dev-infra/benchmark/driver-utilities", + "//modules/e2e_util", "@npm//protractor", ], ) diff --git a/modules/benchmarks/src/tree/baseline/BUILD.bazel b/modules/benchmarks/src/tree/baseline/BUILD.bazel index 5392ffe227dcb..7a6b37ef3dcfd 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("//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__"]) diff --git a/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel index 45ad6220e6289..b99a6d5839a42 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("//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__"]) diff --git a/modules/benchmarks/src/tree/iv/BUILD.bazel b/modules/benchmarks/src/tree/iv/BUILD.bazel index fe253e0398ec5..f7efff307a08c 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("//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__"]) diff --git a/modules/benchmarks/src/tree/ng1/BUILD.bazel b/modules/benchmarks/src/tree/ng1/BUILD.bazel index 7656053b0868e..b9d4a71f66d57 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("//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__"]) diff --git a/modules/benchmarks/src/tree/ng2/BUILD.bazel b/modules/benchmarks/src/tree/ng2/BUILD.bazel index 4f479c0f09b4b..9765e5b1eab3b 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("//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__"]) diff --git a/modules/benchmarks/src/tree/ng2_next/BUILD.bazel b/modules/benchmarks/src/tree/ng2_next/BUILD.bazel index 54cbeaaf18c31..a678099e4d1b8 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("//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__"]) diff --git a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel index 0af1f9111d218..99167f1cb182f 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("//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__"]) diff --git a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel index 5f849591fc69c..4c1e8cb933df9 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("//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__"]) diff --git a/modules/benchmarks/src/tree/render3/BUILD.bazel b/modules/benchmarks/src/tree/render3/BUILD.bazel index c58f47baf4409..ecfad4e8b9219 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("//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") ng_module( diff --git a/modules/benchmarks/src/tree/render3_function/BUILD.bazel b/modules/benchmarks/src/tree/render3_function/BUILD.bazel index 09020c76c9fc5..da9ec7ecb2dcc 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("//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__"]) diff --git a/modules/benchmarks/src/tree/test_utils.ts b/modules/benchmarks/src/tree/test_utils.ts index f7d0a35be294a..0cabe67103e52 100644 --- a/modules/benchmarks/src/tree/test_utils.ts +++ b/modules/benchmarks/src/tree/test_utils.ts @@ -8,7 +8,8 @@ import {browser} from 'protractor'; -import {openBrowser, runBenchmark} from '../../../../dev-infra/benchmark/driver-utilities'; +import {openBrowser} from '../../../e2e_util/e2e_util'; +import {runBenchmark} from '../../../e2e_util/perf_util'; export function runTreeBenchmark({id, prepare, setup, work}: { id: string; prepare ? () : void; setup ? () : void; work(): void; diff --git a/dev-infra/benchmark/component_benchmark/start-server.js b/modules/benchmarks/start-server.js similarity index 100% rename from dev-infra/benchmark/component_benchmark/start-server.js rename to modules/benchmarks/start-server.js diff --git a/modules/benchmarks/tsconfig.json b/modules/benchmarks/tsconfig.json index 04e445884a459..2a5b97245d9cd 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/*"], - "dev_infra/*": ["../../dev-infra/*"] + "e2e_util/*": ["../e2e_util/*"] }, "rootDir": ".", "inlineSourceMap": true, @@ -31,6 +31,5 @@ "no-floating-promises": true, "no-unused-expression": true, "no-unused-variable": true - }, - "include": ["../../dev-infra/benchmark/driver-utilities/"] + } } diff --git a/dev-infra/benchmark/driver-utilities/BUILD.bazel b/modules/e2e_util/BUILD.bazel similarity index 56% rename from dev-infra/benchmark/driver-utilities/BUILD.bazel rename to modules/e2e_util/BUILD.bazel index aac2c6a5fdfe4..0fa699b43b527 100644 --- a/dev-infra/benchmark/driver-utilities/BUILD.bazel +++ b/modules/e2e_util/BUILD.bazel @@ -1,16 +1,15 @@ -package(default_visibility = ["//visibility:public"]) +load("//tools:defaults.bzl", "ts_library") -load("@npm_bazel_typescript//:index.bzl", "ts_library") +package(default_visibility = ["//visibility:public"]) ts_library( - name = "driver-utilities", + name = "e2e_util", + testonly = 1, 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/dev-infra/benchmark/driver-utilities/e2e_util.ts b/modules/e2e_util/e2e_util.ts similarity index 100% rename from dev-infra/benchmark/driver-utilities/e2e_util.ts rename to modules/e2e_util/e2e_util.ts diff --git a/dev-infra/benchmark/driver-utilities/perf_util.ts b/modules/e2e_util/perf_util.ts similarity index 100% rename from dev-infra/benchmark/driver-utilities/perf_util.ts rename to modules/e2e_util/perf_util.ts diff --git a/modules/playground/e2e_test/async/async_spec.ts b/modules/playground/e2e_test/async/async_spec.ts index 073d914e7f3cc..c67993f581f9e 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; describe('async', () => { const URL = '/'; diff --git a/modules/playground/e2e_test/example_test.bzl b/modules/playground/e2e_test/example_test.bzl index 41fdc97a35723..45781f923cca0 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 = [ - "//dev-infra/benchmark/driver-utilities", + "//modules/e2e_util", "//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 536ca619e86c2..2d167fec7436b 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; 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 4820b01aece1d..f5a5618b3f198 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; 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 5c56f56cf799e..72f1003a5fffd 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; 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 47d2d4df7a2dd..898950d8c5036 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; 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 b0c3f04dd4e2d..25c96ee92c0af 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; 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 462025bacbb10..970f71ae9faf9 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; 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 678bf2e9db617..3fddf0638eff9 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; 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 00808d0d20f24..eb57cfe5c3323 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; 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 efe6fcc3b9a71..f71e7eed8cf5f 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; 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 7df5be26ebe1f..7cbeb29b98b50 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; 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 ffb93a7eb9247..96f0efc869c05 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; 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 af48a3df9132f..0a568a1a3038d 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; 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 3f0476051e34d..9e148d5d63655 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 '../../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../../e2e_util/e2e_util'; // 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 2f94fa346e5c5..bd73b09ccf81f 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 '../../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../../e2e_util/e2e_util'; 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 e8a555f6e77ef..ecb474a84f486 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 '../../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../../e2e_util/e2e_util'; 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 51438ceab63ba..23d59484addad 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 '../../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../../e2e_util/e2e_util'; 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 88bfcfee4c2af..752687c20c9dd 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 '../../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../../e2e_util/e2e_util'; 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 f67d044a1b27c..2af60cf400fe2 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 '../../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../../e2e_util/e2e_util'; 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 ae83c971e4bb1..6e66e4049be7f 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 '../../../../dev-infra/benchmark/driver-utilities'; +import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util'; describe('Zippy Component', function() { afterEach(verifyNoBrowserErrors); diff --git a/modules/tsconfig.json b/modules/tsconfig.json index d7a5fd5ad6795..03c7961d56ac7 100644 --- a/modules/tsconfig.json +++ b/modules/tsconfig.json @@ -23,6 +23,7 @@ "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 da80ab8229283..027480e3c1006 100644 --- a/packages/language-service/bundles/BUILD.bazel +++ b/packages/language-service/bundles/BUILD.bazel @@ -1,4 +1,4 @@ -load("//dev-infra/benchmark/ng_rollup_bundle:ng_rollup_bundle.bzl", "ls_rollup_bundle") +load("//tools/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 8e9f5153b6af3..96ae6af801c11 100644 --- a/packages/tsconfig.json +++ b/packages/tsconfig.json @@ -19,7 +19,8 @@ "selenium-webdriver": ["./node_modules/@types/selenium-webdriver/index.d.ts"], "rxjs/*": ["./node_modules/rxjs/*"], "@angular/*": ["./packages/*"], - "zone.js/*": ["./packages/zone.js/*"] + "zone.js/*": ["./packages/zone.js/*"], + "e2e_util/*": ["./modules/e2e_util/*"] }, "rootDir": ".", "inlineSourceMap": true, diff --git a/packages/zone.js/test/karma_test.bzl b/packages/zone.js/test/karma_test.bzl index 4685af3eae710..bc0ac35306e7d 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 = ["//dev-infra/benchmark/browsers:chromium"], + browsers = ["//tools/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 = ["//dev-infra/benchmark/browsers:chromium"], + browsers = ["//tools/browsers:chromium"], config_file = "//:karma-js.conf.js", configuration_env_vars = ["KARMA_WEB_TEST_MODE"], data = [ diff --git a/dev-infra/benchmark/component_benchmark/protractor-perf.conf.js b/protractor-perf.conf.js similarity index 100% rename from dev-infra/benchmark/component_benchmark/protractor-perf.conf.js rename to protractor-perf.conf.js diff --git a/tools/brotli-cli/BUILD.bazel b/tools/brotli-cli/BUILD.bazel new file mode 100644 index 0000000000000..4a0ecc6f93701 --- /dev/null +++ b/tools/brotli-cli/BUILD.bazel @@ -0,0 +1,11 @@ +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/dev-infra/benchmark/brotli-cli/cli.js b/tools/brotli-cli/cli.js similarity index 100% rename from dev-infra/benchmark/brotli-cli/cli.js rename to tools/brotli-cli/cli.js diff --git a/dev-infra/benchmark/browsers/BUILD.bazel b/tools/browsers/BUILD.bazel similarity index 90% rename from dev-infra/benchmark/browsers/BUILD.bazel rename to tools/browsers/BUILD.bazel index a0bba3d5b0444..96aa00190d9e5 100644 --- a/dev-infra/benchmark/browsers/BUILD.bazel +++ b/tools/browsers/BUILD.bazel @@ -14,8 +14,6 @@ # ################################################################################ # -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 @@ -33,7 +31,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 = ["//dev-infra/benchmark/browsers:__subpackages__"], + visibility = ["//tools/browsers:__subpackages__"], ) # Override of chromedriver web_test_archive so that the archive is selected based on platform @@ -57,7 +55,7 @@ web_test_archive( "CHROMEDRIVER": "chromedriver_win32/chromedriver.exe", }, }), - visibility = ["//dev-infra/benchmark/browsers:__subpackages__"], + visibility = ["//tools/browsers:__subpackages__"], ) browser( @@ -70,9 +68,3 @@ browser( "@io_bazel_rules_webtesting//go/wsl", ], ) - -# Make source files available for distribution via pkg_npm -filegroup( - name = "files", - srcs = glob(["*"]), -) diff --git a/dev-infra/benchmark/browsers/browser_repositories.bzl b/tools/browsers/browser_repositories.bzl similarity index 100% rename from dev-infra/benchmark/browsers/browser_repositories.bzl rename to tools/browsers/browser_repositories.bzl diff --git a/dev-infra/benchmark/browsers/chromium.json b/tools/browsers/chromium.json similarity index 100% rename from dev-infra/benchmark/browsers/chromium.json rename to tools/browsers/chromium.json diff --git a/tools/components/BUILD.bazel b/tools/components/BUILD.bazel new file mode 100644 index 0000000000000..af563485d7a15 --- /dev/null +++ b/tools/components/BUILD.bazel @@ -0,0 +1,4 @@ +# 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/dev-infra/benchmark/component_benchmark/component_benchmark.bzl b/tools/components/component_benchmark.bzl similarity index 87% rename from dev-infra/benchmark/component_benchmark/component_benchmark.bzl rename to tools/components/component_benchmark.bzl index 9e4cfa0a26265..40f8788d44408 100644 --- a/dev-infra/benchmark/component_benchmark/component_benchmark.bzl +++ b/tools/components/component_benchmark.bzl @@ -1,11 +1,9 @@ -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") +load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver", "ts_library") +load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") def copy_default_file(origin, destination): """ - Copies a file from /defaults to the destination. + Copies a file from tools/components/defaults to the destination. Args: origin: The name of a file in benchpress/defaults to be copied. @@ -13,7 +11,7 @@ def copy_default_file(origin, destination): """ native.genrule( name = "copy_default_" + origin + "_file_genrule", - srcs = ["//dev-infra/benchmark/component_benchmark/defaults:" + origin], + srcs = ["//tools/components/defaults:" + origin], outs = [destination], cmd = "cat $(SRCS) >> $@", ) @@ -107,7 +105,6 @@ 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). @@ -120,7 +117,7 @@ def component_benchmark( # The ts_library for the driver that runs tests against the benchmark app. ts_library( name = benchmark_driver, - tsconfig = "//dev-infra/benchmark/component_benchmark:tsconfig-e2e.json", + tsconfig = "//modules/benchmarks:tsconfig-e2e.json", testonly = True, srcs = [driver], deps = driver_deps, @@ -133,8 +130,7 @@ def component_benchmark( port = 4200, static_files = assets + styles, deps = [":" + app_main + ".min_debug.es2015.js"], - additional_root_paths = ["//dev-infra/benchmark/component_benchmark/defaults"], - serving_path = "/app_bundle.js", + additional_root_paths = ["tools/components/defaults"], ) # Runs a protractor test that's set up to use @angular/benchpress. diff --git a/dev-infra/benchmark/component_benchmark/defaults/BUILD.bazel b/tools/components/defaults/BUILD.bazel similarity index 51% rename from dev-infra/benchmark/component_benchmark/defaults/BUILD.bazel rename to tools/components/defaults/BUILD.bazel index 0eb8038377aa3..3445ea83fece2 100644 --- a/dev-infra/benchmark/component_benchmark/defaults/BUILD.bazel +++ b/tools/components/defaults/BUILD.bazel @@ -1,11 +1,5 @@ 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/dev-infra/benchmark/component_benchmark/defaults/index.html b/tools/components/defaults/index.html similarity index 100% rename from dev-infra/benchmark/component_benchmark/defaults/index.html rename to tools/components/defaults/index.html diff --git a/dev-infra/benchmark/component_benchmark/defaults/index.ts b/tools/components/defaults/index.ts similarity index 100% rename from dev-infra/benchmark/component_benchmark/defaults/index.ts rename to tools/components/defaults/index.ts diff --git a/dev-infra/benchmark/component_benchmark/defaults/styles.css b/tools/components/defaults/styles.css similarity index 100% rename from dev-infra/benchmark/component_benchmark/defaults/styles.css rename to tools/components/defaults/styles.css diff --git a/tools/defaults.bzl b/tools/defaults.bzl index 743c52bd70887..0b164ad215653 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("//dev-infra/benchmark/ng_rollup_bundle:ng_rollup_bundle.bzl", _ng_rollup_bundle = "ng_rollup_bundle") +load("//tools/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 = ["//dev-infra/benchmark/browsers:chromium"], + browsers = ["//tools/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 = ["//dev-infra/benchmark/browsers:chromium"], + browsers = ["//tools/browsers:chromium"], **kwargs ) diff --git a/tools/gulp-tasks/format.js b/tools/gulp-tasks/format.js index 61fd8d94e4d67..a9d168f535db0 100644 --- a/tools/gulp-tasks/format.js +++ b/tools/gulp-tasks/format.js @@ -18,6 +18,7 @@ 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', diff --git a/dev-infra/benchmark/ng_rollup_bundle/BUILD.bazel b/tools/ng_rollup_bundle/BUILD.bazel similarity index 81% rename from dev-infra/benchmark/ng_rollup_bundle/BUILD.bazel rename to tools/ng_rollup_bundle/BUILD.bazel index 0b7900ba98223..9c7960d9320f6 100644 --- a/dev-infra/benchmark/ng_rollup_bundle/BUILD.bazel +++ b/tools/ng_rollup_bundle/BUILD.bazel @@ -18,9 +18,3 @@ 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/dev-infra/benchmark/ng_rollup_bundle/ng_rollup_bundle.bzl b/tools/ng_rollup_bundle/ng_rollup_bundle.bzl similarity index 98% rename from dev-infra/benchmark/ng_rollup_bundle/ng_rollup_bundle.bzl rename to tools/ng_rollup_bundle/ng_rollup_bundle.bzl index cb18880229a68..db5c17a265e77 100644 --- a/dev-infra/benchmark/ng_rollup_bundle/ng_rollup_bundle.bzl +++ b/tools/ng_rollup_bundle/ng_rollup_bundle.bzl @@ -175,10 +175,10 @@ _NG_ROLLUP_BUNDLE_ATTRS = { "_rollup": attr.label( executable = True, cfg = "host", - default = Label("//dev-infra/benchmark/ng_rollup_bundle:rollup_with_build_optimizer"), + default = Label("//tools/ng_rollup_bundle:rollup_with_build_optimizer"), ), "_rollup_config_tmpl": attr.label( - default = Label("//dev-infra/benchmark/ng_rollup_bundle:rollup.config.js"), + default = Label("//tools/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": "//dev-infra/benchmark/ng_rollup_bundle:terser_config.json", + "config_file": "//tools/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 = "//dev-infra/benchmark/brotli-cli", + tool = "//tools/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 = "//dev-infra/benchmark/brotli-cli", + tool = "//tools/brotli-cli", data = [name + ".min.es2015.js"], outs = [name + ".min.es2015.js.br"], args = [ diff --git a/dev-infra/benchmark/ng_rollup_bundle/rollup.config.js b/tools/ng_rollup_bundle/rollup.config.js similarity index 100% rename from dev-infra/benchmark/ng_rollup_bundle/rollup.config.js rename to tools/ng_rollup_bundle/rollup.config.js diff --git a/dev-infra/benchmark/ng_rollup_bundle/terser_config.json b/tools/ng_rollup_bundle/terser_config.json similarity index 100% rename from dev-infra/benchmark/ng_rollup_bundle/terser_config.json rename to tools/ng_rollup_bundle/terser_config.json