@unocss/vite 65.4.0 → 65.4.3

package/dist/index.mjs

@@ -1,17 +1,158 @@
 import process$1 from 'node:process';
+import { createFilter } from '@rollup/pluginutils';
+import { createRecoveryConfigLoader } from '@unocss/config';
+import { cssIdRE, createGenerator, BetterMap, toEscapedSelector, LAYER_IMPORTS, LAYER_PREFLIGHTS, notNull } from '@unocss/core';
 import UnocssInspector from '@unocss/inspector';
 import fs from 'node:fs';
 import { dirname, resolve, isAbsolute } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { toEscapedSelector, cssIdRE, createGenerator, BetterMap, notNull } from '@unocss/core';
 import fs$1 from 'node:fs/promises';
 import { glob } from 'tinyglobby';
 import remapping from '@ampproject/remapping';
 import MagicString from 'magic-string';
 import { createHash } from 'node:crypto';
 import { Buffer } from 'node:buffer';
-import { createFilter } from '@rollup/pluginutils';
-import { createRecoveryConfigLoader } from '@unocss/config';
+
+const INCLUDE_COMMENT = "@unocss-include";
+const IGNORE_COMMENT = "@unocss-ignore";
+const CSS_PLACEHOLDER = "@unocss-placeholder";
+const SKIP_START_COMMENT = "@unocss-skip-start";
+const SKIP_END_COMMENT = "@unocss-skip-end";
+const SKIP_COMMENT_RE = new RegExp(`(//\\s*?${SKIP_START_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_START_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_START_COMMENT}\\s*?-->)[\\s\\S]*?(//\\s*?${SKIP_END_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_END_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_END_COMMENT}\\s*?-->)`, "g");
+
+const defaultPipelineExclude = [cssIdRE];
+const defaultPipelineInclude = [/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/];
+
+function deprecationCheck(config) {
+  let warned = false;
+  function warn(msg) {
+    warned = true;
+    console.warn(`[unocss] ${msg}`);
+  }
+  if (config.include)
+    warn("`include` option is deprecated, use `content.pipeline.include` instead.");
+  if (config.exclude)
+    warn("`exclude` option is deprecated, use `content.pipeline.exclude` instead.");
+  if (config.extraContent)
+    warn("`extraContent` option is deprecated, use `content` instead.");
+  if (config.content?.plain)
+    warn("`content.plain` option is renamed to `content.inline`.");
+  if (warned && typeof process !== "undefined" && process.env.CI)
+    throw new Error("deprecation warning");
+}
+
+function createContext(configOrPath, defaults = {}, extraConfigSources = [], resolveConfigResult = () => {
+}) {
+  let root = process$1.cwd();
+  let rawConfig = {};
+  let configFileList = [];
+  let uno;
+  const _uno = createGenerator(rawConfig, defaults).then((r) => {
+    uno = r;
+    return r;
+  });
+  let rollupFilter = createFilter(
+    defaultPipelineInclude,
+    defaultPipelineExclude,
+    { resolve: typeof configOrPath === "string" ? configOrPath : root }
+  );
+  const invalidations = [];
+  const reloadListeners = [];
+  const modules = new BetterMap();
+  const tokens = /* @__PURE__ */ new Set();
+  const tasks = [];
+  const affectedModules = /* @__PURE__ */ new Set();
+  const loadConfig = createRecoveryConfigLoader();
+  let ready = reloadConfig();
+  async function reloadConfig() {
+    await _uno;
+    const result = await loadConfig(root, configOrPath, extraConfigSources, defaults);
+    resolveConfigResult(result);
+    deprecationCheck(result.config);
+    rawConfig = result.config;
+    configFileList = result.sources;
+    await uno.setConfig(rawConfig);
+    uno.config.envMode = "dev";
+    rollupFilter = rawConfig.content?.pipeline === false ? () => false : createFilter(
+      rawConfig.content?.pipeline?.include || rawConfig.include || defaultPipelineInclude,
+      rawConfig.content?.pipeline?.exclude || rawConfig.exclude || defaultPipelineExclude,
+      { resolve: typeof configOrPath === "string" ? configOrPath : root }
+    );
+    tokens.clear();
+    await Promise.all(modules.map((code, id) => uno.applyExtractors(code.replace(SKIP_COMMENT_RE, ""), id, tokens)));
+    invalidate();
+    dispatchReload();
+    return result;
+  }
+  async function updateRoot(newRoot) {
+    if (newRoot !== root) {
+      root = newRoot;
+      ready = reloadConfig();
+    }
+    return await ready;
+  }
+  function invalidate() {
+    invalidations.forEach((cb) => cb());
+  }
+  function dispatchReload() {
+    reloadListeners.forEach((cb) => cb());
+  }
+  async function extract(code, id) {
+    const uno2 = await _uno;
+    if (id)
+      modules.set(id, code);
+    const len = tokens.size;
+    await uno2.applyExtractors(code.replace(SKIP_COMMENT_RE, ""), id, tokens);
+    if (tokens.size > len)
+      invalidate();
+  }
+  function filter(code, id) {
+    if (code.includes(IGNORE_COMMENT))
+      return false;
+    return code.includes(INCLUDE_COMMENT) || code.includes(CSS_PLACEHOLDER) || rollupFilter(id.replace(/\?v=\w+$/, ""));
+  }
+  async function getConfig() {
+    await ready;
+    return rawConfig;
+  }
+  async function flushTasks() {
+    const _tasks = [...tasks];
+    await Promise.all(_tasks);
+    if (tasks[0] === _tasks[0])
+      tasks.splice(0, _tasks.length);
+  }
+  return {
+    get ready() {
+      return ready;
+    },
+    tokens,
+    modules,
+    affectedModules,
+    tasks,
+    flushTasks,
+    invalidate,
+    onInvalidate(fn) {
+      invalidations.push(fn);
+    },
+    filter,
+    reloadConfig,
+    onReload(fn) {
+      reloadListeners.push(fn);
+    },
+    get uno() {
+      if (!uno)
+        throw new Error("Run `await context.ready` before accessing `context.uno`");
+      return uno;
+    },
+    extract,
+    getConfig,
+    get root() {
+      return root;
+    },
+    updateRoot,
+    getConfigFileList: () => configFileList
+  };
+}
 
 function ConfigHMRPlugin(ctx) {
   const { ready } = ctx;
@@ -168,6 +309,51 @@ function createDevtoolsPlugin(ctx, pluginConfig) {
   ];
 }
 
