@unocss/vite 0.64.1 → 0.65.0-beta.1

package/dist/index.d.mts

@@ -60,7 +60,7 @@ declare function ChunkModeBuildPlugin({ uno, filter }: UnocssPluginContext): Plu
 
 declare function GlobalModeBuildPlugin(ctx: UnocssPluginContext<VitePluginConfig>): Plugin[];
 
-declare function GlobalModeDevPlugin({ uno, tokens, tasks, flushTasks, affectedModules, onInvalidate, extract, filter, getConfig }: UnocssPluginContext): Plugin[];
+declare function GlobalModeDevPlugin(ctx: UnocssPluginContext): Plugin[];
 
 declare function GlobalModePlugin(ctx: UnocssPluginContext): vite.Plugin<any>[];
 

package/dist/index.d.ts

@@ -60,7 +60,7 @@ declare function ChunkModeBuildPlugin({ uno, filter }: UnocssPluginContext): Plu
 
 declare function GlobalModeBuildPlugin(ctx: UnocssPluginContext<VitePluginConfig>): Plugin[];
 
-declare function GlobalModeDevPlugin({ uno, tokens, tasks, flushTasks, affectedModules, onInvalidate, extract, filter, getConfig }: UnocssPluginContext): Plugin[];
+declare function GlobalModeDevPlugin(ctx: UnocssPluginContext): Plugin[];
 
 declare function GlobalModePlugin(ctx: UnocssPluginContext): vite.Plugin<any>[];
 

package/dist/index.mjs

@@ -14,15 +14,15 @@ import { createFilter } from '@rollup/pluginutils';
 import { createRecoveryConfigLoader } from '@unocss/config';
 
 function ConfigHMRPlugin(ctx) {
-  const { ready, uno } = ctx;
+  const { ready } = ctx;
   return {
     name: "unocss:config",
     async configResolved(config) {
       await ctx.updateRoot(config.root);
     },
     async configureServer(server) {
-      uno.config.envMode = "dev";
       const { sources } = await ready;
+      ctx.uno.config.envMode = "dev";
       if (!sources.length)
         return;
       server.watcher.add(sources);
@@ -254,7 +254,11 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   let root = process$1.cwd();
   let rawConfig = {};
   let configFileList = [];
-  const uno = createGenerator(rawConfig, defaults);
+  let uno;
+  const _uno = createGenerator(rawConfig, defaults).then((r) => {
+    uno = r;
+    return r;
+  });
   let rollupFilter = createFilter(
     defaultPipelineInclude,
     defaultPipelineExclude,
@@ -269,12 +273,13 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   const loadConfig = createRecoveryConfigLoader();
   let ready = reloadConfig();
   async function reloadConfig() {
+    await _uno;
     const result = await loadConfig(root, configOrPath, extraConfigSources, defaults);
     resolveConfigResult(result);
     deprecationCheck(result.config);
     rawConfig = result.config;
     configFileList = result.sources;
-    uno.setConfig(rawConfig);
+    await uno.setConfig(rawConfig);
     uno.config.envMode = "dev";
     rollupFilter = rawConfig.content?.pipeline === false ? () => false : createFilter(
       rawConfig.content?.pipeline?.include || rawConfig.include || defaultPipelineInclude,
@@ -301,10 +306,11 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     reloadListeners.forEach((cb) => cb());
   }
   async function extract(code, id) {
+    const uno2 = await _uno;
     if (id)
       modules.set(id, code);
     const len = tokens.size;
-    await uno.applyExtractors(code.replace(SKIP_COMMENT_RE, ""), id, tokens);
+    await uno2.applyExtractors(code.replace(SKIP_COMMENT_RE, ""), id, tokens);
     if (tokens.size > len)
       invalidate();
   }
@@ -341,7 +347,11 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     onReload(fn) {
       reloadListeners.push(fn);
     },
-    uno,
+    get uno() {
+      if (!uno)
+        throw new Error("Run `await context.ready` before accessing `context.uno`");
+      return uno;
+    },
     extract,
     getConfig,
     get root() {
@@ -516,7 +526,7 @@ function isLegacyChunk(chunk, options) {
   return options.format === "system" && chunk.fileName.includes("-legacy");
 }
 function GlobalModeBuildPlugin(ctx) {
-  const { uno, ready, extract, tokens, filter, getConfig, tasks, flushTasks } = ctx;
+  const { ready, extract, tokens, filter, getConfig, tasks, flushTasks } = ctx;
   const vfsLayers = /* @__PURE__ */ new Set();
   const layerImporterMap = /* @__PURE__ */ new Map();
   let viteConfig;
@@ -544,7 +554,7 @@ function GlobalModeBuildPlugin(ctx) {
     await flushTasks();
     if (lastResult && lastTokenSize === tokens.size)
       return lastResult;
-    lastResult = await uno.generate(tokens, { minify: true });
+    lastResult = await ctx.uno.generate(tokens, { minify: true });
     lastTokenSize = tokens.size;
     return lastResult;
   }
@@ -772,7 +782,8 @@ function GlobalModeBuildPlugin(ctx) {
 const WARN_TIMEOUT = 2e4;
 const WS_EVENT_PREFIX = "unocss:hmr";
 const HASH_LENGTH = 6;
-function GlobalModeDevPlugin({ uno, tokens, tasks, flushTasks, affectedModules, onInvalidate, extract, filter, getConfig }) {
+function GlobalModeDevPlugin(ctx) {
+  const { tokens, tasks, flushTasks, affectedModules, onInvalidate, extract, filter, getConfig } = ctx;
   const servers = [];
   const entries = /* @__PURE__ */ new Set();
   let invalidateTimer;
@@ -785,7 +796,7 @@ function GlobalModeDevPlugin({ uno, tokens, tasks, flushTasks, affectedModules,
     let result;
     let tokensSize = tokens.size;
     do {
-      result = await uno.generate(tokens);
+      result = await ctx.uno.generate(tokens);
       if (tokensSize === tokens.size)
         break;
       tokensSize = tokens.size;
@@ -869,7 +880,7 @@ function GlobalModeDevPlugin({ uno, tokens, tasks, flushTasks, affectedModules,
         });
       },
       buildStart() {
-        uno.generate([], { preflights: true });
+        ctx.uno.generate([], { preflights: true });
       },
       transform(code, id) {
         if (filter(code, id))

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/vite",
   "type": "module",
-  "version": "0.64.1",
+  "version": "0.65.0-beta.1",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -46,7 +46,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "vite": "^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0"
+    "vite": "^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 || ^6.0.0-0"
   },
   "dependencies": {
     "@ampproject/remapping": "^2.3.0",
@@ -54,13 +54,13 @@
     "chokidar": "^3.6.0",
     "magic-string": "^0.30.12",
     "tinyglobby": "^0.2.10",
-    "@unocss/core": "0.64.1",
-    "@unocss/config": "0.64.1",
-    "@unocss/inspector": "0.64.1"
+    "@unocss/config": "0.65.0-beta.1",
+    "@unocss/core": "0.65.0-beta.1",
+    "@unocss/inspector": "0.65.0-beta.1"
   },
   "devDependencies": {
-    "vite": "^5.4.10",
-    "@unocss/shared-integration": "0.64.1"
+    "vite": "^6.0.0",
+    "@unocss/shared-integration": "0.65.0-beta.1"
   },
   "scripts": {
     "build": "unbuild",