From bbff7403fbf46f9ad92240ac213df8d30ef31b64 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Thu, 20 Sep 2018 02:56:13 +0200
Subject: update packages

---
 .../enhanced-resolve/lib/ConcordModulesPlugin.js   | 73 +++++++++++-----------
 1 file changed, 38 insertions(+), 35 deletions(-)

(limited to 'node_modules/enhanced-resolve/lib/ConcordModulesPlugin.js')

diff --git a/node_modules/enhanced-resolve/lib/ConcordModulesPlugin.js b/node_modules/enhanced-resolve/lib/ConcordModulesPlugin.js
index 2aa35ab87..9fbe579d1 100644
--- a/node_modules/enhanced-resolve/lib/ConcordModulesPlugin.js
+++ b/node_modules/enhanced-resolve/lib/ConcordModulesPlugin.js
@@ -2,43 +2,46 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var concord = require("./concord");
-var DescriptionFileUtils = require("./DescriptionFileUtils");
-var createInnerCallback = require("./createInnerCallback");
-var getInnerRequest = require("./getInnerRequest");
+"use strict";
 
-function ConcordModulesPlugin(source, options, target) {
-	this.source = source;
-	this.options = options;
-	this.target = target;
-}
-module.exports = ConcordModulesPlugin;
+const concord = require("./concord");
+const DescriptionFileUtils = require("./DescriptionFileUtils");
+const getInnerRequest = require("./getInnerRequest");
 
-ConcordModulesPlugin.prototype.apply = function(resolver) {
-	var target = this.target;
-	resolver.plugin(this.source, function(request, callback) {
-		var innerRequest = getInnerRequest(resolver, request);
-		if(!innerRequest) return callback();
-		var concordField = DescriptionFileUtils.getField(request.descriptionFileData, "concord");
-		if(!concordField) return callback();
-		var data = concord.matchModule(request.context, concordField, innerRequest);
-		if(data === innerRequest) return callback();
-		if(data === undefined) return callback();
-		if(data === false) {
-			var ignoreObj = Object.assign({}, request, {
-				path: false
+module.exports = class ConcordModulesPlugin {
+	constructor(source, options, target) {
+		this.source = source;
+		this.options = options;
+		this.target = target;
+	}
+
+	apply(resolver) {
+		const target = resolver.ensureHook(this.target);
+		resolver.getHook(this.source).tapAsync("ConcordModulesPlugin", (request, resolveContext, callback) => {
+			const innerRequest = getInnerRequest(resolver, request);
+			if(!innerRequest) return callback();
+			const concordField = DescriptionFileUtils.getField(request.descriptionFileData, "concord");
+			if(!concordField) return callback();
+			const data = concord.matchModule(request.context, concordField, innerRequest);
+			if(data === innerRequest) return callback();
+			if(data === undefined) return callback();
+			if(data === false) {
+				const ignoreObj = Object.assign({}, request, {
+					path: false
+				});
+				return callback(null, ignoreObj);
+			}
+			const obj = Object.assign({}, request, {
+				path: request.descriptionFileRoot,
+				request: data
 			});
-			return callback(null, ignoreObj);
-		}
-		var obj = Object.assign({}, request, {
-			path: request.descriptionFileRoot,
-			request: data
-		});
-		resolver.doResolve(target, obj, "aliased from description file " + request.descriptionFilePath + " with mapping '" + innerRequest + "' to '" + data + "'", createInnerCallback(function(err, result) {
-			if(arguments.length > 0) return callback(err, result);
+			resolver.doResolve(target, obj, "aliased from description file " + request.descriptionFilePath + " with mapping '" + innerRequest + "' to '" + data + "'", resolveContext, (err, result) => {
+				if(err) return callback(err);
 
-			// Don't allow other aliasing or raw request
-			callback(null, null);
-		}, callback));
-	});
+				// Don't allow other aliasing or raw request
+				if(result === undefined) return callback(null, null);
+				callback(null, result);
+			});
+		});
+	}
 };
-- 
cgit v1.2.3