webpack 5.97.1 → 5.104.1

package/lib/runtime/ToBinaryRuntimeModule.js

@@ -0,0 +1,64 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Alexander Akait @alexander-akait
+*/
+
+"use strict";
+
+const RuntimeGlobals = require("../RuntimeGlobals");
+const RuntimeModule = require("../RuntimeModule");
+const Template = require("../Template");
+
+/** @typedef {import("../Compilation")} Compilation */
+
+class ToBinaryRuntimeModule extends RuntimeModule {
+	constructor() {
+		super("to binary");
+	}
+
+	/**
+	 * @returns {string | null} runtime code
+	 */
+	generate() {
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const fn = RuntimeGlobals.toBinary;
+		const { runtimeTemplate } = compilation;
+
+		// Inspired by esbuild
+
+		const isNodePlatform = compilation.compiler.platform.node;
+		const isWebPlatform = compilation.compiler.platform.web;
+		const isNeutralPlatform = runtimeTemplate.isNeutralPlatform();
+
+		return Template.asString([
+			"// define to binary helper",
+			`${fn} = ${isNeutralPlatform ? "typeof Buffer !== 'undefined' ? " : ""}${
+				isNodePlatform || isNeutralPlatform
+					? `${runtimeTemplate.returningFunction("new Uint8Array(Buffer.from(base64, 'base64'))", "base64")}`
+					: ""
+			} ${isNeutralPlatform ? ": " : ""}${
+				isWebPlatform || isNeutralPlatform
+					? `(${runtimeTemplate.basicFunction("", [
+							"var table = new Uint8Array(128);",
+							"for (var i = 0; i < 64; i++) table[i < 26 ? i + 65 : i < 52 ? i + 71 : i < 62 ? i - 4 : i * 4 - 205] = i;",
+							`return ${runtimeTemplate.basicFunction("base64", [
+								"var n = base64.length, bytes = new Uint8Array((n - (base64[n - 1] == '=') - (base64[n - 2] == '=')) * 3 / 4 | 0);",
+								"for (var i = 0, j = 0; i < n;) {",
+								Template.indent([
+									"var c0 = table[base64.charCodeAt(i++)], c1 = table[base64.charCodeAt(i++)];",
+									"var c2 = table[base64.charCodeAt(i++)], c3 = table[base64.charCodeAt(i++)];",
+									"bytes[j++] = (c0 << 2) | (c1 >> 4);",
+									"bytes[j++] = (c1 << 4) | (c2 >> 2);",
+									"bytes[j++] = (c2 << 6) | c3;"
+								]),
+								"}",
+								"return bytes"
+							])}`
+						])})();`
+					: ""
+			}`
+		]);
+	}
+}
+
+module.exports = ToBinaryRuntimeModule;

package/lib/schemes/DataUriPlugin.js

@@ -6,36 +6,11 @@
 "use strict";
 
 const NormalModule = require("../NormalModule");
+const { URIRegEx, decodeDataURI } = require("../util/dataURL");
 
 /** @typedef {import("../Compiler")} Compiler */
 
-// data URL scheme: "data:text/javascript;charset=utf-8;base64,some-string"
-// http://www.ietf.org/rfc/rfc2397.txt
-const URIRegEx = /^data:([^;,]+)?((?:;[^;,]+)*?)(?:;(base64)?)?,(.*)$/i;
-
-/**
- * @param {string} uri data URI
- * @returns {Buffer | null} decoded data
- */
-const decodeDataURI = uri => {
-	const match = URIRegEx.exec(uri);
-	if (!match) return null;
-
-	const isBase64 = match[3];
-	const body = match[4];
-
-	if (isBase64) {
-		return Buffer.from(body, "base64");
-	}
-
-	// CSS allows to use `data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg"><rect width="100%" height="100%" style="stroke: rgb(223,224,225); stroke-width: 2px; fill: none; stroke-dasharray: 6px 3px" /></svg>`
-	// so we return original body if we can't `decodeURIComponent`
-	try {
-		return Buffer.from(decodeURIComponent(body), "ascii");
-	} catch (_) {
-		return Buffer.from(body, "ascii");
-	}
-};
+const PLUGIN_NAME = "DataUriPlugin";
 
 class DataUriPlugin {
 	/**
@@ -45,22 +20,25 @@ class DataUriPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"DataUriPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				normalModuleFactory.hooks.resolveForScheme
 					.for("data")
-					.tap("DataUriPlugin", resourceData => {
+					.tap(PLUGIN_NAME, (resourceData) => {
 						const match = URIRegEx.exec(resourceData.resource);
 						if (match) {
 							resourceData.data.mimetype = match[1] || "";
 							resourceData.data.parameters = match[2] || "";
-							resourceData.data.encoding = match[3] || false;
+							resourceData.data.encoding = /** @type {"base64" | false} */ (
+								match[3] || false
+							);
 							resourceData.data.encodedContent = match[4] || "";
 						}
 					});
+
 				NormalModule.getCompilationHooks(compilation)
 					.readResourceForScheme.for("data")
-					.tap("DataUriPlugin", resource => decodeDataURI(resource));
+					.tap(PLUGIN_NAME, (resource) => decodeDataURI(resource));
 			}
 		);
 	}

package/lib/schemes/FileUriPlugin.js

@@ -5,11 +5,13 @@
 
 "use strict";
 
-const { URL, fileURLToPath } = require("url");
+const { fileURLToPath } = require("url");
 const { NormalModule } = require("..");
 
 /** @typedef {import("../Compiler")} Compiler */
 
+const PLUGIN_NAME = "FileUriPlugin";
+
 class FileUriPlugin {
 	/**
 	 * Apply the plugin
@@ -18,11 +20,11 @@ class FileUriPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"FileUriPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				normalModuleFactory.hooks.resolveForScheme
 					.for("file")
-					.tap("FileUriPlugin", resourceData => {
+					.tap(PLUGIN_NAME, (resourceData) => {
 						const url = new URL(resourceData.resource);
 						const path = fileURLToPath(url);
 						const query = url.search;
@@ -36,10 +38,13 @@ class FileUriPlugin {
 				const hooks = NormalModule.getCompilationHooks(compilation);
 				hooks.readResource
 					.for(undefined)
-					.tapAsync("FileUriPlugin", (loaderContext, callback) => {
+					.tapAsync(PLUGIN_NAME, (loaderContext, callback) => {
 						const { resourcePath } = loaderContext;
-						loaderContext.addDependency(resourcePath);
-						loaderContext.fs.readFile(resourcePath, callback);
+						loaderContext.fs.readFile(resourcePath, (err, result) => {
+							if (err) return callback(err);
+							loaderContext.addDependency(resourcePath);
+							callback(null, result);
+						});
 					});
 			}
 		);