@@ -55,7 +55,6 @@ APPLICATION_CONFIG = COMMON_CONFIG + [
5555TEST_CONFIG = COMMON_CONFIG + [
5656 "@dev-infra//bazel/browsers/chromium" ,
5757 "@dev-infra//bazel/browsers/firefox" ,
58-
5958 "//:ng-base-test-config" ,
6059 ":ng-test-config" ,
6160 "//:node_modules/karma" ,
@@ -76,7 +75,6 @@ TEST_DEPS = [
7675E2E_CONFIG = COMMON_CONFIG + [
7776 "@dev-infra//bazel/browsers/chromium" ,
7877 "@dev-infra//bazel/browsers/firefox" ,
79-
8078 "//:ng-base-test-config" ,
8179 ":ng-e2e-config" ,
8280 "//:node_modules/jasmine-spec-reporter" ,
@@ -89,28 +87,27 @@ E2E_DEPS = [
8987]
9088
9189LINT_CONFIG = COMMON_CONFIG + [
92- # Lint uses the e2e config
93- "//:ng-base-test-config" ,
94- ":ng-e2e-config" ,
95- "//:ng-base-lint-config" ,
96- "//:node_modules/@angular-eslint/builder" ,
97- "//:node_modules/@angular-eslint/eslint-plugin" ,
98- "//:node_modules/@angular-eslint/eslint-plugin-template" ,
99- "//:node_modules/@angular-eslint/template-parser" ,
100- "//:node_modules/eslint-plugin-ban" ,
101- "//:node_modules/eslint-plugin-import" ,
102- "//:node_modules/eslint-plugin-jsdoc" ,
103- "//:node_modules/eslint-plugin-prefer-arrow" ,
104- "//:node_modules/@typescript-eslint/eslint-plugin" ,
105- "//:node_modules/@typescript-eslint/parser" ,
106- "//:node_modules/@stylistic/eslint-plugin" ,
90+ # Lint uses the e2e config
91+ "//:ng-base-test-config" ,
92+ ":ng-e2e-config" ,
93+ "//:ng-base-lint-config" ,
94+ "//:node_modules/@angular-eslint/builder" ,
95+ "//:node_modules/@angular-eslint/eslint-plugin" ,
96+ "//:node_modules/@angular-eslint/eslint-plugin-template" ,
97+ "//:node_modules/@angular-eslint/template-parser" ,
98+ "//:node_modules/eslint-plugin-ban" ,
99+ "//:node_modules/eslint-plugin-import" ,
100+ "//:node_modules/eslint-plugin-jsdoc" ,
101+ "//:node_modules/eslint-plugin-prefer-arrow" ,
102+ "//:node_modules/@typescript-eslint/eslint-plugin" ,
103+ "//:node_modules/@typescript-eslint/parser" ,
104+ "//:node_modules/@stylistic/eslint-plugin" ,
107105]
108106LINT_DEPS = [
109- # TODO(bazel): this should be included as a transitive of @angular-devkit/architect-cli!?
110- "//:node_modules/@angular-devkit/architect" ,
107+ # TODO(bazel): this should be included as a transitive of @angular-devkit/architect-cli!?
108+ "//:node_modules/@angular-devkit/architect" ,
111109]
112110
113-
114111def ng_app (name , project_name = None , deps = [], test_deps = [], e2e_deps = [], ** kwargs ):
115112 """
116113 Macro for Angular applications, creating various targets aligning with the Angular CLI.
@@ -137,44 +134,44 @@ def ng_app(name, project_name = None, deps = [], test_deps = [], e2e_deps = [],
137134
138135 test_srcs = native .glob (["src/test.ts" , "src/**/*.spec.ts" ])
139136
140- e2e_srcs = native .glob (["e2e/src/**/*.ts" ])
137+ e2e_srcs = native .glob (["e2e/src/**/*.ts" ])
141138
142139 tags = kwargs .pop ("tags" , [])
143140
144141 # config files
145142 copy_to_bin (
146143 name = "ng-app-config" ,
147144 srcs = [
148- "tsconfig.app.json" ,
145+ "tsconfig.app.json" ,
149146 ],
150147 visibility = ["//visibility:private" ],
151148 )
152149 copy_to_bin (
153150 name = "ng-test-config" ,
154151 srcs = [
155- "karma.conf.js" ,
156- "tsconfig.spec.json" ,
152+ "karma.conf.js" ,
153+ "tsconfig.spec.json" ,
157154 ],
158155 visibility = ["//visibility:private" ],
159156 )
160157 copy_to_bin (
161158 name = "ng-e2e-config" ,
162159 srcs = [
163- "e2e/tsconfig.json" ,
164- "e2e/protractor.conf.js" ,
160+ "e2e/tsconfig.json" ,
161+ "e2e/protractor.conf.js" ,
165162 ],
166163 visibility = ["//visibility:private" ],
167164 )
168165
169166 # Lint config files in addition to the root
170- if native .package_name () != '' :
171- copy_to_bin (
172- name = "lint-config" ,
173- srcs = [
174- ".eslintrc.json" ,
175- ],
176- visibility = ["//visibility:private" ],
177- )
167+ if native .package_name () != "" :
168+ copy_to_bin (
169+ name = "lint-config" ,
170+ srcs = [
171+ ".eslintrc.json" ,
172+ ],
173+ visibility = ["//visibility:private" ],
174+ )
178175
179176 project_name = project_name if project_name else name
180177
@@ -239,7 +236,7 @@ def ng_app(name, project_name = None, deps = [], test_deps = [], e2e_deps = [],
239236 _architect_test (
240237 project_name ,
241238 "lint" ,
242- srcs = srcs + test_srcs + e2e_srcs + deps + test_deps + NG_COMMON_DEPS + LINT_DEPS + LINT_CONFIG + ([":lint-config" ] if native .package_name () != '' else []),
239+ srcs = srcs + test_srcs + e2e_srcs + deps + test_deps + NG_COMMON_DEPS + LINT_DEPS + LINT_CONFIG + ([":lint-config" ] if native .package_name () != "" else []),
243240 tags = tags + ["lint" ],
244241 ** kwargs
245242 )
@@ -248,8 +245,9 @@ def _architect_build(project_name, configuration = None, args = [], srcs = [], *
248245 output_dir = "%s%s" % (project_name , ".%s" % configuration if configuration else "" )
249246
250247 args = [
251- "%s:build%s" % (project_name , ":%s" % configuration if configuration else "" ),
252- "--output-path" , output_dir
248+ "%s:build%s" % (project_name , ":%s" % configuration if configuration else "" ),
249+ "--output-path" ,
250+ output_dir ,
253251 ] + args
254252
255253 architect_cli .architect (
@@ -258,13 +256,13 @@ def _architect_build(project_name, configuration = None, args = [], srcs = [], *
258256 args = args ,
259257 out_dirs = [output_dir ],
260258 srcs = srcs ,
261- ** kwargs ,
259+ ** kwargs
262260 )
263261
264262def _architect_test (project_name , command , configuration = None , args = [], srcs = [], ** kwargs ):
265263 to_root = ""
266264 if native .package_name () != "" :
267- to_root = "" .join (["../" for _ in native .package_name ().split ("/" )])
265+ to_root = "" .join (["../" for _ in native .package_name ().split ("/" )])
268266
269267 env = {
270268 "CHROME_BIN" : to_root + "$(CHROMIUM)" ,
@@ -275,25 +273,24 @@ def _architect_test(project_name, command, configuration = None, args = [], srcs
275273 name = "%s%s" % (command , ".%s" % configuration if configuration else "" ),
276274 chdir = native .package_name (),
277275 args = [
278- "%s:%s%s" % (project_name , command , ":%s" % configuration if configuration else "" )
276+ "%s:%s%s" % (project_name , command , ":%s" % configuration if configuration else "" ),
279277 ] + args ,
280278 data = srcs ,
281279 env = env ,
282280 toolchains = [
283281 "@dev-infra//bazel/browsers/chromium:toolchain_alias" ,
284282 "@dev-infra//bazel/browsers/firefox:toolchain_alias" ,
285283 ],
286- ** kwargs ,
284+ ** kwargs
287285 )
288286
289287def _architect_binary (project_name , command , configuration = None , args = [], srcs = [], ** kwargs ):
290288 architect_cli .architect_binary (
291289 name = "%s%s" % (command , ".%s" % configuration if configuration else "" ),
292290 chdir = native .package_name (),
293291 args = [
294- "%s:%s%s" % (project_name , command , ":%s" % configuration if configuration else "" )
292+ "%s:%s%s" % (project_name , command , ":%s" % configuration if configuration else "" ),
295293 ] + args ,
296294 data = srcs ,
297- ** kwargs ,
295+ ** kwargs
298296 )
299-
0 commit comments