Visitar URL original
fix(@formatjs/intl-numberformat): rm json import to be more ESM-frien… · formatjs/formatjs@62ec0b3 · GitHub
Skip to content

Commit 62ec0b3

Browse files
longlholonglho
committed
fix(@formatjs/intl-numberformat): rm json import to be more ESM-friendly, fix #2961 
1 parent 0aed8fa commit 62ec0b3

9 files changed

Lines changed: 30 additions & 26 deletions

File tree

‎packages/intl-numberformat/BUILD‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ generate_src_file(
193193
# currency-digits
194194
generate_src_file(
195195
name = "currency-digits",
196-
src = "src/data/currency-digits.json",
196+
src = "src/currency-digits.generated.ts",
197197
data = [
198198
"scripts/extract-currencies.ts",
199199
"scripts/utils.ts",
@@ -211,7 +211,7 @@ generate_src_file(
211211
# numbering-systems
212212
generate_src_file(
213213
name = "numbering-systems",
214-
src = "src/data/numbering-systems.json",
214+
src = "src/numbering-systems.generated.ts",
215215
data = [
216216
"scripts/extract-numbers.ts",
217217
"scripts/utils.ts",
@@ -226,15 +226,15 @@ generate_src_file(
226226
)
227227

228228
# units-constants
229-
generate_src_file(
230-
name = "units-constants",
231-
src = "src/data/units-constants.ts",
232-
data = [
233-
"//packages/ecma402-abstract:dist",
234-
"//packages/ecma402-abstract:types",
235-
],
236-
entry_point = "scripts/units-constants.ts",
237-
)
229+
# generate_src_file(
230+
# name = "units-constants",
231+
# src = "src/units-constants.generated.ts",
232+
# data = [
233+
# "//packages/ecma402-abstract:dist",
234+
# "//packages/ecma402-abstract:types",
235+
# ],
236+
# entry_point = "scripts/units-constants.ts",
237+
# )
238238

239239
# Test262
240240
ts_project(
@@ -304,7 +304,7 @@ check_format(
304304
"**/*",
305305
],
306306
exclude = [
307-
"src/data/*",
307+
"**/*.generated.*",
308308
"test262-main.ts",
309309
"tests/__snapshots__/*",
310310
"tests/locale-data/*",

‎packages/intl-numberformat/scripts/currency-digits.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
import minimist from 'minimist'
22
import {extractCurrencyDigits} from './extract-currencies'
3-
import {outputJSONSync} from 'fs-extra'
3+
import {outputFileSync} from 'fs-extra'
44

55
function main(args: minimist.ParsedArgs) {
66
const {out} = args
77
// Output currency digits file
8-
outputJSONSync(out, extractCurrencyDigits())
8+
outputFileSync(
9+
out,
10+
`export const currencyDigitsData: Record<string, number> = ${JSON.stringify(
11+
extractCurrencyDigits()
12+
)}`
13+
)
914
}
1015

1116
if (require.main === module) {

‎packages/intl-numberformat/scripts/numbering-systems.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
import minimist from 'minimist'
2-
import {outputJSONSync} from 'fs-extra'
2+
import {outputFileSync} from 'fs-extra'
33
import {extractNumberingSystemNames} from './extract-numbers'
44
function main(args: minimist.ParsedArgs) {
55
const {out} = args
66

77
// Output numbering systems file
8-
outputJSONSync(out, extractNumberingSystemNames())
8+
outputFileSync(
9+
out,
10+
`export const numberingSystemNames: ReadonlyArray<string> = ${JSON.stringify(
11+
extractNumberingSystemNames().names
12+
)};`
13+
)
914
}
1015

1116
if (require.main === module) {

‎packages/intl-numberformat/src/core.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ import {
1010
CanonicalizeLocaleList,
1111
OrdinaryHasInstance,
1212
} from '@formatjs/ecma402-abstract'
13-
import * as currencyDigitsData from './data/currency-digits.json'
14-
import * as numberingSystemsData from './data/numbering-systems.json'
15-
const {names: numberingSystemNames} = numberingSystemsData
13+
import {currencyDigitsData} from './currency-digits.generated'
14+
import {numberingSystemNames} from './numbering-systems.generated'
1615
// eslint-disable-next-line import/no-cycle
1716
import getInternalSlots from './get_internal_slots'
1817
import {

‎packages/intl-numberformat/src/currency-digits.generated.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const currencyDigitsData: Record<string, number> = {"ADP":0,"AFN":0,"ALL":0,"AMD":2,"BHD":3,"BIF":0,"BYN":2,"BYR":0,"CAD":2,"CHF":2,"CLF":4,"CLP":0,"COP":2,"CRC":2,"CZK":2,"DEFAULT":2,"DJF":0,"DKK":2,"ESP":0,"GNF":0,"GYD":2,"HUF":2,"IDR":2,"IQD":0,"IRR":0,"ISK":0,"ITL":0,"JOD":3,"JPY":0,"KMF":0,"KPW":0,"KRW":0,"KWD":3,"LAK":0,"LBP":0,"LUF":0,"LYD":3,"MGA":0,"MGF":0,"MMK":0,"MNT":2,"MRO":0,"MUR":2,"NOK":2,"OMR":3,"PKR":2,"PYG":0,"RSD":0,"RWF":0,"SEK":2,"SLL":0,"SOS":0,"STD":0,"SYP":0,"TMM":0,"TND":3,"TRL":0,"TWD":2,"TZS":2,"UGX":0,"UYI":0,"UYW":4,"UZS":2,"VEF":2,"VND":0,"VUV":0,"XAF":0,"XOF":0,"XPF":0,"YER":0,"ZMK":0,"ZWD":0}

‎packages/intl-numberformat/src/data/currency-digits.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎packages/intl-numberformat/src/data/numbering-systems.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎packages/intl-numberformat/src/data/units-constants.ts‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎packages/intl-numberformat/src/numbering-systems.generated.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const numberingSystemNames: ReadonlyArray<string> = ["adlm","ahom","arab","arabext","armn","armnlow","bali","beng","bhks","brah","cakm","cham","cyrl","deva","diak","ethi","fullwide","geor","gong","gonm","grek","greklow","gujr","guru","hanidays","hanidec","hans","hansfin","hant","hantfin","hebr","hmng","hmnp","java","jpan","jpanfin","jpanyear","kali","khmr","knda","lana","lanatham","laoo","latn","lepc","limb","mathbold","mathdbl","mathmono","mathsanb","mathsans","mlym","modi","mong","mroo","mtei","mymr","mymrshan","mymrtlng","newa","nkoo","olck","orya","osma","rohg","roman","romanlow","saur","segment","shrd","sind","sinh","sora","sund","takr","talu","taml","tamldec","telu","thai","tibt","tirh","vaii","wara","wcho"];

0 commit comments

Comments
 (0)