@unocss/vite 0.44.1 → 0.44.4

package/dist/index.cjs

@@ -8,6 +8,7 @@ const crypto = require('crypto');
 const core = require('@unocss/core');
 const pluginutils = require('@rollup/pluginutils');
 const MagicString = require('magic-string');
+const remapping = require('@ampproject/remapping');
 const fs = require('fs');
 const url = require('url');
 const config = require('@unocss/config');
@@ -16,10 +17,11 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 const UnocssInspector__default = /*#__PURE__*/_interopDefaultLegacy(UnocssInspector);
 const MagicString__default = /*#__PURE__*/_interopDefaultLegacy(MagicString);
+const remapping__default = /*#__PURE__*/_interopDefaultLegacy(remapping);
 const fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 
 const defaultExclude = [core.cssIdRE];
-const defaultInclude = [/\.vue$/, /\.vue\?vue/, /\.svelte$/, /\.[jt]sx$/, /\.mdx?$/, /\.astro$/, /\.elm$/];
+const defaultInclude = [/\.vue$/, /\.vue\?vue/, /\.svelte$/, /\.[jt]sx$/, /\.mdx?$/, /\.astro$/, /\.elm$/, /\.html$/];
 
 const VIRTUAL_ENTRY_ALIAS = [
   /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
@@ -779,62 +781,53 @@ function ConfigHMRPlugin(ctx) {
   };
 }
 
