vite-plugin-singlefile-compression 2.0.4 → 2.0.5

package/LICENSE.txt

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright © 2024-present bddjr ; Adapted from https://www.npmjs.com/package/vite-plugin-singlefile
+Copyright © 2024 bddjr
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -105,19 +105,19 @@ export interface Options {
 https://bddjr.github.io/vite-plugin-singlefile-compression/
 
 ```
-vite v6.0.11 building for production...
+vite v6.2.6 building for production...
 ✓ 45 modules transformed.
 rendering chunks (1)...
 
-vite-plugin-singlefile-compression 2.0.1 building...
+vite-plugin-singlefile-compression 2.0.5 building...
 
-  file:///D:/bddjr/Desktop/code/js/vite-plugin-singlefile-compression/test/dist/index.html
-  101.6 KiB -> 46.39 KiB
+  file:///D:/code/js/vite-plugin-singlefile-compression/test/dist/index.html
+  101.63 KiB -> 46.42 KiB
 
 Finish.
 
-dist/index.html  47.50 kB
-✓ built in 732ms
+dist/index.html  47.53 kB
+✓ built in 770ms
 ```
 
 ![](effect.jpg)
@@ -133,10 +133,3 @@ npm i
 cd ..
 npm run build
 ```
-
-## License
-
-Using [MIT License](LICENSE.txt).  
-[src/template](src/template) using [Unlicense](src/template/LICENSE.txt).
-
-Adapted from [vite-plugin-singlefile](https://www.npmjs.com/package/vite-plugin-singlefile).

package/dist/cutPrefix.d.ts

@@ -0,0 +1 @@
+export declare function cutPrefix(str: string, prefix: string): string;

package/dist/cutPrefix.js

@@ -0,0 +1,5 @@
+export function cutPrefix(str, prefix) {
+    return str.startsWith(prefix)
+        ? str.slice(prefix.length)
+        : str;
+}

package/dist/getTemplate.d.ts

@@ -1,5 +1,8 @@
+import { compressFormat } from './compress.js';
 export declare const template: {
-    base(script: string, format: string, useBase128: boolean): string;
+    base(script: string, format: compressFormat, useBase128: boolean): string;
     assets(assetsJSON: string): string;
-    resolve: string;
+    css(cssSource: string): string;
+    icon(dataURL: string): string;
+    importmeta(p: string): string;
 };

package/dist/getTemplate.js

@@ -1,13 +1,26 @@
 import fs from 'fs';
 import { fileURLToPath } from 'url';
+import { compress } from './compress.js';
+function r(name) {
+    return fs.readFileSync(fileURLToPath(import.meta.resolve(`./template/${name}.js`))).toString();
+}
+function rt(name, template) {
+    const s = r(name).split(template, 2);
+    if (s.length !== 2)
+        throw "s.length!==2";
+    return s;
+}
 const files = {
-    base64: fs.readFileSync(fileURLToPath(import.meta.resolve("./template/base64.js"))).toString(),
-    base128: fs.readFileSync(fileURLToPath(import.meta.resolve("./template/base128.js"))).toString(),
-    assets: fs.readFileSync(fileURLToPath(import.meta.resolve("./template/assets.js"))).toString().split('{"":""}', 2),
-    resolve: fs.readFileSync(fileURLToPath(import.meta.resolve("./template/resolve.js"))).toString(),
+    base64: r('base64'),
+    base128: r('base128'),
+    assets: rt('assets', '{"":""}'),
+    css: rt('css', '"<style>"'),
+    icon: rt('icon', '"<icon>"'),
+    importmeta: rt('importmeta', '"<path>"'),
 };
 export const template = {
     base(script, format, useBase128) {
+        script = compress(format, script, useBase128);
         if (useBase128) {
             return files.base128
                 .replace("<format>", format)
@@ -20,5 +33,13 @@ export const template = {
     assets(assetsJSON) {
         return files.assets.join(assetsJSON);
     },
-    resolve: files.resolve,
+    css(cssSource) {
+        return files.css.join(JSON.stringify(cssSource));
+    },
+    icon(dataURL) {
+        return files.icon.join(JSON.stringify(dataURL));
+    },
+    importmeta(p) {
+        return files.importmeta.join(JSON.stringify(p));
+    },
 };

package/dist/index.js

@@ -6,10 +6,10 @@ import fs from 'fs';
 import { pathToFileURL } from "url";
 import { version } from './getVersion.js';
 import { template } from './getTemplate.js';
-import { compress } from "./compress.js";
 import { bufferToDataURL } from "./dataurl.js";
 import { KiB } from "./KiB.js";
 import { getInnerOptions } from "./options.js";
+import { cutPrefix } from "./cutPrefix.js";
 export function singleFileCompression(opt) {
     let conf;
     return {
@@ -22,19 +22,16 @@ export function singleFileCompression(opt) {
 }
 export default singleFileCompression;
 function setConfig(config) {
-    config.base = './';
+    config.base ??= './';
     config.build ??= {};
-    // config.build.assetsDir = 'assets'
-    config.build.cssCodeSplit = false;
+    config.build.cssCodeSplit ??= false;
     config.build.assetsInlineLimit ??= () => true;
     config.build.chunkSizeWarningLimit ??= Number.MAX_SAFE_INTEGER;
     config.build.modulePreload ??= { polyfill: false };
-    // config.build.target ??= 'esnext'
     config.build.reportCompressedSize ??= false;
     config.build.rollupOptions ??= {};
-    config.build.rollupOptions.output ??= {};
-    for (const output of [config.build.rollupOptions.output].flat(1)) {
-        output.inlineDynamicImports = true;
+    for (const output of [config.build.rollupOptions.output ??= {}].flat(1)) {
+        output.inlineDynamicImports ??= true;
     }
 }
 async function generateBundle(bundle, config, options) {
@@ -48,23 +45,19 @@ async function generateBundle(bundle, config, options) {
         bundle[options.rename].fileName = options.rename;
         delete bundle["index.html"];
     }
-    const distURL = pathToFileURL(config.build.outDir).href + '/';
+    const distURL = pathToFileURL(config.build.outDir).href + '/', 
     /** "assets/" */
-    const assetsDir = path.posix.join(config.build.assetsDir, '/');
+    assetsDir = path.posix.join(config.build.assetsDir, '/'), 
+    /** "./assets/" */
+    assetsDirWithBase = config.base + assetsDir, 
     /** '[href^="./assets/"]' */
-    const assetsHrefSelector = `[href^="./${assetsDir}"]`;
+    assetsHrefSelector = `[href^="${assetsDirWithBase}"]`, 
     /** '[src^="./assets/"]' */
-    const assetsSrcSelector = `[src^="./${assetsDir}"]`;
-    const fakeScript = `_vitePluginSinglefileCompression(${Date.now()})`;
-    const globalDelete = new Set();
-    const globalDoNotDelete = new Set();
-    const globalRemoveDistFileNames = new Set();
-    const globalAssetsDataURL = {};
-    const globalPublicFilesCache = {};
-    /** fotmat: ["assets/index-XXXXXXXX.js"] */
-    const bundleAssetsNames = [];
+    assetsSrcSelector = `[src^="${assetsDirWithBase}"]`, fakeScript = `_vitePluginSinglefileCompression(${Date.now()})`, globalDelete = new Set(), globalDoNotDelete = new Set(), globalRemoveDistFileNames = new Set(), globalAssetsDataURL = {}, globalPublicFilesCache = {}, 
+    /** format: ["assets/index-XXXXXXXX.js"] */
+    bundleAssetsNames = [], 
     /** format: ["index.html"] */
-    const bundleHTMLNames = [];
+    bundleHTMLNames = [];
     for (const name of Object.keys(bundle)) {
         if (name.startsWith(assetsDir))
             bundleAssetsNames.push(name);
@@ -72,50 +65,46 @@ async function generateBundle(bundle, config, options) {
             bundleHTMLNames.push(name);
     }
     for (const htmlFileName of bundleHTMLNames) {
+        console.log("\n  " + pc.underline(pc.cyan(distURL) + pc.greenBright(bundle[htmlFileName].fileName)));
         // init
-        const htmlChunk = bundle[htmlFileName];
-        const oldHTML = htmlChunk.source;
+        const htmlChunk = bundle[htmlFileName], oldHTML = htmlChunk.source, dom = new JSDOM(oldHTML), document = dom.window.document, thisDel = new Set(), newJSCode = [], scriptElement = document.querySelector(`script[type=module]${assetsSrcSelector}`), scriptName = scriptElement ? cutPrefix(scriptElement.src, config.base) : '';
         let oldSize = oldHTML.length;
-        const dom = new JSDOM(oldHTML);
-        const document = dom.window.document;
-        const scriptElement = document.querySelector(`script[type=module]${assetsSrcSelector}`);
-        if (!scriptElement) {
-            console.error(`Error: Can not find script tag from ${htmlFileName}`);
-            continue;
+        // fill fake script
+        if (scriptElement) {
+            scriptElement.remove();
+            scriptElement.removeAttribute('src');
+            scriptElement.innerHTML = fakeScript;
+            document.body.appendChild(scriptElement);
+        }
+        else {
+            document.body.insertAdjacentHTML('beforeend', `<script type="module">${fakeScript}</script>`);
         }
-        const thisDel = new Set();
-        // Fix async import
-        const newJSCode = ["self.__VITE_PRELOAD__=void 0"];
         // get css tag
-        {
-            const element = document.querySelector(`link[rel=stylesheet]${assetsHrefSelector}`);
-            if (element) {
-                const name = element.href.slice("./".length);
-                thisDel.add(name);
-                const css = bundle[name];
-                const cssSource = css.source;
-                if (cssSource) {
-                    oldSize += cssSource.length;
-                    // do not delete not inlined asset
-                    for (const name of bundleAssetsNames) {
-                        if (cssSource.includes(name.slice(assetsDir.length)))
-                            globalDoNotDelete.add(name);
-                    }
-                    // add script for load css
-                    newJSCode.push(
-                    // 'document.querySelector("script[type=module]").insertAdjacentElement("afterend",document.createElement("style")).innerHTML='
-                    'document.head.appendChild(document.createElement("style")).innerHTML='
-                        + JSON.stringify(cssSource.replace(/\n$/, '')));
+        let allCSS = '';
+        for (const element of document.querySelectorAll(`link[rel=stylesheet]${assetsHrefSelector}`)) {
+            const name = cutPrefix(element.href, config.base);
+            thisDel.add(name);
+            const css = bundle[name];
+            const cssSource = css.source;
+            if (cssSource) {
+                oldSize += cssSource.length;
+                // do not delete not inlined asset
+                for (const name of bundleAssetsNames) {
+                    if (cssSource.includes(name.slice(assetsDir.length)))
+                        globalDoNotDelete.add(name);
                 }
-                // delete tag
-                element.remove();
+                // add script for load css
+                allCSS += cssSource.replace(/\n$/, '');
             }
+            // remove tag
+            element.remove();
         }
+        newJSCode.push(template.css(allCSS));
         // inline html assets
         const assetsDataURL = {};
         if (options.tryInlineHtmlAssets) {
             for (const element of document.querySelectorAll(assetsSrcSelector)) {
-                const name = element.src.slice(`./${assetsDir}`.length);
+                const name = cutPrefix(element.src, assetsDirWithBase);
                 if (name.endsWith('.js'))
                     continue;
                 if (!Object.hasOwn(assetsDataURL, name)) {
@@ -139,9 +128,9 @@ async function generateBundle(bundle, config, options) {
             let needInline = true;
             let iconName = 'favicon.ico';
             // replace tag
-            const element = document.querySelector('link[rel=icon][href^="./"], link[rel="shortcut icon"][href^="./"]');
+            const element = document.querySelector(`link[rel=icon][href^="${config.base}"], link[rel="shortcut icon"][href^="${config.base}"]`);
             if (element) {
-                iconName = element.href.slice("./".length);
+                iconName = cutPrefix(element.href, config.base);
                 if (bundleAssetsNames.includes(iconName)) {
                     needInline = false;
                 }
@@ -172,7 +161,7 @@ async function generateBundle(bundle, config, options) {
                     }
                     const { dataURL, size } = globalPublicFilesCache[iconName];
                     oldSize += size;
-                    newJSCode.push('document.querySelector("link[rel=icon]").href=' + JSON.stringify(dataURL));
+                    newJSCode.push(template.icon(dataURL));
                     if (!element) {
                         // add link icon tag
                         document.head.insertAdjacentHTML('beforeend', '<link rel="icon" href="data:">');
@@ -184,48 +173,47 @@ async function generateBundle(bundle, config, options) {
                 }
             }
         }
-        // script
-        {
-            const name = scriptElement.src.slice("./".length);
-            thisDel.add(name);
-            const js = bundle[name];
-            oldSize += js.code.length;
-            // fix new URL
-            newJSCode.push(`import.meta.url=new URL(${JSON.stringify(name)},location).href`);
-            // fix import.meta.resolve
-            newJSCode.push(template.resolve);
+        // generate html
+        htmlChunk.source = dom.serialize();
+        // minify html
+        if (options.htmlMinifierTerser)
+            htmlChunk.source = await htmlMinify(htmlChunk.source, options.htmlMinifierTerser);
+        // fill script
+        function inlineHtmlAssets() {
+            if (options.tryInlineHtmlAssets) {
+                // add script for load html assets
+                const assetsJSON = JSON.stringify(assetsDataURL);
+                if (assetsJSON !== '{}')
+                    newJSCode.push(template.assets(assetsJSON));
+            }
+        }
+        if (scriptElement) {
+            thisDel.add(scriptName);
+            let { code } = bundle[scriptName];
+            oldSize += code.length;
+            code = code.replace(/;?\n?$/, '');
             // do not delete not inlined asset
             for (const name of bundleAssetsNames) {
                 const assetName = name.slice(assetsDir.length);
-                if (js.code.includes(assetName)) {
+                if (code.includes(assetName)) {
                     globalDoNotDelete.add(name);
                     delete assetsDataURL[assetName];
                 }
             }
-            if (options.tryInlineHtmlAssets) {
-                // add script for load html assets
-                const assetsJSON = JSON.stringify(assetsDataURL);
-                if (assetsJSON != '{}')
-                    newJSCode.push(template.assets(assetsJSON));
-            }
-            // add script
-            newJSCode.push(js.code.replace(/;?\n?$/, ''));
+            inlineHtmlAssets();
+            newJSCode.push(template.importmeta(scriptName));
+            // 此 polyfill 仅在以下选项的值为 true 时需要。
+            // config.build.rollupOptions.output.inlineDynamicImports
+            if (code.includes("__VITE_PRELOAD__"))
+                newJSCode.push("var __VITE_PRELOAD__");
+            newJSCode.push(code);
         }
-        // fill fake script
-        scriptElement.removeAttribute('src');
-        scriptElement.removeAttribute('crossorigin');
-        scriptElement.innerHTML = fakeScript;
-        // generate html
-        htmlChunk.source = dom.serialize();
-        // minify html
-        if (options.htmlMinifierTerser)
-            htmlChunk.source = await htmlMinify(htmlChunk.source, options.htmlMinifierTerser);
-        // fill script
-        htmlChunk.source = htmlChunk.source.split(fakeScript, 2).join(template.base(compress(options.compressFormat, newJSCode.join(';'), options.useBase128), options.compressFormat, options.useBase128));
+        else {
+            inlineHtmlAssets();
+        }
+        htmlChunk.source = htmlChunk.source.split(fakeScript, 2).join(template.base(newJSCode.join(';'), options.compressFormat, options.useBase128));
         // log
-        console.log("\n"
-            + "  " + pc.underline(pc.cyan(distURL) + pc.greenBright(bundle[htmlFileName].fileName)) + '\n'
-            + "  " + pc.gray(KiB(oldSize) + " -> ") + pc.cyanBright(KiB(htmlChunk.source.length)) + '\n');
+        console.log("  " + pc.gray(KiB(oldSize) + " -> ") + pc.cyanBright(KiB(htmlChunk.source.length)) + '\n');
         // delete assets
         for (const name of thisDel) {
             globalDelete.add(name);
@@ -250,5 +238,5 @@ async function generateBundle(bundle, config, options) {
             }
         }
     }
-    console.log(pc.green('Finish.\n'));
+    console.log(pc.green('Finish.') + pc.reset('\n'));
 }

package/dist/template/css.js

@@ -0,0 +1 @@
+document.head.appendChild(document.createElement("style")).innerHTML="<style>"

package/dist/template/icon.js

@@ -0,0 +1 @@
+document.querySelector("link[rel=icon]").href="<icon>"

package/dist/template/importmeta.js

@@ -0,0 +1 @@
+{import.meta.url=new URL("<path>",location).href;let t=import.meta.resolve;import.meta.resolve=e=>/^\.{0,2}\//.test(e)?new URL(e,import.meta.url).href:t(e)}

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "vite-plugin-singlefile-compression",
-  "version": "2.0.4",
+  "version": "2.0.5",
+  "author": "bddjr",
+  "license": "MIT",
+  "description": "",
   "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
@@ -11,9 +14,6 @@
     "build": "rimraf dist && tsc && node build.js && cd test && npm run build",
     "prepublishOnly": "npm run build"
   },
-  "author": "bddjr",
-  "license": "MIT",
-  "description": "",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/bddjr/vite-plugin-singlefile-compression.git"

package/dist/template/LICENSE.txt

@@ -1,24 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <https://unlicense.org/>

package/dist/template/resolve.js

@@ -1 +0,0 @@
-{let t=import.meta.resolve;import.meta.resolve=e=>/^\.{0,2}\//.test(e)?new URL(e,import.meta.url).href:t(e)}