diff --git a/packages/compiler-cli/src/ngtsc/file_system/index.ts b/packages/compiler-cli/src/ngtsc/file_system/index.ts index faebf2350d9..b83fdf02500 100644 --- a/packages/compiler-cli/src/ngtsc/file_system/index.ts +++ b/packages/compiler-cli/src/ngtsc/file_system/index.ts @@ -35,3 +35,4 @@ export { } from './src/types'; export {getSourceFileOrError} from './src/util'; export {createFileSystemTsReadDirectoryFn} from './src/ts_read_directory'; +export {InvalidFileSystem} from './src/invalid_file_system'; diff --git a/packages/localize/BUILD.bazel b/packages/localize/BUILD.bazel index 762e7ffcec0..e426f12a1e7 100644 --- a/packages/localize/BUILD.bazel +++ b/packages/localize/BUILD.bazel @@ -1,8 +1,9 @@ -load("//tools:defaults.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ts_library") +load("//tools:defaults.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_package") +load("//tools:defaults2.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) -ts_library( +ts_project( name = "localize", srcs = glob( [ @@ -12,8 +13,8 @@ ts_library( ), module_name = "@angular/localize", deps = [ - "//packages/localize/src/localize", - "//packages/localize/src/utils", + "//packages/localize/src/localize:localize_rjs", + "//packages/localize/src/utils:utils_rjs", ], ) diff --git a/packages/localize/init/BUILD.bazel b/packages/localize/init/BUILD.bazel index 4e25fd143b0..3c5352d21a2 100644 --- a/packages/localize/init/BUILD.bazel +++ b/packages/localize/init/BUILD.bazel @@ -1,21 +1,20 @@ -load("//tools:defaults.bzl", "ts_library") load("//adev/shared-docs/pipeline/api-gen:generate_api_docs.bzl", "generate_api_docs") +load("//tools:defaults2.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) exports_files(["package.json"]) -ts_library( +ts_project( name = "init", srcs = glob( [ "**/*.ts", ], ), - module_name = "@angular/localize/init", deps = [ - "//packages/localize", - "@npm//@types/node", + "//:node_modules/@types/node", + "//packages/localize:localize_rjs", ], ) diff --git a/packages/localize/schematics/ng-add/BUILD.bazel b/packages/localize/schematics/ng-add/BUILD.bazel index 57364f08955..eef44f1d76c 100644 --- a/packages/localize/schematics/ng-add/BUILD.bazel +++ b/packages/localize/schematics/ng-add/BUILD.bazel @@ -1,23 +1,19 @@ -load("//tools:defaults.bzl", "esbuild", "jasmine_node_test", "ts_config", "ts_library") +load("//tools:defaults.bzl", "esbuild", "jasmine_node_test", "ts_library") +load("//tools:defaults2.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) -ts_config( - name = "tsconfig", - src = "tsconfig-build.json", - deps = ["//packages:tsconfig-build.json"], -) - -ts_library( +ts_project( name = "ng-add", srcs = [ "index.ts", "schema.d.ts", ], - tsconfig = ":tsconfig", + extends = "//packages:tsconfig_build", + tsconfig = "tsconfig-build.json", deps = [ - "@npm//@angular-devkit/schematics", - "@npm//@schematics/angular", + "//:node_modules/@angular-devkit/schematics", + "//:node_modules/@schematics/angular", ], ) diff --git a/packages/localize/src/localize/BUILD.bazel b/packages/localize/src/localize/BUILD.bazel index 8888f189787..a113d9e9d95 100644 --- a/packages/localize/src/localize/BUILD.bazel +++ b/packages/localize/src/localize/BUILD.bazel @@ -1,8 +1,9 @@ -load("//tools:defaults.bzl", "generate_api_docs", "ts_library") +load("//tools:defaults.bzl", "generate_api_docs") +load("//tools:defaults2.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) -ts_library( +ts_project( name = "localize", srcs = glob( [ @@ -10,8 +11,8 @@ ts_library( ], ), deps = [ - "//packages/localize/src/utils", - "@npm//@types/node", + "//:node_modules/@types/node", + "//packages/localize/src/utils:utils_rjs", ], ) diff --git a/packages/localize/src/localize/test/BUILD.bazel b/packages/localize/src/localize/test/BUILD.bazel index 768cc705006..cb9ca6e9c77 100644 --- a/packages/localize/src/localize/test/BUILD.bazel +++ b/packages/localize/src/localize/test/BUILD.bazel @@ -1,14 +1,17 @@ -load("//tools:defaults.bzl", "jasmine_node_test", "ts_library") +load("//tools:defaults.bzl", "jasmine_node_test") +load("//tools:defaults2.bzl", "ts_project") -ts_library( +ts_project( name = "test_lib", testonly = True, srcs = glob( ["*_spec.ts"], ), - deps = [ + interop_deps = [ "//packages:types", - "//packages/localize/src/localize", + ], + deps = [ + "//packages/localize/src/localize:localize_rjs", ], ) diff --git a/packages/localize/src/utils/BUILD.bazel b/packages/localize/src/utils/BUILD.bazel index 4ac15b8b390..f09146464c1 100644 --- a/packages/localize/src/utils/BUILD.bazel +++ b/packages/localize/src/utils/BUILD.bazel @@ -1,8 +1,8 @@ -load("//tools:defaults.bzl", "ts_library") +load("//tools:defaults2.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) -ts_library( +ts_project( name = "utils", srcs = glob( [ @@ -10,7 +10,7 @@ ts_library( "src/**/*.ts", ], ), - deps = [ + interop_deps = [ "//packages/compiler", ], ) diff --git a/packages/localize/src/utils/test/BUILD.bazel b/packages/localize/src/utils/test/BUILD.bazel index e99869111f2..bba1bb711a8 100644 --- a/packages/localize/src/utils/test/BUILD.bazel +++ b/packages/localize/src/utils/test/BUILD.bazel @@ -1,14 +1,17 @@ -load("//tools:defaults.bzl", "jasmine_node_test", "ts_library") +load("//tools:defaults.bzl", "jasmine_node_test") +load("//tools:defaults2.bzl", "ts_project") -ts_library( +ts_project( name = "test_lib", testonly = True, srcs = glob( ["**/*_spec.ts"], ), - deps = [ + interop_deps = [ "//packages:types", - "//packages/localize/src/utils", + ], + deps = [ + "//packages/localize/src/utils:utils_rjs", ], ) diff --git a/packages/localize/test/BUILD.bazel b/packages/localize/test/BUILD.bazel index 7709fc91eac..ce14c28c3d6 100644 --- a/packages/localize/test/BUILD.bazel +++ b/packages/localize/test/BUILD.bazel @@ -1,16 +1,19 @@ -load("//tools:defaults.bzl", "jasmine_node_test", "ts_library") +load("//tools:defaults.bzl", "jasmine_node_test") +load("//tools:defaults2.bzl", "ts_project") -ts_library( +ts_project( name = "test_lib", testonly = True, srcs = glob( ["**/*_spec.ts"], ), - deps = [ + interop_deps = [ "//packages:types", - "//packages/localize", - "//packages/localize/init", - "//packages/localize/src/utils", + ], + deps = [ + "//packages/localize:localize_rjs", + "//packages/localize/init:init_rjs", + "//packages/localize/src/utils:utils_rjs", ], ) diff --git a/packages/localize/tools/BUILD.bazel b/packages/localize/tools/BUILD.bazel index 8c3544667ce..7d5251238ef 100644 --- a/packages/localize/tools/BUILD.bazel +++ b/packages/localize/tools/BUILD.bazel @@ -1,23 +1,35 @@ load("@npm//@bazel/esbuild:index.bzl", "esbuild", "esbuild_config") -load("//tools:defaults.bzl", "extract_types", "pkg_npm", "ts_library") +load("//tools:defaults.bzl", "extract_types", "pkg_npm") +load("//tools:defaults2.bzl", "ts_config", "ts_project") -ts_library( +ts_config( + name = "tsconfig_build", + src = "tsconfig.json", + deps = [ + "//:node_modules/@types/node", + "//packages:tsconfig_build", + ], +) + +ts_project( name = "tools", srcs = glob( [ "**/*.ts", ], ), - visibility = ["//packages/localize/tools:__subpackages__"], - deps = [ + interop_deps = [ "//packages/compiler", "//packages/compiler-cli/private", - "//packages/localize", - "@npm//@babel/core", - "@npm//@types/babel__core", - "@npm//@types/node", - "@npm//@types/yargs", - "@npm//tinyglobby", + ], + visibility = ["//packages/localize/tools:__subpackages__"], + deps = [ + "//:node_modules/@babel/core", + "//:node_modules/@types/babel__core", + "//:node_modules/@types/node", + "//:node_modules/@types/yargs", + "//:node_modules/tinyglobby", + "//packages/localize:localize_rjs", ], ) diff --git a/packages/localize/tools/esbuild.config.js b/packages/localize/tools/esbuild.config.js index 6f565cbfa20..a5bb3bc56d0 100644 --- a/packages/localize/tools/esbuild.config.js +++ b/packages/localize/tools/esbuild.config.js @@ -7,7 +7,7 @@ */ module.exports = { - resolveExtensions: ['.mjs'], + resolveExtensions: ['.mjs', '.js'], // Note: `@bazel/esbuild` has a bug and does not pass-through the format from Starlark. format: 'esm', banner: { diff --git a/packages/localize/tools/test/BUILD.bazel b/packages/localize/tools/test/BUILD.bazel index c393d5af874..399e84e6cff 100644 --- a/packages/localize/tools/test/BUILD.bazel +++ b/packages/localize/tools/test/BUILD.bazel @@ -1,26 +1,29 @@ -load("//tools:defaults.bzl", "jasmine_node_test", "ts_library") +load("//tools:defaults.bzl", "jasmine_node_test") +load("//tools:defaults2.bzl", "ts_project") -ts_library( +ts_project( name = "test_lib", testonly = True, srcs = glob( ["**/*.ts"], ), - visibility = ["//packages/localize/tools/test:__subpackages__"], - deps = [ + interop_deps = [ "//packages:types", "//packages/compiler", "//packages/compiler-cli/private", "//packages/compiler-cli/src/ngtsc/file_system", "//packages/compiler-cli/src/ngtsc/file_system/testing", "//packages/compiler-cli/src/ngtsc/logging/testing", - "//packages/localize", - "//packages/localize/src/utils", - "//packages/localize/tools", - "//packages/localize/tools/test/helpers", - "@npm//@babel/generator", - "@npm//@types/babel__generator", - "@npm//tinyglobby", + ], + visibility = ["//packages/localize/tools/test:__subpackages__"], + deps = [ + "//:node_modules/@babel/generator", + "//:node_modules/@types/babel__generator", + "//:node_modules/tinyglobby", + "//packages/localize:localize_rjs", + "//packages/localize/src/utils:utils_rjs", + "//packages/localize/tools:tools_rjs", + "//packages/localize/tools/test/helpers:helpers_rjs", ], ) diff --git a/packages/localize/tools/test/extract/integration/BUILD.bazel b/packages/localize/tools/test/extract/integration/BUILD.bazel index b5826c922e7..fb15417aa18 100644 --- a/packages/localize/tools/test/extract/integration/BUILD.bazel +++ b/packages/localize/tools/test/extract/integration/BUILD.bazel @@ -1,21 +1,24 @@ -load("//tools:defaults.bzl", "jasmine_node_test", "ts_library") +load("//tools:defaults.bzl", "jasmine_node_test") +load("//tools:defaults2.bzl", "ts_project") -ts_library( +ts_project( name = "test_lib", testonly = True, srcs = glob( ["**/*_spec.ts"], ), - deps = [ + interop_deps = [ "//packages:types", "//packages/compiler-cli/src/ngtsc/file_system", "//packages/compiler-cli/src/ngtsc/file_system/testing", "//packages/compiler-cli/src/ngtsc/logging", "//packages/compiler-cli/src/ngtsc/logging/testing", "//packages/compiler-cli/src/ngtsc/testing", - "//packages/localize/tools", - "//packages/localize/tools/test:test_lib", - "//packages/localize/tools/test/helpers", + ], + deps = [ + "//packages/localize/tools:tools_rjs", + "//packages/localize/tools/test:test_lib_rjs", + "//packages/localize/tools/test/helpers:helpers_rjs", ], ) diff --git a/packages/localize/tools/test/extract/integration/main_spec.ts b/packages/localize/tools/test/extract/integration/main_spec.ts index c8dc23bd7be..b6ad948fd33 100644 --- a/packages/localize/tools/test/extract/integration/main_spec.ts +++ b/packages/localize/tools/test/extract/integration/main_spec.ts @@ -11,8 +11,8 @@ import { FileSystem, getFileSystem, setFileSystem, + InvalidFileSystem, } from '@angular/compiler-cli/src/ngtsc/file_system'; -import {InvalidFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/src/invalid_file_system'; import {MockLogger} from '@angular/compiler-cli/src/ngtsc/logging/testing'; import {loadTestDirectory} from '@angular/compiler-cli/src/ngtsc/testing'; import path from 'path'; diff --git a/packages/localize/tools/test/helpers/BUILD.bazel b/packages/localize/tools/test/helpers/BUILD.bazel index 9f9ea16d7ef..eb9df42840f 100644 --- a/packages/localize/tools/test/helpers/BUILD.bazel +++ b/packages/localize/tools/test/helpers/BUILD.bazel @@ -1,14 +1,14 @@ -load("//tools:defaults.bzl", "ts_library") +load("//tools:defaults2.bzl", "ts_project") -ts_library( +ts_project( name = "helpers", testonly = True, srcs = glob( ["**/*.ts"], ), - visibility = ["//packages/localize/tools/test:__subpackages__"], - deps = [ + interop_deps = [ "//packages/compiler-cli/src/ngtsc/file_system", "//packages/compiler-cli/src/ngtsc/file_system/testing", ], + visibility = ["//packages/localize/tools/test:__subpackages__"], ) diff --git a/packages/localize/tools/test/helpers/index.ts b/packages/localize/tools/test/helpers/index.ts index 9e2cf56e6cd..ab307498083 100644 --- a/packages/localize/tools/test/helpers/index.ts +++ b/packages/localize/tools/test/helpers/index.ts @@ -5,8 +5,7 @@ * 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 */ -import {setFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {InvalidFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/src/invalid_file_system'; +import {setFileSystem, InvalidFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; import {MockFileSystemNative} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; /** diff --git a/packages/localize/tools/test/migrate/integration/BUILD.bazel b/packages/localize/tools/test/migrate/integration/BUILD.bazel index 5762bd46ae9..4d22acc8cf6 100644 --- a/packages/localize/tools/test/migrate/integration/BUILD.bazel +++ b/packages/localize/tools/test/migrate/integration/BUILD.bazel @@ -1,22 +1,25 @@ load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin") -load("//tools:defaults.bzl", "jasmine_node_test", "ts_library") +load("//tools:defaults.bzl", "jasmine_node_test") +load("//tools:defaults2.bzl", "ts_project") -ts_library( +ts_project( name = "test_lib", testonly = True, srcs = glob( ["**/*_spec.ts"], ), - deps = [ + interop_deps = [ "//packages:types", "//packages/compiler-cli/src/ngtsc/file_system", "//packages/compiler-cli/src/ngtsc/file_system/testing", "//packages/compiler-cli/src/ngtsc/logging", "//packages/compiler-cli/src/ngtsc/logging/testing", "//packages/compiler-cli/src/ngtsc/testing", - "//packages/localize/tools", - "//packages/localize/tools/test:test_lib", - "//packages/localize/tools/test/helpers", + ], + deps = [ + "//packages/localize/tools:tools_rjs", + "//packages/localize/tools/test:test_lib_rjs", + "//packages/localize/tools/test/helpers:helpers_rjs", ], ) diff --git a/packages/localize/tools/test/translate/integration/BUILD.bazel b/packages/localize/tools/test/translate/integration/BUILD.bazel index 08f41903105..46f92fc63f9 100644 --- a/packages/localize/tools/test/translate/integration/BUILD.bazel +++ b/packages/localize/tools/test/translate/integration/BUILD.bazel @@ -1,18 +1,21 @@ -load("//tools:defaults.bzl", "jasmine_node_test", "ts_library") +load("//tools:defaults.bzl", "jasmine_node_test") +load("//tools:defaults2.bzl", "ts_project") -ts_library( +ts_project( name = "test_lib", testonly = True, srcs = glob( ["**/*_spec.ts"], ), - deps = [ + interop_deps = [ "//packages:types", "//packages/compiler-cli/src/ngtsc/file_system", "//packages/compiler-cli/src/ngtsc/file_system/testing", "//packages/compiler-cli/src/ngtsc/testing", - "//packages/localize/tools", - "//packages/localize/tools/test/helpers", + ], + deps = [ + "//packages/localize/tools:tools_rjs", + "//packages/localize/tools/test/helpers:helpers_rjs", ], ) diff --git a/packages/localize/tools/tsconfig.json b/packages/localize/tools/tsconfig.json new file mode 100644 index 00000000000..ff6440f429d --- /dev/null +++ b/packages/localize/tools/tsconfig.json @@ -0,0 +1,10 @@ +{ + "extends": "../../tsconfig-build.json", + "compilerOptions": { + "types": ["node"], + "paths": { + "@angular/*": ["../../*/index"], + "@angular/compiler-cli/private/localize": ["../../compiler-cli/private/localize"], + } + } +} diff --git a/tools/defaults2.bzl b/tools/defaults2.bzl index d4b646ae33f..40b690eab66 100644 --- a/tools/defaults2.bzl +++ b/tools/defaults2.bzl @@ -28,6 +28,9 @@ def _determine_tsconfig(testonly): if native.package_name().startswith("packages/language-service"): return "//packages:tsconfig_test" if testonly else "//packages/language-service:tsconfig_build" + if native.package_name().startswith("packages/localize/tools"): + return "//packages:tsconfig_test" if testonly else "//packages/localize/tools:tsconfig_build" + if native.package_name().startswith("packages"): return "//packages:tsconfig_test" if testonly else "//packages:tsconfig_build"