@unocss/vite 0.57.6 → 0.58.0

package/dist/index.cjs

@@ -92,7 +92,11 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   let rawConfig = {};
   let configFileList = [];
   const uno = core.createGenerator(rawConfig, defaults);
-  let rollupFilter = pluginutils.createFilter(defaultPipelineInclude, defaultPipelineExclude);
+  let rollupFilter = pluginutils.createFilter(
+    defaultPipelineInclude,
+    defaultPipelineExclude,
+    { resolve: typeof configOrPath === "string" ? configOrPath : root }
+  );
   const invalidations = [];
   const reloadListeners = [];
   const modules = new core.BetterMap();
@@ -110,7 +114,8 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     uno.config.envMode = "dev";
     rollupFilter = rawConfig.content?.pipeline === false ? () => false : pluginutils.createFilter(
       rawConfig.content?.pipeline?.include || rawConfig.include || defaultPipelineInclude,
-      rawConfig.content?.pipeline?.exclude || rawConfig.exclude || defaultPipelineExclude
+      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)));
@@ -426,6 +431,11 @@ function GlobalModeBuildPlugin(ctx) {
         order: "pre",
         handler(code, { filename }) {
           tasks.push(extract(code, filename));
+        },
+        // Compatibility with Legacy Vite
+        enforce: "pre",
+        transform(code, { filename }) {
+          tasks.push(extract(code, filename));
         }
       },
       resolveId(id, importer) {
@@ -482,7 +492,7 @@ function GlobalModeBuildPlugin(ctx) {
       async renderChunk(_, chunk, options) {
         if (isLegacyChunk(chunk, options))
           return null;
-        if (!Object.keys(chunk.modules).some((i) => i.match(RESOLVED_ID_RE)))
+        if (!Object.keys(chunk.modules).some((i) => RESOLVED_ID_RE.test(i)))
           return null;
         const cssPost = cssPostPlugins.get(options.dir);
         if (!cssPost) {
@@ -521,7 +531,7 @@ function GlobalModeBuildPlugin(ctx) {
       async renderChunk(code, chunk, options) {
         if (isLegacyChunk(chunk, options))
           return null;
-        if (!Object.keys(chunk.modules).some((i) => i.match(RESOLVED_ID_RE)))
+        if (!Object.keys(chunk.modules).some((i) => RESOLVED_ID_RE.test(i)))
           return null;
         const cssPost = cssPostPlugins.get(options.dir);
         if (!cssPost) {
@@ -711,6 +721,12 @@ function GlobalModeDevPlugin({ uno, tokens, tasks, flushTasks, affectedModules,
         handler(code, { filename }) {
           setWarnTimer();
           tasks.push(extract(code, filename));
+        },
+        // Compatibility with Legacy Vite
+        enforce: "pre",
+        transform(code, { filename }) {
+          setWarnTimer();
+          tasks.push(extract(code, filename));
         }
       },
       resolveId(id) {
@@ -832,7 +848,7 @@ function PerModuleModePlugin({ uno, filter }) {
         if (!filter(code, id))
           return;
         const hash = getHash(id);
-        const hasScope = code.match(SCOPE_IMPORT_RE);
+        const hasScope = SCOPE_IMPORT_RE.test(code);
         const { css } = await uno.generate(code, { id, scope: hasScope ? `.${hash}` : void 0, preflights: false });
         if (!css && !hasScope)
           return null;
@@ -1044,20 +1060,27 @@ function ConfigHMRPlugin(ctx) {
 }
 
 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);
-    },
-    transformIndexHtml: {
-      order: enforce === "default" ? void 0 : enforce,
-      handler(code) {
-        return applyTransformers(ctx, code, "index.html", enforce).then((t) => t?.code);
+  const orders = ["default", "pre", "post"];
+  return orders.map((_order) => {
+    const order = _order === "default" ? void 0 : _order;
+    const htmlHandler = (code) => {
+      return applyTransformers(ctx, code, "index.html", order).then((t) => t?.code);
+    };
+    return {
+      name: `unocss:transformers:${order}`,
+      enforce: order,
+      transform(code, id) {
+        return applyTransformers(ctx, code, id, order);
+      },
+      transformIndexHtml: {
+        order,
+        handler: htmlHandler,
+        // Compatibility with Legacy Vite
+        enforce: order,
+        transform: htmlHandler
       }
-    }
-  }));
+    };
+  });
 }
 
 const _dirname = typeof __dirname !== "undefined" ? __dirname : node_path.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href))));

package/dist/index.mjs

@@ -77,7 +77,11 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   let rawConfig = {};
   let configFileList = [];
   const uno = createGenerator(rawConfig, defaults);
-  let rollupFilter = createFilter(defaultPipelineInclude, defaultPipelineExclude);
+  let rollupFilter = createFilter(
+    defaultPipelineInclude,
+    defaultPipelineExclude,
+    { resolve: typeof configOrPath === "string" ? configOrPath : root }
+  );
   const invalidations = [];
   const reloadListeners = [];
   const modules = new BetterMap();
@@ -95,7 +99,8 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     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
+      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)));
@@ -411,6 +416,11 @@ function GlobalModeBuildPlugin(ctx) {
         order: "pre",
         handler(code, { filename }) {
           tasks.push(extract(code, filename));
+        },
+        // Compatibility with Legacy Vite
+        enforce: "pre",
+        transform(code, { filename }) {
+          tasks.push(extract(code, filename));
         }
       },
       resolveId(id, importer) {
@@ -467,7 +477,7 @@ function GlobalModeBuildPlugin(ctx) {
       async renderChunk(_, chunk, options) {
         if (isLegacyChunk(chunk, options))
           return null;
-        if (!Object.keys(chunk.modules).some((i) => i.match(RESOLVED_ID_RE)))
+        if (!Object.keys(chunk.modules).some((i) => RESOLVED_ID_RE.test(i)))
           return null;
         const cssPost = cssPostPlugins.get(options.dir);
         if (!cssPost) {
@@ -506,7 +516,7 @@ function GlobalModeBuildPlugin(ctx) {
       async renderChunk(code, chunk, options) {
         if (isLegacyChunk(chunk, options))
           return null;
-        if (!Object.keys(chunk.modules).some((i) => i.match(RESOLVED_ID_RE)))
+        if (!Object.keys(chunk.modules).some((i) => RESOLVED_ID_RE.test(i)))
           return null;
         const cssPost = cssPostPlugins.get(options.dir);
         if (!cssPost) {
@@ -696,6 +706,12 @@ function GlobalModeDevPlugin({ uno, tokens, tasks, flushTasks, affectedModules,
         handler(code, { filename }) {
           setWarnTimer();
           tasks.push(extract(code, filename));
+        },
+        // Compatibility with Legacy Vite
+        enforce: "pre",
+        transform(code, { filename }) {
+          setWarnTimer();
+          tasks.push(extract(code, filename));
         }
       },
       resolveId(id) {
@@ -817,7 +833,7 @@ function PerModuleModePlugin({ uno, filter }) {
         if (!filter(code, id))
           return;
         const hash = getHash(id);
-        const hasScope = code.match(SCOPE_IMPORT_RE);
+        const hasScope = SCOPE_IMPORT_RE.test(code);
         const { css } = await uno.generate(code, { id, scope: hasScope ? `.${hash}` : void 0, preflights: false });
         if (!css && !hasScope)
           return null;
@@ -1029,20 +1045,27 @@ function ConfigHMRPlugin(ctx) {
 }
 
 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);
-    },
-    transformIndexHtml: {
-      order: enforce === "default" ? void 0 : enforce,
-      handler(code) {
-        return applyTransformers(ctx, code, "index.html", enforce).then((t) => t?.code);
+  const orders = ["default", "pre", "post"];
+  return orders.map((_order) => {
+    const order = _order === "default" ? void 0 : _order;
+    const htmlHandler = (code) => {
+      return applyTransformers(ctx, code, "index.html", order).then((t) => t?.code);
+    };
+    return {
+      name: `unocss:transformers:${order}`,
+      enforce: order,
+      transform(code, id) {
+        return applyTransformers(ctx, code, id, order);
+      },
+      transformIndexHtml: {
+        order,
+        handler: htmlHandler,
+        // Compatibility with Legacy Vite
+        enforce: order,
+        transform: htmlHandler
       }
-    }
-  }));
+    };
+  });
 }
 
 const _dirname = typeof __dirname !== "undefined" ? __dirname : dirname(fileURLToPath(import.meta.url));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.57.6",
+  "version": "0.58.0",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -43,19 +43,19 @@
   },
   "dependencies": {
     "@ampproject/remapping": "^2.2.1",
-    "@rollup/pluginutils": "^5.0.5",
+    "@rollup/pluginutils": "^5.1.0",
     "chokidar": "^3.5.3",
     "fast-glob": "^3.3.2",
     "magic-string": "^0.30.5",
-    "@unocss/config": "0.57.6",
-    "@unocss/core": "0.57.6",
-    "@unocss/inspector": "0.57.6",
-    "@unocss/scope": "0.57.6",
-    "@unocss/transformer-directives": "0.57.6"
+    "@unocss/config": "0.58.0",
+    "@unocss/core": "0.58.0",
+    "@unocss/inspector": "0.58.0",
+    "@unocss/scope": "0.58.0",
+    "@unocss/transformer-directives": "0.58.0"
   },
   "devDependencies": {
-    "vite": "^5.0.0",
-    "@unocss/shared-integration": "0.57.6"
+    "vite": "^5.0.4",
+    "@unocss/shared-integration": "0.58.0"
   },
   "scripts": {
     "build": "unbuild",