diff --git a/package.json b/package.json index 542c624b2840d7..ea7e5aebf2ae54 100644 --- a/package.json +++ b/package.json @@ -157,7 +157,7 @@ "mkdirp": "^0.5.1", "module-deps": "^3.9.1", "node-fetch": "^1.3.3", - "node-haste": "~2.9.4", + "node-haste": "~2.9.6", "opn": "^3.0.2", "optimist": "^0.6.1", "progress": "^1.1.8", diff --git a/packager/react-packager/src/Bundler/index.js b/packager/react-packager/src/Bundler/index.js index 30da6417eab7b6..b25ce4ca586281 100644 --- a/packager/react-packager/src/Bundler/index.js +++ b/packager/react-packager/src/Bundler/index.js @@ -612,10 +612,11 @@ class Bundler { }; const json = JSON.stringify(asset); + const assetRegistryPath = 'react-native/Libraries/Image/AssetRegistry'; const code = - `module.exports = require('AssetRegistry').registerAsset(${json});`; - const dependencies = ['AssetRegistry']; - const dependencyOffsets = [code.indexOf('AssetRegistry') - 1]; + `module.exports = require(${JSON.stringify(assetRegistryPath)}).registerAsset(${json});`; + const dependencies = [assetRegistryPath]; + const dependencyOffsets = [code.indexOf(assetRegistryPath) - 1]; return { asset, diff --git a/packager/react-packager/src/Resolver/index.js b/packager/react-packager/src/Resolver/index.js index 11e696ff4368bf..8de8d5f8352a53 100644 --- a/packager/react-packager/src/Resolver/index.js +++ b/packager/react-packager/src/Resolver/index.js @@ -107,7 +107,7 @@ class Resolver { cache: opts.cache, shouldThrowOnUnresolvedErrors: (_, platform) => platform === 'ios', transformCode: opts.transformCode, - assetDependencies: ['AssetRegistry'], + assetDependencies: ['react-native/Libraries/Image/AssetRegistry'], }); this._getModuleId = options.getModuleId;