Merge pull request #452 from umijs/fix/umi-test

fix(umi-test): module-resovle pllugin conflict and json ext support
umijs · May 11, 2018 · 8759f1a · 8759f1a
2 parents 43b5e4a + b880b5f
commit 8759f1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/packages/umi-test/src/index.js b/packages/umi-test/src/index.js
@@ -38,7 +38,7 @@ export default function(opts = {}) {
       '\\.tsx?$': require.resolve('./transformers/tsTransformer'),
     },
     testMatch: ['**/?(*.)(spec|test|e2e).(j|t)s?(x)'],
-    moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx'],
+    moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx', 'json'],
     setupTestFrameworkScriptFile: require.resolve('./jasmine'),
     moduleNameMapper: {
       '\\.(css|less|sass|scss)$': require.resolve('identity-obj-proxy'),

diff --git a/packages/umi-test/src/transformers/jsTransformer.js b/packages/umi-test/src/transformers/jsTransformer.js
@@ -21,6 +21,7 @@ export default babelJest.createTransformer({
           enzyme: require.resolve('enzyme'),
         },
       },
+      'module-resolver-in-umi-test',
     ],
   ],
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ export default babelJest.createTransformer({ @@
               enzyme: require.resolve('enzyme'),
             },
           },
+          'module-resolver-in-umi-test',
         ],
       ],
     });