@unocss/webpack 0.52.7 → 0.53.0

package/dist/index.cjs

@@ -26,8 +26,26 @@ const INCLUDE_COMMENT = "@unocss-include";
 const IGNORE_COMMENT = "@unocss-ignore";
 const CSS_PLACEHOLDER = "@unocss-placeholder";
 
-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)($|\?)/];
+
+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 = () => {
 }) {
@@ -35,7 +53,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   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();
@@ -46,13 +64,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)));
@@ -163,18 +182,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))
@@ -265,7 +288,7 @@ function WebpackPlugin(configOrPath, defaults) {
         '[unocss] webpack integration only supports "pre" enforce transformers currently.the following transformers will be ignored\n' + nonPreTransformers.map((i) => ` - ${i.name}`).join("\n")
       );
     }
-    tasks.push(setupExtraContent(ctx));
+    tasks.push(setupContentExtractor(ctx));
     const entries = /* @__PURE__ */ new Set();
     const hashes = /* @__PURE__ */ new Map();
     const plugin = {

package/dist/index.mjs

@@ -14,8 +14,26 @@ const INCLUDE_COMMENT = "@unocss-include";
 const IGNORE_COMMENT = "@unocss-ignore";
 const CSS_PLACEHOLDER = "@unocss-placeholder";
 
-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)($|\?)/];
+
+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 = () => {
 }) {
@@ -23,7 +41,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   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();
@@ -34,13 +52,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)));
@@ -151,18 +170,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))
@@ -253,7 +276,7 @@ function WebpackPlugin(configOrPath, defaults) {
         '[unocss] webpack integration only supports "pre" enforce transformers currently.the following transformers will be ignored\n' + nonPreTransformers.map((i) => ` - ${i.name}`).join("\n")
       );
     }
-    tasks.push(setupExtraContent(ctx));
+    tasks.push(setupContentExtractor(ctx));
     const entries = /* @__PURE__ */ new Set();
     const hashes = /* @__PURE__ */ new Map();
     const plugin = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/webpack",
-  "version": "0.52.7",
+  "version": "0.53.0",
   "description": "The Webpack plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -43,13 +43,13 @@
     "magic-string": "^0.30.0",
     "unplugin": "^1.3.1",
     "webpack-sources": "^3.2.3",
-    "@unocss/config": "0.52.7",
-    "@unocss/core": "0.52.7"
+    "@unocss/config": "0.53.0",
+    "@unocss/core": "0.53.0"
   },
   "devDependencies": {
     "@types/webpack": "^5.28.1",
     "@types/webpack-sources": "^3.2.0",
-    "webpack": "^5.84.1"
+    "webpack": "^5.85.0"
   },
   "scripts": {
     "build": "unbuild",