@unocss/vite 0.32.8 → 0.32.12

package/dist/index.cjs

@@ -3,14 +3,14 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const UnocssInspector = require('@unocss/inspector');
-const pluginutils = require('@rollup/pluginutils');
-const config = require('@unocss/config');
-const core = require('@unocss/core');
 const crypto = require('crypto');
+const core = require('@unocss/core');
+const pluginutils = require('@rollup/pluginutils');
 const MagicString = require('magic-string');
 const fs = require('fs');
 const path = require('path');
 const url = require('url');
+const config = require('@unocss/config');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
@@ -18,8 +18,7 @@ const UnocssInspector__default = /*#__PURE__*/_interopDefaultLegacy(UnocssInspec
 const MagicString__default = /*#__PURE__*/_interopDefaultLegacy(MagicString);
 const fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 
-const regexCssId = /\.(css|postcss|sass|scss|less|stylus|styl)$/;
-const defaultExclude = [regexCssId];
+const defaultExclude = [core.cssIdRE];
 const defaultInclude = [/\.vue$/, /\.vue\?vue/, /\.svelte$/, /\.[jt]sx$/, /\.mdx?$/, /\.astro$/, /\.elm$/];
 
 const VIRTUAL_ENTRY_ALIAS = [
@@ -40,6 +39,7 @@ function resolveId(id) {
     }
   }
 }