+function ChunkModeBuildPlugin(ctx) {
+  let cssPlugin;
+  const files = {};
+  return {
+    name: "unocss:chunk",
+    apply: "build",
+    enforce: "pre",
+    configResolved(config) {
+      cssPlugin = config.plugins.find((i) => i.name === "vite:css-post");
+    },
+    async transform(code, id) {
+      await ctx.ready;
+      if (!ctx.filter(code, id))
+        return;
+      files[id] = code;
+      return null;
+    },
+    async renderChunk(_, chunk) {
+      const chunks = Object.keys(chunk.modules).map((i) => files[i]).filter(Boolean);
+      if (!chunks.length)
+        return null;
+      await ctx.ready;
+      const tokens = /* @__PURE__ */ new Set();
+      await Promise.all(chunks.map((c) => ctx.uno.applyExtractors(c, undefined, tokens)));
+      const { css } = await ctx.uno.generate(tokens);
+      const fakeCssId = `${chunk.fileName}.css`;
+      await cssPlugin.transform(css, fakeCssId);
+      chunk.modules[fakeCssId] = {
+        code: null,
+        originalLength: 0,
+        removedExports: [],
+        renderedExports: [],
+        renderedLength: 0
+      };
+      return null;
+    },
+    async transformIndexHtml(code) {
+      await ctx.ready;
+      const { css } = await ctx.uno.generate(code);
+      if (css)
+        return `${code}<style>${css}</style>`;
+    }
+  };
+}
+
 function getPath(id) {
   return id.replace(/\?.*$/, "");
 }
@@ -197,7 +383,6 @@ function restoreSkipCode(code, map) {
     code = code.replaceAll(withHashKey, matched);
   return code;
 }
