Skip to content

Correctly replace shims using relative requires #11472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaearon merged 1 commit into from
Nov 6, 2017
Merged

Correctly replace shims using relative requires #11472

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions scripts/rollup/modules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,20 @@ function getShims(bundleType, entry, featureFlags) {
// so we resort to using a shim that re-exports the www module, and then
// treating shim's target destinations as external (see getDependencies).
forkedFBModules.forEach(srcPath => {
const wwwName = path.parse(srcPath).name;
const fileName = path.parse(srcPath).name;
const shimPath = path.resolve(
__dirname + `/shims/rollup/${wwwName}-www.js`
__dirname + `/shims/rollup/${fileName}-www.js`
);
shims[srcPath] = shimPath;
// <hack>
// Unfortunately the above doesn't work for relative imports,
// and Rollup isn't smart enough to understand they refer to the same file.
// We should come up with a real fix for this, but for now this will do.
// FIXME: this is gross.
shims['./' + fileName] = shimPath;
shims['../' + fileName] = shimPath;
// We don't have deeper relative requires between source files.
// </hack>
});
break;
}
Expand Down