inline requires + preprocessor updates

cpojer · facebook-github-bot-3 · commit 3fca7f4d7ba7 · 2015-09-19T15:22:33.000-07:00
Reviewed By: @DmitrySoshnikov Differential Revision: D2455903
diff --git a/jestSupport/preprocessor.js b/jestSupport/preprocessor.js
@@ -8,10 +8,18 @@
  */
 'use strict';
 
-var transformer = require('../packager/transformer.js');
+const createCacheKeyFunction = require('fbjs-scripts/jest/createCacheKeyFunction');
+const path = require('path');
+const transformer = require('../packager/transformer.js');
 
 module.exports = {
   process(src, file) {
     return transformer.transform(src, file).code;
-  }
+  },
+
+  getCacheKey: createCacheKeyFunction([
+    __filename,
+    path.join(__dirname, '../packager/transformer.js'),
+    path.join(__dirname, '../node_modules/babel-core/package.json'),
+  ]),
 };
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -53,6 +53,7 @@
     "chalk": "^1.1.1",
     "connect": "^2.8.3",
     "debug": "^2.2.0",
+    "fbjs-scripts": "^0.2.1",
     "graceful-fs": "^4.1.2",
     "image-size": "^0.3.5",
     "immutable": "^3.7.5",
diff --git a/packager/transformer.js b/packager/transformer.js
@@ -10,20 +10,26 @@
  */
 'use strict';
 
-var babel = require('babel-core');
+const babel = require('babel-core');
+const inlineRequires = require('fbjs-scripts/babel/inline-requires');
 
-function transform(srcTxt, filename, options) {
-  var plugins = [];
+function transform(src, filename, options) {
+  const plugins = [];
 
   if (process.env.NODE_ENV === 'production') {
-    plugins = plugins.concat(['node-env-inline', 'dunderscore-dev-inline']);
+    plugins.push('node-env-inline', 'dunderscore-dev-inline');
+  } else if (process.env.NODE_ENV === 'test') {
+    plugins.push({
+      position: 'after',
+      transformer: inlineRequires,
+    });
   }
 
-  var result = babel.transform(srcTxt, {
+  const result = babel.transform(src, {
     retainLines: true,
     compact: true,
     comments: false,
-    filename: filename,
+    filename,
     whitelist: [
       'es6.arrowFunctions',
       'es6.blockScoping',
@@ -42,24 +48,21 @@ function transform(srcTxt, filename, options) {
       'react.displayName',
       'regenerator',
     ],
-    plugins: plugins,
+    plugins,
     sourceFileName: filename,
     sourceMaps: false,
     extra: options || {},
   });
 
   return {
-    code: result.code,
+    code: result.code
   };
 }
 
 module.exports = function(data, callback) {
-  var result;
+  let result;
   try {
-    result = transform(
-      data.sourceCode,
-      data.filename
-    );
+    result = transform(data.sourceCode, data.filename);
   } catch (e) {
     callback(e);
     return;