-
 function replaceAsync(string, searchValue, replacer) {
   try {
     if (typeof replacer === "function") {
@@ -221,229 +406,6 @@ function replaceAsync(string, searchValue, replacer) {
   }
 }
 
-const INCLUDE_COMMENT = "@unocss-include";
-const IGNORE_COMMENT = "@unocss-ignore";
-const CSS_PLACEHOLDER = "@unocss-placeholder";
-const SKIP_START_COMMENT = "@unocss-skip-start";
-const SKIP_END_COMMENT = "@unocss-skip-end";
-const SKIP_COMMENT_RE = new RegExp(`(//\\s*?${SKIP_START_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_START_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_START_COMMENT}\\s*?-->)[\\s\\S]*?(//\\s*?${SKIP_END_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_END_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_END_COMMENT}\\s*?-->)`, "g");
-
-const defaultPipelineExclude = [cssIdRE];
-const defaultPipelineInclude = [/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/];
-
-function deprecationCheck(config) {
-  let warned = false;
-  function warn(msg) {
-    warned = true;
-    console.warn(`[unocss] ${msg}`);
-  }
-  if (config.include)
-    warn("`include` option is deprecated, use `content.pipeline.include` instead.");
-  if (config.exclude)
-    warn("`exclude` option is deprecated, use `content.pipeline.exclude` instead.");
-  if (config.extraContent)
-    warn("`extraContent` option is deprecated, use `content` instead.");
-  if (config.content?.plain)
-    warn("`content.plain` option is renamed to `content.inline`.");
-  if (warned && typeof process !== "undefined" && process.env.CI)
-    throw new Error("deprecation warning");
-}
-
-function createContext(configOrPath, defaults = {}, extraConfigSources = [], resolveConfigResult = () => {
-}) {
-  let root = process$1.cwd();
-  let rawConfig = {};
-  let configFileList = [];
-  let uno;
-  const _uno = createGenerator(rawConfig, defaults).then((r) => {
-    uno = r;
-    return r;
-  });
-  let rollupFilter = createFilter(
-    defaultPipelineInclude,
-    defaultPipelineExclude,
-    { resolve: typeof configOrPath === "string" ? configOrPath : root }
-  );
-  const invalidations = [];
-  const reloadListeners = [];
-  const modules = new BetterMap();
-  const tokens = /* @__PURE__ */ new Set();
-  const tasks = [];
-  const affectedModules = /* @__PURE__ */ new Set();
-  const loadConfig = createRecoveryConfigLoader();
-  let ready = reloadConfig();
-  async function reloadConfig() {
-    await _uno;
-    const result = await loadConfig(root, configOrPath, extraConfigSources, defaults);
-    resolveConfigResult(result);
-    deprecationCheck(result.config);
-    rawConfig = result.config;
-    configFileList = result.sources;
-    await uno.setConfig(rawConfig);
-    uno.config.envMode = "dev";
-    rollupFilter = rawConfig.content?.pipeline === false ? () => false : createFilter(
-      rawConfig.content?.pipeline?.include || rawConfig.include || defaultPipelineInclude,
-      rawConfig.content?.pipeline?.exclude || rawConfig.exclude || defaultPipelineExclude,
-      { resolve: typeof configOrPath === "string" ? configOrPath : root }
-    );
-    tokens.clear();
-    await Promise.all(modules.map((code, id) => uno.applyExtractors(code.replace(SKIP_COMMENT_RE, ""), id, tokens)));
-    invalidate();
-    dispatchReload();
-    return result;
-  }
-  async function updateRoot(newRoot) {
-    if (newRoot !== root) {
-      root = newRoot;
-      ready = reloadConfig();
-    }
-    return await ready;
-  }
-  function invalidate() {
-    invalidations.forEach((cb) => cb());
-  }
-  function dispatchReload() {
-    reloadListeners.forEach((cb) => cb());
-  }
-  async function extract(code, id) {
-    const uno2 = await _uno;
-    if (id)
-      modules.set(id, code);
-    const len = tokens.size;
-    await uno2.applyExtractors(code.replace(SKIP_COMMENT_RE, ""), id, tokens);
-    if (tokens.size > len)
-      invalidate();
-  }
-  function filter(code, id) {
-    if (code.includes(IGNORE_COMMENT))
-      return false;
-    return code.includes(INCLUDE_COMMENT) || code.includes(CSS_PLACEHOLDER) || rollupFilter(id.replace(/\?v=\w+$/, ""));
-  }
-  async function getConfig() {
-    await ready;
-    return rawConfig;
-  }
-  async function flushTasks() {
-    const _tasks = [...tasks];
-    await Promise.all(_tasks);
-    if (tasks[0] === _tasks[0])
-      tasks.splice(0, _tasks.length);
-  }
-  return {
-    get ready() {
-      return ready;
-    },
-    tokens,
-    modules,
-    affectedModules,
-    tasks,
-    flushTasks,
-    invalidate,
-    onInvalidate(fn) {
-      invalidations.push(fn);
-    },
-    filter,
-    reloadConfig,
-    onReload(fn) {
-      reloadListeners.push(fn);
-    },
-    get uno() {
-      if (!uno)
-        throw new Error("Run `await context.ready` before accessing `context.uno`");
-      return uno;
-    },
-    extract,
-    getConfig,
-    get root() {
-      return root;
-    },
-    updateRoot,
-    getConfigFileList: () => configFileList
-  };
-}
-
-function getHash(input, length = 8) {
-  return createHash("sha256").update(input).digest("hex").slice(0, length);
-}
-
-const VIRTUAL_ENTRY_ALIAS = [
-  /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
-];
-const LAYER_MARK_ALL = "__ALL__";
-const RESOLVED_ID_WITH_QUERY_RE = /[/\\]__uno(_.*?)?\.css(\?.*)?$/;
-const RESOLVED_ID_RE = /[/\\]__uno(?:_(.*?))?\.css$/;
-function resolveId(id) {
-  if (id.match(RESOLVED_ID_WITH_QUERY_RE))
-    return id;
-  for (const alias of VIRTUAL_ENTRY_ALIAS) {
-    const match = id.match(alias);
-    if (match) {
-      return match[1] ? `/__uno_${match[1]}.css` : "/__uno.css";
-    }
-  }
-}
-function resolveLayer(id) {
-  const match = id.match(RESOLVED_ID_RE);
-  if (match)
-    return match[1] || LAYER_MARK_ALL;
-}
-const LAYER_PLACEHOLDER_RE = /#--unocss--\s*\{\s*layer\s*:\s*(.+?)\s*(?:;\s*escape-view\s*:\s*(.+?)\s*)?;?\s*\}/g;
-function getLayerPlaceholder(layer) {
-  return `#--unocss--{layer:${layer};escape-view:\\"\\'\\\`\\\\}`;
-}
-const HASH_PLACEHOLDER_RE = /#--unocss-hash--\s*\{\s*content\s*:\s*\\*"([^\\"]+)\\*";?\s*\}/g;
-function getHashPlaceholder(hash) {
-  return `#--unocss-hash--{content:"${hash}"}`;
-}
-
-function ChunkModeBuildPlugin(ctx) {
-  let cssPlugin;
-  const files = {};
-  return {
-    name: "unocss:chunk",
-    apply: "build",
-    enforce: "pre",
-    configResolved(config) {
-      cssPlugin = config.plugins.find((i) => i.name === "vite:css-post");
-    },
-    async transform(code, id) {
-      await ctx.ready;
-      if (!ctx.filter(code, id))
-        return;
-      files[id] = code;
-      return null;
-    },
-    async renderChunk(_, chunk) {
-      const chunks = Object.keys(chunk.modules).map((i) => files[i]).filter(Boolean);
-      if (!chunks.length)
-        return null;
-      await ctx.ready;
-      const tokens = /* @__PURE__ */ new Set();
-      await Promise.all(chunks.map((c) => ctx.uno.applyExtractors(c, void 0, tokens)));
-      const { css } = await ctx.uno.generate(tokens);
-      const fakeCssId = `${chunk.fileName}.css`;
-      await cssPlugin.transform(css, fakeCssId);
-      chunk.modules[fakeCssId] = {
-        code: null,
-        originalLength: 0,
-        removedExports: [],
-        renderedExports: [],
-        renderedLength: 0
-      };
-      return null;
-    },
-    async transformIndexHtml(code) {
-      await ctx.ready;
-      const { css } = await ctx.uno.generate(code);
-      if (css)
-        return `${code}<style>${css}</style>`;
-    }
-  };
-}
-
-const LAYER_PREFLIGHTS = "preflights";
-const LAYER_IMPORTS = "imports";
-
 async function applyTransformers(ctx, original, id, enforce = "default") {
   if (original.includes(IGNORE_COMMENT))
     return;
@@ -525,6 +487,40 @@ async function setupContentExtractor(ctx, shouldWatch = false) {
   }
 }
 
+function getHash(input, length = 8) {
+  return createHash("sha256").update(input).digest("hex").slice(0, length);
+}
+
+const VIRTUAL_ENTRY_ALIAS = [
+  /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
+];
+const LAYER_MARK_ALL = "__ALL__";
+const RESOLVED_ID_WITH_QUERY_RE = /[/\\]__uno(_.*?)?\.css(\?.*)?$/;
+const RESOLVED_ID_RE = /[/\\]__uno(?:_(.*?))?\.css$/;
+function resolveId(id) {
+  if (id.match(RESOLVED_ID_WITH_QUERY_RE))
+    return id;
+  for (const alias of VIRTUAL_ENTRY_ALIAS) {
+    const match = id.match(alias);
+    if (match) {
+      return match[1] ? `/__uno_${match[1]}.css` : "/__uno.css";
+    }
+  }
+}
+function resolveLayer(id) {
+  const match = id.match(RESOLVED_ID_RE);
+  if (match)
+    return match[1] || LAYER_MARK_ALL;
+}
+const LAYER_PLACEHOLDER_RE = /#--unocss--\s*\{\s*layer\s*:\s*(.+?)\s*(?:;\s*escape-view\s*:\s*(.+?)\s*)?;?\s*\}/g;
+function getLayerPlaceholder(layer) {
+  return `#--unocss--{layer:${layer};escape-view:\\"\\'\\\`\\\\}`;
+}
+const HASH_PLACEHOLDER_RE = /#--unocss-hash--\s*\{\s*content\s*:\s*\\*"([^\\"]+)\\*";?\s*\}/g;
+function getHashPlaceholder(hash) {
+  return `#--unocss-hash--{content:"${hash}"}`;
+}
+
 const MESSAGE_UNOCSS_ENTRY_NOT_FOUND = "[unocss] Entry module not found. Did you add `import 'uno.css'` in your main entry?";
 
 function isLegacyChunk(chunk, options) {
@@ -573,7 +569,7 @@ function GlobalModeBuildPlugin(ctx) {
         vfsLayers.clear();
         tasks.length = 0;
         lastTokenSize = 0;
-        lastResult = void 0;
+        lastResult = undefined;
       },
       transform(code, id) {
         if (filter(code, id))
@@ -711,7 +707,7 @@ function GlobalModeBuildPlugin(ctx) {
           const layerEnd = `#--unocss-layer-end--${layer}--{end:${layer}}`;
           let layerContent;
           if (layer === LAYER_MARK_ALL) {
-            layerContent = result.getLayers(void 0, [...vfsLayers, LAYER_IMPORTS]);
+            layerContent = result.getLayers(undefined, [...vfsLayers, LAYER_IMPORTS]);
           } else {
             layerContent = result.getLayer(layer) || "";
           }
@@ -807,7 +803,7 @@ function GlobalModeDevPlugin(ctx) {
         break;
       tokensSize = tokens.size;
     } while (true);
-    const css = layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries).map((i) => resolveLayer(i)).filter((i) => !!i)) : result.getLayer(layer);
+    const css = layer === LAYER_MARK_ALL ? result.getLayers(undefined, Array.from(entries).map((i) => resolveLayer(i)).filter((i) => !!i)) : result.getLayer(layer);
     const hash = getHash(css || "", HASH_LENGTH);
     lastServedHash.set(layer, hash);
     lastServedTime = Date.now();
@@ -864,7 +860,7 @@ function GlobalModeDevPlugin(ctx) {
   function clearWarnTimer() {
     if (resolvedWarnTimer) {
       clearTimeout(resolvedWarnTimer);
-      resolvedWarnTimer = void 0;
+      resolvedWarnTimer = undefined;
     }
   }
   onInvalidate(() => {
@@ -1027,7 +1023,7 @@ function PerModuleModePlugin(ctx) {
           return;
         const hash = getHash(id);
         const hasScope = SCOPE_IMPORT_RE.test(code);
-        const { css } = await ctx.uno.generate(code, { id, scope: hasScope ? `.${hash}` : void 0, preflights: false });
+        const { css } = await ctx.uno.generate(code, { id, scope: hasScope ? `.${hash}` : undefined, preflights: false });
         if (!css && !hasScope)
           return null;
         if (hasScope)
@@ -1227,7 +1223,7 @@ function VueScopedPlugin(ctx) {
 function createTransformerPlugins(ctx) {
   const orders = ["default", "pre", "post"];
   return orders.map((_order) => {
-    const order = _order === "default" ? void 0 : _order;
+    const order = _order === "default" ? undefined : _order;
     const htmlHandler = (code) => {
       return applyTransformers(ctx, code, "index.html", order).then((t) => t?.code);
     };

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@unocss/vite",
   "type": "module",
-  "version": "65.4.0",
+  "version": "65.4.3",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
   "funding": "https://github.com/sponsors/antfu",
-  "homepage": "https://github.com/unocss/unocss/tree/main/packages/vite#readme",
+  "homepage": "https://unocss.dev",
   "repository": {
     "type": "git",
     "url": "https://github.com/unocss/unocss",
-    "directory": "packages/vite"
+    "directory": "packages-integrations/vite"
   },
   "bugs": {
     "url": "https://github.com/unocss/unocss/issues"
@@ -54,13 +54,12 @@
     "chokidar": "^3.6.0",
     "magic-string": "^0.30.17",
     "tinyglobby": "^0.2.10",
-    "@unocss/config": "65.4.0",
-    "@unocss/core": "65.4.0",
-    "@unocss/inspector": "65.4.0"
+    "@unocss/core": "65.4.3",
+    "@unocss/config": "65.4.3",
+    "@unocss/inspector": "65.4.3"
   },
   "devDependencies": {
-    "vite": "^6.0.5",
-    "@unocss/shared-integration": "65.4.0"
+    "vite": "^6.0.11"
   },
   "scripts": {
     "build": "unbuild",