@unocss/webpack 0.62.2 → 0.62.4

package/dist/index.cjs

@@ -2,17 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const process$1 = require('node:process');
 const node_path = require('node:path');
+const process$1 = require('node:process');
 const unplugin = require('unplugin');
 const WebpackSources = require('webpack-sources');
-const pluginutils = require('@rollup/pluginutils');
-const config = require('@unocss/config');
-const core = require('@unocss/core');
 const fs = require('node:fs/promises');
 const tinyglobby = require('tinyglobby');
-const MagicString = require('magic-string');
 const remapping = require('@ampproject/remapping');
+const MagicString = require('magic-string');
+const core = require('@unocss/core');
+const pluginutils = require('@rollup/pluginutils');
+const config = require('@unocss/config');
 const node_crypto = require('node:crypto');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
@@ -20,8 +20,8 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 const process__default = /*#__PURE__*/_interopDefaultCompat(process$1);
 const WebpackSources__default = /*#__PURE__*/_interopDefaultCompat(WebpackSources);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
-const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
 const remapping__default = /*#__PURE__*/_interopDefaultCompat(remapping);
+const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
 
 const INCLUDE_COMMENT = "@unocss-include";
 const IGNORE_COMMENT = "@unocss-ignore";
@@ -30,6 +30,120 @@ const SKIP_START_COMMENT = "@unocss-skip-start";
 const SKIP_END_COMMENT = "@unocss-skip-end";
 const SKIP_COMMENT_RE = new RegExp(`(//\\s*?${SKIP_START_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_START_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_START_COMMENT}\\s*?-->)[\\s\\S]*?(//\\s*?${SKIP_END_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_END_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_END_COMMENT}\\s*?-->)`, "g");
 
+function getPath(id) {
+  return id.replace(/\?.*$/, "");
+}
+function isCssId(id) {
+  return core.cssIdRE.test(id);
+}
+function hash(str) {
+  let i;
+  let l;
+  let hval = 2166136261;
+  for (i = 0, l = str.length; i < l; i++) {
+    hval ^= str.charCodeAt(i);
+    hval += (hval << 1) + (hval << 4) + (hval << 7) + (hval << 8) + (hval << 24);
+  }
+  return `00000${(hval >>> 0).toString(36)}`.slice(-6);
+}
+function transformSkipCode(code, map, SKIP_RULES_RE, keyFlag) {
+  for (const item of Array.from(code.matchAll(SKIP_RULES_RE))) {
+    if (item != null) {
+      const matched = item[0];
+      const withHashKey = `${keyFlag}${hash(matched)}`;
+      map.set(withHashKey, matched);
+      code = code.replace(matched, withHashKey);
+    }
+  }
+  return code;
+}
+function restoreSkipCode(code, map) {
+  for (const [withHashKey, matched] of map.entries())
+    code = code.replaceAll(withHashKey, matched);
+  return code;
+}
+
+async function applyTransformers(ctx, original, id, enforce = "default") {
+  if (original.includes(IGNORE_COMMENT))
+    return;
+  const transformers = (ctx.uno.config.transformers || []).filter((i) => (i.enforce || "default") === enforce);
+  if (!transformers.length)
+    return;
+  const skipMap = /* @__PURE__ */ new Map();
+  let code = original;
+  let s = new MagicString__default(transformSkipCode(code, skipMap, SKIP_COMMENT_RE, "@unocss-skip-placeholder-"));
+  const maps = [];
+  for (const t of transformers) {
+    if (t.idFilter) {
+      if (!t.idFilter(id))
+        continue;
+    } else if (!ctx.filter(code, id)) {
+      continue;
+    }
+    await t.transform(s, id, ctx);
+    if (s.hasChanged()) {
+      code = restoreSkipCode(s.toString(), skipMap);
+      maps.push(s.generateMap({ hires: true, source: id }));
+      s = new MagicString__default(code);
+    }
+  }
+  if (code !== original) {
+    return {
+      code,
+      map: remapping__default(maps, (_, ctx2) => {
+        ctx2.content = code;
+        return null;
+      })
+    };
+  }
+}
+
+async function setupContentExtractor(ctx, shouldWatch = false) {
+  const { content } = await ctx.getConfig();
+  const { extract, tasks, root, filter } = ctx;
+  if (content?.inline) {
+    await Promise.all(
+      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 (content?.filesystem) {
+    const files = await tinyglobby.glob(content.filesystem, { cwd: root, expandDirectories: false });
+    async function extractFile(file) {
+      file = node_path.isAbsolute(file) ? file : node_path.resolve(root, file);
+      const code = await fs__default.readFile(file, "utf-8");
+      if (!filter(code, file))
+        return;
+      const preTransform = await applyTransformers(ctx, code, file, "pre");
+      const defaultTransform = await applyTransformers(ctx, preTransform?.code || code, file);
+      await applyTransformers(ctx, defaultTransform?.code || preTransform?.code || code, file, "post");
+      return await extract(preTransform?.code || code, file);
+    }
+    if (shouldWatch) {
+      const { watch } = await import('chokidar');
+      const ignored = ["**/{.git,node_modules}/**"];
+      const watcher = watch(files, {
+        ignorePermissionErrors: true,
+        ignored,
+        cwd: root,
+        ignoreInitial: true
+      });
+      watcher.on("all", (type, file) => {
+        if (type === "add" || type === "change") {
+          const absolutePath = node_path.resolve(root, file);
+          tasks.push(extractFile(absolutePath));
+        }
+      });
+    }
+    await Promise.all(files.map(extractFile));
+  }
+}
+
 const defaultPipelineExclude = [core.cssIdRE];
 const defaultPipelineInclude = [/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/];
 
@@ -163,120 +277,6 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   };
 }
 
