@unocss/vite 0.26.3 → 0.27.1

package/dist/index.cjs

@@ -7,10 +7,12 @@ const pluginutils = require('@rollup/pluginutils');
 const config = require('@unocss/config');
 const core = require('@unocss/core');
 const crypto = require('crypto');
+const MagicString = require('magic-string-extra');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
 const UnocssInspector__default = /*#__PURE__*/_interopDefaultLegacy(UnocssInspector);
+const MagicString__default = /*#__PURE__*/_interopDefaultLegacy(MagicString);
 
 const regexCssId = /\.(css|postcss|sass|scss|less|stylus|styl)$/;
 const defaultExclude = [regexCssId];
@@ -366,7 +368,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
           return code.replace("return hot", "hot.send = (data) => socket.send(data);return hot;");
         if (entries.has(getPath(id)) && code.includes("import.meta.hot")) {
           const snippet = `
-if (import.meta.hot) { try { import.meta.hot.send('${WS_EVENT_PREFIX}${lastServed}') } catch {} }`;
+if (import.meta.hot) { try { import.meta.hot.send('${WS_EVENT_PREFIX}${lastServed}') } catch (e) { console.warn('[unocss-hmr]', e) } }`;
           return code + snippet;
         }
       }
@@ -630,11 +632,11 @@ function ConfigHMRPlugin(ctx) {
 }
 
 function initTransformerPlugins(ctx) {
-  async function applyTransformers(c, _code, id, enforce) {
+  async function applyTransformers(code, id, enforce) {
     const transformers = (ctx.uno.config.transformers || []).filter((i) => i.enforce === enforce);
     if (!transformers.length)
-      return void 0;
-    let code = _code;
+      return;
+    const s = new MagicString__default(code);
     for (const t of transformers) {
       if (t.idFilter) {
         if (!t.idFilter(id))
@@ -642,40 +644,29 @@ function initTransformerPlugins(ctx) {
       } else if (!ctx.filter(code, id)) {
         continue;
       }
-      const result = await t.transform(code, id, ctx);
-      if (result == null)
-        continue;
-      if (typeof result === "string") {
-        code = result;
-      } else {
-        code = result.code;
-        if (result.map && "sourcemapChain" in c)
-          c.sourcemapChain.push(result.map);
-      }
+      await t.transform(s, id, ctx);
     }
-    if (code === _code)
-      return null;
-    return code;
+    return s.toRollupResult(true, { hires: true });
   }
   return [
     {
-      name: "unocss:transformers:deafult",
+      name: "unocss:transformers:default",
       transform(code, id) {
-        return applyTransformers(this, code, id);
+        return applyTransformers(code, id);
       }
     },
     {
       name: "unocss:transformers:pre",
       enforce: "pre",
       transform(code, id) {
-        return applyTransformers(this, code, id, "pre");
+        return applyTransformers(code, id, "pre");
       }
     },
     {
       name: "unocss:transformers:post",
       enforce: "post",
       transform(code, id) {
-        return applyTransformers(this, code, id, "post");
+        return applyTransformers(code, id, "post");
       }
     }
   ];

package/dist/index.mjs

@@ -3,6 +3,7 @@ import { createFilter } from '@rollup/pluginutils';
 import { createConfigLoader } from '@unocss/config';
 import { createGenerator, BetterMap } from '@unocss/core';
 import { createHash } from 'crypto';
+import MagicString from 'magic-string-extra';
 
 const regexCssId = /\.(css|postcss|sass|scss|less|stylus|styl)$/;
 const defaultExclude = [regexCssId];
@@ -358,7 +359,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
           return code.replace("return hot", "hot.send = (data) => socket.send(data);return hot;");
         if (entries.has(getPath(id)) && code.includes("import.meta.hot")) {
           const snippet = `
-if (import.meta.hot) { try { import.meta.hot.send('${WS_EVENT_PREFIX}${lastServed}') } catch {} }`;
+if (import.meta.hot) { try { import.meta.hot.send('${WS_EVENT_PREFIX}${lastServed}') } catch (e) { console.warn('[unocss-hmr]', e) } }`;
           return code + snippet;
         }
       }
@@ -622,11 +623,11 @@ function ConfigHMRPlugin(ctx) {
 }
 
 function initTransformerPlugins(ctx) {
-  async function applyTransformers(c, _code, id, enforce) {
+  async function applyTransformers(code, id, enforce) {
     const transformers = (ctx.uno.config.transformers || []).filter((i) => i.enforce === enforce);
     if (!transformers.length)
-      return void 0;
-    let code = _code;
+      return;
+    const s = new MagicString(code);
     for (const t of transformers) {
       if (t.idFilter) {
         if (!t.idFilter(id))
@@ -634,40 +635,29 @@ function initTransformerPlugins(ctx) {
       } else if (!ctx.filter(code, id)) {
         continue;
       }
-      const result = await t.transform(code, id, ctx);
-      if (result == null)
-        continue;
-      if (typeof result === "string") {
-        code = result;
-      } else {
-        code = result.code;
-        if (result.map && "sourcemapChain" in c)
-          c.sourcemapChain.push(result.map);
-      }
+      await t.transform(s, id, ctx);
     }
-    if (code === _code)
-      return null;
-    return code;
+    return s.toRollupResult(true, { hires: true });
   }
   return [
     {
-      name: "unocss:transformers:deafult",
+      name: "unocss:transformers:default",
       transform(code, id) {
-        return applyTransformers(this, code, id);
+        return applyTransformers(code, id);
       }
     },
     {
       name: "unocss:transformers:pre",
       enforce: "pre",
       transform(code, id) {
-        return applyTransformers(this, code, id, "pre");
+        return applyTransformers(code, id, "pre");
       }
     },
     {
       name: "unocss:transformers:post",
       enforce: "post",
       transform(code, id) {
-        return applyTransformers(this, code, id, "post");
+        return applyTransformers(code, id, "post");
       }
     }
   ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.26.3",
+  "version": "0.27.1",
   "description": "The Vite plugin for UnoCSS",
   "keywords": [
     "unocss",
@@ -35,11 +35,12 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "@rollup/pluginutils": "^4.1.2",
-    "@unocss/config": "0.26.3",
-    "@unocss/core": "0.26.3",
-    "@unocss/inspector": "0.26.3",
-    "@unocss/scope": "0.26.3",
-    "@unocss/transformer-directives": "0.26.3"
+    "@unocss/config": "0.27.1",
+    "@unocss/core": "0.27.1",
+    "@unocss/inspector": "0.27.1",
+    "@unocss/scope": "0.27.1",
+    "@unocss/transformer-directives": "0.27.1",
+    "magic-string-extra": "^0.1.2"
   },
   "devDependencies": {
     "vite": "^2.8.4"