fix(@formatjs/cli): glob files instead of relying on shell, fix #383

Author: longlho

packages/cli/package.json

@@ -50,6 +50,7 @@
     "babel-plugin-react-intl": "^5.1.12",
     "commander": "4.0.0-1",
     "fs-extra": "^8.1.0",
+    "glob": "^7.0.0",
     "loader-utils": "^1.2.3",
     "lodash": "^4.17.15",
     "loud-rejection": "^2.1.0"

packages/cli/src/cli.ts

@@ -1,6 +1,7 @@
 import commander from 'commander';
 import loudRejection from 'loud-rejection';
 import extract, {ExtractCLIOptions} from './extract';
+import {sync as globSync} from 'glob';
 
 const KNOWN_COMMANDS = ['extract'];
 
@@ -98,6 +99,15 @@ async function main(argv: string[]) {
       false
     )
     .action(async (files: readonly string[], cmdObj: ExtractCLIOptions) => {
+      files = files.reduce(
+        (all: string[], f) =>
+          all.concat(
+            globSync(f, {
+              cwd: process.cwd(),
+            })
+          ),
+        []
+      );
       await extract(files, {
         outFile: cmdObj.outFile,
         idInterpolationPattern:

packages/cli/tests/extract/integration_tests/__snapshots__/index.test.ts.snap

@@ -1,5 +1,40 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`[glob] basic case: defineMessages -> stdout 1`] = `
+Array [
+  Object {
+    "defaultMessage": "Hello World!",
+    "description": "The default message",
+    "id": "foo.bar.baz",
+  },
+  Object {
+    "defaultMessage": "Hello Nurse!",
+    "description": "Another message",
+    "id": "foo.bar.biff",
+  },
+  Object {
+    "defaultMessage": "{count, plural, =0 {😭} one {# kitten} other {# kittens}}",
+    "description": "Counts kittens",
+    "id": "app.home.kittens",
+  },
+  Object {
+    "defaultMessage": "   Some whitespace   ",
+    "description": "Whitespace",
+    "id": "trailing.ws",
+  },
+  Object {
+    "defaultMessage": "A quoted value ''{value}'",
+    "description": "Escaped apostrophe",
+    "id": "escaped.apostrophe",
+  },
+  Object {
+    "defaultMessage": "No ID",
+    "description": "no ID",
+    "id": "ae494",
+  },
+]
+`;
+
 exports[`basic case: defineMessages -> directory 1`] = `
 Array [
   "actual.json",

packages/cli/tests/extract/integration_tests/index.test.ts

@@ -28,6 +28,14 @@ test('basic case: defineMessages -> stdout', async () => {
   expect(stderr).toBe('');
 }, 10000);
 
+test('[glob] basic case: defineMessages -> stdout', async () => {
+  const {stdout, stderr} = await exec(
+    `${BIN_PATH} extract ${path.join(__dirname, 'defineMessages/*.js')}`
+  );
+  expect(JSON.parse(stdout)).toMatchSnapshot();
+  expect(stderr).toBe('');
+}, 10000);
+
 test('basic case: defineMessages -> directory', async () => {
   process.chdir(__dirname);
   const {stdout, stderr} = await exec(

packages/cli/tests/extract/unit.test.ts

@@ -18,6 +18,10 @@ const babel = require('@babel/core');
 // Commander.js will call this.
 jest.spyOn(process, 'exit').mockImplementation((() => null) as any);
 
+jest.mock('glob', () => ({
+  sync: (p: string) => [p],
+}));
+
 beforeEach(() => {
   jest.clearAllMocks();
 });