Skip to content

Commit 3657d68

Browse files
filipesilvafilipesilva
committed
style: reformat bazel files
1 parent 40a98e3 commit 3657d68

File tree

23 files changed

+148
-158
lines changed

23 files changed

+148
-158
lines changed

‎integration/build_angular/BUILD.bazel

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ filegroup(
55
srcs = glob(
66
include = ["**/*"],
77
exclude = [
8-
"node_modules/**",
9-
".yarn_local_cache/**",
8+
"node_modules/**",
9+
".yarn_local_cache/**",
1010
],
1111
),
1212
)
@@ -30,6 +30,7 @@ INTEGRATION_TESTS = [
3030
[
3131
npm_integration_test(
3232
name = test_name,
33+
size = "large",
3334
check_npm_packages = [
3435
"@angular-devkit/architect",
3536
"@angular-devkit/build-angular",
@@ -38,14 +39,6 @@ INTEGRATION_TESTS = [
3839
"@angular-devkit/core",
3940
"@ngtools/webpack",
4041
],
41-
npm_packages = {
42-
"//packages/angular_devkit/architect:npm_package_archive": "@angular-devkit/architect",
43-
"//packages/angular_devkit/build_optimizer:npm_package_archive": "@angular-devkit/build-optimizer",
44-
"//packages/angular_devkit/build_webpack:npm_package_archive": "@angular-devkit/build-webpack",
45-
"//packages/angular_devkit/build_angular:npm_package_archive": "@angular-devkit/build-angular",
46-
"//packages/angular_devkit/core:npm_package_archive": "@angular-devkit/core",
47-
"//packages/ngtools/webpack:npm_package_archive": "@ngtools/webpack",
48-
},
4942
commands = [
5043
"patch-package-json",
5144
# Workaround https://github.com/yarnpkg/yarn/issues/2165
@@ -63,13 +56,20 @@ INTEGRATION_TESTS = [
6356
"@nodejs//:yarn_bin",
6457
"@nodejs//:yarn_files",
6558
],
66-
test_files = ":build_angular_sources",
67-
size = "large",
68-
tags = ["exclusive"],
6959
# This test contains a lot of node modules that can take up to 100s to install.
70-
# Instead of completely isolating the test and the cache, this one is run in-place so it
60+
# Instead of completely isolating the test and the cache, this one is run in-place so it
7161
# reuses the local node_modules and cache for all tests in this BUILD file.
72-
debug = True
62+
debug = True,
63+
npm_packages = {
64+
"//packages/angular_devkit/architect:npm_package_archive": "@angular-devkit/architect",
65+
"//packages/angular_devkit/build_optimizer:npm_package_archive": "@angular-devkit/build-optimizer",
66+
"//packages/angular_devkit/build_webpack:npm_package_archive": "@angular-devkit/build-webpack",
67+
"//packages/angular_devkit/build_angular:npm_package_archive": "@angular-devkit/build-angular",
68+
"//packages/angular_devkit/core:npm_package_archive": "@angular-devkit/core",
69+
"//packages/ngtools/webpack:npm_package_archive": "@ngtools/webpack",
70+
},
71+
tags = ["exclusive"],
72+
test_files = ":build_angular_sources",
7373
)
7474
for test_name in INTEGRATION_TESTS
7575
]

‎integration/build_webpack/BUILD.bazel

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,39 @@ filegroup(
55
srcs = glob(
66
include = ["**/*"],
77
exclude = [
8-
"node_modules/**",
9-
".yarn_local_cache/**",
8+
"node_modules/**",
9+
".yarn_local_cache/**",
1010
],
1111
),
1212
)
1313

1414
npm_integration_test(
1515
name = "build_webpack",
1616
check_npm_packages = [
17-
"@angular-devkit/architect",
18-
"@angular-devkit/build-webpack",
19-
"@angular-devkit/core",
20-
"@ngtools/webpack",
17+
"@angular-devkit/architect",
18+
"@angular-devkit/build-webpack",
19+
"@angular-devkit/core",
20+
"@ngtools/webpack",
2121
],
22-
npm_packages = {
23-
"//packages/angular_devkit/architect:npm_package_archive": "@angular-devkit/architect",
24-
"//packages/angular_devkit/build_webpack:npm_package_archive": "@angular-devkit/build-webpack",
25-
"//packages/angular_devkit/core:npm_package_archive": "@angular-devkit/core",
26-
"//packages/ngtools/webpack:npm_package_archive": "@ngtools/webpack",
27-
},
2822
commands = [
29-
# Workaround https://github.com/yarnpkg/yarn/issues/2165
30-
# Yarn will cache file://dist URIs and not update
31-
"rm -rf ./.yarn_local_cache",
32-
"mkdir .yarn_local_cache",
33-
"patch-package-json",
34-
"$(rootpath @nodejs//:yarn_bin) install --cache-folder ./.yarn_local_cache",
35-
"$(rootpath @nodejs//:yarn_bin) --cache-folder ./.yarn_local_cache test",
36-
"rm -rf ./.yarn_local_cache",
23+
# Workaround https://github.com/yarnpkg/yarn/issues/2165
24+
# Yarn will cache file://dist URIs and not update
25+
"rm -rf ./.yarn_local_cache",
26+
"mkdir .yarn_local_cache",
27+
"patch-package-json",
28+
"$(rootpath @nodejs//:yarn_bin) install --cache-folder ./.yarn_local_cache",
29+
"$(rootpath @nodejs//:yarn_bin) --cache-folder ./.yarn_local_cache test",
30+
"rm -rf ./.yarn_local_cache",
3731
],
3832
data = [
39-
"@nodejs//:yarn_bin",
40-
"@nodejs//:yarn_files",
33+
"@nodejs//:yarn_bin",
34+
"@nodejs//:yarn_files",
4135
],
42-
test_files = ":build_webpack_sources"
43-
)
36+
npm_packages = {
37+
"//packages/angular_devkit/architect:npm_package_archive": "@angular-devkit/architect",
38+
"//packages/angular_devkit/build_webpack:npm_package_archive": "@angular-devkit/build-webpack",
39+
"//packages/angular_devkit/core:npm_package_archive": "@angular-devkit/core",
40+
"//packages/ngtools/webpack:npm_package_archive": "@ngtools/webpack",
41+
},
42+
test_files = ":build_webpack_sources",
43+
)

‎packages/angular/cli/BUILD.bazel

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,26 @@ ts_library(
1919
"**/*_spec_large.ts",
2020
],
2121
) + [
22-
"//packages/angular/cli:lib/config/schema.ts",
23-
"//packages/angular/cli:commands/analytics.ts",
24-
"//packages/angular/cli:commands/add.ts",
25-
"//packages/angular/cli:commands/build.ts",
26-
"//packages/angular/cli:commands/deploy.ts",
27-
"//packages/angular/cli:commands/config.ts",
28-
"//packages/angular/cli:commands/deprecated.ts",
29-
"//packages/angular/cli:commands/doc.ts",
30-
"//packages/angular/cli:commands/e2e.ts",
31-
"//packages/angular/cli:commands/easter-egg.ts",
32-
"//packages/angular/cli:commands/generate.ts",
33-
"//packages/angular/cli:commands/help.ts",
34-
"//packages/angular/cli:commands/lint.ts",
35-
"//packages/angular/cli:commands/new.ts",
36-
"//packages/angular/cli:commands/serve.ts",
37-
"//packages/angular/cli:commands/test.ts",
38-
"//packages/angular/cli:commands/update.ts",
39-
"//packages/angular/cli:commands/version.ts",
40-
"//packages/angular/cli:commands/run.ts",
41-
"//packages/angular/cli:commands/xi18n.ts",
22+
"//packages/angular/cli:lib/config/schema.ts",
23+
"//packages/angular/cli:commands/analytics.ts",
24+
"//packages/angular/cli:commands/add.ts",
25+
"//packages/angular/cli:commands/build.ts",
26+
"//packages/angular/cli:commands/deploy.ts",
27+
"//packages/angular/cli:commands/config.ts",
28+
"//packages/angular/cli:commands/deprecated.ts",
29+
"//packages/angular/cli:commands/doc.ts",
30+
"//packages/angular/cli:commands/e2e.ts",
31+
"//packages/angular/cli:commands/easter-egg.ts",
32+
"//packages/angular/cli:commands/generate.ts",
33+
"//packages/angular/cli:commands/help.ts",
34+
"//packages/angular/cli:commands/lint.ts",
35+
"//packages/angular/cli:commands/new.ts",
36+
"//packages/angular/cli:commands/serve.ts",
37+
"//packages/angular/cli:commands/test.ts",
38+
"//packages/angular/cli:commands/update.ts",
39+
"//packages/angular/cli:commands/version.ts",
40+
"//packages/angular/cli:commands/run.ts",
41+
"//packages/angular/cli:commands/xi18n.ts",
4242
],
4343
data = glob([
4444
"**/*.json",

‎packages/angular/pwa/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ts_library(
2525
"**/*_spec_large.ts",
2626
],
2727
) + [
28-
"//packages/angular/pwa:pwa/schema.ts",
28+
"//packages/angular/pwa:pwa/schema.ts",
2929
],
3030
deps = [
3131
"//packages/angular_devkit/core",

‎packages/angular_devkit/architect/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ ts_library(
4545
"**/*_spec_large.ts",
4646
],
4747
) + [
48-
"//packages/angular_devkit/architect:src/input-schema.ts",
49-
"//packages/angular_devkit/architect:src/output-schema.ts",
50-
"//packages/angular_devkit/architect:src/builders-schema.ts",
51-
"//packages/angular_devkit/architect:src/progress-schema.ts",
48+
"//packages/angular_devkit/architect:src/input-schema.ts",
49+
"//packages/angular_devkit/architect:src/output-schema.ts",
50+
"//packages/angular_devkit/architect:src/builders-schema.ts",
51+
"//packages/angular_devkit/architect:src/progress-schema.ts",
5252
],
5353
# strict_checks = False,
5454
data = glob(["**/*.json"]),

‎packages/angular_devkit/architect/node/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ load("@npm_bazel_typescript//:index.bzl", "ts_library")
99

1010
package(default_visibility = ["//visibility:public"])
1111

12-
1312
ts_library(
1413
name = "node",
1514
srcs = glob(

‎packages/angular_devkit/architect/testing/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ load("@npm_bazel_typescript//:index.bzl", "ts_library")
99

1010
package(default_visibility = ["//visibility:public"])
1111

12-
1312
ts_library(
1413
name = "testing",
1514
srcs = glob(

‎packages/angular_devkit/build_angular/BUILD.bazel

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ load("//tools:ts_json_schema.bzl", "ts_json_schema")
1212

1313
package(default_visibility = ["//visibility:public"])
1414

15-
1615
ts_json_schema(
1716
name = "app_shell_schema",
1817
src = "src/app-shell/schema.json",
@@ -57,42 +56,47 @@ ts_library(
5756
name = "build_angular",
5857
srcs = glob(
5958
include = [
60-
"src/**/*.ts",
61-
"plugins/**/*.ts",
59+
"src/**/*.ts",
60+
"plugins/**/*.ts",
6261
],
6362
exclude = [
6463
"src/**/*_spec.ts",
6564
"plugins/**/*_spec.ts",
6665
],
6766
) + [
68-
"//packages/angular_devkit/build_angular:src/app-shell/schema.ts",
69-
"//packages/angular_devkit/build_angular:src/browser/schema.ts",
70-
"//packages/angular_devkit/build_angular:src/dev-server/schema.ts",
71-
"//packages/angular_devkit/build_angular:src/extract-i18n/schema.ts",
72-
"//packages/angular_devkit/build_angular:src/karma/schema.ts",
73-
"//packages/angular_devkit/build_angular:src/protractor/schema.ts",
74-
"//packages/angular_devkit/build_angular:src/server/schema.ts",
75-
"//packages/angular_devkit/build_angular:src/tslint/schema.ts",
67+
"//packages/angular_devkit/build_angular:src/app-shell/schema.ts",
68+
"//packages/angular_devkit/build_angular:src/browser/schema.ts",
69+
"//packages/angular_devkit/build_angular:src/dev-server/schema.ts",
70+
"//packages/angular_devkit/build_angular:src/extract-i18n/schema.ts",
71+
"//packages/angular_devkit/build_angular:src/karma/schema.ts",
72+
"//packages/angular_devkit/build_angular:src/protractor/schema.ts",
73+
"//packages/angular_devkit/build_angular:src/server/schema.ts",
74+
"//packages/angular_devkit/build_angular:src/tslint/schema.ts",
7675
],
7776
data = glob(
7877
include = [
79-
"package.json",
80-
"builders.json",
81-
"src/**/schema.json",
82-
"src/**/*.js",
83-
"src/**/*.html",
78+
"package.json",
79+
"builders.json",
80+
"src/**/schema.json",
81+
"src/**/*.js",
82+
"src/**/*.html",
8483
],
8584
),
8685
module_name = "@angular-devkit/build-angular",
87-
module_root = "src/index.d.ts",
86+
module_root = "src/index.d.ts",
8887
deps = [
89-
"//packages/angular_devkit/core",
90-
"//packages/angular_devkit/core/node",
9188
"//packages/angular_devkit/architect",
9289
"//packages/angular_devkit/build_optimizer",
9390
"//packages/angular_devkit/build_webpack",
91+
"//packages/angular_devkit/core",
92+
"//packages/angular_devkit/core/node",
9493
"//packages/ngtools/webpack",
95-
"@npm//@types/node",
94+
"@npm//@angular/compiler-cli",
95+
"@npm//@angular/localize",
96+
"@npm//@angular/service-worker",
97+
"@npm//@babel/core",
98+
"@npm//@babel/preset-env",
99+
"@npm//@babel/template",
96100
"@npm//@types/babel__core",
97101
"@npm//@types/babel__template",
98102
"@npm//@types/browserslist",
@@ -101,40 +105,40 @@ ts_library(
101105
"@npm//@types/cssnano",
102106
"@npm//@types/find-cache-dir",
103107
"@npm//@types/glob",
108+
"@npm//@types/karma",
104109
"@npm//@types/loader-utils",
105110
"@npm//@types/minimatch",
111+
"@npm//@types/node",
106112
"@npm//@types/rimraf",
107113
"@npm//@types/semver",
108114
"@npm//@types/webpack",
109115
"@npm//@types/webpack-dev-server",
110116
"@npm//@types/webpack-sources",
111-
"@npm//@babel/core",
112-
"@npm//@babel/preset-env",
113-
"@npm//@babel/template",
114117
"@npm//ajv",
115118
"@npm//autoprefixer",
116119
"@npm//babel-loader",
117120
"@npm//browserslist",
118121
"@npm//cacache",
119122
"@npm//caniuse-lite",
120-
"@npm//cssnano",
121123
"@npm//circular-dependency-plugin",
122-
"@npm//coverage-istanbul-loader",
123124
"@npm//copy-webpack-plugin",
124125
"@npm//core-js",
126+
"@npm//coverage-istanbul-loader",
127+
"@npm//cssnano",
125128
"@npm//file-loader",
126129
"@npm//find-cache-dir",
127130
"@npm//glob",
128131
"@npm//jest-worker",
132+
"@npm//karma",
129133
"@npm//karma-source-map-support",
130134
"@npm//less",
131135
"@npm//less-loader",
132136
"@npm//license-webpack-plugin",
133137
"@npm//loader-utils",
134138
"@npm//mini-css-extract-plugin",
135139
"@npm//minimatch",
136-
"@npm//parse5",
137140
"@npm//open",
141+
"@npm//parse5",
138142
"@npm//postcss",
139143
"@npm//postcss-import",
140144
"@npm//postcss-loader",
@@ -147,29 +151,24 @@ ts_library(
147151
"@npm//sass-loader",
148152
"@npm//semver",
149153
"@npm//source-map",
150-
"@npm//source-map-support",
151154
"@npm//source-map-loader",
155+
"@npm//source-map-support",
152156
"@npm//speed-measure-webpack-plugin",
153157
"@npm//style-loader",
154158
"@npm//stylus",
155159
"@npm//stylus-loader",
156-
"@npm//tree-kill",
157160
"@npm//terser",
158161
"@npm//terser-webpack-plugin",
162+
"@npm//tree-kill",
163+
"@npm//tslint",
164+
"@npm//typescript",
159165
"@npm//webpack",
160166
"@npm//webpack-dev-middleware",
161167
"@npm//webpack-dev-server",
162168
"@npm//webpack-merge",
163169
"@npm//webpack-sources",
164170
"@npm//webpack-subresource-integrity",
165171
"@npm//worker-plugin",
166-
"@npm//typescript",
167-
"@npm//@angular/compiler-cli",
168-
"@npm//@angular/localize",
169-
"@npm//@angular/service-worker",
170-
"@npm//karma",
171-
"@npm//tslint",
172-
"@npm//@types/karma",
173172
],
174173
)
175174

@@ -186,4 +185,4 @@ pkg_tar(
186185
extension = "tar.gz",
187186
strip_prefix = "./npm_package",
188187
tags = ["manual"],
189-
)
188+
)

0 commit comments

Comments
 (0)