Skip to content

Commit bb2e7b5

Browse files
committed
build: migrate @angular-devkit/build-webpack to ts_project
The `@angular-devkit/build-webpack` package has been migrated to the `rules_js` ts_project rule. (cherry picked from commit b4e9a2a)
1 parent 5a93866 commit bb2e7b5

File tree

1 file changed

+29
-30
lines changed

1 file changed

+29
-30
lines changed

packages/angular_devkit/build_webpack/BUILD.bazel

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
77
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
8-
load("//tools:defaults.bzl", "pkg_npm", "ts_library")
8+
load("//tools:defaults.bzl", "pkg_npm")
9+
load("//tools:interop.bzl", "ts_project")
910
load("//tools:ts_json_schema.bzl", "ts_json_schema")
1011

1112
licenses(["notice"])
@@ -22,14 +23,13 @@ ts_json_schema(
2223
src = "src/builders/webpack-dev-server/schema.json",
2324
)
2425

25-
ts_library(
26+
ts_project(
2627
name = "build_webpack",
27-
package_name = "@angular-devkit/build-webpack",
2828
srcs = glob(
2929
include = ["src/**/*.ts"],
3030
exclude = [
3131
"src/test-utils.ts",
32-
"src/**/*_spec.ts",
32+
"**/*_spec.ts",
3333
],
3434
) + [
3535
"index.ts",
@@ -42,18 +42,19 @@ ts_library(
4242
"src/builders/webpack-dev-server/schema.json",
4343
"src/builders/webpack/schema.json",
4444
],
45+
interop_deps = [
46+
"//packages/angular_devkit/architect",
47+
],
4548
module_name = "@angular-devkit/build-webpack",
46-
module_root = "src/index.d.ts",
4749
deps = [
48-
"//packages/angular_devkit/architect",
49-
"@npm//@types/node",
50-
"@npm//rxjs",
51-
"@npm//webpack",
52-
"@npm//webpack-dev-server",
50+
"//:root_modules/@types/node",
51+
"//:root_modules/rxjs",
52+
"//:root_modules/webpack",
53+
"//:root_modules/webpack-dev-server",
5354
],
5455
)
5556

56-
ts_library(
57+
ts_project(
5758
name = "build_webpack_test_lib",
5859
testonly = True,
5960
srcs = glob(
@@ -66,34 +67,32 @@ ts_library(
6667
"test/**/*",
6768
],
6869
),
69-
deps = [
70-
":build_webpack",
71-
"//packages/angular_devkit/architect",
72-
"//packages/angular_devkit/architect/node",
73-
"//packages/angular_devkit/architect/testing",
70+
interop_deps = [
7471
"//packages/angular_devkit/core",
7572
"//packages/angular_devkit/core/node",
7673
"//packages/ngtools/webpack",
77-
"@npm//@angular/common",
78-
"@npm//@angular/compiler",
79-
"@npm//@angular/compiler-cli",
80-
"@npm//@angular/core",
81-
"@npm//@angular/platform-browser",
82-
"@npm//@angular/platform-browser-dynamic",
83-
"@npm//tslib",
84-
"@npm//zone.js",
74+
"//packages/angular_devkit/architect",
75+
"//packages/angular_devkit/architect/node",
76+
"//packages/angular_devkit/architect/testing",
77+
],
78+
deps = [
79+
":build_webpack_rjs",
80+
"//:root_modules/@types/jasmine",
8581
],
8682
)
8783

8884
jasmine_node_test(
8985
name = "build_webpack_test",
9086
srcs = [":build_webpack_test_lib"],
91-
# Turns off nodejs require patches and turns on the linker, which sets up up node_modules
92-
# so that standard node module resolution work.
93-
templated_args = ["--nobazel_patch_module_resolver"],
94-
deps = [
95-
"@npm//jasmine",
96-
"@npm//source-map",
87+
data = [
88+
"//:root_modules/@angular/common",
89+
"//:root_modules/@angular/compiler",
90+
"//:root_modules/@angular/compiler-cli",
91+
"//:root_modules/@angular/core",
92+
"//:root_modules/@angular/platform-browser",
93+
"//:root_modules/@angular/platform-browser-dynamic",
94+
"//:root_modules/tslib",
95+
"//:root_modules/zone.js",
9796
],
9897
)
9998

0 commit comments

Comments
 (0)