update packages

1 files changed, 68 insertions, 49 deletions

diff --git a/node_modules/webpack/lib/dependencies/ContextDependency.js b/node_modules/webpack/lib/dependencies/ContextDependency.js
index 55bc9823c..10c2fea99 100644
--- a/node_modules/webpack/lib/dependencies/ContextDependency.js
+++ b/node_modules/webpack/lib/dependencies/ContextDependency.js
@@ -1,49 +1,68 @@
-/*

-	MIT License http://www.opensource.org/licenses/mit-license.php

-	Author Tobias Koppers @sokra

-*/

-"use strict";

-const Dependency = require("../Dependency");

-const CriticalDependencyWarning = require("./CriticalDependencyWarning");

-

-class ContextDependency extends Dependency {

-	constructor(request, recursive, regExp) {

-		super();

-		this.request = request;

-		this.userRequest = request;

-		this.recursive = recursive;

-		this.regExp = regExp;

-		this.async = false;

-

-		this.hadGlobalOrStickyRegExp = false;

-		if(this.regExp.global || this.regExp.sticky) {

-			this.regExp = null;

-			this.hadGlobalOrStickyRegExp = true;

-		}

-

-	}

-

-	isEqualResource(other) {

-		if(!(other instanceof ContextDependency))

-			return false;

-

-		return this.request === other.request &&

-			this.recursive === other.recursive &&

-			this.regExp === other.regExp &&

-			this.async === other.async;

-	}

-

-	getWarnings() {

-		let warnings = super.getWarnings() || [];

-		if(this.critical) {

-			warnings.push(new CriticalDependencyWarning(this.critical));

-		}

-		if(this.hadGlobalOrStickyRegExp) {

-			warnings.push(new CriticalDependencyWarning("Contexts can't use RegExps with the 'g' or 'y' flags."));

-		}

-		return warnings;

-	}

-

-}

-

-module.exports = ContextDependency;

+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const Dependency = require("../Dependency");
+const CriticalDependencyWarning = require("./CriticalDependencyWarning");
+
+const regExpToString = r => (r ? r + "" : "");
+
+class ContextDependency extends Dependency {
+	// options: { request, recursive, regExp, include, exclude, mode, chunkName, groupOptions }
+	constructor(options) {
+		super();
+		this.options = options;
+		this.userRequest = this.options.request;
+		/** @type {false | string} */
+		this.critical = false;
+		this.hadGlobalOrStickyRegExp = false;
+		if (this.options.regExp.global || this.options.regExp.sticky) {
+			this.options.regExp = null;
+			this.hadGlobalOrStickyRegExp = true;
+		}
+	}
+
+	getResourceIdentifier() {
+		return (
+			`context${this.options.request} ${this.options.recursive} ` +
+			`${regExpToString(this.options.regExp)} ${regExpToString(
+				this.options.include
+			)} ${regExpToString(this.options.exclude)} ` +
+			`${this.options.mode} ${this.options.chunkName} ` +
+			`${JSON.stringify(this.options.groupOptions)}`
+		);
+	}
+
+	getWarnings() {
+		let warnings = super.getWarnings() || [];
+		if (this.critical) {
+			warnings.push(new CriticalDependencyWarning(this.critical));
+		}
+		if (this.hadGlobalOrStickyRegExp) {
+			warnings.push(
+				new CriticalDependencyWarning(
+					"Contexts can't use RegExps with the 'g' or 'y' flags."
+				)
+			);
+		}
+		return warnings;
+	}
+}
+
+// TODO remove in webpack 5
+Object.defineProperty(ContextDependency.prototype, "async", {
+	configurable: false,
+	get() {
+		throw new Error(
+			"ContextDependency.async was removed. Use ContextDependency.options.mode instead."
+		);
+	},
+	set() {
+		throw new Error(
+			"ContextDependency.async was removed. Pass options.mode to constructor instead"
+		);
+	}
+});
+
+module.exports = ContextDependency;