vite-plugin-singlefile-compression 2.2.1 → 2.2.3

package/README.md

@@ -152,21 +152,21 @@ type: `boolean`
 Preview: https://bddjr.github.io/vite-plugin-singlefile-compression/
 
 ```
-vite v8.0.3 building client environment for production...
+vite v8.0.5 building client environment for production...
 ✓ 42 modules transformed.
 rendering chunks (1)...
 
-vite-plugin-singlefile-compression 2.2.1 deflate-raw base128-ascii
+vite-plugin-singlefile-compression 2.2.3 deflate-raw base128-ascii
 
   file:///D:/code/js/vite-plugin-singlefile-compression/test/dist/index.html
-  122.739 kB -> 50.220 kB
+  122.750 kB -> 50.221 kB
 
 Finish.
 
 computing gzip size...
-dist/index.html  50.22 kB │ gzip: 43.77 kB
+dist/index.html  50.22 kB │ gzip: 43.79 kB
 
-✓ built in 461ms
+✓ built in 275ms
 ```
 
 ## Clone

package/dist/index.d.ts

@@ -2,27 +2,27 @@ import { Options as HtmlMinifierOptions } from "html-minifier-terser";
 import zlib from "zlib";
 import { PluginOption } from "vite";
 
-//#region _dist/compress.d.ts
+//#region src/compress.d.ts
 declare const compressors: {
-  "deflate-raw"(buf: zlib.InputType): Buffer;
-  deflate(buf: zlib.InputType): Buffer;
-  gzip(buf: zlib.InputType): Buffer;
-  brotli: typeof zlib.brotliCompressSync;
-  zstd: (buf: zlib.InputType) => NonSharedBuffer;
+  readonly "deflate-raw": (buf: zlib.InputType) => Buffer;
+  readonly deflate: (buf: zlib.InputType) => Buffer;
+  readonly gzip: (buf: zlib.InputType) => Buffer;
+  readonly brotli: typeof zlib.brotliCompressSync;
+  readonly zstd: (buf: zlib.InputType) => Buffer;
+};
+declare const compressFormatAlias: {
+  readonly deflateRaw: "deflate-raw";
+  readonly gz: "gzip";
+  readonly br: "brotli";
+  readonly brotliCompress: "brotli";
+  readonly zstandard: "zstd";
+  readonly zst: "zstd";
 };
-declare const compressFormatAlias: Readonly<{
-  deflateRaw: "deflate-raw";
-  gz: "gzip";
-  br: "brotli";
-  brotliCompress: "brotli";
-  zstandard: "zstd";
-  zst: "zstd";
-}>;
 type Compressor = ((buf: zlib.InputType) => (Buffer | Uint8Array | Promise<Buffer | Uint8Array>));
 type CompressFormat = keyof typeof compressors | CompressionFormat;
 type CompressFormatAlias = keyof typeof compressFormatAlias;
 //#endregion
-//#region _dist/options.d.ts
+//#region src/options.d.ts
 interface Options {
   /**
    * Rename index.html
@@ -87,7 +87,7 @@ interface Options {
 }
 declare const defaultHtmlMinifierTerserOptions: HtmlMinifierOptions;
 //#endregion
-//#region _dist/index.d.ts
+//#region src/index.d.ts
 declare function singleFileCompression(opt?: Options): PluginOption;
 //#endregion
 export { CompressFormat, CompressFormatAlias, Compressor, HtmlMinifierOptions, Options, singleFileCompression as default, singleFileCompression, defaultHtmlMinifierTerserOptions };

package/dist/index.js

@@ -8,10 +8,10 @@ import base128 from "base128-ascii";
 import zlib from "zlib";
 import svgToTinyDataUri from "mini-svg-data-uri";
 import mime from "mime";
-//#region _dist/getVersion.js
-var version = "2.2.1";
+//#region package.json
+var version = "2.2.3";
 //#endregion
-//#region _dist/compress.js
+//#region src/compress.ts
 const compressors = {
 	"deflate-raw"(buf) {
 		return zlib.deflateRawSync(buf, { level: zlib.constants.Z_BEST_COMPRESSION });
@@ -25,14 +25,14 @@ const compressors = {
 	brotli: zlib.brotliCompressSync,
 	zstd: zlib.zstdCompressSync && ((buf) => zlib.zstdCompressSync(buf, { params: { [zlib.constants.ZSTD_c_compressionLevel]: 19 } }))
 };
-const compressFormatAlias = Object.freeze({
+const compressFormatAlias = {
 	deflateRaw: "deflate-raw",
 	gz: "gzip",
 	br: "brotli",
 	brotliCompress: "brotli",
 	zstandard: "zstd",
 	zst: "zstd"
-});
+};
 function switchCompressor(format) {
 	if (compressors.hasOwnProperty(format)) {
 		const f = compressors[format];
@@ -64,62 +64,59 @@ async function compress(format, buf, useBase128, compressor) {
 	return Buffer.from(outBuf).toString("base64");
 }
 //#endregion
-//#region _dist/templateRaw.js
-var raw = {
-	"assets": "{let e={\"\":\"\"};for(let o in e)for(let s of document.querySelectorAll(`[src=\"data:${o}\"]`))s.src=e[o]}",
-	"base128": "var a=\"<script>\",c=a.length,r=new Uint8Array(c/8*7),p=0,n=0,e,t=o=>(e=a.charCodeAt(p++))>127?e=0:e,i=Response;for(;p<c;)r[n++]=t()<<1|t()>>6,r[n++]=e<<2|t()>>5,r[n++]=e<<3|t()>>4,r[n++]=e<<4|t()>>3,r[n++]=e<<5|t()>>2,r[n++]=e<<6|t()>>1,r[n++]=e<<7|t();new i(new i(r).body.pipeThrough(new DecompressionStream(\"<format>\")),{headers:{\"Content-Type\":\"text/javascript\"}}).blob().then(o=>(import(o=URL.createObjectURL(o)),URL.revokeObjectURL(o)))",
-	"base64": "fetch(\"data:;base64,<script>\").then(e=>new Response(e.body.pipeThrough(new DecompressionStream(\"<format>\")),{headers:{\"Content-Type\":\"text/javascript\"}}).blob()).then(e=>(import(e=URL.createObjectURL(e)),URL.revokeObjectURL(e)))",
-	"css": "document.head.appendChild(document.createElement(\"style\")).innerHTML=\"<style>\"",
-	"icon": "document.querySelector(\"link[rel=icon]\").href=\"<icon>\"",
-	"importmeta": "{let e=import.meta,r=e.resolve,l=e.url=new URL(\"<path>\",location).href;e.resolve=function(t){return/^\\.{0,2}\\//.test(t)?new URL(t,l).href:r.apply(this,arguments)}}"
-};
-//#endregion
-//#region _dist/getTemplate.js
-function split2(str, separator) {
-	const s = str.split(separator);
-	if (s.length !== 2) throw Error("s.length!==2");
-	return s;
-}
+//#region _dist/templateRaw.ts
 const files = {
-	base64: raw.base64,
-	base128: raw.base128,
-	assets: split2(raw.assets, "{\"\":\"\"}"),
-	css: split2(raw.css, "\"<style>\""),
-	icon: split2(raw.icon, "\"<icon>\""),
-	importmeta: split2(raw.importmeta, "\"<path>\"")
+	"assets": ["{let e=", ";for(let l in e)for(let r of document.querySelectorAll(`[src=\"data:${l}\"]`))r.src=e[l]}"],
+	"base128": [
+		"for(var e,t=",
+		",r=t.length,n=new Uint8Array(r/8*7),o=0,a=0,_=r=>(e=t.charCodeAt(o++))>127?e=0:e,p=Response;o<r;)n[a++]=_()<<1|_()>>6,n[a++]=e<<2|_()>>5,n[a++]=e<<3|_()>>4,n[a++]=e<<4|_()>>3,n[a++]=e<<5|_()>>2,n[a++]=e<<6|_()>>1,n[a++]=e<<7|_();new p(new p(n).body.pipeThrough(new DecompressionStream(",
+		")),{headers:{\"Content-Type\":\"text/javascript\"}}).blob().then(e=>(import(e=URL.createObjectURL(e)),URL.revokeObjectURL(e)))"
+	],
+	"base64": [
+		"fetch(\"data:;base64,",
+		"\").then(e=>new Response(e.body.pipeThrough(new DecompressionStream(",
+		")),{headers:{\"Content-Type\":\"text/javascript\"}}).blob()).then(e=>(import(e=URL.createObjectURL(e)),URL.revokeObjectURL(e)))"
+	],
+	"css": "document.head.appendChild(document.createElement(\"style\")).innerHTML=",
+	"icon": "document.querySelector(\"link[rel=icon]\").href=",
+	"importmeta": ["{let e=import.meta,t=e.resolve,r=e.url=new URL(", ",location).href;e.resolve=function(e){return/^\\.{0,2}\\//.test(e)?new URL(e,r).href:t.apply(this,arguments)}}"]
 };
+//#endregion
+//#region src/getTemplate.ts
 const template = {
 	async base(script, format, useBase128, compressor) {
 		script = await compress(format, script, useBase128, compressor);
-		if (useBase128) return files.base128.replace("<format>", format).split("\"<script>\"", 2).join(script);
-		return files.base64.replace("<format>", format).split("<script>", 2).join(script);
+		const t = useBase128 ? files.base128 : files.base64;
+		return t[0].concat(script, t[1], JSON.stringify(format), t[2]);
 	},
 	assets(assetsJSON) {
-		return files.assets.join(assetsJSON);
+		const t = files.assets;
+		return t[0].concat(JSON.stringify(assetsJSON), t[1]);
 	},
 	css(cssSource) {
-		return files.css.join(JSON.stringify(cssSource));
+		return files.css + JSON.stringify(cssSource);
 	},
 	icon(dataURL) {
-		return files.icon.join(JSON.stringify(dataURL));
+		return files.icon + JSON.stringify(dataURL);
 	},
 	importmeta(p) {
-		return files.importmeta.join(JSON.stringify(p));
+		const t = files.importmeta;
+		return t[0].concat(JSON.stringify(p), t[1]);
 	}
 };
 //#endregion
-//#region _dist/dataurl.js
+//#region src/dataurl.ts
 function bufferToDataURL(name, b) {
 	return /\.svg$/i.test(name) ? svgToTinyDataUri(b.toString()) : `data:${mime.getType(name)};base64,${b.toString("base64")}`;
 }
 //#endregion
-//#region _dist/kB.js
+//#region src/kB.ts
 function kB(size) {
 	const s = String(size).padStart(4, "0");
 	return `${s.slice(0, -3)}.${s.slice(-3)} kB`;
 }
 //#endregion
-//#region _dist/options.js
+//#region src/options.ts
 const defaultHtmlMinifierTerserOptions = {
 	removeAttributeQuotes: true,
 	removeComments: true,
@@ -145,12 +142,12 @@ function getInnerOptions(opt) {
 	};
 }
 //#endregion
-//#region _dist/cutPrefix.js
+//#region src/cutPrefix.ts
 function cutPrefix(str, prefix) {
 	return str.startsWith(prefix) ? str.slice(prefix.length) : str;
 }
 //#endregion
-//#region _dist/index.js
+//#region src/index.ts
 function singleFileCompression(opt) {
 	let conf;
 	const innerOptions = getInnerOptions(opt);
@@ -195,7 +192,7 @@ async function generateBundle(bundle, config, options) {
 	for (const htmlFileName of bundleHTMLNames) {
 		console.log("\n  " + pc.underline(pc.cyan(distURL) + pc.greenBright(bundle[htmlFileName].fileName)));
 		const htmlChunk = bundle[htmlFileName], oldHTML = htmlChunk.source, dom = new JSDOM(oldHTML), document = dom.window.document, thisDel = /* @__PURE__ */ new Set(), newJSCode = [], scriptElement = document.querySelector(`script[type=module]${assetsSrcSelector}`), scriptName = scriptElement ? cutPrefix(scriptElement.src, config.base) : "";
-		let oldSize = oldHTML.length;
+		let oldSize = Buffer.byteLength(oldHTML);
 		if (scriptElement) {
 			scriptElement.remove();
 			scriptElement.removeAttribute("src");
@@ -210,7 +207,7 @@ async function generateBundle(bundle, config, options) {
 			thisDel.add(name);
 			const cssSource = bundle[name].source;
 			if (cssSource) {
-				oldSize += cssSource.length;
+				oldSize += Buffer.byteLength(cssSource);
 				for (const name of bundleAssetsNames) if (cssSource.includes(name.slice(assetsDir.length))) globalDoNotDelete.add(name);
 				allCSS += cssSource.replace(/\s*(\/\*[^*]*\*\/)?\s*$/, "");
 			}
@@ -232,10 +229,15 @@ async function generateBundle(bundle, config, options) {
 				const a = bundle[bundleName];
 				if (!a) continue;
 				thisDel.add(bundleName);
-				oldSize += a.source.length;
 				let dataURL;
-				if (Object.prototype.hasOwnProperty.call(globalAssetsDataURL, name)) dataURL = globalAssetsDataURL[name];
-				else globalAssetsDataURL[name] = dataURL = bufferToDataURL(name, Buffer.from(a.source));
+				if (Object.prototype.hasOwnProperty.call(globalAssetsDataURL, name)) {
+					oldSize += Buffer.byteLength(a.source);
+					dataURL = globalAssetsDataURL[name];
+				} else {
+					const buf = Buffer.from(a.source);
+					oldSize += buf.length;
+					globalAssetsDataURL[name] = dataURL = bufferToDataURL(name, buf);
+				}
 				if (options.enableCompress) assetsDataURL[name] = dataURL;
 				else element.src = dataURL;
 			}
@@ -290,7 +292,7 @@ async function generateBundle(bundle, config, options) {
 		if (scriptElement) {
 			thisDel.add(scriptName);
 			let { code } = bundle[scriptName];
-			oldSize += code.length;
+			oldSize += Buffer.byteLength(code);
 			code = code.replace(/;?\n?$/, "");
 			for (const name of bundleAssetsNames) {
 				const assetName = name.slice(assetsDir.length);
@@ -301,14 +303,15 @@ async function generateBundle(bundle, config, options) {
 			}
 			inlineHtmlAssets();
 			if (options.useImportMetaPolyfill) newJSCode.push(template.importmeta(scriptName));
-			if (/\b__VITE_PRELOAD__\b/.test(code)) newJSCode.push("var __VITE_PRELOAD__");
+			if (/\b__VITE_PRELOAD__\b/.test(code)) if (code.startsWith("var ")) code = "var __VITE_PRELOAD__," + code.slice(4);
+			else newJSCode.push("var __VITE_PRELOAD__");
 			newJSCode.push(code);
 		} else inlineHtmlAssets();
 		let outputScript = newJSCode.join(";");
 		if (options.enableCompress) outputScript = await template.base(outputScript, options.compressFormat, options.useBase128, options.compressor);
 		else outputScript = outputScript.replaceAll("<\/script", "<\\/script");
-		htmlChunk.source = htmlChunk.source.split(fakeScript, 2).join(outputScript);
-		console.log("  " + pc.gray(kB(oldSize) + " -> ") + pc.cyanBright(kB(htmlChunk.source.length)) + "\n");
+		htmlChunk.source = htmlChunk.source.replace(fakeScript, () => outputScript);
+		console.log("  " + pc.gray(kB(oldSize) + " -> ") + pc.cyanBright(kB(Buffer.byteLength(htmlChunk.source))) + "\n");
 		for (const name of thisDel) globalDelete.add(name);
 	}
 	if (options.removeInlinedAssetFiles) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-singlefile-compression",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "author": "bddjr",
   "license": "MIT",
   "description": "Compress all assets and embeds them into dist/index.html, making it convenient to share as a single HTML file.",
@@ -11,7 +11,7 @@
   ],
   "type": "module",
   "scripts": {
-    "build": "rimraf dist _dist && tsc && node build.js && cd test && node --run build",
+    "build": "tsc && node build.js && tsc _dist/templateRaw.ts --ignoreConfig --noEmit && cd test && node --run build",
     "prepublishOnly": "node --run build"
   },
   "repository": {
@@ -32,7 +32,7 @@
     "compression",
     "compress",
     "compressionstream",
-    "decompres",
+    "decompress",
     "decompression",
     "decompressionstream",
     "compression streams api",
@@ -90,13 +90,11 @@
     "vite": ">=3.0.0"
   },
   "devDependencies": {
-    "@bddjr/rimraf": "^0.1.0",
     "@types/jsdom": ">=28.0.0",
     "@types/node": "^22.19.15",
-    "esbuild": "^0.27.4",
     "rolldown": ">=1.0.0-rc.9",
     "rolldown-plugin-dts": "^0.22.5",
-    "rollup": ">=4.59.0",
+    "terser": "^5.46.1",
     "typescript": ">=5.9.3",
     "vite": ">=8.0.0"
   }