Skip to content

Commit 5f3f736

Browse files
filipesilvamgechev
filipesilva
authored and
mgechev
committed
build: move BUILD.bazel files for secondary entry points into own folder
Without this change, module names will be computed with incorrect paths containing duplicate path fragments (e.g. `@angular-devkit/architect/testing/testing/test-logger`).
1 parent f2d2cd1 commit 5f3f736

File tree

20 files changed

+413
-334
lines changed

20 files changed

+413
-334
lines changed

‎packages/angular/cli/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ ts_library(
4848
# strict_checks = False,
4949
deps = [
5050
"//packages/angular_devkit/architect",
51-
"//packages/angular_devkit/architect:node",
51+
"//packages/angular_devkit/architect/node",
5252
"//packages/angular_devkit/core",
53-
"//packages/angular_devkit/core:node",
53+
"//packages/angular_devkit/core/node",
5454
"//packages/angular_devkit/schematics",
55-
"//packages/angular_devkit/schematics:tools",
55+
"//packages/angular_devkit/schematics/tools",
5656
# @node_module: typescript:es2017.object
5757
"@npm//@types/debug",
5858
"@npm//@types/node",

‎packages/angular_devkit/architect/BUILD.bazel‎

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,6 @@ ts_json_schema(
3636
src = "src/progress-schema.json",
3737
)
3838

39-
ts_library(
40-
name = "node",
41-
srcs = glob(
42-
include = ["node/**/*.ts"],
43-
exclude = [
44-
"**/*_spec.ts",
45-
"**/*_spec_large.ts",
46-
],
47-
),
48-
module_name = "@angular-devkit/architect/node",
49-
module_root = "node/index.d.ts",
50-
# strict_checks = False,
51-
deps = [
52-
":architect",
53-
"//packages/angular_devkit/core",
54-
"//packages/angular_devkit/core:node",
55-
"@npm//@types/node",
56-
"@npm//rxjs",
57-
],
58-
)
59-
6039
ts_library(
6140
name = "architect",
6241
srcs = glob(
@@ -77,27 +56,7 @@ ts_library(
7756
module_root = "src/index.d.ts",
7857
deps = [
7958
"//packages/angular_devkit/core",
80-
"//packages/angular_devkit/core:node",
81-
"@npm//@types/node",
82-
"@npm//rxjs",
83-
],
84-
)
85-
86-
ts_library(
87-
name = "testing",
88-
srcs = glob(
89-
include = ["testing/**/*.ts"],
90-
exclude = [
91-
"**/*_spec.ts",
92-
"**/*_spec_large.ts",
93-
],
94-
),
95-
module_name = "@angular-devkit/architect/testing",
96-
module_root = "testing/index.d.ts",
97-
deps = [
98-
":architect",
99-
"//packages/angular_devkit/core",
100-
"//packages/angular_devkit/core:node",
59+
"//packages/angular_devkit/core/node",
10160
"@npm//@types/node",
10261
"@npm//rxjs",
10362
],
@@ -108,7 +67,8 @@ pkg_npm(
10867
name = "npm_package",
10968
deps = [
11069
":architect",
111-
":testing",
70+
"//packages/angular_devkit/architect/node",
71+
"//packages/angular_devkit/architect/testing",
11272
],
11373
)
11474

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Copyright Google Inc. All Rights Reserved.
2+
#
3+
# Use of this source code is governed by an MIT-style license that can be
4+
# found in the LICENSE file at https://angular.io/license
5+
6+
licenses(["notice"]) # MIT
7+
8+
load("@npm_bazel_typescript//:index.bzl", "ts_library")
9+
10+
package(default_visibility = ["//visibility:public"])
11+
12+
13+
ts_library(
14+
name = "node",
15+
srcs = glob(
16+
include = ["**/*.ts"],
17+
exclude = [
18+
"**/*_spec.ts",
19+
"**/*_spec_large.ts",
20+
],
21+
),
22+
module_name = "@angular-devkit/architect/node",
23+
module_root = "index.d.ts",
24+
# strict_checks = False,
25+
deps = [
26+
"//packages/angular_devkit/architect",
27+
"//packages/angular_devkit/core",
28+
"//packages/angular_devkit/core/node",
29+
"@npm//@types/node",
30+
"@npm//rxjs",
31+
],
32+
)

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Copyright Google Inc. All Rights Reserved.
2+
#
3+
# Use of this source code is governed by an MIT-style license that can be
4+
# found in the LICENSE file at https://angular.io/license
5+
6+
licenses(["notice"]) # MIT
7+
8+
load("@npm_bazel_typescript//:index.bzl", "ts_library")
9+
10+
package(default_visibility = ["//visibility:public"])
11+
12+
13+
ts_library(
14+
name = "testing",
15+
srcs = glob(
16+
include = ["**/*.ts"],
17+
exclude = [
18+
"**/*_spec.ts",
19+
"**/*_spec_large.ts",
20+
],
21+
),
22+
module_name = "@angular-devkit/architect/testing",
23+
module_root = "index.d.ts",
24+
deps = [
25+
"//packages/angular_devkit/architect",
26+
"//packages/angular_devkit/core",
27+
"//packages/angular_devkit/core/node",
28+
"@npm//@types/node",
29+
"@npm//rxjs",
30+
],
31+
)

‎packages/angular_devkit/architect_cli/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ ts_library(
1616
module_name = "@angular-devkit/architect-cli",
1717
deps = [
1818
"//packages/angular_devkit/architect",
19-
"//packages/angular_devkit/architect:node",
19+
"//packages/angular_devkit/architect/node",
2020
"//packages/angular_devkit/core",
21-
"//packages/angular_devkit/core:node",
21+
"//packages/angular_devkit/core/node",
2222
"@npm//@types/minimist",
2323
"@npm//@types/node",
2424
"@npm//@types/progress",

‎packages/angular_devkit/benchmark/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ts_library(
2626
module_root = "src/index.d.ts",
2727
deps = [
2828
"//packages/angular_devkit/core",
29-
"//packages/angular_devkit/core:node",
29+
"//packages/angular_devkit/core/node",
3030
"@npm//@types/minimist",
3131
"@npm//@types/node",
3232
"@npm//rxjs",
@@ -55,7 +55,7 @@ ts_library(
5555
deps = [
5656
":benchmark",
5757
"//packages/angular_devkit/core",
58-
"//packages/angular_devkit/core:node",
58+
"//packages/angular_devkit/core/node",
5959
"@npm//@types/jasmine",
6060
"@npm//@types/node",
6161
"@npm//rxjs",

‎packages/angular_devkit/core/BUILD.bazel‎

Lines changed: 3 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ts_library(
6868
# @external_end
6969
deps = [
7070
":core",
71-
":node",
71+
"//packages/angular_devkit/core/node:node",
7272
"@npm//@types/jasmine",
7373
"@npm//@types/node",
7474
"@npm//rxjs",
@@ -88,98 +88,13 @@ jasmine_node_test(
8888
],
8989
)
9090

91-
# @angular-devkit/core/node
92-
93-
ts_library(
94-
name = "node",
95-
srcs = glob(
96-
include = ["node/**/*.ts"],
97-
exclude = [
98-
"node/testing/**/*.ts",
99-
"node/**/*_spec.ts",
100-
"node/**/*_spec_large.ts",
101-
"node/**/*_benchmark.ts",
102-
],
103-
),
104-
module_name = "@angular-devkit/core/node",
105-
module_root = "node/index.d.ts",
106-
# The attribute below is needed in g3 to turn off strict typechecking
107-
# strict_checks = False,
108-
deps = [
109-
":core",
110-
"@npm//@types/node",
111-
"@npm//rxjs",
112-
],
113-
)
114-
115-
ts_library(
116-
name = "node_test_lib",
117-
testonly = True,
118-
srcs = glob(
119-
include = [
120-
"node/**/*_spec.ts",
121-
"node/**/*_spec_large.ts",
122-
],
123-
),
124-
# @external_begin
125-
tsconfig = "//:tsconfig-test.json",
126-
# @external_end
127-
deps = [
128-
":core",
129-
":node",
130-
"//tests/angular_devkit/core/node/jobs:jobs_test_lib",
131-
"@npm//@types/jasmine",
132-
"@npm//@types/node",
133-
"@npm//rxjs",
134-
],
135-
)
136-
137-
jasmine_node_test(
138-
name = "node_test",
139-
srcs = [":node_test_lib"],
140-
# TODO: Audit tests to determine if tests can be run in RBE environments
141-
local = True,
142-
deps = [
143-
"@npm//chokidar",
144-
"@npm//temp",
145-
# @node_module: ajv
146-
# @node_module: fast_json_stable_stringify
147-
# @node_module: magic_string
148-
],
149-
)
150-
151-
# @angular-devkit/core/node/testing
152-
153-
ts_library(
154-
name = "node_testing",
155-
srcs = glob(
156-
include = ["node/testing/**/*.ts"],
157-
exclude = [
158-
"node/testing/**/*_spec.ts",
159-
"node/testing/**/*_spec_large.ts",
160-
"node/testing/**/*_benchmark.ts",
161-
],
162-
),
163-
module_name = "@angular-devkit/core/node/testing",
164-
module_root = "node/testing/index.d.ts",
165-
# The attribute below is needed in g3 to turn off strict typechecking
166-
# strict_checks = False,
167-
deps = [
168-
":core",
169-
":node",
170-
"@npm//@types/jasmine",
171-
"@npm//@types/node",
172-
"@npm//rxjs",
173-
],
174-
)
175-
17691
# @external_begin
17792
pkg_npm(
17893
name = "npm_package",
17994
deps = [
18095
":core",
181-
":node",
182-
":node_testing",
96+
"//packages/angular_devkit/core/node:node",
97+
"//packages/angular_devkit/core/node/testing:testing",
18398
],
18499
)
185100

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# Copyright Google Inc. All Rights Reserved.
2+
#
3+
# Use of this source code is governed by an MIT-style license that can be
4+
# found in the LICENSE file at https://angular.io/license
5+
package(default_visibility = ["//visibility:public"])
6+
7+
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
8+
load("@npm_bazel_typescript//:index.bzl", "ts_library")
9+
10+
licenses(["notice"]) # MIT License
11+
12+
13+
ts_library(
14+
name = "node",
15+
srcs = glob(
16+
include = ["**/*.ts"],
17+
exclude = [
18+
"testing/**/*.ts",
19+
"**/*_spec.ts",
20+
"**/*_spec_large.ts",
21+
"**/*_benchmark.ts",
22+
],
23+
),
24+
module_name = "@angular-devkit/core/node",
25+
module_root = "index.d.ts",
26+
# The attribute below is needed in g3 to turn off strict typechecking
27+
# strict_checks = False,
28+
deps = [
29+
"//packages/angular_devkit/core",
30+
"@npm//@types/node",
31+
"@npm//rxjs",
32+
],
33+
)
34+
35+
ts_library(
36+
name = "node_test_lib",
37+
testonly = True,
38+
srcs = glob(
39+
include = [
40+
"**/*_spec.ts",
41+
"**/*_spec_large.ts",
42+
],
43+
exclude = [
44+
"testing/**/*.ts",
45+
],
46+
),
47+
# @external_begin
48+
tsconfig = "//:tsconfig-test.json",
49+
# @external_end
50+
deps = [
51+
":node",
52+
"//packages/angular_devkit/core",
53+
"//tests/angular_devkit/core/node/jobs:jobs_test_lib",
54+
"@npm//@types/jasmine",
55+
"@npm//@types/node",
56+
"@npm//rxjs",
57+
],
58+
)
59+
60+
jasmine_node_test(
61+
name = "node_test",
62+
srcs = [":node_test_lib"],
63+
# TODO: Audit tests to determine if tests can be run in RBE environments
64+
local = True,
65+
deps = [
66+
"@npm//chokidar",
67+
"@npm//temp",
68+
# @node_module: ajv
69+
# @node_module: fast_json_stable_stringify
70+
# @node_module: magic_string
71+
],
72+
)

‎packages/angular_devkit/core/node/testing/BUILD.bazel‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Copyright Google Inc. All Rights Reserved.
2+
#
3+
# Use of this source code is governed by an MIT-style license that can be
4+
# found in the LICENSE file at https://angular.io/license
5+
package(default_visibility = ["//visibility:public"])
6+
7+
load("@npm_bazel_typescript//:index.bzl", "ts_library")
8+
9+
licenses(["notice"]) # MIT License
10+
11+
12+
ts_library(
13+
name = "testing",
14+
srcs = glob(
15+
include = ["**/*.ts"],
16+
exclude = [
17+
"**/*_spec.ts",
18+
"**/*_spec_large.ts",
19+
"**/*_benchmark.ts",
20+
],
21+
),
22+
module_name = "@angular-devkit/core/node/testing",
23+
module_root = "index.d.ts",
24+
# The attribute below is needed in g3 to turn off strict typechecking
25+
# strict_checks = False,
26+
deps = [
27+
"//packages/angular_devkit/core",
28+
"//packages/angular_devkit/core/node:node",
29+
"@npm//@types/jasmine",
30+
"@npm//@types/node",
31+
"@npm//rxjs",
32+
],
33+
)

0 commit comments

Comments
 (0)