root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix incorrect parsing of define functions 

fix invalid code when using declaring local modules and arrow functions are supported
This commit is contained in:
Tobias Koppers 2021-02-10 19:12:51 +01:00
parent 1b463f9820
commit 0c4e157196
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/dependencies/AMDDefineDependency.js
View File

@ -68,7 +68,7 @@ const DEFINITIONS = {
lf: {
definition: "var XXX, XXXmodule;",
content:
"!(XXXmodule = { id: YYY, exports: {}, loaded: false }, XXX = #.call(XXXmodule.exports, __webpack_require__, XXXmodule.exports, XXXmodule), XXXmodule.loaded = true, XXX === undefined && (XXX = XXXmodule.exports))",
"!(XXXmodule = { id: YYY, exports: {}, loaded: false }, XXX = (#).call(XXXmodule.exports, __webpack_require__, XXXmodule.exports, XXXmodule), XXXmodule.loaded = true, XXX === undefined && (XXX = XXXmodule.exports))",
requests: [RuntimeGlobals.require, RuntimeGlobals.module]
},
lo: {

8
lib/dependencies/AMDDefineDependencyParserPlugin.js
View File

@ -276,6 +276,10 @@ class AMDDefineDependencyParserPlugin {
}
parser.scope.inTry = inTry;
if (fn.body.type === "BlockStatement") {
parser.detectMode(fn.body.body);
const prev = parser.prevStatement;
parser.preWalkStatement(fn.body);
parser.prevStatement = prev;
parser.walkStatement(fn.body);
} else {
parser.walkExpression(fn.body);
@ -293,6 +297,10 @@ class AMDDefineDependencyParserPlugin {
}
parser.scope.inTry = inTry;
if (fn.callee.object.body.type === "BlockStatement") {
parser.detectMode(fn.callee.object.body.body);
const prev = parser.prevStatement;
parser.preWalkStatement(fn.callee.object.body);
parser.prevStatement = prev;
parser.walkStatement(fn.callee.object.body);
} else {
parser.walkExpression(fn.callee.object.body);

3
test/cases/parsing/declared-api/index.js Normal file
View File

@ -0,0 +1,3 @@
it("should not replace declared variables", () => {
expect(require("./module")).toBe(42 + 42);
});

11
test/cases/parsing/declared-api/module.js Normal file
View File

@ -0,0 +1,11 @@
define("local", () => {
var __webpack_modules__ = 42;
return __webpack_modules__;
});
define(["local"], l => {
var __webpack_modules__ = 42 + l;
return __webpack_modules__;
});