Allow fbt-common-path to be JS modules again.

nkzw-tech · Dec 12, 2024 · 3c18f58 · 3c18f58
1 parent 194c94a
commit 3c18f58
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nkzw/fbtee-internal",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "private": true,
   "license": "MIT",
   "type": "module",

diff --git a/packages/babel-fbtee/package.json b/packages/babel-fbtee/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nkzw/babel-fbtee",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "The JavaScript & React Internationalization Framework.",
   "keywords": [
     "fbt",

diff --git a/packages/babel-plugin-fbtee-auto-import/package.json b/packages/babel-plugin-fbtee-auto-import/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nkzw/babel-plugin-fbtee-auto-import",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "The JavaScript & React Internationalization Framework.",
   "keywords": [
     "fbt",

diff --git a/packages/babel-plugin-fbtee-runtime/package.json b/packages/babel-plugin-fbtee-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nkzw/babel-plugin-fbtee-runtime",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "The JavaScript & React Internationalization Framework.",
   "keywords": [
     "fbt",

diff --git a/packages/babel-plugin-fbtee/package.json b/packages/babel-plugin-fbtee/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nkzw/babel-plugin-fbtee",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "The JavaScript & React Internationalization Framework.",
   "keywords": [
     "fbt",

diff --git a/packages/babel-plugin-fbtee/src/bin/collect.tsx b/packages/babel-plugin-fbtee/src/bin/collect.tsx
@@ -121,7 +121,7 @@ const argv = y
       '[<source_file1>, ...]}. Otherwise stdin itself will be parsed',
   )
   .string(args.COMMON_STRINGS)
-  .default(args.COMMON_STRINGS, null)
+  .default(args.COMMON_STRINGS, '')
   .describe(
     args.COMMON_STRINGS,
     'Optional path to the common strings module. ' +
@@ -240,12 +240,17 @@ if (argv.help) {
     ? (await import(transformPath)).default
     : null;
 
-  const commonPath = argv[args.COMMON_STRINGS];
-  const fbtCommon = commonPath
+  const commonFile = argv[args.COMMON_STRINGS];
+  const fbtCommon = commonFile?.length
     ? (
-        await import(resolve(process.cwd(), commonPath), {
-          with: { type: 'json' },
-        })
+        await import(
+          resolve(process.cwd(), commonFile),
+          commonFile.endsWith('.json')
+            ? {
+                with: { type: 'json' },
+              }
+            : {}
+        )
       ).default
     : null;
 

diff --git a/packages/fbtee/package.json b/packages/fbtee/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fbtee",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "The JavaScript & React Internationalization Framework.",
   "keywords": [
     "fbt",