From 363723fc84f7b8477592e0105aeb331ec9a017af Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Mon, 14 Aug 2017 05:01:11 +0200
Subject: node_modules

---
 node_modules/webpack/lib/DelegatedModule.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'node_modules/webpack/lib/DelegatedModule.js')

diff --git a/node_modules/webpack/lib/DelegatedModule.js b/node_modules/webpack/lib/DelegatedModule.js
index d06e82214..cd80a21ff 100644
--- a/node_modules/webpack/lib/DelegatedModule.js
+++ b/node_modules/webpack/lib/DelegatedModule.js
@@ -9,20 +9,26 @@ const OriginalSource = require("webpack-sources").OriginalSource;
 const RawSource = require("webpack-sources").RawSource;
 const WebpackMissingModule = require("./dependencies/WebpackMissingModule");
 const DelegatedSourceDependency = require("./dependencies/DelegatedSourceDependency");
+const DelegatedExportsDependency = require("./dependencies/DelegatedExportsDependency");
 
 class DelegatedModule extends Module {
-	constructor(sourceRequest, data, type, userRequest) {
+	constructor(sourceRequest, data, type, userRequest, originalRequest) {
 		super();
 		this.sourceRequest = sourceRequest;
 		this.request = data.id;
 		this.meta = data.meta;
 		this.type = type;
+		this.originalRequest = originalRequest;
 		this.userRequest = userRequest;
 		this.built = false;
 		this.delegated = true;
 		this.delegateData = data;
 	}
 
+	libIdent(options) {
+		return typeof this.originalRequest === "string" ? this.originalRequest : this.originalRequest.libIdent(options);
+	}
+
 	identifier() {
 		return `delegated ${JSON.stringify(this.request)} from ${this.sourceRequest}`;
 	}
@@ -38,10 +44,10 @@ class DelegatedModule extends Module {
 	build(options, compilation, resolver, fs, callback) {
 		this.built = true;
 		this.builtTime = Date.now();
-		this.usedExports = true;
-		this.providedExports = this.delegateData.exports || true;
+		this.cacheable = true;
 		this.dependencies.length = 0;
 		this.addDependency(new DelegatedSourceDependency(this.sourceRequest));
+		this.addDependency(new DelegatedExportsDependency(this, this.delegateData.exports || true));
 		callback();
 	}
 
@@ -57,7 +63,7 @@ class DelegatedModule extends Module {
 		if(!sourceModule) {
 			str = WebpackMissingModule.moduleCode(this.sourceRequest);
 		} else {
-			str = `module.exports = (__webpack_require__(${sourceModule.id}))`;
+			str = `module.exports = (__webpack_require__(${JSON.stringify(sourceModule.id)}))`;
 
 			switch(this.type) {
 				case "require":
-- 
cgit v1.2.3