Content-Length: 560082 | pFad | http://github.com/angular/angular/commit/4abaef282558ea7c91fc02e3bd5c944ad413f150

63 build: update common's locales to use rules_js · angular/angular@4abaef2 · GitHub
Skip to content

Commit 4abaef2

Browse files
committed
build: update common's locales to use rules_js
Use ts_project to build the common locales
1 parent e33444e commit 4abaef2

File tree

7 files changed

+41
-19
lines changed

7 files changed

+41
-19
lines changed

packages/bazel/test/ng_package/common_package.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ describe('@angular/common ng_package', () => {
2323
it('/locales', () => {
2424
const files = shx.ls('locales').stdout.split('\n');
2525
expect(files.some((n) => n.endsWith('.d.ts'))).toBe(true, `.d.ts files don't exist`);
26-
expect(files.some((n) => n.endsWith('.mjs'))).toBe(true, `.mjs files don't exist`);
26+
expect(files.some((n) => n.endsWith('.js'))).toBe(true, `.js files don't exist`);
2727
});
2828
it('/locales/extra', () => {
2929
const files = shx.ls('locales/extra').stdout.split('\n');
3030
expect(files.some((n) => n.endsWith('.d.ts'))).toBe(true, `.d.ts files don't exist`);
31-
expect(files.some((n) => n.endsWith('.mjs'))).toBe(true, `.mjs files don't exist`);
31+
expect(files.some((n) => n.endsWith('.js'))).toBe(true, `.js files don't exist`);
3232
});
3333
});
3434

@@ -98,7 +98,7 @@ describe('@angular/common ng_package', () => {
9898
typings: `./index.d.ts`,
9999
exports: matchesObjectWithOrder({
100100
'./locales/global/*': {default: './locales/global/*.js'},
101-
'./locales/*': {types: './locales/*.d.ts', default: './locales/*.mjs'},
101+
'./locales/*': {types: './locales/*.d.ts', default: './locales/*.js'},
102102
'./package.json': {default: './package.json'},
103103
'.': {
104104
types: './index.d.ts',

packages/common/locales/BUILD.bazel

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test")
22
load("//packages/common/locales:index.bzl", "LOCALES", "generate_all_locale_files", "generate_closure_locale_file")
3-
load("//tools:defaults.bzl", "pkg_npm", "ts_library")
3+
load("//tools:defaults.bzl", "pkg_npm")
4+
load("//tools:defaults2.bzl", "ts_project")
45

56
package(default_visibility = ["//visibility:public"])
67

@@ -23,7 +24,7 @@ generate_all_locale_files(
2324
name = "locale_files",
2425
)
2526

26-
ts_library(
27+
ts_project(
2728
name = "locales",
2829
# TODO(devversion): Remove glob for checked-in legacy locale files that haven't been
2930
# removed in the past (when CLDR has been updated). These can be removed in a major.
Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
1-
load("//tools:defaults.bzl", "ts_library")
1+
load("//tools:defaults2.bzl", "ts_config", "ts_project")
22

33
package(default_visibility = ["//visibility:public"])
44

5-
ts_library(
5+
ts_config(
6+
name = "tsconfig_build",
7+
src = "tsconfig.json",
8+
deps = [
9+
"//:node_modules/@types/node",
10+
"//packages:tsconfig_build",
11+
],
12+
)
13+
14+
ts_project(
615
name = "generate-locales-tool",
716
srcs = glob(["*.ts"]),
817
deps = [
9-
"@npm//@bazel/runfiles",
10-
"@npm//@types/cldrjs",
11-
"@npm//@types/node",
12-
"@npm//cldr",
13-
"@npm//cldrjs",
14-
"@npm//tinyglobby",
18+
"//:node_modules/@bazel/runfiles",
19+
"//:node_modules/@types/cldrjs",
20+
"//:node_modules/@types/node",
21+
"//:node_modules/cldr",
22+
"//:node_modules/cldrjs",
23+
"//:node_modules/tinyglobby",
1524
],
1625
)

packages/common/locales/generate-locales-tool/bin/BUILD.bazel

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
load("//tools:defaults.bzl", "nodejs_binary", "ts_library")
1+
load("//tools:defaults.bzl", "nodejs_binary")
2+
load("//tools:defaults2.bzl", "ts_project")
23

34
package(default_visibility = ["//visibility:public"])
45

@@ -9,12 +10,14 @@ BIN_ENTRYPOINTS = [
910
"write-locale-files-to-dist",
1011
]
1112

12-
ts_library(
13+
ts_project(
1314
name = "bin",
1415
srcs = glob(["*.ts"]),
15-
deps = [
16+
interop_deps = [
1617
"//packages/common/locales/generate-locales-tool",
17-
"@npm//@types/node",
18+
],
19+
deps = [
20+
"//:node_modules/@types/node",
1821
],
1922
)
2023

@@ -25,5 +28,5 @@ ts_library(
2528
"@cldr_json_data//:all_json",
2629
"@cldr_xml_data//:all_xml",
2730
],
28-
entry_point = ":%s.ts" % entrypoint,
31+
entry_point = ":%s.js" % entrypoint,
2932
) for entrypoint in BIN_ENTRYPOINTS]
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "../../../tsconfig-build.json",
3+
"compilerOptions": {
4+
"types": ["node"],
5+
}
6+
}

packages/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"./locales/*": {
1919
"types": "./locales/*.d.ts",
20-
"default": "./locales/*.mjs"
20+
"default": "./locales/*.js"
2121
}
2222
},
2323
"peerDependencies": {

tools/defaults2.bzl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ def _determine_tsconfig(testonly):
2828
if native.package_name().startswith("packages/language-service"):
2929
return "//packages:tsconfig_test" if testonly else "//packages/language-service:tsconfig_build"
3030

31+
if native.package_name().startswith("packages/common/locales/generate-locales-tool"):
32+
return "//packages:tsconfig_test" if testonly else "//packages/common/locales/generate-locales-tool:tsconfig_build"
33+
3134
if native.package_name().startswith("packages"):
3235
return "//packages:tsconfig_test" if testonly else "//packages:tsconfig_build"
3336

0 commit comments

Comments
 (0)








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/angular/angular/commit/4abaef282558ea7c91fc02e3bd5c944ad413f150

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy