Merge pull request webpack#6956 from webpack/refactor/share_shapes

sokra · web-flow · commit e717fcc6a1f2 · 2018-04-04T15:06:05.000+02:00
Use a single object shape for dependency exports
diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
@@ -31,19 +31,17 @@ const loaderToIdent = data => {
 
 const identToLoaderRequest = resultString => {
 	const idx = resultString.indexOf("?");
-	let options;
-
 	if (idx >= 0) {
-		options = resultString.substr(idx + 1);
-		resultString = resultString.substr(0, idx);
-
+		const loader = resultString.substr(0, idx);
+		const options = resultString.substr(idx + 1);
 		return {
-			loader: resultString,
+			loader,
 			options
 		};
 	} else {
 		return {
-			loader: resultString
+			loader: resultString,
+			options: undefined
 		};
 	}
 };
diff --git a/lib/dependencies/AMDDefineDependencyParserPlugin.js b/lib/dependencies/AMDDefineDependencyParserPlugin.js
@@ -223,9 +223,8 @@ class AMDDefineDependencyParserPlugin {
 			}
 		}
 		let fnRenames = parser.scope.renames.createChild();
-		let identifiers;
 		if (array) {
-			identifiers = {};
+			const identifiers = {};
 			const param = parser.evaluateExpression(array);
 			const result = this.processArray(
 				parser,
@@ -244,7 +243,7 @@ class AMDDefineDependencyParserPlugin {
 					return true;
 				});
 		} else {
-			identifiers = ["require", "exports", "module"];
+			const identifiers = ["require", "exports", "module"];
 			if (fnParams)
 				fnParams = fnParams.slice(fnParamsOffset).filter((param, idx) => {
 					if (identifiers[idx]) {
diff --git a/lib/dependencies/DelegatedExportsDependency.js b/lib/dependencies/DelegatedExportsDependency.js
@@ -24,7 +24,8 @@ class DelegatedExportsDependency extends NullDependency {
 
 	getExports() {
 		return {
-			exports: this.exports
+			exports: this.exports,
+			dependencies: undefined
 		};
 	}
 }
diff --git a/lib/dependencies/HarmonyExportExpressionDependency.js b/lib/dependencies/HarmonyExportExpressionDependency.js
@@ -19,7 +19,8 @@ class HarmonyExportExpressionDependency extends NullDependency {
 
 	getExports() {
 		return {
-			exports: ["default"]
+			exports: ["default"],
+			dependencies: undefined
 		};
 	}
 }
diff --git a/lib/dependencies/HarmonyExportImportedSpecifierDependency.js b/lib/dependencies/HarmonyExportImportedSpecifierDependency.js
@@ -252,7 +252,8 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	getExports() {
 		if (this.name) {
 			return {
-				exports: [this.name]
+				exports: [this.name],
+				dependencies: undefined
 			};
 		}
 
@@ -261,7 +262,8 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		if (!importedModule) {
 			// no imported module available
 			return {
-				exports: null
+				exports: null,
+				dependencies: undefined
 			};
 		}
 
@@ -276,7 +278,8 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 		if (importedModule.buildMeta.providedExports) {
 			return {
-				exports: true
+				exports: true,
+				dependencies: undefined
 			};
 		}
 
diff --git a/lib/dependencies/HarmonyExportSpecifierDependency.js b/lib/dependencies/HarmonyExportSpecifierDependency.js
@@ -19,7 +19,8 @@ class HarmonyExportSpecifierDependency extends NullDependency {
 
 	getExports() {
 		return {
-			exports: [this.name]
+			exports: [this.name],
+			dependencies: undefined
 		};
 	}
 }
diff --git a/lib/dependencies/JsonExportsDependency.js b/lib/dependencies/JsonExportsDependency.js
@@ -17,7 +17,8 @@ class JsonExportsDependency extends NullDependency {
 
 	getExports() {
 		return {
-			exports: this.exports
+			exports: this.exports,
+			dependencies: undefined
 		};
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ class DelegatedExportsDependency extends NullDependency {`
`24`	`24`
`25`	`25`	`getExports() {`
`26`	`26`	`return {`
`27`		`- exports: this.exports`
	`27`	`+ exports: this.exports,`
	`28`	`+ dependencies: undefined`
`28`	`29`	`};`
`29`	`30`	`}`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@ class HarmonyExportExpressionDependency extends NullDependency {`
`19`	`19`
`20`	`20`	`getExports() {`
`21`	`21`	`return {`
`22`		`- exports: ["default"]`
	`22`	`+ exports: ["default"],`
	`23`	`+ dependencies: undefined`
`23`	`24`	`};`
`24`	`25`	`}`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@ class HarmonyExportSpecifierDependency extends NullDependency {`
`19`	`19`
`20`	`20`	`getExports() {`
`21`	`21`	`return {`
`22`		`- exports: [this.name]`
	`22`	`+ exports: [this.name],`
	`23`	`+ dependencies: undefined`
`23`	`24`	`};`
`24`	`25`	`}`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ class JsonExportsDependency extends NullDependency {`
`17`	`17`
`18`	`18`	`getExports() {`
`19`	`19`	`return {`
`20`		`- exports: this.exports`
	`20`	`+ exports: this.exports,`
	`21`	`+ dependencies: undefined`
`21`	`22`	`};`
`22`	`23`	`}`
`23`	`24`	`}`