Merge pull request webpack#7011 from webpack/fix/object_shapes

sokra · web-flow · commit 540138126b6f · 2018-04-11T08:25:25.000+02:00
Always return object with the same shape to avoid polymorphism
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -1877,7 +1877,8 @@ class Parser extends Tapable {
 						return {
 							range: left.range,
 							value: left.value,
-							code: true
+							code: true,
+							conditional: false
 						};
 					} else if (right.code) {
 						return {
@@ -1886,12 +1887,15 @@ class Parser extends Tapable {
 								right.range ? right.range[1] : left.range[1]
 							],
 							value: left.value + right.value,
-							code: true
+							code: true,
+							conditional: false
 						};
 					} else {
 						return {
 							range: [left.range[0], right.range[1]],
-							value: left.value + right.value
+							value: left.value + right.value,
+							code: false,
+							conditional: false
 						};
 					}
 				}
@@ -1907,6 +1911,7 @@ class Parser extends Tapable {
 				else if (!alternate.code) items.push(alternate);
 				else break;
 				return {
+					range: undefined,
 					value: "",
 					code: true,
 					conditional: items
@@ -1915,12 +1920,16 @@ class Parser extends Tapable {
 			case "Literal":
 				return {
 					range: expression.range,
-					value: expression.value + ""
+					value: expression.value + "",
+					code: false,
+					conditional: false
 				};
 		}
 		return {
+			range: undefined,
 			value: "",
-			code: true
+			code: true,
+			conditional: false
 		};
 	}
 
diff --git a/lib/RuleSet.js b/lib/RuleSet.js
@@ -353,7 +353,8 @@ module.exports = class RuleSet {
 			};
 		}
 		return {
-			loader: useItemString
+			loader: useItemString,
+			options: undefined
 		};
 	}
 
diff --git a/lib/dependencies/getFunctionExpression.js b/lib/dependencies/getFunctionExpression.js
@@ -26,7 +26,8 @@ module.exports = expr => {
 	) {
 		return {
 			fn: expr.callee.object,
-			expressions: [expr.arguments[0]]
+			expressions: [expr.arguments[0]],
+			needThis: undefined
 		};
 	}
 	// (function(_this) {return <FunctionExpression>})(this) (Coffeescript)

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,8 @@ module.exports = class RuleSet {`
`353`	`353`	`};`
`354`	`354`	`}`
`355`	`355`	`return {`
`356`		`- loader: useItemString`
	`356`	`+ loader: useItemString,`
	`357`	`+ options: undefined`
`357`	`358`	`};`
`358`	`359`	`}`
`359`	`360`