@unocss/vite 0.53.4 → 0.53.5

package/dist/index.cjs

@@ -521,8 +521,9 @@ function GlobalModeBuildPlugin(ctx) {
           return null;
         }
         const result = await generateAll();
+        const mappedVfsLayer = Array.from(vfsLayers).map((layer) => layer === LAYER_MARK_ALL ? layer : layer.replace(/^_/, ""));
         const cssWithLayers = Array.from(vfsLayers).map(
-          (layer) => `#--unocss-layer-start--${layer}--{start:${layer}} ${layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayers)) : result.getLayer(layer) || ""} #--unocss-layer-end--${layer}--{end:${layer}}`
+          (layer) => `#--unocss-layer-start--${layer}--{start:${layer}} ${layer === LAYER_MARK_ALL ? result.getLayers(void 0, mappedVfsLayer) : result.getLayer(layer.replace(/^_/, "")) || ""} #--unocss-layer-end--${layer}--{end:${layer}}`
         ).join("");
         const fakeCssId = `${viteConfig.root}/${chunk.fileName}-unocss-hash.css`;
         const css = await applyCssTransform(cssWithLayers, fakeCssId, options.dir, this);
@@ -1061,7 +1062,7 @@ const MODULES_MAP = {
   [DEVTOOLS_MODULE_ID]: DEVTOOLS_PATH,
   [MOCK_CLASSES_MODULE_ID]: MOCK_CLASSES_PATH
 };
