Unify Dependency#getExports result

lib/NormalModuleFactory.js

@@ -31,20 +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,
-			options
+			options: undefined
 		};
 	}
 };

lib/dependencies/DelegatedExportsDependency.js

@@ -24,7 +24,8 @@ class DelegatedExportsDependency extends NullDependency {
 
 	getExports() {
 		return {
-			exports: this.exports
+			exports: this.exports,
+			dependencies: undefined
 		};
 	}
 }

lib/dependencies/HarmonyExportExpressionDependency.js

@@ -19,7 +19,8 @@ class HarmonyExportExpressionDependency extends NullDependency {
 
 	getExports() {
 		return {
-			exports: ["default"]
+			exports: ["default"],
+			dependencies: undefined
 		};
 	}
 }

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
 			};
 		}
 

lib/dependencies/HarmonyExportSpecifierDependency.js

@@ -19,7 +19,8 @@ class HarmonyExportSpecifierDependency extends NullDependency {
 
 	getExports() {
 		return {
-			exports: [this.name]
+			exports: [this.name],
+			dependencies: undefined
 		};
 	}
 }

lib/dependencies/JsonExportsDependency.js

@@ -17,7 +17,8 @@ class JsonExportsDependency extends NullDependency {
 
 	getExports() {
 		return {
-			exports: this.exports
+			exports: this.exports,
+			dependencies: undefined
 		};
 	}
 }