diff --git a/packages/angular_devkit/core/BUILD.bazel b/packages/angular_devkit/core/BUILD.bazel index f736dfe023..e577e15d58 100644 --- a/packages/angular_devkit/core/BUILD.bazel +++ b/packages/angular_devkit/core/BUILD.bazel @@ -1,6 +1,7 @@ load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package") load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test") -load("//tools:defaults.bzl", "pkg_npm", "ts_library") +load("//tools:defaults.bzl", "pkg_npm") +load("//tools:interop.bzl", "ts_project") # Copyright Google Inc. All Rights Reserved. # @@ -12,15 +13,14 @@ licenses(["notice"]) # @angular-devkit/core -ts_library( +ts_project( name = "core", - package_name = "@angular-devkit/core", srcs = glob( include = ["src/**/*.ts"], exclude = [ "src/**/*_spec.ts", ], - ), + ) + ["index.ts"], data = glob( include = ["**/*.json"], # NB: we need to exclude the nested node_modules that is laid out by yarn workspaces @@ -30,16 +30,16 @@ ts_library( ], ), module_name = "@angular-devkit/core", - module_root = "src/index.d.ts", deps = [ - "@npm//@types/node", - "@npm//@types/picomatch", - "@npm//ajv", - "@npm//ajv-formats", - "@npm//jsonc-parser", - "@npm//picomatch", - "@npm//rxjs", - "@npm//source-map", + "//:root_modules/@types/node", + "//:root_modules/@types/picomatch", + "//:root_modules/@types/jasmine", + "//:root_modules/ajv", + "//:root_modules/ajv-formats", + "//:root_modules/jsonc-parser", + "//:root_modules/picomatch", + "//:root_modules/rxjs", + "//:root_modules/source-map", # @node_module: typescript:es2015.proxy # @node_module: typescript:es2015.reflect # @node_module: typescript:es2015.symbol.wellknown @@ -49,15 +49,15 @@ ts_library( # @external_begin -ts_library( +ts_project( name = "core_test_lib", testonly = True, srcs = glob(["src/**/*_spec.ts"]), data = glob(["src/workspace/json/test/**/*.json"]), deps = [ - ":core", - "//packages/angular_devkit/core/node", - "@npm//rxjs", + ":core_rjs", + "//:root_modules/rxjs", + "//packages/angular_devkit/core/node:node_rjs", ], ) diff --git a/packages/angular_devkit/core/index.ts b/packages/angular_devkit/core/index.ts new file mode 100644 index 0000000000..e6da94cc7d --- /dev/null +++ b/packages/angular_devkit/core/index.ts @@ -0,0 +1,9 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.dev/license + */ + +export * from './src/index'; diff --git a/packages/angular_devkit/core/node/BUILD.bazel b/packages/angular_devkit/core/node/BUILD.bazel index a52feab8f7..6e2d05567e 100644 --- a/packages/angular_devkit/core/node/BUILD.bazel +++ b/packages/angular_devkit/core/node/BUILD.bazel @@ -4,13 +4,13 @@ # found in the LICENSE file at https://angular.dev/license load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test") -load("//tools:defaults.bzl", "ts_library") +load("//tools:interop.bzl", "ts_project") licenses(["notice"]) package(default_visibility = ["//visibility:public"]) -ts_library( +ts_project( name = "node", srcs = glob( include = ["**/*.ts"], @@ -20,18 +20,17 @@ ts_library( ], ), module_name = "@angular-devkit/core/node", - module_root = "index.d.ts", deps = [ - "//packages/angular_devkit/core", - "@npm//@types/node", - "@npm//chokidar", - "@npm//rxjs", + "//:root_modules/@types/node", + "//:root_modules/chokidar", + "//:root_modules/rxjs", + "//packages/angular_devkit/core:core_rjs", ], ) # @external_begin -ts_library( +ts_project( name = "node_test_lib", testonly = True, srcs = glob( @@ -43,9 +42,10 @@ ts_library( ], ), deps = [ - ":node", - "//packages/angular_devkit/core", - "@npm//rxjs", + ":node_rjs", + "//:root_modules/@types/jasmine", + "//:root_modules/rxjs", + "//packages/angular_devkit/core:core_rjs", ], ) diff --git a/packages/angular_devkit/core/node/testing/BUILD.bazel b/packages/angular_devkit/core/node/testing/BUILD.bazel index cd8e7d01b0..89870c7f87 100644 --- a/packages/angular_devkit/core/node/testing/BUILD.bazel +++ b/packages/angular_devkit/core/node/testing/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults.bzl", "ts_library") +load("//tools:interop.bzl", "ts_project") # Copyright Google Inc. All Rights Reserved. # @@ -8,7 +8,7 @@ licenses(["notice"]) package(default_visibility = ["//visibility:public"]) -ts_library( +ts_project( name = "testing", srcs = glob( include = ["**/*.ts"], @@ -17,12 +17,11 @@ ts_library( ], ), module_name = "@angular-devkit/core/node/testing", - module_root = "index.d.ts", deps = [ - "//packages/angular_devkit/core", - "//packages/angular_devkit/core/node", - "@npm//@types/jasmine", - "@npm//@types/node", - "@npm//rxjs", + "//:root_modules/@types/jasmine", + "//:root_modules/@types/node", + "//:root_modules/rxjs", + "//packages/angular_devkit/core:core_rjs", + "//packages/angular_devkit/core/node:node_rjs", ], )