Skip to content

Commit ad8c4cd

Browse files
wagnermacielAndrewKushnir
wagnermaciel
authored and
AndrewKushnir
committed
revert: "feat(dev-infra): exposed new rule 'component_benchmark' via dev_infra (angular#36434)" (angular#36798)
This reverts commit b7f2a03. PR Close angular#36798
1 parent f5ff206 commit ad8c4cd

File tree

98 files changed

+127
-192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+127
-192
lines changed

‎.pullapprove.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -966,17 +966,23 @@ groups:
966966
'docs/TOOLS.md',
967967
'docs/TRIAGE_AND_LABELS.md',
968968
'goldens/*',
969+
'modules/e2e_util/e2e_util.ts',
970+
'modules/e2e_util/perf_util.ts',
969971
'modules/*',
970972
'packages/*',
971973
'packages/examples/test-utils/**',
972974
'packages/private/**',
973975
'packages/examples/*',
974976
'scripts/**',
975977
'third_party/**',
978+
'tools/brotli-cli/**',
979+
'tools/browsers/**',
976980
'tools/build/**',
977981
'tools/circular_dependency_test/**',
978982
'tools/contributing-stats/**',
983+
'tools/components/**',
979984
'tools/gulp-tasks/**',
985+
'tools/ng_rollup_bundle/**',
980986
'tools/ngcontainer/**',
981987
'tools/npm/**',
982988
'tools/npm_integration_test/**',

‎BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package(default_visibility = ["//visibility:public"])
22

33
exports_files([
44
"LICENSE",
5+
"protractor-perf.conf.js",
56
"karma-js.conf.js",
67
"browser-providers.conf.js",
78
"scripts/ci/track-payload-size.sh",

‎WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
6464

6565
web_test_repositories()
6666

67-
load("//dev-infra/benchmark/browsers:browser_repositories.bzl", "browser_repositories")
67+
load("//tools/browsers:browser_repositories.bzl", "browser_repositories")
6868

6969
browser_repositories()
7070

‎dev-infra/benchmark/BUILD.bazel

Lines changed: 0 additions & 12 deletions
This file was deleted.

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

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎dev-infra/benchmark/component_benchmark/BUILD.bazel

Lines changed: 0 additions & 12 deletions
This file was deleted.

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

Lines changed: 0 additions & 6 deletions
This file was deleted.

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

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎dev-infra/tools/BUILD.bazel

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎modules/benchmarks/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ package(default_visibility = ["//visibility:public"])
33
exports_files([
44
"tsconfig-build.json",
55
"tsconfig-e2e.json",
6+
"start-server.js",
67
])

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_bazel_protractor//:index.bzl", "protractor_web_test_suite")
1+
load("//tools:defaults.bzl", "protractor_web_test_suite")
22

33
"""
44
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")
1010
def benchmark_test(name, server, tags = [], **kwargs):
1111
protractor_web_test_suite(
1212
name = name,
13-
browsers = ["//dev-infra/benchmark/browsers:chromium"],
14-
configuration = "//dev-infra/benchmark/component_benchmark:protractor-perf.conf.js",
15-
on_prepare = "//dev-infra/benchmark/component_benchmark:start-server.js",
13+
configuration = "//:protractor-perf.conf.js",
14+
data = [
15+
"//packages/benchpress",
16+
],
17+
on_prepare = "//modules/benchmarks:start-server.js",
1618
server = server,
1719
# Benchmark targets should not run on CI by default.
1820
tags = tags + [

‎modules/benchmarks/e2e_test.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ load("//tools:defaults.bzl", "protractor_web_test_suite")
99
def e2e_test(name, server, **kwargs):
1010
protractor_web_test_suite(
1111
name = name,
12-
on_prepare = "//dev-infra/benchmark/component_benchmark:start-server.js",
12+
on_prepare = "//modules/benchmarks:start-server.js",
1313
server = server,
1414
**kwargs
1515
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ts_library(
1515
srcs = ["change_detection.perf-spec.ts"],
1616
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
1717
deps = [
18-
"//dev-infra/benchmark/driver-utilities",
18+
"//modules/e2e_util",
1919
"@npm//protractor",
2020
],
2121
)
@@ -26,7 +26,7 @@ ts_library(
2626
srcs = ["change_detection.e2e-spec.ts"],
2727
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
2828
deps = [
29-
"//dev-infra/benchmark/driver-utilities",
29+
"//modules/e2e_util",
3030
"@npm//protractor",
3131
],
3232
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {$} from 'protractor';
1010

11-
import {openBrowser, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
11+
import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util';
1212

1313
describe('change detection benchmark', () => {
1414
afterEach(verifyNoBrowserErrors);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {$} from 'protractor';
10-
import {runBenchmark, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
10+
import {runBenchmark, verifyNoBrowserErrors} from '../../../e2e_util/perf_util';
1111

1212
interface Worker {
1313
id: string;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
2-
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
2+
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
33
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {$, browser} from 'protractor';
10-
import {runBenchmark} from '../../../../dev-infra/benchmark/driver-utilities';
10+
import {runBenchmark} from '../../../e2e_util/perf_util';
1111

1212
describe('class bindings perf', () => {
1313
it('should work for update', async () => {

‎modules/benchmarks/src/expanding_rows/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
22

33
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver", "ts_library")
4-
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
4+
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
55

66
ng_module(
77
name = "application_lib",
@@ -26,7 +26,7 @@ ts_library(
2626
srcs = ["expanding_rows.perf-spec.ts"],
2727
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
2828
deps = [
29-
"//dev-infra/benchmark/driver-utilities",
29+
"//modules/e2e_util",
3030
"@npm//protractor",
3131
],
3232
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {$, browser} from 'protractor';
10-
import {runBenchmark} from '../../../../dev-infra/benchmark/driver-utilities';
10+
import {runBenchmark} from '../../../e2e_util/perf_util';
1111

1212
describe('benchmarks', () => {
1313
it('should work for create', async () => {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ts_library(
88
srcs = ["js-web-frameworks.perf-spec.ts"],
99
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
1010
deps = [
11-
"//dev-infra/benchmark/driver-utilities",
11+
"//modules/e2e_util",
1212
"@npm//protractor",
1313
],
1414
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {$} from 'protractor';
10-
import {runBenchmark, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
10+
import {runBenchmark, verifyNoBrowserErrors} from '../../../e2e_util/perf_util';
1111

1212
interface Worker {
1313
id: string;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
2-
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
2+
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
33

44
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
55

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ts_library(
88
srcs = ["largeform.perf-spec.ts"],
99
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
1010
deps = [
11-
"//dev-infra/benchmark/driver-utilities",
11+
"//modules/e2e_util",
1212
"@npm//protractor",
1313
],
1414
)
@@ -19,7 +19,7 @@ ts_library(
1919
srcs = ["largeform.e2e-spec.ts"],
2020
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
2121
deps = [
22-
"//dev-infra/benchmark/driver-utilities",
22+
"//modules/e2e_util",
2323
"@npm//protractor",
2424
],
2525
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {$, By, element} from 'protractor';
1010

11-
import {openBrowser, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
11+
import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util';
1212

1313
describe('largeform benchmark', () => {
1414
afterEach(verifyNoBrowserErrors);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
import {$} from 'protractor';
1010

11-
import {runBenchmark, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
11+
import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util';
12+
import {runBenchmark} from '../../../e2e_util/perf_util';
1213

1314
interface Worker {
1415
id: string;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ng_module", "ts_devserver")
2-
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
2+
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
33
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/largetable/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ts_library(
1515
srcs = ["largetable.perf-spec.ts"],
1616
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
1717
deps = [
18-
"//dev-infra/benchmark/driver-utilities",
18+
"//modules/e2e_util",
1919
"@npm//protractor",
2020
],
2121
)
@@ -26,7 +26,7 @@ ts_library(
2626
srcs = ["largetable.e2e-spec.ts"],
2727
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
2828
deps = [
29-
"//dev-infra/benchmark/driver-utilities",
29+
"//modules/e2e_util",
3030
"@npm//protractor",
3131
],
3232
)

‎modules/benchmarks/src/largetable/baseline/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ts_devserver", "ts_library")
2-
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
2+
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
33
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ts_devserver", "ts_library")
2-
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
2+
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
33
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/largetable/iv/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ts_devserver")
2-
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
2+
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
33
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/largetable/largetable.e2e-spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {$} from 'protractor';
1010

11-
import {openBrowser, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
11+
import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util';
1212

1313
describe('largetable benchmark', () => {
1414
afterEach(verifyNoBrowserErrors);

‎modules/benchmarks/src/largetable/largetable.perf-spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {$} from 'protractor';
10-
import {runBenchmark, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
10+
import {runBenchmark, verifyNoBrowserErrors} from '../../../e2e_util/perf_util';
1111

1212
interface Worker {
1313
id: string;

‎modules/benchmarks/src/largetable/ng2/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
2-
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
2+
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
33
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ng_module", "ts_devserver")
2-
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
2+
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
33
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/largetable/render3/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package(default_visibility = ["//visibility:public"])
22

33
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
4-
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
4+
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
55
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
66

77
ng_module(

‎modules/benchmarks/src/styling/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ts_library(
88
srcs = ["styling_perf.spec.ts"],
99
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
1010
deps = [
11-
"//dev-infra/benchmark/driver-utilities",
11+
"//modules/e2e_util",
1212
"@npm//protractor",
1313
],
1414
)

‎modules/benchmarks/src/styling/ng2/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
2-
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
2+
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
33

44
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
55

0 commit comments

Comments
 (0)