-const POST_PATH = "/@unocss-devtools-update";
+const BASE_POST_PATH = "/@unocss-devtools-update";
 function getBodyJson(req) {
   return new Promise((resolve2, reject) => {
     let body = "";
@@ -1082,6 +1083,7 @@ function createDevtoolsPlugin(ctx) {
   let clientCode = "";
   let devtoolTimer;
   let lastUpdate = Date.now();
+  let postPath = BASE_POST_PATH;
   function toClass(name) {
     return `${core.toEscapedSelector(name)}{}`;
   }
@@ -1122,11 +1124,12 @@ function createDevtoolsPlugin(ctx) {
       name: "unocss:devtools",
       configResolved(_config) {
         config = _config;
+        postPath = `${config.base?.replace(/\/$/, "") ?? ""}${BASE_POST_PATH}`;
       },
       configureServer(_server) {
         server = _server;
         server.middlewares.use(async (req, res, next) => {
-          if (req.url !== POST_PATH)
+          if (req.url !== postPath)
             return next();
           try {
             const data = await getBodyJson(req);
@@ -1163,7 +1166,7 @@ function createDevtoolsPlugin(ctx) {
               await fs__default$1.promises.readFile(node_path.resolve(_dirname, "client.mjs"), "utf-8"),
               `import('${MOCK_CLASSES_MODULE_ID}')`,
               `import('${DEVTOOLS_CSS_PATH}')`
-            ].join("\n").replace("__POST_PATH__", (config.server?.origin ?? "") + POST_PATH);
+            ].join("\n").replace("__POST_PATH__", `${config.server?.origin ?? ""}${postPath}`);
           }
           return config.command === "build" ? "" : clientCode;
         } else if (id === MOCK_CLASSES_PATH) {

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import * as vite from 'vite';
 import { Plugin } from 'vite';
 import { UserConfig, UnocssPluginContext, UserConfigDefaults } from '@unocss/core';
 
-interface VitePluginConfig<Theme extends {} = {}> extends UserConfig<Theme> {
+interface VitePluginConfig<Theme extends object = object> extends UserConfig<Theme> {
     /**
      * Enable UnoCSS inspector
      *
@@ -59,7 +59,7 @@ declare function PerModuleModePlugin({ uno, filter }: UnocssPluginContext): Plug
 
 declare function VueScopedPlugin({ uno, ready }: UnocssPluginContext): Plugin;
 
-declare function defineConfig<Theme extends {}>(config: VitePluginConfig<Theme>): VitePluginConfig<Theme>;
-declare function UnocssPlugin<Theme extends {}>(configOrPath?: VitePluginConfig<Theme> | string, defaults?: UserConfigDefaults): Plugin[];
+declare function defineConfig<Theme extends object>(config: VitePluginConfig<Theme>): VitePluginConfig<Theme>;
+declare function UnocssPlugin<Theme extends object>(configOrPath?: VitePluginConfig<Theme> | string, defaults?: UserConfigDefaults): Plugin[];
 
 export { ChunkModeBuildPlugin, GlobalModeBuildPlugin, GlobalModeDevPlugin, GlobalModePlugin, PerModuleModePlugin, VitePluginConfig, VueScopedPlugin, UnocssPlugin as default, defineConfig };

package/dist/index.mjs

@@ -508,8 +508,9 @@ function GlobalModeBuildPlugin(ctx) {
           return null;
         }
         const result = await generateAll();
+        const mappedVfsLayer = Array.from(vfsLayers).map((layer) => layer === LAYER_MARK_ALL ? layer : layer.replace(/^_/, ""));
         const cssWithLayers = Array.from(vfsLayers).map(
-          (layer) => `#--unocss-layer-start--${layer}--{start:${layer}} ${layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayers)) : result.getLayer(layer) || ""} #--unocss-layer-end--${layer}--{end:${layer}}`
+          (layer) => `#--unocss-layer-start--${layer}--{start:${layer}} ${layer === LAYER_MARK_ALL ? result.getLayers(void 0, mappedVfsLayer) : result.getLayer(layer.replace(/^_/, "")) || ""} #--unocss-layer-end--${layer}--{end:${layer}}`
         ).join("");
         const fakeCssId = `${viteConfig.root}/${chunk.fileName}-unocss-hash.css`;
         const css = await applyCssTransform(cssWithLayers, fakeCssId, options.dir, this);
@@ -1048,7 +1049,7 @@ const MODULES_MAP = {
   [DEVTOOLS_MODULE_ID]: DEVTOOLS_PATH,
   [MOCK_CLASSES_MODULE_ID]: MOCK_CLASSES_PATH
 };
-const POST_PATH = "/@unocss-devtools-update";
+const BASE_POST_PATH = "/@unocss-devtools-update";
 function getBodyJson(req) {
   return new Promise((resolve2, reject) => {
     let body = "";
@@ -1069,6 +1070,7 @@ function createDevtoolsPlugin(ctx) {
   let clientCode = "";
   let devtoolTimer;
   let lastUpdate = Date.now();
+  let postPath = BASE_POST_PATH;
   function toClass(name) {
     return `${toEscapedSelector(name)}{}`;
   }
@@ -1109,11 +1111,12 @@ function createDevtoolsPlugin(ctx) {
       name: "unocss:devtools",
       configResolved(_config) {
         config = _config;
+        postPath = `${config.base?.replace(/\/$/, "") ?? ""}${BASE_POST_PATH}`;
       },
       configureServer(_server) {
         server = _server;
         server.middlewares.use(async (req, res, next) => {
-          if (req.url !== POST_PATH)
+          if (req.url !== postPath)
             return next();
           try {
             const data = await getBodyJson(req);
@@ -1150,7 +1153,7 @@ function createDevtoolsPlugin(ctx) {
               await fs$1.promises.readFile(resolve(_dirname, "client.mjs"), "utf-8"),
               `import('${MOCK_CLASSES_MODULE_ID}')`,
               `import('${DEVTOOLS_CSS_PATH}')`
-            ].join("\n").replace("__POST_PATH__", (config.server?.origin ?? "") + POST_PATH);
+            ].join("\n").replace("__POST_PATH__", `${config.server?.origin ?? ""}${postPath}`);
           }
           return config.command === "build" ? "" : clientCode;
         } else if (id === MOCK_CLASSES_PATH) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.53.4",
+  "version": "0.53.5",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -45,17 +45,17 @@
     "@ampproject/remapping": "^2.2.1",
     "@rollup/pluginutils": "^5.0.2",
     "chokidar": "^3.5.3",
-    "fast-glob": "^3.2.12",
-    "magic-string": "^0.30.0",
-    "@unocss/config": "0.53.4",
-    "@unocss/core": "0.53.4",
-    "@unocss/inspector": "0.53.4",
-    "@unocss/scope": "0.53.4",
-    "@unocss/transformer-directives": "0.53.4"
+    "fast-glob": "^3.3.0",
+    "magic-string": "^0.30.1",
+    "@unocss/config": "0.53.5",
+    "@unocss/core": "0.53.5",
+    "@unocss/inspector": "0.53.5",
+    "@unocss/scope": "0.53.5",
+    "@unocss/transformer-directives": "0.53.5"
   },
   "devDependencies": {
-    "vite": "^4.3.9",
-    "@unocss/shared-integration": "0.53.4"
+    "vite": "^4.4.2",
+    "@unocss/shared-integration": "0.53.5"
   },
   "scripts": {
     "build": "unbuild",