+const RESOLVED_ID_RE = /\/__uno(_.*?)?\.css$/;
 const LAYER_PLACEHOLDER_RE = /(\\?")?#--unocss--\s*{\s*layer\s*:\s*(.+?);?\s*}/g;
 function getLayerPlaceholder(layer) {
   return `#--unocss--{layer:${layer}}`;
@@ -50,6 +50,7 @@ function getHashPlaceholder(hash) {
 }
 
 const INCLUDE_COMMENT = "@unocss-include";
+const IGNORE_COMMENT = "@unocss-ignore";
 const CSS_PLACEHOLDER = "@unocss-placeholder";
 
 function createContext(configOrPath, defaults = {}, extraConfigSources = [], resolveConfigResult = () => {
@@ -93,6 +94,8 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
       invalidate();
   }
   const filter = (code, id) => {
+    if (code.includes(IGNORE_COMMENT))
+      return false;
     return code.includes(INCLUDE_COMMENT) || code.includes(CSS_PLACEHOLDER) || rollupFilter(id);
   };
   async function getConfig() {
@@ -122,6 +125,11 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
 function getPath(id) {
   return id.replace(/\?.*$/, "");
 }
+
+function getHash(input, length = 8) {
+  return crypto.createHash("sha256").update(input).digest("hex").slice(0, length);
+}
+
 function replaceAsync(string, searchValue, replacer) {
   try {
     if (typeof replacer === "function") {
@@ -185,10 +193,6 @@ function ChunkModeBuildPlugin({ uno, filter }) {
   };
 }
 
-function getHash(input, length = 8) {
-  return crypto.createHash("sha256").update(input).digest("hex").slice(0, length);
-}
-
 function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, getConfig }) {
   const vfsLayerMap = /* @__PURE__ */ new Map();
   let tasks = [];
@@ -253,12 +257,14 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
         const chunks = Object.keys(chunk.modules).filter((i) => modules.has(i));
         if (!chunks.length)
           return null;
+        const fakeCssId = `${chunk.fileName}-unocss-hash.css`;
         const tokens2 = /* @__PURE__ */ new Set();
         await Promise.all(chunks.map((c) => uno.applyExtractors(modules.get(c) || "", c, tokens2)));
         let { css } = await uno.generate(tokens2, { minify: true });
         if (!css)
           return null;
-        const fakeCssId = `${chunk.fileName}-unocss-hash.css`;
+        if (!Object.keys(chunk.modules).some((i) => i.match(RESOLVED_ID_RE)))
+          return null;
         css = await transformCSS(css, fakeCssId);
         const hash = getHash(css);
         await cssPostPlugin.transform(getHashPlaceholder(hash), fakeCssId);
@@ -686,6 +692,8 @@ 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;

package/dist/index.mjs

@@ -1,15 +1,14 @@
 import UnocssInspector from '@unocss/inspector';
-import { createFilter } from '@rollup/pluginutils';
-import { loadConfig } from '@unocss/config';
-import { createGenerator, BetterMap, toEscapedSelector } from '@unocss/core';
 import { createHash } from 'crypto';
+import { cssIdRE, createGenerator, BetterMap, toEscapedSelector } from '@unocss/core';
+import { createFilter } from '@rollup/pluginutils';
 import MagicString from 'magic-string';
 import fs from 'fs';
 import { resolve, dirname } from 'path';
 import { fileURLToPath } from 'url';
+import { loadConfig } from '@unocss/config';
 
-const regexCssId = /\.(css|postcss|sass|scss|less|stylus|styl)$/;
-const defaultExclude = [regexCssId];
+const defaultExclude = [cssIdRE];
 const defaultInclude = [/\.vue$/, /\.vue\?vue/, /\.svelte$/, /\.[jt]sx$/, /\.mdx?$/, /\.astro$/, /\.elm$/];
 
 const VIRTUAL_ENTRY_ALIAS = [
@@ -30,6 +29,7 @@ function resolveId(id) {
     }
   }
 }
+const RESOLVED_ID_RE = /\/__uno(_.*?)?\.css$/;
 const LAYER_PLACEHOLDER_RE = /(\\?")?#--unocss--\s*{\s*layer\s*:\s*(.+?);?\s*}/g;
 function getLayerPlaceholder(layer) {
   return `#--unocss--{layer:${layer}}`;
@@ -40,6 +40,7 @@ function getHashPlaceholder(hash) {
 }
 
 const INCLUDE_COMMENT = "@unocss-include";
+const IGNORE_COMMENT = "@unocss-ignore";
 const CSS_PLACEHOLDER = "@unocss-placeholder";
 
 function createContext(configOrPath, defaults = {}, extraConfigSources = [], resolveConfigResult = () => {
@@ -83,6 +84,8 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
       invalidate();
   }
   const filter = (code, id) => {
+    if (code.includes(IGNORE_COMMENT))
+      return false;
     return code.includes(INCLUDE_COMMENT) || code.includes(CSS_PLACEHOLDER) || rollupFilter(id);
   };
   async function getConfig() {
@@ -112,6 +115,11 @@ 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 replaceAsync(string, searchValue, replacer) {
   try {
     if (typeof replacer === "function") {
@@ -175,10 +183,6 @@ function ChunkModeBuildPlugin({ uno, filter }) {
   };
 }
 
-function getHash(input, length = 8) {
-  return createHash("sha256").update(input).digest("hex").slice(0, length);
-}
-
 function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, getConfig }) {
   const vfsLayerMap = /* @__PURE__ */ new Map();
   let tasks = [];
@@ -243,12 +247,14 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
         const chunks = Object.keys(chunk.modules).filter((i) => modules.has(i));
         if (!chunks.length)
           return null;
+        const fakeCssId = `${chunk.fileName}-unocss-hash.css`;
         const tokens2 = /* @__PURE__ */ new Set();
         await Promise.all(chunks.map((c) => uno.applyExtractors(modules.get(c) || "", c, tokens2)));
         let { css } = await uno.generate(tokens2, { minify: true });
         if (!css)
           return null;
-        const fakeCssId = `${chunk.fileName}-unocss-hash.css`;
+        if (!Object.keys(chunk.modules).some((i) => i.match(RESOLVED_ID_RE)))
+          return null;
         css = await transformCSS(css, fakeCssId);
         const hash = getHash(css);
         await cssPostPlugin.transform(getHashPlaceholder(hash), fakeCssId);
@@ -676,6 +682,8 @@ 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.32.8",
+  "version": "0.32.12",
   "description": "The Vite plugin for UnoCSS",
   "keywords": [
     "unocss",
@@ -43,14 +43,15 @@
   },
   "dependencies": {
     "@rollup/pluginutils": "^4.2.1",
-    "@unocss/config": "0.32.8",
-    "@unocss/core": "0.32.8",
-    "@unocss/inspector": "0.32.8",
-    "@unocss/scope": "0.32.8",
-    "@unocss/transformer-directives": "0.32.8",
+    "@unocss/config": "0.32.12",
+    "@unocss/core": "0.32.12",
+    "@unocss/inspector": "0.32.12",
+    "@unocss/scope": "0.32.12",
+    "@unocss/transformer-directives": "0.32.12",
     "magic-string": "^0.26.1"
   },
   "devDependencies": {
+    "@unocss/shared-integration": "0.32.12",
     "vite": "^2.9.6"
   },
   "scripts": {