@plumeria/unplugin 18.1.3 → 18.1.4

package/dist/bun.d.ts

@@ -1,3 +1,3 @@
 import { type PluginOptions } from './core';
-declare const _default: (options?: PluginOptions | undefined) => BunPlugin;
+declare const _default: (options?: PluginOptions) => any;
 export default _default;

package/dist/bun.js

@@ -2,4 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const unplugin_1 = require("unplugin");
 const core_1 = require("./core");
-exports.default = (0, unplugin_1.createBunPlugin)(core_1.unpluginFactory);
+const css_marker_1 = require("./css-marker");
+const createPlugin = (outputs) => (0, unplugin_1.createBunPlugin)((options, metaOptions) => ({
+    ...(0, core_1.unpluginFactory)(options, metaOptions),
+    writeBundle() {
+        (0, css_marker_1.stripCssMarkersIn)(outputs);
+    },
+}));
+exports.default = (options) => {
+    const outputs = new Set();
+    const plugin = createPlugin(outputs)(options);
+    const setup = plugin.setup;
+    return {
+        ...plugin,
+        async setup(build) {
+            const outdir = build?.config?.outdir;
+            if (outdir)
+                outputs.add(outdir);
+            return setup.call(plugin, build);
+        },
+    };
+};

package/dist/bun.mjs

@@ -1,3 +1,23 @@
 import { createBunPlugin } from 'unplugin';
 import { unpluginFactory } from './core.mjs';
-export default createBunPlugin(unpluginFactory);
+import { stripCssMarkersIn } from './css-marker.mjs';
+const createPlugin = (outputs) => createBunPlugin((options, metaOptions) => ({
+    ...unpluginFactory(options, metaOptions),
+    writeBundle() {
+        stripCssMarkersIn(outputs);
+    },
+}));
+export default (options) => {
+    const outputs = new Set();
+    const plugin = createPlugin(outputs)(options);
+    const setup = plugin.setup;
+    return {
+        ...plugin,
+        async setup(build) {
+            const outdir = build?.config?.outdir;
+            if (outdir)
+                outputs.add(outdir);
+            return setup.call(plugin, build);
+        },
+    };
+};

package/dist/core.js

