1 files changed, 58 insertions, 38 deletions
diff --git a/node_modules/webpack/lib/dependencies/RequireEnsureDependency.js b/node_modules/webpack/lib/dependencies/RequireEnsureDependency.js
index 65a9c8a3f..840130519 100644
--- a/node_modules/webpack/lib/dependencies/RequireEnsureDependency.js
+++ b/node_modules/webpack/lib/dependencies/RequireEnsureDependency.js
@@ -1,38 +1,58 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const NullDependency = require("./NullDependency");
-const DepBlockHelpers = require("./DepBlockHelpers");
-
-class RequireEnsureDependency extends NullDependency {
-	constructor(block) {
-		super();
-		this.block = block;
-	}
-
-	get type() {
-		return "require.ensure";
-	}
-}
-
-RequireEnsureDependency.Template = class RequireEnsureDependencyTemplate {
-	apply(dep, source, outputOptions, requestShortener) {
-		const depBlock = dep.block;
-		const wrapper = DepBlockHelpers.getLoadDepBlockWrapper(depBlock, outputOptions, requestShortener, "require.ensure");
-		const errorCallbackExists = depBlock.expr.arguments.length === 4 || (!depBlock.chunkName && depBlock.expr.arguments.length === 3);
-		const startBlock = wrapper[0] + "(";
-		const middleBlock = `).bind(null, __webpack_require__)${wrapper[1]}`;
-		const endBlock = `${middleBlock}__webpack_require__.oe${wrapper[2]}`;
-		source.replace(depBlock.expr.range[0], depBlock.expr.arguments[1].range[0] - 1, startBlock);
-		if(errorCallbackExists) {
-			source.replace(depBlock.expr.arguments[1].range[1], depBlock.expr.arguments[2].range[0] - 1, middleBlock);
-			source.replace(depBlock.expr.arguments[2].range[1], depBlock.expr.range[1] - 1, wrapper[2]);
-		} else {
-			source.replace(depBlock.expr.arguments[1].range[1], depBlock.expr.range[1] - 1, endBlock);
-		}
-	}
-};
-
-module.exports = RequireEnsureDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const NullDependency = require("./NullDependency");
+
+class RequireEnsureDependency extends NullDependency {
+	constructor(block) {
+		super();
+		this.block = block;
+	}
+
+	get type() {
+		return "require.ensure";
+	}
+}
+
+RequireEnsureDependency.Template = class RequireEnsureDependencyTemplate {
+	apply(dep, source, runtime) {
+		const depBlock = dep.block;
+		const promise = runtime.blockPromise({
+			block: depBlock,
+			message: "require.ensure"
+		});
+		const errorCallbackExists =
+			depBlock.expr.arguments.length === 4 ||
+			(!depBlock.chunkName && depBlock.expr.arguments.length === 3);
+		const startBlock = `${promise}.then((`;
+		const middleBlock = ").bind(null, __webpack_require__)).catch(";
+		const endBlock = `).bind(null, __webpack_require__)).catch(${runtime.onError()})`;
+		source.replace(
+			depBlock.expr.range[0],
+			depBlock.expr.arguments[1].range[0] - 1,
+			startBlock
+		);
+		if (errorCallbackExists) {
+			source.replace(
+				depBlock.expr.arguments[1].range[1],
+				depBlock.expr.arguments[2].range[0] - 1,
+				middleBlock
+			);
+			source.replace(
+				depBlock.expr.arguments[2].range[1],
+				depBlock.expr.range[1] - 1,
+				")"
+			);
+		} else {
+			source.replace(
+				depBlock.expr.arguments[1].range[1],
+				depBlock.expr.range[1] - 1,
+				endBlock
+			);
+		}
+	}
+};
+
+module.exports = RequireEnsureDependency;