-function initTransformerPlugins(ctx) {
-  async function applyTransformers(code, id, enforce) {
-    if (code.includes(IGNORE_COMMENT))
-      return;
-    const transformers = (ctx.uno.config.transformers || []).filter((i) => i.enforce === enforce);
-    if (!transformers.length)
-      return;
-    const s = new MagicString__default(code);
-    for (const t of transformers) {
-      if (t.idFilter) {
-        if (!t.idFilter(id))
-          continue;
-      } else if (!ctx.filter(code, id)) {
+async function applyTransformers(ctx, original, id, enforce = "default") {
+  if (original.includes(IGNORE_COMMENT))
+    return;
+  const transformers = (ctx.uno.config.transformers || []).filter((i) => (i.enforce || "default") === enforce);
+  if (!transformers.length)
+    return;
+  let code = original;
+  let s = new MagicString__default(code);
+  const maps = [];
+  for (const t of transformers) {
+    if (t.idFilter) {
+      if (!t.idFilter(id))
         continue;
-      }
-      await t.transform(s, id, ctx);
+    } else if (!ctx.filter(code, id)) {
+      continue;
     }
+    await t.transform(s, id, ctx);
     if (s.hasChanged()) {
-      ctx.affectedModules.add(id);
-      return {
-        code: s.toString(),
-        map: s.generateMap({ hires: true, source: id })
-      };
+      code = s.toString();
+      maps.push(s.generateMap({ hires: true, source: id }));
+      s = new MagicString__default(code);
     }
   }
-  return [
-    {
-      name: "unocss:transformers:default",
-      transform(code, id) {
-        return applyTransformers(code, id);
-      },
-      transformIndexHtml(code) {
-        return applyTransformers(code, "index.html").then((t) => t?.code);
-      }
-    },
-    {
-      name: "unocss:transformers:pre",
-      enforce: "pre",
-      transform(code, id) {
-        return applyTransformers(code, id, "pre");
-      },
-      transformIndexHtml(code) {
-        return applyTransformers(code, "index.html", "pre").then((t) => t?.code);
-      }
+  if (code !== original) {
+    ctx.affectedModules.add(id);
+    return {
+      code,
+      map: remapping__default(maps, () => null)
+    };
+  }
+}
+
+function createTransformerPlugins(ctx) {
+  const enforces = ["default", "pre", "post"];
+  return enforces.map((enforce) => ({
+    name: `unocss:transformers:${enforce}`,
+    enforce: enforce === "default" ? void 0 : enforce,
+    transform(code, id) {
+      return applyTransformers(ctx, code, id, enforce);
     },
-    {
-      name: "unocss:transformers:post",
-      enforce: "post",
-      transform(code, id) {
-        return applyTransformers(code, id, "post");
-      },
-      transformIndexHtml(code) {
-        applyTransformers(code, "index.html", "post").then((t) => t?.code);
+    transformIndexHtml: {
+      enforce: enforce === "default" ? void 0 : enforce,
+      transform(code) {
+        return applyTransformers(ctx, code, "index.html", enforce).then((t) => t?.code);
       }
     }
-  ];
+  }));
 }
 
 const _dirname = typeof __dirname !== "undefined" ? __dirname : path.dirname(url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index.cjs', document.baseURI).href))));
@@ -973,7 +966,7 @@ function UnocssPlugin(configOrPath, defaults = {}) {
   const mode = inlineConfig.mode ?? "global";
   const plugins = [
     ConfigHMRPlugin(ctx),
-    ...initTransformerPlugins(ctx),
+    ...createTransformerPlugins(ctx),
     ...createDevtoolsPlugin(ctx)
   ];
   if (inlineConfig.inspector !== false)

package/dist/index.mjs

@@ -4,12 +4,13 @@ import { createHash } from 'crypto';
 import { cssIdRE, createGenerator, BetterMap, notNull, toEscapedSelector } from '@unocss/core';
 import { createFilter } from '@rollup/pluginutils';
 import MagicString from 'magic-string';
+import remapping from '@ampproject/remapping';
 import fs from 'fs';
 import { fileURLToPath } from 'url';
 import { loadConfig } from '@unocss/config';
 
 const defaultExclude = [cssIdRE];
-const defaultInclude = [/\.vue$/, /\.vue\?vue/, /\.svelte$/, /\.[jt]sx$/, /\.mdx?$/, /\.astro$/, /\.elm$/];
+const defaultInclude = [/\.vue$/, /\.vue\?vue/, /\.svelte$/, /\.[jt]sx$/, /\.mdx?$/, /\.astro$/, /\.elm$/, /\.html$/];
 
 const VIRTUAL_ENTRY_ALIAS = [
   /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
@@ -769,62 +770,53 @@ function ConfigHMRPlugin(ctx) {
   };
 }
 
-function initTransformerPlugins(ctx) {
-  async function applyTransformers(code, id, enforce) {
-    if (code.includes(IGNORE_COMMENT))
-      return;
-    const transformers = (ctx.uno.config.transformers || []).filter((i) => i.enforce === enforce);
-    if (!transformers.length)
-      return;
-    const s = new MagicString(code);
-    for (const t of transformers) {
-      if (t.idFilter) {
-        if (!t.idFilter(id))
-          continue;
-      } else if (!ctx.filter(code, id)) {
+async function applyTransformers(ctx, original, id, enforce = "default") {
+  if (original.includes(IGNORE_COMMENT))
+    return;
+  const transformers = (ctx.uno.config.transformers || []).filter((i) => (i.enforce || "default") === enforce);
+  if (!transformers.length)
+    return;
+  let code = original;
+  let s = new MagicString(code);
+  const maps = [];
+  for (const t of transformers) {
+    if (t.idFilter) {
+      if (!t.idFilter(id))
         continue;
-      }
-      await t.transform(s, id, ctx);
+    } else if (!ctx.filter(code, id)) {
+      continue;
     }
+    await t.transform(s, id, ctx);
     if (s.hasChanged()) {
-      ctx.affectedModules.add(id);
-      return {
-        code: s.toString(),
-        map: s.generateMap({ hires: true, source: id })
-      };
+      code = s.toString();
+      maps.push(s.generateMap({ hires: true, source: id }));
+      s = new MagicString(code);
     }
   }
-  return [
-    {
-      name: "unocss:transformers:default",
-      transform(code, id) {
-        return applyTransformers(code, id);
-      },
-      transformIndexHtml(code) {
-        return applyTransformers(code, "index.html").then((t) => t?.code);
-      }
-    },
-    {
-      name: "unocss:transformers:pre",
-      enforce: "pre",
-      transform(code, id) {
-        return applyTransformers(code, id, "pre");
-      },
-      transformIndexHtml(code) {
-        return applyTransformers(code, "index.html", "pre").then((t) => t?.code);
-      }
+  if (code !== original) {
+    ctx.affectedModules.add(id);
+    return {
+      code,
+      map: remapping(maps, () => null)
+    };
+  }
+}
+
+function createTransformerPlugins(ctx) {
+  const enforces = ["default", "pre", "post"];
+  return enforces.map((enforce) => ({
+    name: `unocss:transformers:${enforce}`,
+    enforce: enforce === "default" ? void 0 : enforce,
+    transform(code, id) {
+      return applyTransformers(ctx, code, id, enforce);
     },
-    {
-      name: "unocss:transformers:post",
-      enforce: "post",
-      transform(code, id) {
-        return applyTransformers(code, id, "post");
-      },
-      transformIndexHtml(code) {
-        applyTransformers(code, "index.html", "post").then((t) => t?.code);
+    transformIndexHtml: {
+      enforce: enforce === "default" ? void 0 : enforce,
+      transform(code) {
+        return applyTransformers(ctx, code, "index.html", enforce).then((t) => t?.code);
       }
     }
-  ];
+  }));
 }
 
 const _dirname = typeof __dirname !== "undefined" ? __dirname : dirname(fileURLToPath(import.meta.url));
@@ -963,7 +955,7 @@ function UnocssPlugin(configOrPath, defaults = {}) {
   const mode = inlineConfig.mode ?? "global";
   const plugins = [
     ConfigHMRPlugin(ctx),
-    ...initTransformerPlugins(ctx),
+    ...createTransformerPlugins(ctx),
     ...createDevtoolsPlugin(ctx)
   ];
   if (inlineConfig.inspector !== false)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.44.1",
+  "version": "0.44.4",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -42,16 +42,17 @@
     "vite": "^2.9.0 || ^3.0.0-0"
   },
   "dependencies": {
+    "@ampproject/remapping": "^2.2.0",
     "@rollup/pluginutils": "^4.2.1",
-    "@unocss/config": "0.44.1",
-    "@unocss/core": "0.44.1",
-    "@unocss/inspector": "0.44.1",
-    "@unocss/scope": "0.44.1",
-    "@unocss/transformer-directives": "0.44.1",
+    "@unocss/config": "0.44.4",
+    "@unocss/core": "0.44.4",
+    "@unocss/inspector": "0.44.4",
+    "@unocss/scope": "0.44.4",
+    "@unocss/transformer-directives": "0.44.4",
     "magic-string": "^0.26.2"
   },
   "devDependencies": {
-    "@unocss/shared-integration": "0.44.1",
+    "@unocss/shared-integration": "0.44.4",
     "vite": "^2.9.12"
   },
   "scripts": {