fix(@formatjs/intl-getcanonicallocales): rm json import to be more ES…

…M-friendly, fix #2961
formatjs · Jun 26, 2021 · 9d491e2 · 9d491e2
1 parent 2bfedbb
commit 9d491e2
Show file tree

Hide file tree

Showing 7 changed files with 1,896 additions and 6 deletions.
diff --git a/packages/intl-getcanonicallocales/BUILD b/packages/intl-getcanonicallocales/BUILD
@@ -61,13 +61,22 @@ jest_test(
 # aliases
 generate_src_file(
     name = "aliases",
-    src = "src/data/aliases.ts",
+    src = "src/aliases.generated.ts",
     data = [
         "@npm//cldr-core",
     ],
     entry_point = "scripts/aliases.ts",
     visibility = ["//:__pkg__"],
 )
+generate_src_file(
+    name = "likelySubtags",
+    src = "src/likelySubtags.generated.ts",
+    data = [
+        "@npm//cldr-core",
+    ],
+    entry_point = "scripts/likely-subtags.ts",
+    visibility = ["//:__pkg__"],
+)
 
 # karma tests
 bundle_karma_tests(
@@ -101,7 +110,7 @@ check_format(
         ],
         exclude = [
             "CHANGELOG.md",
-            "src/data/aliases.ts",
+            "**/*.generated.*",
         ],
     ),
 )
diff --git a/packages/intl-getcanonicallocales/index.ts b/packages/intl-getcanonicallocales/index.ts
@@ -39,3 +39,5 @@ export {
 } from './src/parser'
 export * from './src/types'
 export * from './src/emitter'
+
+export * from './src/likelySubtags.generated'
diff --git a/packages/intl-getcanonicallocales/package.json b/packages/intl-getcanonicallocales/package.json
@@ -25,7 +25,6 @@
     "url": "https://github.com/formatjs/formatjs/issues"
   },
   "dependencies": {
-    "cldr-core": "38",
     "tslib": "^2.1.0"
   }
 }
diff --git a/packages/intl-getcanonicallocales/scripts/likely-subtags.ts b/packages/intl-getcanonicallocales/scripts/likely-subtags.ts
@@ -0,0 +1,20 @@
+import {outputFileSync} from 'fs-extra'
+import minimist from 'minimist'
+import * as likelySubtags from 'cldr-core/supplemental/likelySubtags.json'
+function main({out}: minimist.ParsedArgs) {
+  outputFileSync(
+    out,
+    `/* @generated */	
+// prettier-ignore  
+export const likelySubtags: Record<string, string> = ${JSON.stringify(
+      likelySubtags.supplemental.likelySubtags,
+      undefined,
+      2
+    )};
+`
+  )
+}
+
+if (require.main === module) {
+  main(minimist(process.argv))
+}
diff --git a/...l-getcanonicallocales/src/data/aliases.ts → ...canonicallocales/src/aliases.generated.ts b/...l-getcanonicallocales/src/data/aliases.ts → ...canonicallocales/src/aliases.generated.ts
diff --git a/packages/intl-getcanonicallocales/src/canonicalizer.ts b/packages/intl-getcanonicallocales/src/canonicalizer.ts
@@ -4,14 +4,14 @@ import {
   variantAlias,
   scriptAlias,
   territoryAlias,
-} from './data/aliases'
+} from './aliases.generated'
 import {
   parseUnicodeLanguageId,
   isUnicodeVariantSubtag,
   isUnicodeLanguageSubtag,
   SEPARATOR,
 } from './parser'
-import * as likelySubtags from 'cldr-core/supplemental/likelySubtags.json'
+import {likelySubtags} from './likelySubtags.generated'
 import {emitUnicodeLanguageId} from './emitter'
 
 function canonicalizeAttrs(strs: string[]): string[] {
@@ -186,7 +186,7 @@ export function canonicalizeUnicodeLanguageId(
       const regions = regionAlias.split(' ')
       replacedRegion = regions[0]
       const likelySubtag =
-        likelySubtags.supplemental.likelySubtags[
+        likelySubtags[
           emitUnicodeLanguageId({
             lang: finalLangAst.lang,
             script: finalLangAst.script,