Skip to content

fix(nmf): Fix exports for var injection to include free glob export or args #3971

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
sokra merged 3 commits into from
Jan 16, 2017
Merged

fix(nmf): Fix exports for var injection to include free glob export or args #3971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a3a23f
fix(nmf): Fix exports for var injection to include free glob exports …
TheLarkInn Jan 15, 2017
bfccb20
fix PR
sokra Jan 16, 2017
bd45bdc
add test case for global in harmony modules
sokra Jan 16, 2017
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
3 changes: 1 addition & 2 deletions lib/NormalModule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,9 @@ NormalModule.prototype.source = function(dependencyTemplates, outputOptions, req

var emitFunction = function emitFunction() {
if(varNames.length === 0) return;

varStartCode += "/* WEBPACK VAR INJECTION */(function(" + varNames.join(", ") + ") {";
// exports === this in the topLevelBlock, but exports do compress better...
varEndCode = (topLevelBlock === block ? "}.call(exports, " : "}.call(this, ") +
varEndCode = (topLevelBlock === block ? "}.call(" + (topLevelBlock.exportsArgument || "exports") + ", " : "}.call(this, ") +
varExpressions.map(function(e) {
return e.source();
}).join(", ") + "))" + varEndCode;
Expand Down
5 changes: 5 additions & 0 deletions test/configCases/parsing/harmony-global/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require("should");
it("should be able to use global in a harmony module", function() {
var x = require("./module1");
(x.default === global).should.be.ok();
});
1 change: 1 addition & 0 deletions test/configCases/parsing/harmony-global/module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default 1;
3 changes: 3 additions & 0 deletions test/configCases/parsing/harmony-global/module1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
var freeGlobal = typeof global === "object" && global && global.Object === Object && global;

export default freeGlobal;
6 changes: 6 additions & 0 deletions test/configCases/parsing/harmony-global/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
target: "web",
performance: {
hints: false
}
};