diff --git a/jest/setup.js b/jest/setup.js index a24fbd6ea..4a94e5e44 100644 --- a/jest/setup.js +++ b/jest/setup.js @@ -10,9 +10,9 @@ const mockComponent = require.requireActual('./mockComponent'); -require.requireActual('metro-bundler/src/Resolver/polyfills/babelHelpers.js'); -require.requireActual('metro-bundler/src/Resolver/polyfills/Object.es7.js'); -require.requireActual('metro-bundler/src/Resolver/polyfills/error-guard'); +require.requireActual('../Libraries/polyfills/babelHelpers.js'); +require.requireActual('../Libraries/polyfills/Object.es7.js'); +require.requireActual('../Libraries/polyfills/error-guard'); global.__DEV__ = true; diff --git a/local-cli/bundle/buildBundle.js b/local-cli/bundle/buildBundle.js index 4469b2a3e..7c7cf6249 100644 --- a/local-cli/bundle/buildBundle.js +++ b/local-cli/bundle/buildBundle.js @@ -87,6 +87,7 @@ function buildBundle( assetExts: defaultAssetExts.concat(assetExts), blacklistRE: config.getBlacklistRE(), extraNodeModules: config.extraNodeModules, + getPolyfills: config.getPolyfills, getTransformOptions: config.getTransformOptions, globalTransformCache: null, hasteImpl: config.hasteImpl, diff --git a/local-cli/server/runServer.js b/local-cli/server/runServer.js index ef2a6e089..21af48744 100644 --- a/local-cli/server/runServer.js +++ b/local-cli/server/runServer.js @@ -37,6 +37,8 @@ const statusPageMiddleware = require('./middleware/statusPageMiddleware.js'); const systraceProfileMiddleware = require('./middleware/systraceProfileMiddleware.js'); const webSocketProxy = require('./util/webSocketProxy.js'); +const TransformCaching = require('metro-bundler/src/lib/TransformCaching'); + import type {ConfigT} from '../util/Config'; import type {Reporter} from 'metro-bundler/src/lib/reporting'; @@ -118,9 +120,7 @@ function runServer( function getPackagerServer(args, config) { const transformModulePath = args.transformer ? path.resolve(args.transformer) - : typeof config.getTransformModulePath === 'function' - ? config.getTransformModulePath() - : undefined; + : config.getTransformModulePath(); const providesModuleNodeModules = args.providesModuleNodeModules || defaultProvidesModuleNodeModules; @@ -152,6 +152,7 @@ function getPackagerServer(args, config) { extraNodeModules: config.extraNodeModules, getPolyfills: config.getPolyfills, getTransformOptions: config.getTransformOptions, + globalTransformCache: null, hasteImpl: config.hasteImpl, maxWorkers: args.maxWorkers, platforms: defaultPlatforms.concat(args.platforms), @@ -164,6 +165,7 @@ function getPackagerServer(args, config) { resetCache: args.resetCache, sourceExts: defaultSourceExts.concat(args.sourceExts), transformModulePath: transformModulePath, + transformCache: TransformCaching.useTempDir(), verbose: args.verbose, watch: !args.nonPersistent, workerPath: config.getWorkerPath(), diff --git a/local-cli/util/Config.js b/local-cli/util/Config.js index f9b16416a..1a0dd4fe1 100644 --- a/local-cli/util/Config.js +++ b/local-cli/util/Config.js @@ -25,7 +25,6 @@ import type { GetTransformOptions, PostMinifyProcess, PostProcessModules, - // $FlowFixMe: Exported by metro bundler PostProcessBundleSourcemap } from 'metro-bundler/src/Bundler'; import type {HasteImpl} from 'metro-bundler/src/node-haste/Module'; diff --git a/package.json b/package.json index 58635cb7b..4468462be 100644 --- a/package.json +++ b/package.json @@ -182,7 +182,7 @@ "left-pad": "^1.1.3", "lodash": "^4.16.6", "merge-stream": "^1.0.1", - "metro-bundler": "^0.9.0", + "metro-bundler": "^0.10.0", "mime": "^1.3.4", "mime-types": "2.1.11", "minimist": "^1.2.0",