@unocss/vite 0.60.4 → 0.61.2

package/dist/index.mjs

@@ -5,8 +5,8 @@ import fs from 'node:fs/promises';
 import fg from 'fast-glob';
 import MagicString from 'magic-string';
 import remapping from '@ampproject/remapping';
-import { createHash } from 'node:crypto';
 import { cssIdRE, createGenerator, BetterMap, notNull, toEscapedSelector } from '@unocss/core';
+import { createHash } from 'node:crypto';
 import { Buffer } from 'node:buffer';
 import { createFilter } from '@rollup/pluginutils';
 import fs$1 from 'node:fs';
@@ -184,10 +184,6 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
 function getPath(id) {
   return id.replace(/\?.*$/, "");
 }
-
-function getHash(input, length = 8) {
-  return createHash("sha256").update(input).digest("hex").slice(0, length);
-}
 function hash(str) {
   let i;
   let l;
@@ -198,6 +194,26 @@ function hash(str) {
   }
   return `00000${(hval >>> 0).toString(36)}`.slice(-6);
 }
+function transformSkipCode(code, map, SKIP_RULES_RE, keyFlag) {
+  for (const item of Array.from(code.matchAll(SKIP_RULES_RE))) {
+    if (item != null) {
+      const matched = item[0];
+      const withHashKey = `${keyFlag}${hash(matched)}`;
+      map.set(withHashKey, matched);
+      code = code.replace(matched, withHashKey);
+    }
+  }
+  return code;
+}
+function restoreSkipCode(code, map) {
+  for (const [withHashKey, matched] of map.entries())
+    code = code.replaceAll(withHashKey, matched);
+  return code;
+}
+
+function getHash(input, length = 8) {
+  return createHash("sha256").update(input).digest("hex").slice(0, length);
+}
 
 function replaceAsync(string, searchValue, replacer) {
   try {
@@ -272,7 +288,7 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
     return;
   const skipMap = /* @__PURE__ */ new Map();
   let code = original;
-  let s = new MagicString(transformSkipCode(code, skipMap));
+  let s = new MagicString(transformSkipCode(code, skipMap, SKIP_COMMENT_RE, "@unocss-skip-placeholder-"));
   const maps = [];
   for (const t of transformers) {
     if (t.idFilter) {
@@ -298,22 +314,6 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
     };
   }
 }
-function transformSkipCode(code, map) {
-  for (const item of Array.from(code.matchAll(SKIP_COMMENT_RE))) {
-    if (item != null) {
-      const matched = item[0];
-      const withHashKey = `@unocss-skip-placeholder-${hash(matched)}`;
-      map.set(withHashKey, matched);
-      code = code.replace(matched, withHashKey);
-    }
-  }
-  return code;
-}
-function restoreSkipCode(code, map) {
-  for (const [withHashKey, matched] of map.entries())
-    code = code.replace(withHashKey, matched);
-  return code;
-}
 
 async function setupContentExtractor(ctx, shouldWatch = false) {
   const { content } = await ctx.getConfig();
@@ -479,7 +479,8 @@ function GlobalModeBuildPlugin(ctx) {
       // we inject a hash to chunk before the dist hash calculation to make sure
       // the hash is different when unocss changes
       async renderChunk(_, chunk, options) {
-        if (isLegacyChunk(chunk, options))
+        const isLegacy = isLegacyChunk(chunk, options);
+        if (isLegacy && (!ctx.uno.config.legacy || ctx.uno.config.legacy.renderModernChunks))
           return null;
         if (!Object.keys(chunk.modules).some((i) => RESOLVED_ID_RE.test(i)))
           return null;
@@ -491,9 +492,13 @@ function GlobalModeBuildPlugin(ctx) {
         let { css } = await generateAll();
         const fakeCssId = `${viteConfig.root}/${chunk.fileName}-unocss-hash.css`;
         css = await applyCssTransform(css, fakeCssId, options.dir, this);
-        const hash = getHash(css);
         const transformHandler = "handler" in cssPost.transform ? cssPost.transform.handler : cssPost.transform;
-        await transformHandler.call({}, getHashPlaceholder(hash), fakeCssId);
+        if (isLegacy) {
+          await transformHandler.call({}, css, "/__uno.css");
+        } else {
+          const hash = getHash(css);
+          await transformHandler.call({}, getHashPlaceholder(hash), fakeCssId);
+        }
         chunk.modules[fakeCssId] = {
           code: null,
           originalLength: 0,
@@ -905,10 +910,16 @@ function VueScopedPlugin({ uno, ready }) {
         config.content?.pipeline?.exclude ?? config.exclude ?? defaultPipelineExclude
       );
     },
-    transform(code, id) {
+    async transform(code, id) {
       if (!filter(id) || !id.endsWith(".vue"))
         return;
-      return transformSFC(code);
+      const css = await transformSFC(code);
+      if (css) {
+        return {
+          code: css,
+          map: null
+        };
+      }
     },
     handleHotUpdate(ctx) {
       const read = ctx.read;
@@ -1011,7 +1022,11 @@ function ShadowDomModuleModePlugin({ uno }) {
     name: "unocss:shadow-dom",
     enforce: "pre",
     async transform(code, id) {
-      return transformWebComponent(code, id);
+      const css = await transformWebComponent(code, id);
+      return {
+        code: css,
+        map: null
+      };
     },
     handleHotUpdate(ctx) {
       const read = ctx.read;
@@ -1208,7 +1223,8 @@ function defineConfig(config) {
 function UnocssPlugin(configOrPath, defaults = {}) {
   const ctx = createContext(configOrPath, {
     envMode: process$1.env.NODE_ENV === "development" ? "dev" : "build",
-    ...defaults
+    ...defaults,
+    legacy: typeof configOrPath !== "string" ? configOrPath?.legacy || { renderModernChunks: true } : { renderModernChunks: true }
   });
   const inlineConfig = configOrPath && typeof configOrPath !== "string" ? configOrPath : {};
   const mode = inlineConfig.mode ?? "global";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/vite",
   "type": "module",
-  "version": "0.60.4",
+  "version": "0.61.2",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -54,15 +54,15 @@
     "chokidar": "^3.6.0",
     "fast-glob": "^3.3.2",
     "magic-string": "^0.30.10",
-    "@unocss/config": "0.60.4",
-    "@unocss/core": "0.60.4",
-    "@unocss/inspector": "0.60.4",
-    "@unocss/scope": "0.60.4",
-    "@unocss/transformer-directives": "0.60.4"
+    "@unocss/config": "0.61.2",
+    "@unocss/core": "0.61.2",
+    "@unocss/scope": "0.61.2",
+    "@unocss/inspector": "0.61.2",
+    "@unocss/transformer-directives": "0.61.2"
   },
   "devDependencies": {
-    "vite": "^5.2.12",
-    "@unocss/shared-integration": "0.60.4"
+    "vite": "^5.3.1",
+    "@unocss/shared-integration": "0.61.2"
   },
   "scripts": {
     "build": "unbuild",