@@ -70,11 +70,7 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
             const [pathId, query] = id.split('?');
             if (pathId.endsWith('.zero.css')) {
                 if (pathId.startsWith('/')) {
-                    let absolutePath = cssFileLookup.get(pathId);
-                    if (!absolutePath) {
-                        absolutePath = path.join(viteRoot, pathId);
-                    }
-                    return query ? `${absolutePath}?${query}` : absolutePath;
+                    return id;
                 }
                 if (importer && !path.isAbsolute(pathId)) {
                     const resolved = path.resolve(path.dirname(importer), pathId);
@@ -90,7 +86,8 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
         },
         load(id) {
             const [pathId] = id.split('?', 1);
-            return cssLookup.get(pathId) || '';
+            const resolved = cssFileLookup.get(pathId) ?? path.join(viteRoot, pathId);
+            return cssLookup.get(resolved) ?? cssLookup.get(pathId) ?? '';
         },
         transformInclude(id) {
             return filter(id);

package/dist/core.mjs

@@ -34,11 +34,7 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
             const [pathId, query] = id.split('?');
             if (pathId.endsWith('.zero.css')) {
                 if (pathId.startsWith('/')) {
-                    let absolutePath = cssFileLookup.get(pathId);
-                    if (!absolutePath) {
-                        absolutePath = path.join(viteRoot, pathId);
-                    }
-                    return query ? `${absolutePath}?${query}` : absolutePath;
+                    return id;
                 }
                 if (importer && !path.isAbsolute(pathId)) {
                     const resolved = path.resolve(path.dirname(importer), pathId);
@@ -54,7 +50,8 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
         },
         load(id) {
             const [pathId] = id.split('?', 1);
-            return cssLookup.get(pathId) || '';
+            const resolved = cssFileLookup.get(pathId) ?? path.join(viteRoot, pathId);
+            return cssLookup.get(resolved) ?? cssLookup.get(pathId) ?? '';
         },
         transformInclude(id) {
             return filter(id);

package/dist/css-marker.d.ts

@@ -0,0 +1,2 @@
+export declare function stripCssMarkers(css: string): string;
+export declare function stripCssMarkersIn(targets: Iterable<string>): void;

package/dist/css-marker.js

@@ -0,0 +1,87 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stripCssMarkers = stripCssMarkers;
+exports.stripCssMarkersIn = stripCssMarkersIn;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const COMMENT = /\/\*[\s\S]*?\*\//g;
+function stripCssMarkers(css) {
+    return css
+        .replace(COMMENT, (comment) => comment.includes('.zero.css') ? '' : comment)
+        .replace(/^\s*\n/, '')
+        .replace(/\n{3,}/g, '\n\n');
+}
+function collectCssFiles(target, found) {
+    let stat;
+    try {
+        stat = fs.statSync(target);
+    }
+    catch {
+        return;
+    }
+    if (stat.isFile()) {
+        if (target.endsWith('.css'))
+            found.push(target);
+        return;
+    }
+    if (!stat.isDirectory())
+        return;
+    for (const entry of fs.readdirSync(target)) {
+        collectCssFiles(path.join(target, entry), found);
+    }
+}
+function stripCssMarkersIn(targets) {
+    const found = [];
+    for (const target of targets) {
+        if (!target)
+            continue;
+        collectCssFiles(path.resolve(target), found);
+    }
+    for (const file of new Set(found)) {
+        let css;
+        try {
+            css = fs.readFileSync(file, 'utf-8');
+        }
+        catch {
+            continue;
+        }
+        if (!css.includes('.zero.css'))
+            continue;
+        const stripped = stripCssMarkers(css);
+        if (stripped !== css)
+            fs.writeFileSync(file, stripped, 'utf-8');
+    }
+}

package/dist/css-marker.mjs

@@ -0,0 +1,50 @@
+import * as fs from 'fs';
+import * as path from 'path';
+const COMMENT = /\/\*[\s\S]*?\*\//g;
+export function stripCssMarkers(css) {
+    return css
+        .replace(COMMENT, (comment) => comment.includes('.zero.css') ? '' : comment)
+        .replace(/^\s*\n/, '')
+        .replace(/\n{3,}/g, '\n\n');
+}
+function collectCssFiles(target, found) {
+    let stat;
+    try {
+        stat = fs.statSync(target);
+    }
+    catch {
+        return;
+    }
+    if (stat.isFile()) {
+        if (target.endsWith('.css'))
+            found.push(target);
+        return;
+    }
+    if (!stat.isDirectory())
+        return;
+    for (const entry of fs.readdirSync(target)) {
+        collectCssFiles(path.join(target, entry), found);
+    }
+}
+export function stripCssMarkersIn(targets) {
+    const found = [];
+    for (const target of targets) {
+        if (!target)
+            continue;
+        collectCssFiles(path.resolve(target), found);
+    }
+    for (const file of new Set(found)) {
+        let css;
+        try {
+            css = fs.readFileSync(file, 'utf-8');
+        }
+        catch {
+            continue;
+        }
+        if (!css.includes('.zero.css'))
+            continue;
+        const stripped = stripCssMarkers(css);
+        if (stripped !== css)
+            fs.writeFileSync(file, stripped, 'utf-8');
+    }
+}

package/dist/esbuild.js

@@ -1,5 +1,59 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 const unplugin_1 = require("unplugin");
+const path = __importStar(require("path"));
 const core_1 = require("./core");
-exports.default = (0, unplugin_1.createEsbuildPlugin)(core_1.unpluginFactory);
+const css_marker_1 = require("./css-marker");
+function attachEsbuildHooks(plugin) {
+    const outputs = new Set();
+    return {
+        ...plugin,
+        esbuild: {
+            ...plugin.esbuild,
+            config(options) {
+                plugin.esbuild?.config?.call(this, options);
+                if (options.outdir)
+                    outputs.add(options.outdir);
+                if (options.outfile)
+                    outputs.add(path.dirname(options.outfile));
+            },
+        },
+        writeBundle() {
+            (0, css_marker_1.stripCssMarkersIn)(outputs);
+        },
+    };
+}
+exports.default = (0, unplugin_1.createEsbuildPlugin)((options, metaOptions) => attachEsbuildHooks((0, core_1.unpluginFactory)(options, metaOptions)));

package/dist/esbuild.mjs

@@ -1,3 +1,24 @@
 import { createEsbuildPlugin } from 'unplugin';
+import * as path from 'path';
 import { unpluginFactory } from './core.mjs';
-export default createEsbuildPlugin(unpluginFactory);
+import { stripCssMarkersIn } from './css-marker.mjs';
+function attachEsbuildHooks(plugin) {
+    const outputs = new Set();
+    return {
+        ...plugin,
+        esbuild: {
+            ...plugin.esbuild,
+            config(options) {
+                plugin.esbuild?.config?.call(this, options);
+                if (options.outdir)
+                    outputs.add(options.outdir);
+                if (options.outfile)
+                    outputs.add(path.dirname(options.outfile));
+            },
+        },
+        writeBundle() {
+            stripCssMarkersIn(outputs);
+        },
+    };
+}
+export default createEsbuildPlugin((options, metaOptions) => attachEsbuildHooks(unpluginFactory(options, metaOptions)));

package/dist/index.d.ts

@@ -8,7 +8,7 @@ import vite from './vite';
 import webpack from './webpack';
 import unloader from './unloader';
 declare const plumeria: {
-    bun: (options?: import("./core").PluginOptions | undefined) => BunPlugin;
+    bun: (options?: import("./core").PluginOptions) => any;
     esbuild: (options?: import("./core").PluginOptions | undefined) => import("unplugin").EsbuildPlugin;
     farm: (options?: import("./core").PluginOptions) => any;
     rolldown: (options?: import("./core").PluginOptions | undefined) => import("unplugin").RolldownPlugin<any> | import("unplugin").RolldownPlugin<any>[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/unplugin",
-  "version": "18.1.3",
+  "version": "18.1.4",
   "description": "Universal Plumeria plugin for various build tools",
   "author": "Refirst 11",
   "license": "MIT",
@@ -89,7 +89,7 @@
   "dependencies": {
     "@rollup/pluginutils": "^5.4.0",
     "unplugin": "^3.0.0",
-    "@plumeria/utils": "^18.1.3"
+    "@plumeria/utils": "^18.1.4"
   },
   "devDependencies": {
     "@swc/core": "1.15.47",