tailwindcss-injector 1.0.5 → 1.0.7

package/dist/postcss.cjs

@@ -1,239 +1,16 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-};
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-
-// ../../node_modules/.pnpm/tsup@8.5.0_@swc+core@1.12.1_jiti@2.5.1_postcss@8.5.6_tsx@4.20.5_typescript@5.9.2_yaml@2.8.1/node_modules/tsup/assets/cjs_shims.js
-var init_cjs_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.5.0_@swc+core@1.12.1_jiti@2.5.1_postcss@8.5.6_tsx@4.20.5_typescript@5.9.2_yaml@2.8.1/node_modules/tsup/assets/cjs_shims.js"() {
-    "use strict";
-  }
-});
-
-// ../../node_modules/.pnpm/is-primitive@3.0.1/node_modules/is-primitive/index.js
-var require_is_primitive = __commonJS({
-  "../../node_modules/.pnpm/is-primitive@3.0.1/node_modules/is-primitive/index.js"(exports, module) {
-    "use strict";
-    init_cjs_shims();
-    module.exports = function isPrimitive(val) {
-      if (typeof val === "object") {
-        return val === null;
-      }
-      return typeof val !== "function";
-    };
-  }
-});
-
-// ../../node_modules/.pnpm/isobject@3.0.1/node_modules/isobject/index.js
-var require_isobject = __commonJS({
-  "../../node_modules/.pnpm/isobject@3.0.1/node_modules/isobject/index.js"(exports, module) {
-    "use strict";
-    init_cjs_shims();
-    module.exports = function isObject(val) {
-      return val != null && typeof val === "object" && Array.isArray(val) === false;
-    };
-  }
-});
-
-// ../../node_modules/.pnpm/is-plain-object@2.0.4/node_modules/is-plain-object/index.js
-var require_is_plain_object = __commonJS({
-  "../../node_modules/.pnpm/is-plain-object@2.0.4/node_modules/is-plain-object/index.js"(exports, module) {
-    "use strict";
-    init_cjs_shims();
-    var isObject = require_isobject();
-    function isObjectObject(o) {
-      return isObject(o) === true && Object.prototype.toString.call(o) === "[object Object]";
-    }
-    module.exports = function isPlainObject(o) {
-      var ctor, prot;
-      if (isObjectObject(o) === false) return false;
-      ctor = o.constructor;
-      if (typeof ctor !== "function") return false;
-      prot = ctor.prototype;
-      if (isObjectObject(prot) === false) return false;
-      if (prot.hasOwnProperty("isPrototypeOf") === false) {
-        return false;
-      }
-      return true;
-    };
-  }
-});
-
-// ../../node_modules/.pnpm/set-value@4.1.0/node_modules/set-value/index.js
-var require_set_value = __commonJS({
-  "../../node_modules/.pnpm/set-value@4.1.0/node_modules/set-value/index.js"(exports, module) {
-    "use strict";
-    init_cjs_shims();
-    var { deleteProperty } = Reflect;
-    var isPrimitive = require_is_primitive();
-    var isPlainObject = require_is_plain_object();
-    var isObject = (value) => {
-      return typeof value === "object" && value !== null || typeof value === "function";
-    };
-    var isUnsafeKey = (key) => {
-      return key === "__proto__" || key === "constructor" || key === "prototype";
-    };
-    var validateKey = (key) => {
-      if (!isPrimitive(key)) {
-        throw new TypeError("Object keys must be strings or symbols");
-      }
-      if (isUnsafeKey(key)) {
-        throw new Error(`Cannot set unsafe key: "${key}"`);
-      }
-    };
-    var toStringKey = (input) => {
-      return Array.isArray(input) ? input.flat().map(String).join(",") : input;
-    };
-    var createMemoKey = (input, options) => {
-      if (typeof input !== "string" || !options) return input;
-      let key = input + ";";
-      if (options.arrays !== void 0) key += `arrays=${options.arrays};`;
-      if (options.separator !== void 0) key += `separator=${options.separator};`;
-      if (options.split !== void 0) key += `split=${options.split};`;
-      if (options.merge !== void 0) key += `merge=${options.merge};`;
-      if (options.preservePaths !== void 0) key += `preservePaths=${options.preservePaths};`;
-      return key;
-    };
-    var memoize = (input, options, fn) => {
-      const key = toStringKey(options ? createMemoKey(input, options) : input);
-      validateKey(key);
-      const value = setValue.cache.get(key) || fn();
-      setValue.cache.set(key, value);
-      return value;
-    };
-    var splitString = (input, options = {}) => {
-      const sep2 = options.separator || ".";
-      const preserve = sep2 === "/" ? false : options.preservePaths;
-      if (typeof input === "string" && preserve !== false && /\//.test(input)) {
-        return [input];
-      }
-      const parts = [];
-      let part = "";
-      const push = (part2) => {
-        let number;
-        if (part2.trim() !== "" && Number.isInteger(number = Number(part2))) {
-          parts.push(number);
-        } else {
-          parts.push(part2);
-        }
-      };
-      for (let i = 0; i < input.length; i++) {
-        const value = input[i];
-        if (value === "\\") {
-          part += input[++i];
-          continue;
-        }
-        if (value === sep2) {
-          push(part);
-          part = "";
-          continue;
-        }
-        part += value;
-      }
-      if (part) {
-        push(part);
-      }
-      return parts;
-    };
-    var split = (input, options) => {
-      if (options && typeof options.split === "function") return options.split(input);
-      if (typeof input === "symbol") return [input];
-      if (Array.isArray(input)) return input;
-      return memoize(input, options, () => splitString(input, options));
-    };
-    var assignProp = (obj, prop, value, options) => {
-      validateKey(prop);
-      if (value === void 0) {
-        deleteProperty(obj, prop);
-      } else if (options && options.merge) {
-        const merge = options.merge === "function" ? options.merge : Object.assign;
-        if (merge && isPlainObject(obj[prop]) && isPlainObject(value)) {
-          obj[prop] = merge(obj[prop], value);
-        } else {
-          obj[prop] = value;
-        }
-      } else {
-        obj[prop] = value;
-      }
-      return obj;
-    };
-    var setValue = (target, path2, value, options) => {
-      if (!path2 || !isObject(target)) return target;
-      const keys = split(path2, options);
-      let obj = target;
-      for (let i = 0; i < keys.length; i++) {
-        const key = keys[i];
-        const next = keys[i + 1];
-        validateKey(key);
-        if (next === void 0) {
-          assignProp(obj, key, value, options);
-          break;
-        }
-        if (typeof next === "number" && !Array.isArray(obj[key])) {
-          obj = obj[key] = [];
-          continue;
-        }
-        if (!isObject(obj[key])) {
-          obj[key] = {};
-        }
-        obj = obj[key];
-      }
-      return target;
-    };
-    setValue.split = split;
-    setValue.cache = /* @__PURE__ */ new Map();
-    setValue.clear = () => {
-      setValue.cache = /* @__PURE__ */ new Map();
-    };
-    module.exports = setValue;
-  }
-});
-
-// src/postcss.ts
-init_cjs_shims();
-var import_set_value = __toESM(require_set_value(), 1);
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// src/postcss.ts
 var _postcss = require('postcss'); var _postcss2 = _interopRequireDefault(_postcss);
 var _tailwindcss = require('tailwindcss'); var _tailwindcss2 = _interopRequireDefault(_tailwindcss);
 var _tailwindcssconfig = require('tailwindcss-config');
 
 // src/config.ts
