webpack 5.51.0 → 5.51.1

package/lib/EvalSourceMapDevToolPlugin.js

@@ -11,7 +11,7 @@ const NormalModule = require("./NormalModule");
 const SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOptionsPlugin");
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 const ConcatenatedModule = require("./optimize/ConcatenatedModule");
-const { absolutify } = require("./util/identifier");
+const { makePathsAbsolute } = require("./util/identifier");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/WebpackOptions").DevTool} DevToolOptions */
@@ -125,7 +125,7 @@ class EvalSourceMapDevToolPlugin {
 						const root = compiler.root;
 						const modules = sourceMap.sources.map(source => {
 							if (!source.startsWith("webpack://")) return source;
-							source = absolutify(context, source.slice(10), root);
+							source = makePathsAbsolute(context, source.slice(10), root);
 							const module = compilation.findModule(source);
 							return module || source;
 						});

package/lib/FileSystemInfo.js

@@ -813,6 +813,7 @@ const getManagedItem = (managedPath, path) => {
  */
 const getResolvedTimestamp = entry => {
 	if (entry === "ignore") return undefined;
+	if (entry === null) return null;
 	if (entry.resolved !== undefined) return entry.resolved;
 	return entry.symlinks === undefined ? entry : undefined;
 };
@@ -822,6 +823,7 @@ const getResolvedTimestamp = entry => {
  * @returns {string | undefined} the resolved entry
  */
 const getResolvedHash = entry => {
+	if (entry === null) return null;
 	if (entry.resolved !== undefined) return entry.resolved;
 	return entry.symlinks === undefined ? entry.hash : undefined;
 };

package/lib/NormalModule.js

@@ -38,7 +38,11 @@ const {
 } = require("./util/comparators");
 const createHash = require("./util/createHash");
 const { join } = require("./util/fs");
-const { contextify, absolutify } = require("./util/identifier");
+const {
+	contextify,
+	absolutify,
+	makePathsRelative
+} = require("./util/identifier");
 const makeSerializable = require("./util/makeSerializable");
 const memoize = require("./util/memoize");
 
@@ -102,7 +106,11 @@ const ABSOLUTE_PATH_REGEX = /^([a-zA-Z]:\\|\\\\|\/)/;
  */
 const contextifySourceUrl = (context, source, associatedObjectForCache) => {
 	if (source.startsWith("webpack://")) return source;
-	return `webpack://${contextify(context, source, associatedObjectForCache)}`;
+	return `webpack://${makePathsRelative(
+		context,
+		source,
+		associatedObjectForCache
+	)}`;
 };
 
 /**

package/lib/SourceMapDevToolPlugin.js

@@ -14,7 +14,7 @@ const SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOpt
 const createSchemaValidation = require("./util/create-schema-validation");
 const createHash = require("./util/createHash");
 const { relative, dirname } = require("./util/fs");
-const { absolutify } = require("./util/identifier");
+const { makePathsAbsolute } = require("./util/identifier");
 
 /** @typedef {import("webpack-sources").MapOptions} MapOptions */
 /** @typedef {import("webpack-sources").Source} Source */
@@ -91,7 +91,7 @@ const getTaskForFile = (
 	if (!sourceMap || typeof source !== "string") return;
 	const context = compilation.options.context;
 	const root = compilation.compiler.root;
-	const cachedAbsolutify = absolutify.bindContextCache(context, root);
+	const cachedAbsolutify = makePathsAbsolute.bindContextCache(context, root);
 	const modules = sourceMap.sources.map(source => {
 		if (!source.startsWith("webpack://")) return source;
 		source = cachedAbsolutify(source.slice(10));

package/lib/library/ModuleLibraryPlugin.js

@@ -78,6 +78,10 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 		const result = new ConcatSource(source);
 		const exportsInfo = moduleGraph.getExportsInfo(module);
 		const exports = [];
+		const isAsync = moduleGraph.isAsync(module);
+		if (isAsync) {
+			result.add(`__webpack_exports__ = await __webpack_exports__;\n`);
+		}
 		for (const exportInfo of exportsInfo.orderedExports) {
 			if (!exportInfo.provided) continue;
 			const varName = `__webpack_exports__${Template.toIdentifier(

package/lib/optimize/ConcatenatedModule.js

@@ -23,7 +23,7 @@ const { equals } = require("../util/ArrayHelpers");
 const LazySet = require("../util/LazySet");
 const { concatComparators, keepOriginalOrder } = require("../util/comparators");
 const createHash = require("../util/createHash");
-const contextify = require("../util/identifier").contextify;
+const { makePathsRelative } = require("../util/identifier");
 const makeSerializable = require("../util/makeSerializable");
 const propertyAccess = require("../util/propertyAccess");
 const {
@@ -1011,13 +1011,13 @@ class ConcatenatedModule extends Module {
 	}
 
 	static _createIdentifier(rootModule, modules, associatedObjectForCache) {
-		const cachedContextify = contextify.bindContextCache(
+		const cachedMakePathsRelative = makePathsRelative.bindContextCache(
 			rootModule.context,
 			associatedObjectForCache
 		);
 		let identifiers = [];
 		for (const module of modules) {
-			identifiers.push(cachedContextify(module.identifier()));
+			identifiers.push(cachedMakePathsRelative(module.identifier()));
 		}
 		identifiers.sort();
 		const hash = createHash("md4");

package/lib/util/identifier.js

@@ -15,6 +15,13 @@ const WINDOWS_PATH_SEPARATOR_REGEXP = /\\/g;
  * @property {Map<string, Map<string, string>>=} relativePaths
  */
 
+const relativePathToRequest = relativePath => {
+	if (relativePath === "") return "./.";
+	if (relativePath === "..") return "../.";
+	if (relativePath.startsWith("../")) return relativePath;
+	return `./${relativePath}`;
+};
+
 /**
  * @param {string} context context for relative path
  * @param {string} maybeAbsolutePath path to make relative
@@ -36,10 +43,7 @@ const absoluteToRequest = (context, maybeAbsolutePath) => {
 			querySplitPos === -1
 				? maybeAbsolutePath
 				: maybeAbsolutePath.slice(0, querySplitPos);
-		resource = path.posix.relative(context, resource);
-		if (!resource.startsWith("../")) {
-			resource = "./" + resource;
-		}
+		resource = relativePathToRequest(path.posix.relative(context, resource));
 		return querySplitPos === -1
 			? resource
 			: resource + maybeAbsolutePath.slice(querySplitPos);
@@ -53,10 +57,9 @@ const absoluteToRequest = (context, maybeAbsolutePath) => {
 				: maybeAbsolutePath.slice(0, querySplitPos);
 		resource = path.win32.relative(context, resource);
 		if (!WINDOWS_ABS_PATH_REGEXP.test(resource)) {
-			resource = resource.replace(WINDOWS_PATH_SEPARATOR_REGEXP, "/");
-			if (!resource.startsWith("../")) {
-				resource = "./" + resource;
-			}
+			resource = relativePathToRequest(
+				resource.replace(WINDOWS_PATH_SEPARATOR_REGEXP, "/")
+			);
 		}
 		return querySplitPos === -1
 			? resource
@@ -214,6 +217,21 @@ const _makePathsRelative = (context, identifier) => {
 
 exports.makePathsRelative = makeCacheable(_makePathsRelative);
 
+/**
+ *
+ * @param {string} context context for relative path
+ * @param {string} identifier identifier for path
+ * @returns {string} a converted relative path
+ */
+const _makePathsAbsolute = (context, identifier) => {
+	return identifier
+		.split(SEGMENTS_SPLIT_REGEXP)
+		.map(str => requestToAbsolute(context, str))
+		.join("");
+};
+
+exports.makePathsAbsolute = makeCacheable(_makePathsAbsolute);
+
 /**
  * @param {string} context absolute context path
  * @param {string} request any request string may containing absolute paths, query string, etc.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.51.0",
+  "version": "5.51.1",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",