@unocss/vite 0.52.7 → 0.53.0

package/dist/index.cjs

@@ -25,8 +25,8 @@ const fg__default = /*#__PURE__*/_interopDefaultLegacy(fg);
 const remapping__default = /*#__PURE__*/_interopDefaultLegacy(remapping);
 const fs__default$1 = /*#__PURE__*/_interopDefaultLegacy(fs$1);
 
-const defaultExclude = [core.cssIdRE];
-const defaultInclude = [/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/];
+const defaultPipelineExclude = [core.cssIdRE];
+const defaultPipelineInclude = [/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/];
 
 const VIRTUAL_ENTRY_ALIAS = [
   /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
@@ -62,13 +62,31 @@ const INCLUDE_COMMENT = "@unocss-include";
 const IGNORE_COMMENT = "@unocss-ignore";
 const CSS_PLACEHOLDER = "@unocss-placeholder";
 
+function deprecationCheck(config) {
+  let warned = false;
+  function warn(msg) {
+    warned = true;
+    console.warn(`[unocss] ${msg}`);
+  }
+  if (config.include)
+    warn("`include` option is deprecated, use `content.pipeline.include` instead.");
+  if (config.exclude)
+    warn("`exclude` option is deprecated, use `content.pipeline.exclude` instead.");
+  if (config.extraContent)
+    warn("`extraContent` option is deprecated, use `content` instead.");
+  if (config.content?.plain)
+    warn("`content.plain` option is renamed to `content.inline`.");
+  if (warned && typeof process !== "undefined" && process.env.CI)
+    throw new Error("deprecation warning");
+}
+
 function createContext(configOrPath, defaults = {}, extraConfigSources = [], resolveConfigResult = () => {
 }) {
   let root = process.cwd();
   let rawConfig = {};
   let configFileList = [];
   const uno = core.createGenerator(rawConfig, defaults);
-  let rollupFilter = pluginutils.createFilter(defaultInclude, defaultExclude);
+  let rollupFilter = pluginutils.createFilter(defaultPipelineInclude, defaultPipelineExclude);
   const invalidations = [];
   const reloadListeners = [];
   const modules = new core.BetterMap();
@@ -79,13 +97,14 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   async function reloadConfig() {
     const result = await config.loadConfig(root, configOrPath, extraConfigSources, defaults);
     resolveConfigResult(result);
+    deprecationCheck(result.config);
     rawConfig = result.config;
     configFileList = result.sources;
     uno.setConfig(rawConfig);
     uno.config.envMode = "dev";
-    rollupFilter = pluginutils.createFilter(
-      rawConfig.include || defaultInclude,
-      rawConfig.exclude || defaultExclude
+    rollupFilter = rawConfig.content?.pipeline === false ? () => false : pluginutils.createFilter(
+      rawConfig.content?.pipeline?.include || rawConfig.include || defaultPipelineInclude,
+      rawConfig.content?.pipeline?.exclude || rawConfig.exclude || defaultPipelineExclude
     );
     tokens.clear();
     await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
@@ -269,18 +288,22 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
   }
 }
 
-async function setupExtraContent(ctx, shouldWatch = false) {
-  const { extraContent } = await ctx.getConfig();
+async function setupContentExtractor(ctx, shouldWatch = false) {
+  const { content } = await ctx.getConfig();
   const { extract, tasks, root, filter } = ctx;
-  if (extraContent?.plain) {
+  if (content?.inline) {
     await Promise.all(
-      extraContent.plain.map((code, idx) => {
-        return extract(code, `__extra_content_${idx}__`);
+      content.inline.map(async (c, idx) => {
+        if (typeof c === "function")
+          c = await c();
+        if (typeof c === "string")
+          c = { code: c };
+        return extract(c.code, c.id ?? `__plain_content_${idx}__`);
       })
     );
   }
-  if (extraContent?.filesystem) {
-    const files = await fg__default(extraContent.filesystem, { cwd: root });
+  if (content?.filesystem) {
+    const files = await fg__default(content.filesystem, { cwd: root });
     async function extractFile(file) {
       const code = await fs__default.readFile(file, "utf-8");
       if (!filter(code, file))
@@ -451,7 +474,7 @@ function GlobalModeBuildPlugin(ctx) {
         viteConfig = config;
       },
       buildStart() {
-        tasks.push(setupExtraContent(ctx, viteConfig.command === "serve"));
+        tasks.push(setupContentExtractor(ctx, viteConfig.command === "serve"));
       }
     },
     {
@@ -818,7 +841,7 @@ ${css}`;
 }
 
 function VueScopedPlugin({ uno, ready }) {
-  let filter = pluginutils.createFilter([/\.vue$/], defaultExclude);
+  let filter = pluginutils.createFilter([/\.vue$/], defaultPipelineExclude);
   async function transformSFC(code) {
     const { css } = await uno.generate(code);
     if (!css)
@@ -831,9 +854,9 @@ function VueScopedPlugin({ uno, ready }) {
     enforce: "pre",
     async configResolved() {
       const { config } = await ready;
-      filter = pluginutils.createFilter(
-        config.include || [/\.vue$/],
-        config.exclude || defaultExclude
+      filter = config.content?.pipeline === false ? () => false : pluginutils.createFilter(
+        config.content?.pipeline?.include ?? config.include ?? [/\.vue$/],
+        config.content?.pipeline?.exclude ?? config.exclude ?? defaultPipelineExclude
       );
     },
     transform(code, id) {

package/dist/index.mjs

@@ -12,8 +12,8 @@ import { Buffer } from 'node:buffer';
 import fs$1 from 'node:fs';
 import { fileURLToPath } from 'node:url';
 
-const defaultExclude = [cssIdRE];
-const defaultInclude = [/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/];
+const defaultPipelineExclude = [cssIdRE];
+const defaultPipelineInclude = [/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/];
 
 const VIRTUAL_ENTRY_ALIAS = [
   /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
@@ -49,13 +49,31 @@ const INCLUDE_COMMENT = "@unocss-include";
 const IGNORE_COMMENT = "@unocss-ignore";
 const CSS_PLACEHOLDER = "@unocss-placeholder";
 
+function deprecationCheck(config) {
+  let warned = false;
+  function warn(msg) {
+    warned = true;
+    console.warn(`[unocss] ${msg}`);
+  }
+  if (config.include)
+    warn("`include` option is deprecated, use `content.pipeline.include` instead.");
+  if (config.exclude)
+    warn("`exclude` option is deprecated, use `content.pipeline.exclude` instead.");
+  if (config.extraContent)
+    warn("`extraContent` option is deprecated, use `content` instead.");
+  if (config.content?.plain)
+    warn("`content.plain` option is renamed to `content.inline`.");
+  if (warned && typeof process !== "undefined" && process.env.CI)
+    throw new Error("deprecation warning");
+}
+
 function createContext(configOrPath, defaults = {}, extraConfigSources = [], resolveConfigResult = () => {
 }) {
   let root = process.cwd();
   let rawConfig = {};
   let configFileList = [];
   const uno = createGenerator(rawConfig, defaults);
-  let rollupFilter = createFilter(defaultInclude, defaultExclude);
+  let rollupFilter = createFilter(defaultPipelineInclude, defaultPipelineExclude);
   const invalidations = [];
   const reloadListeners = [];
   const modules = new BetterMap();
@@ -66,13 +84,14 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   async function reloadConfig() {
     const result = await loadConfig(root, configOrPath, extraConfigSources, defaults);
     resolveConfigResult(result);
+    deprecationCheck(result.config);
     rawConfig = result.config;
     configFileList = result.sources;
     uno.setConfig(rawConfig);
     uno.config.envMode = "dev";
-    rollupFilter = createFilter(
-      rawConfig.include || defaultInclude,
-      rawConfig.exclude || defaultExclude
+    rollupFilter = rawConfig.content?.pipeline === false ? () => false : createFilter(
+      rawConfig.content?.pipeline?.include || rawConfig.include || defaultPipelineInclude,
+      rawConfig.content?.pipeline?.exclude || rawConfig.exclude || defaultPipelineExclude
     );
     tokens.clear();
     await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
@@ -256,18 +275,22 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
   }
 }
 
-async function setupExtraContent(ctx, shouldWatch = false) {
-  const { extraContent } = await ctx.getConfig();
+async function setupContentExtractor(ctx, shouldWatch = false) {
+  const { content } = await ctx.getConfig();
   const { extract, tasks, root, filter } = ctx;
-  if (extraContent?.plain) {
+  if (content?.inline) {
     await Promise.all(
-      extraContent.plain.map((code, idx) => {
-        return extract(code, `__extra_content_${idx}__`);
+      content.inline.map(async (c, idx) => {
+        if (typeof c === "function")
+          c = await c();
+        if (typeof c === "string")
+          c = { code: c };
+        return extract(c.code, c.id ?? `__plain_content_${idx}__`);
       })
     );
   }
-  if (extraContent?.filesystem) {
-    const files = await fg(extraContent.filesystem, { cwd: root });
+  if (content?.filesystem) {
+    const files = await fg(content.filesystem, { cwd: root });
     async function extractFile(file) {
       const code = await fs.readFile(file, "utf-8");
       if (!filter(code, file))
@@ -438,7 +461,7 @@ function GlobalModeBuildPlugin(ctx) {
         viteConfig = config;
       },
       buildStart() {
-        tasks.push(setupExtraContent(ctx, viteConfig.command === "serve"));
+        tasks.push(setupContentExtractor(ctx, viteConfig.command === "serve"));
       }
     },
     {
@@ -805,7 +828,7 @@ ${css}`;
 }
 
 function VueScopedPlugin({ uno, ready }) {
-  let filter = createFilter([/\.vue$/], defaultExclude);
+  let filter = createFilter([/\.vue$/], defaultPipelineExclude);
   async function transformSFC(code) {
     const { css } = await uno.generate(code);
     if (!css)
@@ -818,9 +841,9 @@ function VueScopedPlugin({ uno, ready }) {
     enforce: "pre",
     async configResolved() {
       const { config } = await ready;
-      filter = createFilter(
-        config.include || [/\.vue$/],
-        config.exclude || defaultExclude
+      filter = config.content?.pipeline === false ? () => false : createFilter(
+        config.content?.pipeline?.include ?? config.include ?? [/\.vue$/],
+        config.content?.pipeline?.exclude ?? config.exclude ?? defaultPipelineExclude
       );
     },
     transform(code, id) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.52.7",
+  "version": "0.53.0",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -47,15 +47,15 @@
     "chokidar": "^3.5.3",
     "fast-glob": "^3.2.12",
     "magic-string": "^0.30.0",
-    "@unocss/config": "0.52.7",
-    "@unocss/core": "0.52.7",
-    "@unocss/inspector": "0.52.7",
-    "@unocss/scope": "0.52.7",
-    "@unocss/transformer-directives": "0.52.7"
+    "@unocss/config": "0.53.0",
+    "@unocss/core": "0.53.0",
+    "@unocss/inspector": "0.53.0",
+    "@unocss/scope": "0.53.0",
+    "@unocss/transformer-directives": "0.53.0"
   },
   "devDependencies": {
     "vite": "^4.3.9",
-    "@unocss/shared-integration": "0.52.7"
+    "@unocss/shared-integration": "0.53.0"
   },
   "scripts": {
     "build": "unbuild",