-init_cjs_shims();
 var _process = require('process'); var _process2 = _interopRequireDefault(_process);
 
 // src/utils.ts
-init_cjs_shims();
 var _crypto = require('crypto'); var _crypto2 = _interopRequireDefault(_crypto);
 var _shared = require('@weapp-tailwindcss/shared');
 
-// ../../node_modules/.pnpm/pathe@2.0.3/node_modules/pathe/dist/index.mjs
-init_cjs_shims();
-
 // ../../node_modules/.pnpm/pathe@2.0.3/node_modules/pathe/dist/shared/pathe.M-eThtNZ.mjs
-init_cjs_shims();
 var _lazyMatch = () => {
   var __lib__ = (() => {
     var m = Object.defineProperty, V = Object.getOwnPropertyDescriptor, G = Object.getOwnPropertyNames, T = Object.prototype.hasOwnProperty, q = (r, e) => {
@@ -690,11 +467,9 @@ function getConfig(options) {
 }
 
 // src/constants.ts
-init_cjs_shims();
 var postcssPlugin = "postcss-tailwindcss-injector";
 
 // src/wxml.ts
-init_cjs_shims();
 var _path2 = require('path'); var _path3 = _interopRequireDefault(_path2);
 var _fsextra = require('fs-extra'); var _fsextra2 = _interopRequireDefault(_fsextra);
 var _htmlparser2 = require('htmlparser2');
@@ -758,10 +533,10 @@ function processWxml(wxml) {
   parser.end();
   return deps;
 }
-async function getDep(filepath, set2) {
+async function getDep(filepath, set) {
   if (await _fsextra2.default.exists(filepath)) {
     const dirname2 = _path3.default.dirname(filepath);
-    set2.add(filepath);
+    set.add(filepath);
     const wxml = await _fsextra2.default.readFile(filepath, "utf8");
     const hash = md5(wxml);
     const oldHash = hashMap.get(filepath);
@@ -777,19 +552,51 @@ async function getDep(filepath, set2) {
     }
     for (const { value } of deps) {
       const p = _path3.default.resolve(dirname2, value);
-      if (!set2.has(p)) {
-        await getDep(p, set2);
+      if (!set.has(p)) {
+        await getDep(p, set);
       }
     }
   }
 }
 async function getDepFiles(file) {
-  const set2 = /* @__PURE__ */ new Set();
-  await getDep(file, set2);
-  return set2;
+  const set = /* @__PURE__ */ new Set();
+  await getDep(file, set);
+  return set;
 }
 
 // src/postcss.ts
+var configCache = /* @__PURE__ */ new Map();
+async function loadTailwindConfigOnce(cwd2, configPath) {
+  const cacheKey = `${cwd2}::${configPath}`;
+  let cached = configCache.get(cacheKey);
+  if (!cached) {
+    cached = _tailwindcssconfig.loadConfig.call(void 0, {
+      cwd: cwd2,
+      config: configPath
+    }).then((result) => _optionalChain([result, 'optionalAccess', _11 => _11.config]));
+    configCache.set(cacheKey, cached);
+  }
+  return cached;
+}
+function cloneConfig(config) {
+  if (!config) {
+    return config;
+  }
+  return {
+    ...config
+  };
+}
+async function resolveTailwindConfig(config, cwd2, sourceInput) {
+  if (!config) {
+    return void 0;
+  }
+  const resolved = typeof config === "function" ? config(sourceInput) : config;
+  if (typeof resolved === "string") {
+    const loaded = await loadTailwindConfigOnce(cwd2, resolved);
+    return cloneConfig(loaded);
+  }
+  return cloneConfig(resolved);
+}
 var creator = (options) => {
   const { config, filter, directiveParams, cwd: cwd2, extensions, insertAfterAtRulesNames, insertAfterComments } = getConfig(options);
   const extensionsGlob = `{${extensions.join(",")}}`;
@@ -799,51 +606,65 @@ var creator = (options) => {
       {
         postcssPlugin: `${postcssPlugin}:post`,
         async Once(root, helpers) {
-          if (filter(_optionalChain([root, 'access', _11 => _11.source, 'optionalAccess', _12 => _12.input]))) {
-            const atruleLastIndex = root.nodes.findLastIndex((x) => x.type === "atrule" && insertAfterAtRulesNames.includes(x.name));
-            const commentLastIndex = root.nodes.findLastIndex((x) => x.type === "comment" && _shared.regExpTest.call(void 0, insertAfterComments, x.text));
-            const lastIndex = Math.max(atruleLastIndex, commentLastIndex);
+          const sourceInput = _optionalChain([root, 'access', _12 => _12.source, 'optionalAccess', _13 => _13.input]);
+          if (filter(sourceInput)) {
+            const nodes = _nullishCoalesce(root.nodes, () => ( []));
+            let atruleAnchorIndex = -1;
+            let commentAnchorIndex = -1;
+            const directivePresence = /* @__PURE__ */ new Set();
+            nodes.forEach((node, index) => {
+              if (node.type === "atrule") {
+                const nameMatches = insertAfterAtRulesNames.includes(node.name);
+                if (nameMatches) {
+                  atruleAnchorIndex = Math.max(atruleAnchorIndex, index);
+                }
+                if (typeof node.params === "string") {
+                  directivePresence.add(node.params);
+                }
+              } else if (node.type === "comment" && _shared.regExpTest.call(void 0, insertAfterComments, node.text)) {
+                commentAnchorIndex = Math.max(commentAnchorIndex, index);
+              }
+            });
+            const anchorIndex = Math.max(atruleAnchorIndex, commentAnchorIndex);
+            const anchorNode = anchorIndex >= 0 ? nodes[anchorIndex] : void 0;
+            let lastInserted = anchorNode;
             for (const params of directiveParams) {
-              const node = root.nodes.find((x) => x.type === "atrule" && x.params === params);
-              if (!node) {
+              if (!directivePresence.has(params)) {
                 const atRule = helpers.atRule({ name: "tailwind", params });
-                if (lastIndex < 0) {
-                  root.prepend(atRule);
+                if (lastInserted) {
+                  root.insertAfter(lastInserted, atRule);
                 } else {
-                  root.insertAfter(lastIndex, atRule);
+                  root.prepend(atRule);
                 }
+                lastInserted = atRule;
+                directivePresence.add(params);
               }
             }
-            const cfg = typeof config === "function" ? config(_optionalChain([root, 'access', _13 => _13.source, 'optionalAccess', _14 => _14.input])) : config;
-            let tailwindcssConfig;
-            if (typeof cfg === "string") {
-              const result = await _tailwindcssconfig.loadConfig.call(void 0, {
-                cwd: cwd2,
-                config: cfg
-              });
-              if (result) {
-                tailwindcssConfig = result.config;
-              }
-            } else {
-              tailwindcssConfig = _nullishCoalesce(cfg, () => ( {
-                content: []
-              }));
-            }
-            if (tailwindcssConfig && _optionalChain([root, 'access', _15 => _15.source, 'optionalAccess', _16 => _16.input]) && root.source.input.file) {
-              const basename2 = removeFileExtension(root.source.input.file);
-              (0, import_set_value.default)(tailwindcssConfig, "content", [
-                `${basename2}.${extensionsGlob}`
-              ]);
+            if (_optionalChain([sourceInput, 'optionalAccess', _14 => _14.file])) {
+              const tailwindcssConfig = await _asyncNullishCoalesce(await resolveTailwindConfig(config, cwd2, sourceInput), async () => ( { content: [] }));
+              const basename2 = removeFileExtension(sourceInput.file);
+              const contentEntries = [`${basename2}.${extensionsGlob}`];
               const deps = await getDepFiles(`${basename2}.wxml`);
               for (const dep of deps) {
-                if (Array.isArray(tailwindcssConfig.content)) {
-                  tailwindcssConfig.content.push(`${removeFileExtension(dep)}.${extensionsGlob}`);
-                }
+                contentEntries.push(`${removeFileExtension(dep)}.${extensionsGlob}`);
+              }
+              const uniqueEntries = Array.from(new Set(contentEntries));
+              const { content: existingContent } = tailwindcssConfig;
+              if (!existingContent || Array.isArray(existingContent)) {
+                tailwindcssConfig.content = uniqueEntries;
+              } else if (typeof existingContent === "object" && existingContent !== null) {
+                const normalizedContent = { ...existingContent };
+                const currentFiles = normalizedContent.files;
+                const normalizedFiles = Array.isArray(currentFiles) ? currentFiles : typeof currentFiles === "string" ? [currentFiles] : [];
+                normalizedContent.files = Array.from(/* @__PURE__ */ new Set([...normalizedFiles, ...uniqueEntries]));
+                tailwindcssConfig.content = normalizedContent;
+              } else {
+                tailwindcssConfig.content = uniqueEntries;
               }
               await _postcss2.default.call(void 0, [
                 _tailwindcss2.default.call(void 0, tailwindcssConfig)
               ]).process(root, {
-                from: root.source.input.file
+                from: sourceInput.file
               }).async();
             }
           }
@@ -857,39 +678,5 @@ var postcss_default = creator;
 
 
 exports.default = postcss_default;
-/*! Bundled license information:
-
-is-primitive/index.js:
-  (*!
-   * is-primitive <https://github.com/jonschlinkert/is-primitive>
-   *
-   * Copyright (c) 2014-present, Jon Schlinkert.
-   * Released under the MIT License.
-   *)
-
-isobject/index.js:
-  (*!
-   * isobject <https://github.com/jonschlinkert/isobject>
-   *
-   * Copyright (c) 2014-2017, Jon Schlinkert.
-   * Released under the MIT License.
-   *)
-
-is-plain-object/index.js:
-  (*!
-   * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
-   *
-   * Copyright (c) 2014-2017, Jon Schlinkert.
-   * Released under the MIT License.
-   *)
-
-set-value/index.js:
-  (*!
-   * set-value <https://github.com/jonschlinkert/set-value>
-   *
-   * Copyright (c) Jon Schlinkert (https://github.com/jonschlinkert).
-   * Released under the MIT License.
-   *)
-*/
 
 module.exports = exports.default;

package/dist/postcss.js

@@ -1,241 +1,16 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-};
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-
-// ../../node_modules/.pnpm/tsup@8.5.0_@swc+core@1.12.1_jiti@2.5.1_postcss@8.5.6_tsx@4.20.5_typescript@5.9.2_yaml@2.8.1/node_modules/tsup/assets/esm_shims.js
-import path from "path";
-import { fileURLToPath } from "url";
-var init_esm_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.5.0_@swc+core@1.12.1_jiti@2.5.1_postcss@8.5.6_tsx@4.20.5_typescript@5.9.2_yaml@2.8.1/node_modules/tsup/assets/esm_shims.js"() {
-    "use strict";
-  }
-});
-
-// ../../node_modules/.pnpm/is-primitive@3.0.1/node_modules/is-primitive/index.js
-var require_is_primitive = __commonJS({
-  "../../node_modules/.pnpm/is-primitive@3.0.1/node_modules/is-primitive/index.js"(exports, module) {
-    "use strict";
-    init_esm_shims();
-    module.exports = function isPrimitive(val) {
-      if (typeof val === "object") {
-        return val === null;
-      }
-      return typeof val !== "function";
-    };
-  }
-});
-
-// ../../node_modules/.pnpm/isobject@3.0.1/node_modules/isobject/index.js
-var require_isobject = __commonJS({
-  "../../node_modules/.pnpm/isobject@3.0.1/node_modules/isobject/index.js"(exports, module) {
-    "use strict";
-    init_esm_shims();
-    module.exports = function isObject(val) {
-      return val != null && typeof val === "object" && Array.isArray(val) === false;
-    };
-  }
-});
-
-// ../../node_modules/.pnpm/is-plain-object@2.0.4/node_modules/is-plain-object/index.js
-var require_is_plain_object = __commonJS({
-  "../../node_modules/.pnpm/is-plain-object@2.0.4/node_modules/is-plain-object/index.js"(exports, module) {
-    "use strict";
-    init_esm_shims();
-    var isObject = require_isobject();
-    function isObjectObject(o) {
-      return isObject(o) === true && Object.prototype.toString.call(o) === "[object Object]";
-    }
-    module.exports = function isPlainObject(o) {
-      var ctor, prot;
-      if (isObjectObject(o) === false) return false;
-      ctor = o.constructor;
-      if (typeof ctor !== "function") return false;
-      prot = ctor.prototype;
-      if (isObjectObject(prot) === false) return false;
-      if (prot.hasOwnProperty("isPrototypeOf") === false) {
-        return false;
-      }
-      return true;
-    };
-  }
-});
-
-// ../../node_modules/.pnpm/set-value@4.1.0/node_modules/set-value/index.js
-var require_set_value = __commonJS({
-  "../../node_modules/.pnpm/set-value@4.1.0/node_modules/set-value/index.js"(exports, module) {
-    "use strict";
-    init_esm_shims();
-    var { deleteProperty } = Reflect;
-    var isPrimitive = require_is_primitive();
-    var isPlainObject = require_is_plain_object();
-    var isObject = (value) => {
-      return typeof value === "object" && value !== null || typeof value === "function";
-    };
-    var isUnsafeKey = (key) => {
-      return key === "__proto__" || key === "constructor" || key === "prototype";
-    };
-    var validateKey = (key) => {
-      if (!isPrimitive(key)) {
-        throw new TypeError("Object keys must be strings or symbols");
-      }
-      if (isUnsafeKey(key)) {
-        throw new Error(`Cannot set unsafe key: "${key}"`);
-      }
-    };
-    var toStringKey = (input) => {
-      return Array.isArray(input) ? input.flat().map(String).join(",") : input;
-    };
-    var createMemoKey = (input, options) => {
-      if (typeof input !== "string" || !options) return input;
-      let key = input + ";";
-      if (options.arrays !== void 0) key += `arrays=${options.arrays};`;
-      if (options.separator !== void 0) key += `separator=${options.separator};`;
-      if (options.split !== void 0) key += `split=${options.split};`;
-      if (options.merge !== void 0) key += `merge=${options.merge};`;
-      if (options.preservePaths !== void 0) key += `preservePaths=${options.preservePaths};`;
-      return key;
-    };
-    var memoize = (input, options, fn) => {
-      const key = toStringKey(options ? createMemoKey(input, options) : input);
-      validateKey(key);
-      const value = setValue.cache.get(key) || fn();
-      setValue.cache.set(key, value);
-      return value;
-    };
-    var splitString = (input, options = {}) => {
-      const sep2 = options.separator || ".";
-      const preserve = sep2 === "/" ? false : options.preservePaths;
-      if (typeof input === "string" && preserve !== false && /\//.test(input)) {
-        return [input];
-      }
-      const parts = [];
-      let part = "";
-      const push = (part2) => {
-        let number;
-        if (part2.trim() !== "" && Number.isInteger(number = Number(part2))) {
-          parts.push(number);
-        } else {
-          parts.push(part2);
-        }
-      };
-      for (let i = 0; i < input.length; i++) {
-        const value = input[i];
-        if (value === "\\") {
-          part += input[++i];
-          continue;
-        }
-        if (value === sep2) {
-          push(part);
-          part = "";
-          continue;
-        }
-        part += value;
-      }
-      if (part) {
-        push(part);
-      }
-      return parts;
-    };
-    var split = (input, options) => {
-      if (options && typeof options.split === "function") return options.split(input);
-      if (typeof input === "symbol") return [input];
-      if (Array.isArray(input)) return input;
-      return memoize(input, options, () => splitString(input, options));
-    };
-    var assignProp = (obj, prop, value, options) => {
-      validateKey(prop);
-      if (value === void 0) {
-        deleteProperty(obj, prop);
-      } else if (options && options.merge) {
-        const merge = options.merge === "function" ? options.merge : Object.assign;
-        if (merge && isPlainObject(obj[prop]) && isPlainObject(value)) {
-          obj[prop] = merge(obj[prop], value);
-        } else {
-          obj[prop] = value;
-        }
-      } else {
-        obj[prop] = value;
-      }
-      return obj;
-    };
-    var setValue = (target, path3, value, options) => {
-      if (!path3 || !isObject(target)) return target;
-      const keys = split(path3, options);
-      let obj = target;
-      for (let i = 0; i < keys.length; i++) {
-        const key = keys[i];
-        const next = keys[i + 1];
-        validateKey(key);
-        if (next === void 0) {
-          assignProp(obj, key, value, options);
-          break;
-        }
-        if (typeof next === "number" && !Array.isArray(obj[key])) {
-          obj = obj[key] = [];
-          continue;
-        }
-        if (!isObject(obj[key])) {
-          obj[key] = {};
-        }
-        obj = obj[key];
-      }
-      return target;
-    };
-    setValue.split = split;
-    setValue.cache = /* @__PURE__ */ new Map();
-    setValue.clear = () => {
-      setValue.cache = /* @__PURE__ */ new Map();
-    };
-    module.exports = setValue;
-  }
-});
-
 // src/postcss.ts
-init_esm_shims();
-var import_set_value = __toESM(require_set_value(), 1);
 import postcss from "postcss";
 import tailwindcss from "tailwindcss";
 import { loadConfig } from "tailwindcss-config";
 
 // src/config.ts
-init_esm_shims();
 import process2 from "process";
 
 // src/utils.ts
-init_esm_shims();
 import crypto from "crypto";
 import { defu, defuOverrideArray, isRegexp, regExpTest } from "@weapp-tailwindcss/shared";
 
-// ../../node_modules/.pnpm/pathe@2.0.3/node_modules/pathe/dist/index.mjs
-init_esm_shims();
-
 // ../../node_modules/.pnpm/pathe@2.0.3/node_modules/pathe/dist/shared/pathe.M-eThtNZ.mjs
-init_esm_shims();
 var _lazyMatch = () => {
   var __lib__ = (() => {
     var m = Object.defineProperty, V = Object.getOwnPropertyDescriptor, G = Object.getOwnPropertyNames, T = Object.prototype.hasOwnProperty, q = (r, e) => {
@@ -394,12 +169,12 @@ var _lazyMatch = () => {
   return __lib__.default || __lib__;
 };
 var _match;
-var zeptomatch = (path3, pattern) => {
+var zeptomatch = (path2, pattern) => {
   if (!_match) {
     _match = _lazyMatch();
     _lazyMatch = null;
   }
-  return _match(path3, pattern);
+  return _match(path2, pattern);
 };
 var _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
@@ -415,55 +190,55 @@ var _ROOT_FOLDER_RE = /^\/([A-Za-z]:)?$/;
 var _EXTNAME_RE = /.(\.[^./]+|\.)$/;
 var _PATH_ROOT_RE = /^[/\\]|^[a-zA-Z]:[/\\]/;
 var sep = "/";
-var normalize = function(path3) {
-  if (path3.length === 0) {
+var normalize = function(path2) {
+  if (path2.length === 0) {
     return ".";
   }
-  path3 = normalizeWindowsPath(path3);
-  const isUNCPath = path3.match(_UNC_REGEX);
-  const isPathAbsolute = isAbsolute(path3);
-  const trailingSeparator = path3[path3.length - 1] === "/";
-  path3 = normalizeString(path3, !isPathAbsolute);
-  if (path3.length === 0) {
+  path2 = normalizeWindowsPath(path2);
+  const isUNCPath = path2.match(_UNC_REGEX);
+  const isPathAbsolute = isAbsolute(path2);
+  const trailingSeparator = path2[path2.length - 1] === "/";
+  path2 = normalizeString(path2, !isPathAbsolute);
+  if (path2.length === 0) {
     if (isPathAbsolute) {
       return "/";
     }
     return trailingSeparator ? "./" : ".";
   }
   if (trailingSeparator) {
-    path3 += "/";
+    path2 += "/";
   }
-  if (_DRIVE_LETTER_RE.test(path3)) {
-    path3 += "/";
+  if (_DRIVE_LETTER_RE.test(path2)) {
+    path2 += "/";
   }
   if (isUNCPath) {
     if (!isPathAbsolute) {
-      return `//./${path3}`;
+      return `//./${path2}`;
     }
-    return `//${path3}`;
+    return `//${path2}`;
   }
-  return isPathAbsolute && !isAbsolute(path3) ? `/${path3}` : path3;
+  return isPathAbsolute && !isAbsolute(path2) ? `/${path2}` : path2;
 };
 var join = function(...segments) {
-  let path3 = "";
+  let path2 = "";
   for (const seg of segments) {
     if (!seg) {
       continue;
     }
-    if (path3.length > 0) {
-      const pathTrailing = path3[path3.length - 1] === "/";
+    if (path2.length > 0) {
+      const pathTrailing = path2[path2.length - 1] === "/";
       const segLeading = seg[0] === "/";
       const both = pathTrailing && segLeading;
       if (both) {
-        path3 += seg.slice(1);
+        path2 += seg.slice(1);
       } else {
-        path3 += pathTrailing || segLeading ? seg : `/${seg}`;
+        path2 += pathTrailing || segLeading ? seg : `/${seg}`;
       }
     } else {
-      path3 += seg;
+      path2 += seg;
     }
   }
-  return normalize(path3);
+  return normalize(path2);
 };
 function cwd() {
   if (typeof process !== "undefined" && typeof process.cwd === "function") {
@@ -476,12 +251,12 @@ var resolve = function(...arguments_) {
   let resolvedPath = "";
   let resolvedAbsolute = false;
   for (let index = arguments_.length - 1; index >= -1 && !resolvedAbsolute; index--) {
-    const path3 = index >= 0 ? arguments_[index] : cwd();
-    if (!path3 || path3.length === 0) {
+    const path2 = index >= 0 ? arguments_[index] : cwd();
+    if (!path2 || path2.length === 0) {
       continue;
     }
-    resolvedPath = `${path3}/${resolvedPath}`;
-    resolvedAbsolute = isAbsolute(path3);
+    resolvedPath = `${path2}/${resolvedPath}`;
+    resolvedAbsolute = isAbsolute(path2);
   }
   resolvedPath = normalizeString(resolvedPath, !resolvedAbsolute);
   if (resolvedAbsolute && !isAbsolute(resolvedPath)) {
@@ -489,15 +264,15 @@ var resolve = function(...arguments_) {
   }
   return resolvedPath.length > 0 ? resolvedPath : ".";
 };
-function normalizeString(path3, allowAboveRoot) {
+function normalizeString(path2, allowAboveRoot) {
   let res = "";
   let lastSegmentLength = 0;
   let lastSlash = -1;
   let dots = 0;
   let char = null;
-  for (let index = 0; index <= path3.length; ++index) {
-    if (index < path3.length) {
-      char = path3[index];
+  for (let index = 0; index <= path2.length; ++index) {
+    if (index < path2.length) {
+      char = path2[index];
     } else if (char === "/") {
       break;
     } else {
@@ -533,9 +308,9 @@ function normalizeString(path3, allowAboveRoot) {
         }
       } else {
         if (res.length > 0) {
-          res += `/${path3.slice(lastSlash + 1, index)}`;
+          res += `/${path2.slice(lastSlash + 1, index)}`;
         } else {
-          res = path3.slice(lastSlash + 1, index);
+          res = path2.slice(lastSlash + 1, index);
         }
         lastSegmentLength = index - lastSlash - 1;
       }
@@ -616,8 +391,8 @@ var parse = function(p) {
     name: base.slice(0, base.length - extension.length)
   };
 };
-var matchesGlob = (path3, pattern) => {
-  return zeptomatch(pattern, normalize(path3));
+var matchesGlob = (path2, pattern) => {
+  return zeptomatch(pattern, normalize(path2));
 };
 var _path = {
   __proto__: null,
@@ -692,12 +467,10 @@ function getConfig(options) {
 }
 
 // src/constants.ts
-init_esm_shims();
 var postcssPlugin = "postcss-tailwindcss-injector";
 
 // src/wxml.ts
-init_esm_shims();
-import path2 from "path";
+import path from "path";
 import fs from "fs-extra";
 import { Parser } from "htmlparser2";
 import MagicString from "magic-string";
@@ -760,10 +533,10 @@ function processWxml(wxml) {
   parser.end();
   return deps;
 }
-async function getDep(filepath, set2) {
+async function getDep(filepath, set) {
   if (await fs.exists(filepath)) {
-    const dirname2 = path2.dirname(filepath);
-    set2.add(filepath);
+    const dirname2 = path.dirname(filepath);
+    set.add(filepath);
     const wxml = await fs.readFile(filepath, "utf8");
     const hash = md5(wxml);
     const oldHash = hashMap.get(filepath);
@@ -778,20 +551,52 @@ async function getDep(filepath, set2) {
       deps = cacheDeps;
     }
     for (const { value } of deps) {
-      const p = path2.resolve(dirname2, value);
-      if (!set2.has(p)) {
-        await getDep(p, set2);
+      const p = path.resolve(dirname2, value);
+      if (!set.has(p)) {
+        await getDep(p, set);
       }
     }
   }
 }
 async function getDepFiles(file) {
-  const set2 = /* @__PURE__ */ new Set();
-  await getDep(file, set2);
-  return set2;
+  const set = /* @__PURE__ */ new Set();
+  await getDep(file, set);
+  return set;
 }
 
 // src/postcss.ts
+var configCache = /* @__PURE__ */ new Map();
+async function loadTailwindConfigOnce(cwd2, configPath) {
+  const cacheKey = `${cwd2}::${configPath}`;
+  let cached = configCache.get(cacheKey);
+  if (!cached) {
+    cached = loadConfig({
+      cwd: cwd2,
+      config: configPath
+    }).then((result) => result?.config);
+    configCache.set(cacheKey, cached);
+  }
+  return cached;
+}
+function cloneConfig(config) {
+  if (!config) {
+    return config;
+  }
+  return {
+    ...config
+  };
+}
+async function resolveTailwindConfig(config, cwd2, sourceInput) {
+  if (!config) {
+    return void 0;
+  }
+  const resolved = typeof config === "function" ? config(sourceInput) : config;
+  if (typeof resolved === "string") {
+    const loaded = await loadTailwindConfigOnce(cwd2, resolved);
+    return cloneConfig(loaded);
+  }
+  return cloneConfig(resolved);
+}
 var creator = (options) => {
   const { config, filter, directiveParams, cwd: cwd2, extensions, insertAfterAtRulesNames, insertAfterComments } = getConfig(options);
   const extensionsGlob = `{${extensions.join(",")}}`;
@@ -801,51 +606,65 @@ var creator = (options) => {
       {
         postcssPlugin: `${postcssPlugin}:post`,
         async Once(root, helpers) {
-          if (filter(root.source?.input)) {
-            const atruleLastIndex = root.nodes.findLastIndex((x) => x.type === "atrule" && insertAfterAtRulesNames.includes(x.name));
-            const commentLastIndex = root.nodes.findLastIndex((x) => x.type === "comment" && regExpTest(insertAfterComments, x.text));
-            const lastIndex = Math.max(atruleLastIndex, commentLastIndex);
+          const sourceInput = root.source?.input;
+          if (filter(sourceInput)) {
+            const nodes = root.nodes ?? [];
+            let atruleAnchorIndex = -1;
+            let commentAnchorIndex = -1;
+            const directivePresence = /* @__PURE__ */ new Set();
+            nodes.forEach((node, index) => {
+              if (node.type === "atrule") {
+                const nameMatches = insertAfterAtRulesNames.includes(node.name);
+                if (nameMatches) {
+                  atruleAnchorIndex = Math.max(atruleAnchorIndex, index);
+                }
+                if (typeof node.params === "string") {
+                  directivePresence.add(node.params);
+                }
+              } else if (node.type === "comment" && regExpTest(insertAfterComments, node.text)) {
+                commentAnchorIndex = Math.max(commentAnchorIndex, index);
+              }
+            });
+            const anchorIndex = Math.max(atruleAnchorIndex, commentAnchorIndex);
+            const anchorNode = anchorIndex >= 0 ? nodes[anchorIndex] : void 0;
+            let lastInserted = anchorNode;
             for (const params of directiveParams) {
-              const node = root.nodes.find((x) => x.type === "atrule" && x.params === params);
-              if (!node) {
+              if (!directivePresence.has(params)) {
                 const atRule = helpers.atRule({ name: "tailwind", params });
-                if (lastIndex < 0) {
-                  root.prepend(atRule);
+                if (lastInserted) {
+                  root.insertAfter(lastInserted, atRule);
                 } else {
-                  root.insertAfter(lastIndex, atRule);
+                  root.prepend(atRule);
                 }
+                lastInserted = atRule;
+                directivePresence.add(params);
               }
             }
-            const cfg = typeof config === "function" ? config(root.source?.input) : config;
-            let tailwindcssConfig;
-            if (typeof cfg === "string") {
-              const result = await loadConfig({
-                cwd: cwd2,
-                config: cfg
-              });
-              if (result) {
-                tailwindcssConfig = result.config;
-              }
-            } else {
-              tailwindcssConfig = cfg ?? {
-                content: []
-              };
-            }
-            if (tailwindcssConfig && root.source?.input && root.source.input.file) {
-              const basename2 = removeFileExtension(root.source.input.file);
-              (0, import_set_value.default)(tailwindcssConfig, "content", [
-                `${basename2}.${extensionsGlob}`
-              ]);
+            if (sourceInput?.file) {
+              const tailwindcssConfig = await resolveTailwindConfig(config, cwd2, sourceInput) ?? { content: [] };
+              const basename2 = removeFileExtension(sourceInput.file);
+              const contentEntries = [`${basename2}.${extensionsGlob}`];
               const deps = await getDepFiles(`${basename2}.wxml`);
               for (const dep of deps) {
-                if (Array.isArray(tailwindcssConfig.content)) {
-                  tailwindcssConfig.content.push(`${removeFileExtension(dep)}.${extensionsGlob}`);
-                }
+                contentEntries.push(`${removeFileExtension(dep)}.${extensionsGlob}`);
+              }
+              const uniqueEntries = Array.from(new Set(contentEntries));
+              const { content: existingContent } = tailwindcssConfig;
+              if (!existingContent || Array.isArray(existingContent)) {
+                tailwindcssConfig.content = uniqueEntries;
+              } else if (typeof existingContent === "object" && existingContent !== null) {
+                const normalizedContent = { ...existingContent };
+                const currentFiles = normalizedContent.files;
+                const normalizedFiles = Array.isArray(currentFiles) ? currentFiles : typeof currentFiles === "string" ? [currentFiles] : [];
+                normalizedContent.files = Array.from(/* @__PURE__ */ new Set([...normalizedFiles, ...uniqueEntries]));
+                tailwindcssConfig.content = normalizedContent;
+              } else {
+                tailwindcssConfig.content = uniqueEntries;
               }
               await postcss([
                 tailwindcss(tailwindcssConfig)
               ]).process(root, {
-                from: root.source.input.file
+                from: sourceInput.file
               }).async();
             }
           }
@@ -859,37 +678,3 @@ var postcss_default = creator;
 export {
   postcss_default as default
 };
-/*! Bundled license information:
-
-is-primitive/index.js:
-  (*!
-   * is-primitive <https://github.com/jonschlinkert/is-primitive>
-   *
-   * Copyright (c) 2014-present, Jon Schlinkert.
-   * Released under the MIT License.
-   *)
-
-isobject/index.js:
-  (*!
-   * isobject <https://github.com/jonschlinkert/isobject>
-   *
-   * Copyright (c) 2014-2017, Jon Schlinkert.
-   * Released under the MIT License.
-   *)
-
-is-plain-object/index.js:
-  (*!
-   * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
-   *
-   * Copyright (c) 2014-2017, Jon Schlinkert.
-   * Released under the MIT License.
-   *)
-
-set-value/index.js:
-  (*!
-   * set-value <https://github.com/jonschlinkert/set-value>
-   *
-   * Copyright (c) Jon Schlinkert (https://github.com/jonschlinkert).
-   * Released under the MIT License.
-   *)
-*/

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tailwindcss-injector",
   "type": "module",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "tsup(esbuild) build package template",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -31,9 +31,9 @@
     "dist"
   ],
   "dependencies": {
-    "fs-extra": "^11.3.1",
+    "fs-extra": "^11.3.2",
     "htmlparser2": "^10.0.0",
-    "magic-string": "^0.30.18",
+    "magic-string": "^0.30.19",
     "postcss": "^8.5.6",
     "tailwindcss": "^3.4.17",
     "@weapp-tailwindcss/shared": "1.0.3",