status-im
/
metro
mirror of https://github.com/status-im/metro.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Resolve requires on HMR 

Summary:
public

Requires are transformed when building the bundle but we forgot doing so when building the HMR one.

Reviewed By: vjeux

Differential Revision: D2801319

fb-gh-sync-id: ae70612945ab81a05154b14d6b756ef390770542
This commit is contained in:
Martín Bigio 2016-01-06 09:46:56 -08:00 committed by facebook-github-bot-5
parent d30da1ec01
commit e02756ca21
2 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
react-packager/src/Bundler/index.js vendored
View File

@ -284,29 +284,37 @@ class Bundler {
});
}
bundleForHMR(modules) {
return Promise.all(
modules.map(module => {
return Promise.all([
module.getName(),
this._transformer.loadFileAndTransform(
module.path,
// TODO(martinb): pass non null main (t9527509)
this._getTransformOptions({main: null}, {hot: true}),
),
]).then(([moduleName, transformedSource]) => {
return (`
__accept(
'${moduleName}',
function(global, require, module, exports) {
${transformedSource.code}
}
);
`);
});
bundleForHMR({entryFile, platform, modules}) {
return this.getDependencies(entryFile, /*isDev*/true, platform)
.then(response => {
return Promise.all(
modules.map(module => {
return Promise.all([
module.getName(),
this._transformer.loadFileAndTransform(
module.path,
// TODO(martinb): pass non null main (t9527509)
this._getTransformOptions({main: null}, {hot: true}),
),
]).then(([moduleName, transformed]) => {
return this._resolver.resolveRequires(response,
module,
transformed.code,
).then(({name, code}) => {
return (`
__accept(
'${moduleName}',
function(global, require, module, exports) {
${code}
}
);
`);
});
});
})
);
})
)
.then(code => code.join('\n'));
.then(modules => modules.join('\n'));
}
invalidateFile(filePath) {

18
react-packager/src/Resolver/index.js vendored
View File

@ -165,7 +165,7 @@ class Resolver {
);
}
wrapModule(resolutionResponse, module, code) {
resolveRequires(resolutionResponse, module, code) {
return Promise.resolve().then(() => {
if (module.isPolyfill()) {
return Promise.resolve({code});
@ -200,12 +200,24 @@ class Resolver {
.replace(replacePatterns.EXPORT_RE, relativizeCode)
.replace(replacePatterns.REQUIRE_RE, relativizeCode);
return module.getName().then(name =>
({name, code: defineModuleCode(name, code)}));
return module.getName().then(name => {
return {name, code};
});
});
});
}
wrapModule(resolutionResponse, module, code) {
if (module.isPolyfill()) {
return Promise.resolve({code});
}
return this.resolveRequires(resolutionResponse, module, code).then(
({name, code}) => {
return {name, code: defineModuleCode(name, code)};
});
}
getDebugInfo() {
return this._depGraph.getDebugInfo();
}