From 5c8a4bb89f6f741511bef98cdab3d84e9759c72a Mon Sep 17 00:00:00 2001
From: Florent Cailhol <florent.cailhol@gmail.com>
Date: Wed, 4 Apr 2018 13:42:37 +0200
Subject: [PATCH] Unify Dependency#getExports result

---
 lib/NormalModuleFactory.js                            | 11 ++++-------
 lib/dependencies/DelegatedExportsDependency.js        |  3 ++-
 lib/dependencies/HarmonyExportExpressionDependency.js |  3 ++-
 .../HarmonyExportImportedSpecifierDependency.js       |  9 ++++++---
 lib/dependencies/HarmonyExportSpecifierDependency.js  |  3 ++-
 lib/dependencies/JsonExportsDependency.js             |  3 ++-
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
index ef6decfd0..9bee66d07 100644
--- a/lib/NormalModuleFactory.js
+++ b/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
 		};
 	}
 };
diff --git a/lib/dependencies/DelegatedExportsDependency.js b/lib/dependencies/DelegatedExportsDependency.js
index 52bbaf4b5..fcacedb42 100644
--- 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
index 56344e43f..1f12f9d76 100644
--- 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
index 0cb7896d1..a9086b073 100644
--- 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
index 6f5836180..1bf6a3fe6 100644
--- 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
index 0cdf9dc79..9e17bfb5a 100644
--- 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
 		};
 	}
 }