diff --git a/Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js b/Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js index 54b954dc0..ce1e56cfa 100644 --- a/Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js +++ b/Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js @@ -138,7 +138,10 @@ function setupProfile() { function setUpProcessEnv() { GLOBAL.process = GLOBAL.process || {}; - GLOBAL.process.env = {NODE_ENV: __DEV__ ? 'development' : 'production'}; + GLOBAL.process.env = GLOBAL.process.env || {}; + if (!GLOBAL.process.env.NODE_ENV) { + GLOBAL.process.env.NODE_ENV = __DEV__ ? 'development' : 'production'; + } } setUpRedBoxErrorHandler(); diff --git a/packager/react-packager/src/JSTransformer/index.js b/packager/react-packager/src/JSTransformer/index.js index 47019846d..93dd5d01d 100644 --- a/packager/react-packager/src/JSTransformer/index.js +++ b/packager/react-packager/src/JSTransformer/index.js @@ -23,7 +23,7 @@ const readFile = Promise.denodeify(fs.readFile); const MAX_CALLS_PER_WORKER = 600; // Worker will timeout if one of the callers timeout. -const DEFAULT_MAX_CALL_TIME = 60000; +const DEFAULT_MAX_CALL_TIME = 120000; const validateOpts = declareOpts({ projectRoots: {