-function getPath(id) {
-  return id.replace(/\?.*$/, "");
-}
-function isCssId(id) {
-  return core.cssIdRE.test(id);
-}
-function hash(str) {
-  let i;
-  let l;
-  let hval = 2166136261;
-  for (i = 0, l = str.length; i < l; i++) {
-    hval ^= str.charCodeAt(i);
-    hval += (hval << 1) + (hval << 4) + (hval << 7) + (hval << 8) + (hval << 24);
-  }
-  return `00000${(hval >>> 0).toString(36)}`.slice(-6);
-}
-function transformSkipCode(code, map, SKIP_RULES_RE, keyFlag) {
-  for (const item of Array.from(code.matchAll(SKIP_RULES_RE))) {
-    if (item != null) {
-      const matched = item[0];
-      const withHashKey = `${keyFlag}${hash(matched)}`;
-      map.set(withHashKey, matched);
-      code = code.replace(matched, withHashKey);
-    }
-  }
-  return code;
-}
-function restoreSkipCode(code, map) {
-  for (const [withHashKey, matched] of map.entries())
-    code = code.replaceAll(withHashKey, matched);
-  return code;
-}
-
-async function applyTransformers(ctx, original, id, enforce = "default") {
-  if (original.includes(IGNORE_COMMENT))
-    return;
-  const transformers = (ctx.uno.config.transformers || []).filter((i) => (i.enforce || "default") === enforce);
-  if (!transformers.length)
-    return;
-  const skipMap = /* @__PURE__ */ new Map();
-  let code = original;
-  let s = new MagicString__default(transformSkipCode(code, skipMap, SKIP_COMMENT_RE, "@unocss-skip-placeholder-"));
-  const maps = [];
-  for (const t of transformers) {
-    if (t.idFilter) {
-      if (!t.idFilter(id))
-        continue;
-    } else if (!ctx.filter(code, id)) {
-      continue;
-    }
-    await t.transform(s, id, ctx);
-    if (s.hasChanged()) {
-      code = restoreSkipCode(s.toString(), skipMap);
-      maps.push(s.generateMap({ hires: true, source: id }));
-      s = new MagicString__default(code);
-    }
-  }
-  if (code !== original) {
-    return {
-      code,
-      map: remapping__default(maps, (_, ctx2) => {
-        ctx2.content = code;
-        return null;
-      })
-    };
-  }
-}
-
-async function setupContentExtractor(ctx, shouldWatch = false) {
-  const { content } = await ctx.getConfig();
-  const { extract, tasks, root, filter } = ctx;
-  if (content?.inline) {
-    await Promise.all(
-      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 (content?.filesystem) {
-    const files = await tinyglobby.glob(content.filesystem, { cwd: root, expandDirectories: false });
-    async function extractFile(file) {
-      file = node_path.isAbsolute(file) ? file : node_path.resolve(root, file);
-      const code = await fs__default.readFile(file, "utf-8");
-      if (!filter(code, file))
-        return;
-      const preTransform = await applyTransformers(ctx, code, file, "pre");
-      const defaultTransform = await applyTransformers(ctx, preTransform?.code || code, file);
-      await applyTransformers(ctx, defaultTransform?.code || preTransform?.code || code, file, "post");
-      return await extract(preTransform?.code || code, file);
-    }
-    if (shouldWatch) {
-      const { watch } = await import('chokidar');
-      const ignored = ["**/{.git,node_modules}/**"];
-      const watcher = watch(files, {
-        ignorePermissionErrors: true,
-        ignored,
-        cwd: root,
-        ignoreInitial: true
-      });
-      watcher.on("all", (type, file) => {
-        if (type === "add" || type === "change") {
-          const absolutePath = node_path.resolve(root, file);
-          tasks.push(extractFile(absolutePath));
-        }
-      });
-    }
-    await Promise.all(files.map(extractFile));
-  }
-}
-
 function getHash(input, length = 8) {
   return node_crypto.createHash("sha256").update(input).digest("hex").slice(0, length);
 }

package/dist/index.mjs

@@ -1,14 +1,14 @@
-import process$1 from 'node:process';
 import { resolve, isAbsolute, normalize } from 'node:path';
+import process$1 from 'node:process';
 import { createUnplugin } from 'unplugin';
 import WebpackSources from 'webpack-sources';
-import { createFilter } from '@rollup/pluginutils';
-import { createRecoveryConfigLoader } from '@unocss/config';
-import { cssIdRE, createGenerator, BetterMap } from '@unocss/core';
 import fs from 'node:fs/promises';
 import { glob } from 'tinyglobby';
-import MagicString from 'magic-string';
 import remapping from '@ampproject/remapping';
+import MagicString from 'magic-string';
+import { cssIdRE, createGenerator, BetterMap } from '@unocss/core';
+import { createFilter } from '@rollup/pluginutils';
+import { createRecoveryConfigLoader } from '@unocss/config';
 import { createHash } from 'node:crypto';
 
 const INCLUDE_COMMENT = "@unocss-include";
@@ -18,6 +18,120 @@ const SKIP_START_COMMENT = "@unocss-skip-start";
 const SKIP_END_COMMENT = "@unocss-skip-end";
 const SKIP_COMMENT_RE = new RegExp(`(//\\s*?${SKIP_START_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_START_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_START_COMMENT}\\s*?-->)[\\s\\S]*?(//\\s*?${SKIP_END_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_END_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_END_COMMENT}\\s*?-->)`, "g");
 
+function getPath(id) {
+  return id.replace(/\?.*$/, "");
+}
+function isCssId(id) {
+  return cssIdRE.test(id);
+}
+function hash(str) {
+  let i;
+  let l;
+  let hval = 2166136261;
+  for (i = 0, l = str.length; i < l; i++) {
+    hval ^= str.charCodeAt(i);
+    hval += (hval << 1) + (hval << 4) + (hval << 7) + (hval << 8) + (hval << 24);
+  }
+  return `00000${(hval >>> 0).toString(36)}`.slice(-6);
+}
+function transformSkipCode(code, map, SKIP_RULES_RE, keyFlag) {
+  for (const item of Array.from(code.matchAll(SKIP_RULES_RE))) {
+    if (item != null) {
+      const matched = item[0];
+      const withHashKey = `${keyFlag}${hash(matched)}`;
+      map.set(withHashKey, matched);
+      code = code.replace(matched, withHashKey);
+    }
+  }
+  return code;
+}
+function restoreSkipCode(code, map) {
+  for (const [withHashKey, matched] of map.entries())
+    code = code.replaceAll(withHashKey, matched);
+  return code;
+}
+
+async function applyTransformers(ctx, original, id, enforce = "default") {
+  if (original.includes(IGNORE_COMMENT))
+    return;
+  const transformers = (ctx.uno.config.transformers || []).filter((i) => (i.enforce || "default") === enforce);
+  if (!transformers.length)
+    return;
+  const skipMap = /* @__PURE__ */ new Map();
+  let code = original;
+  let s = new MagicString(transformSkipCode(code, skipMap, SKIP_COMMENT_RE, "@unocss-skip-placeholder-"));
+  const maps = [];
+  for (const t of transformers) {
+    if (t.idFilter) {
+      if (!t.idFilter(id))
+        continue;
+    } else if (!ctx.filter(code, id)) {
+      continue;
+    }
+    await t.transform(s, id, ctx);
+    if (s.hasChanged()) {
+      code = restoreSkipCode(s.toString(), skipMap);
+      maps.push(s.generateMap({ hires: true, source: id }));
+      s = new MagicString(code);
+    }
+  }
+  if (code !== original) {
+    return {
+      code,
+      map: remapping(maps, (_, ctx2) => {
+        ctx2.content = code;
+        return null;
+      })
+    };
+  }
+}
+
+async function setupContentExtractor(ctx, shouldWatch = false) {
+  const { content } = await ctx.getConfig();
+  const { extract, tasks, root, filter } = ctx;
+  if (content?.inline) {
+    await Promise.all(
+      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 (content?.filesystem) {
+    const files = await glob(content.filesystem, { cwd: root, expandDirectories: false });
+    async function extractFile(file) {
+      file = isAbsolute(file) ? file : resolve(root, file);
+      const code = await fs.readFile(file, "utf-8");
+      if (!filter(code, file))
+        return;
+      const preTransform = await applyTransformers(ctx, code, file, "pre");
+      const defaultTransform = await applyTransformers(ctx, preTransform?.code || code, file);
+      await applyTransformers(ctx, defaultTransform?.code || preTransform?.code || code, file, "post");
+      return await extract(preTransform?.code || code, file);
+    }
+    if (shouldWatch) {
+      const { watch } = await import('chokidar');
+      const ignored = ["**/{.git,node_modules}/**"];
+      const watcher = watch(files, {
+        ignorePermissionErrors: true,
+        ignored,
+        cwd: root,
+        ignoreInitial: true
+      });
+      watcher.on("all", (type, file) => {
+        if (type === "add" || type === "change") {
+          const absolutePath = resolve(root, file);
+          tasks.push(extractFile(absolutePath));
+        }
+      });
+    }
+    await Promise.all(files.map(extractFile));
+  }
+}
+
 const defaultPipelineExclude = [cssIdRE];
 const defaultPipelineInclude = [/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/];
 
@@ -151,120 +265,6 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   };
 }
 
-function getPath(id) {
-  return id.replace(/\?.*$/, "");
-}
-function isCssId(id) {
-  return cssIdRE.test(id);
-}
-function hash(str) {
-  let i;
-  let l;
-  let hval = 2166136261;
-  for (i = 0, l = str.length; i < l; i++) {
-    hval ^= str.charCodeAt(i);
-    hval += (hval << 1) + (hval << 4) + (hval << 7) + (hval << 8) + (hval << 24);
-  }
-  return `00000${(hval >>> 0).toString(36)}`.slice(-6);
-}
-function transformSkipCode(code, map, SKIP_RULES_RE, keyFlag) {
-  for (const item of Array.from(code.matchAll(SKIP_RULES_RE))) {
-    if (item != null) {
-      const matched = item[0];
-      const withHashKey = `${keyFlag}${hash(matched)}`;
-      map.set(withHashKey, matched);
-      code = code.replace(matched, withHashKey);
-    }
-  }
-  return code;
-}
-function restoreSkipCode(code, map) {
-  for (const [withHashKey, matched] of map.entries())
-    code = code.replaceAll(withHashKey, matched);
-  return code;
-}
-
-async function applyTransformers(ctx, original, id, enforce = "default") {
-  if (original.includes(IGNORE_COMMENT))
-    return;
-  const transformers = (ctx.uno.config.transformers || []).filter((i) => (i.enforce || "default") === enforce);
-  if (!transformers.length)
-    return;
-  const skipMap = /* @__PURE__ */ new Map();
-  let code = original;
-  let s = new MagicString(transformSkipCode(code, skipMap, SKIP_COMMENT_RE, "@unocss-skip-placeholder-"));
-  const maps = [];
-  for (const t of transformers) {
-    if (t.idFilter) {
-      if (!t.idFilter(id))
-        continue;
-    } else if (!ctx.filter(code, id)) {
-      continue;
-    }
-    await t.transform(s, id, ctx);
-    if (s.hasChanged()) {
-      code = restoreSkipCode(s.toString(), skipMap);
-      maps.push(s.generateMap({ hires: true, source: id }));
-      s = new MagicString(code);
-    }
-  }
-  if (code !== original) {
-    return {
-      code,
-      map: remapping(maps, (_, ctx2) => {
-        ctx2.content = code;
-        return null;
-      })
-    };
-  }
-}
-
-async function setupContentExtractor(ctx, shouldWatch = false) {
-  const { content } = await ctx.getConfig();
-  const { extract, tasks, root, filter } = ctx;
-  if (content?.inline) {
-    await Promise.all(
-      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 (content?.filesystem) {
-    const files = await glob(content.filesystem, { cwd: root, expandDirectories: false });
-    async function extractFile(file) {
-      file = isAbsolute(file) ? file : resolve(root, file);
-      const code = await fs.readFile(file, "utf-8");
-      if (!filter(code, file))
-        return;
-      const preTransform = await applyTransformers(ctx, code, file, "pre");
-      const defaultTransform = await applyTransformers(ctx, preTransform?.code || code, file);
-      await applyTransformers(ctx, defaultTransform?.code || preTransform?.code || code, file, "post");
-      return await extract(preTransform?.code || code, file);
-    }
-    if (shouldWatch) {
-      const { watch } = await import('chokidar');
-      const ignored = ["**/{.git,node_modules}/**"];
-      const watcher = watch(files, {
-        ignorePermissionErrors: true,
-        ignored,
-        cwd: root,
-        ignoreInitial: true
-      });
-      watcher.on("all", (type, file) => {
-        if (type === "add" || type === "change") {
-          const absolutePath = resolve(root, file);
-          tasks.push(extractFile(absolutePath));
-        }
-      });
-    }
-    await Promise.all(files.map(extractFile));
-  }
-}
-
 function getHash(input, length = 8) {
   return createHash("sha256").update(input).digest("hex").slice(0, length);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/webpack",
   "type": "module",
-  "version": "0.62.2",
+  "version": "0.62.4",
   "description": "The Webpack plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -46,16 +46,16 @@
     "@rollup/pluginutils": "^5.1.0",
     "chokidar": "^3.6.0",
     "magic-string": "^0.30.11",
-    "tinyglobby": "^0.2.2",
-    "unplugin": "^1.12.1",
+    "tinyglobby": "^0.2.6",
+    "unplugin": "^1.14.1",
     "webpack-sources": "^3.2.3",
-    "@unocss/core": "0.62.2",
-    "@unocss/config": "0.62.2"
+    "@unocss/config": "0.62.4",
+    "@unocss/core": "0.62.4"
   },
   "devDependencies": {
     "@types/webpack": "^5.28.5",
     "@types/webpack-sources": "^3.2.3",
-    "webpack": "^5.93.0"
+    "webpack": "^5.94.0"
   },
   "scripts": {
     "build": "unbuild",