Skip to content

Commit a5b95d5

Browse files
bestanderMartin Konicek
authored andcommitted
Fixed images required from node_modules
Summary:This fixes #6638 by resolving AssetRegistry relatively. Closes #6822 Reviewed By: davidaurelio Differential Revision: D3144463 Pulled By: bestander fb-gh-sync-id: d3eeb24ae9e08a32f742c50ae5f0314fd33d1b6b fbshipit-source-id: d3eeb24ae9e08a32f742c50ae5f0314fd33d1b6b
1 parent 7c031ca commit a5b95d5

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
"mkdirp": "^0.5.1",
157157
"module-deps": "^3.9.1",
158158
"node-fetch": "^1.3.3",
159-
"node-haste": "~2.9.2",
159+
"node-haste": "~2.9.6",
160160
"opn": "^3.0.2",
161161
"optimist": "^0.6.1",
162162
"progress": "^1.1.8",

packager/react-packager/src/Bundler/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -588,10 +588,11 @@ class Bundler {
588588
};
589589

590590
const json = JSON.stringify(asset);
591+
const assetRegistryPath = 'react-native/Libraries/Image/AssetRegistry';
591592
const code =
592-
`module.exports = require('AssetRegistry').registerAsset(${json});`;
593-
const dependencies = ['AssetRegistry'];
594-
const dependencyOffsets = [code.indexOf('AssetRegistry') - 1];
593+
`module.exports = require(${JSON.stringify(assetRegistryPath)}).registerAsset(${json});`;
594+
const dependencies = [assetRegistryPath];
595+
const dependencyOffsets = [code.indexOf(assetRegistryPath) - 1];
595596

596597
return {
597598
asset,

packager/react-packager/src/Resolver/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class Resolver {
107107
cache: opts.cache,
108108
shouldThrowOnUnresolvedErrors: (_, platform) => platform === 'ios',
109109
transformCode: opts.transformCode,
110-
assetDependencies: ['AssetRegistry'],
110+
assetDependencies: ['react-native/Libraries/Image/AssetRegistry'],
111111
});
112112

113113
this._getModuleId = options.getModuleId;

0 commit comments

Comments
 (0)