tailwindcss-injector 0.1.4 → 0.1.6-alpha.0

package/dist/postcss.cjs

@@ -27,9 +27,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.1_postcss@8.4.49_tsx@4.19.2_typescript@5.7.2_yaml@2.6.1/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/cjs_shims.js
 var init_cjs_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.1_postcss@8.4.49_tsx@4.19.2_typescript@5.7.2_yaml@2.6.1/node_modules/tsup/assets/cjs_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/cjs_shims.js"() {
     "use strict";
   }
 });
@@ -68,7 +68,7 @@ var require_is_plain_object = __commonJS({
     function isObjectObject(o) {
       return isObject(o) === true && Object.prototype.toString.call(o) === "[object Object]";
     }
-    module.exports = function isPlainObject2(o) {
+    module.exports = function isPlainObject(o) {
       var ctor, prot;
       if (isObjectObject(o) === false) return false;
       ctor = o.constructor;
@@ -90,7 +90,7 @@ var require_set_value = __commonJS({
     init_cjs_shims();
     var { deleteProperty } = Reflect;
     var isPrimitive = require_is_primitive();
-    var isPlainObject2 = require_is_plain_object();
+    var isPlainObject = require_is_plain_object();
     var isObject = (value) => {
       return typeof value === "object" && value !== null || typeof value === "function";
     };
@@ -171,7 +171,7 @@ var require_set_value = __commonJS({
         deleteProperty(obj, prop);
       } else if (options && options.merge) {
         const merge = options.merge === "function" ? options.merge : Object.assign;
-        if (merge && isPlainObject2(obj[prop]) && isPlainObject2(value)) {
+        if (merge && isPlainObject(obj[prop]) && isPlainObject(value)) {
           obj[prop] = merge(obj[prop], value);
         } else {
           obj[prop] = value;
@@ -228,77 +228,7 @@ var _process = require('process'); var _process2 = _interopRequireDefault(_proce
 init_cjs_shims();
 var _crypto = require('crypto'); var _crypto2 = _interopRequireDefault(_crypto);
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
-
-// ../../node_modules/.pnpm/defu@6.1.4/node_modules/defu/dist/defu.mjs
-init_cjs_shims();
-function isPlainObject(value) {
-  if (value === null || typeof value !== "object") {
-    return false;
-  }
-  const prototype = Object.getPrototypeOf(value);
-  if (prototype !== null && prototype !== Object.prototype && Object.getPrototypeOf(prototype) !== null) {
-    return false;
-  }
-  if (Symbol.iterator in value) {
-    return false;
-  }
-  if (Symbol.toStringTag in value) {
-    return Object.prototype.toString.call(value) === "[object Module]";
-  }
-  return true;
-}
-function _defu(baseObject, defaults, namespace = ".", merger) {
-  if (!isPlainObject(defaults)) {
-    return _defu(baseObject, {}, namespace, merger);
-  }
-  const object = Object.assign({}, defaults);
-  for (const key in baseObject) {
-    if (key === "__proto__" || key === "constructor") {
-      continue;
-    }
-    const value = baseObject[key];
-    if (value === null || value === void 0) {
-      continue;
-    }
-    if (merger && merger(object, key, value, namespace)) {
-      continue;
-    }
-    if (Array.isArray(value) && Array.isArray(object[key])) {
-      object[key] = [...value, ...object[key]];
-    } else if (isPlainObject(value) && isPlainObject(object[key])) {
-      object[key] = _defu(
-        value,
-        object[key],
-        (namespace ? `${namespace}.` : "") + key.toString(),
-        merger
-      );
-    } else {
-      object[key] = value;
-    }
-  }
-  return object;
-}
-function createDefu(merger) {
-  return (...arguments_) => (
-    // eslint-disable-next-line unicorn/no-array-reduce
-    arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
-  );
-}
-var defu = createDefu();
-var defuFn = createDefu((object, key, currentValue) => {
-  if (object[key] !== void 0 && typeof currentValue === "function") {
-    object[key] = currentValue(object[key]);
-    return true;
-  }
-});
-var defuArrayFn = createDefu((object, key, currentValue) => {
-  if (Array.isArray(object[key]) && typeof currentValue === "function") {
-    object[key] = currentValue(object[key]);
-    return true;
-  }
-});
-
-// src/utils.ts
+var _shared = require('@weapp-tailwindcss/shared');
 function removeFileExtension(filePath) {
   if (!filePath) {
     return "";
@@ -312,12 +242,6 @@ function removeFileExtension(filePath) {
   const dir = _path2.default.dirname(filePath);
   return _path2.default.join(dir, baseName);
 }
-var defuOverrideArray = createDefu((obj, key, value) => {
-  if (Array.isArray(obj[key]) && Array.isArray(value)) {
-    obj[key] = value;
-    return true;
-  }
-});
 function md5(input) {
   const hash = _crypto2.default.createHash("md5");
   hash.update(input);
@@ -334,11 +258,12 @@ function getDefaultConfig() {
     cwd: _process2.default.cwd(),
     extensions: ["wxml", "js", "ts"],
     // @import and @use (scss)
-    insertAfterAtRulesNames: ["import", "use"]
+    insertAfterAtRulesNames: ["import", "use"],
+    insertAfterComments: ["@import"]
   };
 }
 function getConfig(options) {
-  return defuOverrideArray(options, getDefaultConfig());
+  return _shared.defuOverrideArray.call(void 0, options, getDefaultConfig());
 }
 
 // src/constants.ts
@@ -443,7 +368,7 @@ async function getDepFiles(file) {
 
 // src/postcss.ts
 var creator = (options) => {
-  const { config, filter, directiveParams, cwd, extensions, insertAfterAtRulesNames } = getConfig(options);
+  const { config, filter, directiveParams, cwd, extensions, insertAfterAtRulesNames, insertAfterComments } = getConfig(options);
   const extensionsGlob = `{${extensions.join(",")}}`;
   return {
     postcssPlugin,
@@ -452,7 +377,9 @@ var creator = (options) => {
         postcssPlugin: `${postcssPlugin}:post`,
         async Once(root, helpers) {
           if (filter(_optionalChain([root, 'access', _ => _.source, 'optionalAccess', _2 => _2.input]))) {
-            const lastIndex = root.nodes.findLastIndex((x) => x.type === "atrule" && insertAfterAtRulesNames.includes(x.name));
+            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);
             for (const params of directiveParams) {
               const node = root.nodes.find((x) => x.type === "atrule" && x.params === params);
               if (!node) {
@@ -491,7 +418,7 @@ var creator = (options) => {
                 _tailwindcss2.default.call(void 0, tailwindcssConfig)
               ]).process(root, {
                 from: root.source.input.file
-              });
+              }).async();
             }
           }
         }

package/dist/postcss.d.cts

@@ -9,6 +9,7 @@ interface Options {
     directiveParams: ('base' | 'components' | 'utilities' | 'variants')[];
     extensions: string[];
     insertAfterAtRulesNames: string[];
+    insertAfterComments: (string | RegExp)[];
 }
 
 declare const creator: PluginCreator<Partial<Options>>;

package/dist/postcss.d.ts

@@ -9,6 +9,7 @@ interface Options {
     directiveParams: ('base' | 'components' | 'utilities' | 'variants')[];
     extensions: string[];
     insertAfterAtRulesNames: string[];
+    insertAfterComments: (string | RegExp)[];
 }
 
 declare const creator: PluginCreator<Partial<Options>>;

package/dist/postcss.js

@@ -27,9 +27,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.1_postcss@8.4.49_tsx@4.19.2_typescript@5.7.2_yaml@2.6.1/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/esm_shims.js
 var init_esm_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.1_postcss@8.4.49_tsx@4.19.2_typescript@5.7.2_yaml@2.6.1/node_modules/tsup/assets/esm_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/esm_shims.js"() {
     "use strict";
   }
 });
@@ -68,7 +68,7 @@ var require_is_plain_object = __commonJS({
     function isObjectObject(o) {
       return isObject(o) === true && Object.prototype.toString.call(o) === "[object Object]";
     }
-    module.exports = function isPlainObject2(o) {
+    module.exports = function isPlainObject(o) {
       var ctor, prot;
       if (isObjectObject(o) === false) return false;
       ctor = o.constructor;
@@ -90,7 +90,7 @@ var require_set_value = __commonJS({
     init_esm_shims();
     var { deleteProperty } = Reflect;
     var isPrimitive = require_is_primitive();
-    var isPlainObject2 = require_is_plain_object();
+    var isPlainObject = require_is_plain_object();
     var isObject = (value) => {
       return typeof value === "object" && value !== null || typeof value === "function";
     };
@@ -171,7 +171,7 @@ var require_set_value = __commonJS({
         deleteProperty(obj, prop);
       } else if (options && options.merge) {
         const merge = options.merge === "function" ? options.merge : Object.assign;
-        if (merge && isPlainObject2(obj[prop]) && isPlainObject2(value)) {
+        if (merge && isPlainObject(obj[prop]) && isPlainObject(value)) {
           obj[prop] = merge(obj[prop], value);
         } else {
           obj[prop] = value;
@@ -228,77 +228,7 @@ import process from "node:process";
 init_esm_shims();
 import crypto from "node:crypto";
 import path from "node:path";
-
-// ../../node_modules/.pnpm/defu@6.1.4/node_modules/defu/dist/defu.mjs
-init_esm_shims();
-function isPlainObject(value) {
-  if (value === null || typeof value !== "object") {
-    return false;
-  }
-  const prototype = Object.getPrototypeOf(value);
-  if (prototype !== null && prototype !== Object.prototype && Object.getPrototypeOf(prototype) !== null) {
-    return false;
-  }
-  if (Symbol.iterator in value) {
-    return false;
-  }
-  if (Symbol.toStringTag in value) {
-    return Object.prototype.toString.call(value) === "[object Module]";
-  }
-  return true;
-}
-function _defu(baseObject, defaults, namespace = ".", merger) {
-  if (!isPlainObject(defaults)) {
-    return _defu(baseObject, {}, namespace, merger);
-  }
-  const object = Object.assign({}, defaults);
-  for (const key in baseObject) {
-    if (key === "__proto__" || key === "constructor") {
-      continue;
-    }
-    const value = baseObject[key];
-    if (value === null || value === void 0) {
-      continue;
-    }
-    if (merger && merger(object, key, value, namespace)) {
-      continue;
-    }
-    if (Array.isArray(value) && Array.isArray(object[key])) {
-      object[key] = [...value, ...object[key]];
-    } else if (isPlainObject(value) && isPlainObject(object[key])) {
-      object[key] = _defu(
-        value,
-        object[key],
-        (namespace ? `${namespace}.` : "") + key.toString(),
-        merger
-      );
-    } else {
-      object[key] = value;
-    }
-  }
-  return object;
-}
-function createDefu(merger) {
-  return (...arguments_) => (
-    // eslint-disable-next-line unicorn/no-array-reduce
-    arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
-  );
-}
-var defu = createDefu();
-var defuFn = createDefu((object, key, currentValue) => {
-  if (object[key] !== void 0 && typeof currentValue === "function") {
-    object[key] = currentValue(object[key]);
-    return true;
-  }
-});
-var defuArrayFn = createDefu((object, key, currentValue) => {
-  if (Array.isArray(object[key]) && typeof currentValue === "function") {
-    object[key] = currentValue(object[key]);
-    return true;
-  }
-});
-
-// src/utils.ts
+import { defu, defuOverrideArray, isRegexp, regExpTest } from "@weapp-tailwindcss/shared";
 function removeFileExtension(filePath) {
   if (!filePath) {
     return "";
@@ -312,12 +242,6 @@ function removeFileExtension(filePath) {
   const dir = path.dirname(filePath);
   return path.join(dir, baseName);
 }
-var defuOverrideArray = createDefu((obj, key, value) => {
-  if (Array.isArray(obj[key]) && Array.isArray(value)) {
-    obj[key] = value;
-    return true;
-  }
-});
 function md5(input) {
   const hash = crypto.createHash("md5");
   hash.update(input);
@@ -334,7 +258,8 @@ function getDefaultConfig() {
     cwd: process.cwd(),
     extensions: ["wxml", "js", "ts"],
     // @import and @use (scss)
-    insertAfterAtRulesNames: ["import", "use"]
+    insertAfterAtRulesNames: ["import", "use"],
+    insertAfterComments: ["@import"]
   };
 }
 function getConfig(options) {
@@ -443,7 +368,7 @@ async function getDepFiles(file) {
 
 // src/postcss.ts
 var creator = (options) => {
-  const { config, filter, directiveParams, cwd, extensions, insertAfterAtRulesNames } = getConfig(options);
+  const { config, filter, directiveParams, cwd, extensions, insertAfterAtRulesNames, insertAfterComments } = getConfig(options);
   const extensionsGlob = `{${extensions.join(",")}}`;
   return {
     postcssPlugin,
@@ -452,7 +377,9 @@ var creator = (options) => {
         postcssPlugin: `${postcssPlugin}:post`,
         async Once(root, helpers) {
           if (filter(root.source?.input)) {
-            const lastIndex = root.nodes.findLastIndex((x) => x.type === "atrule" && insertAfterAtRulesNames.includes(x.name));
+            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);
             for (const params of directiveParams) {
               const node = root.nodes.find((x) => x.type === "atrule" && x.params === params);
               if (!node) {
@@ -491,7 +418,7 @@ var creator = (options) => {
                 tailwindcss(tailwindcssConfig)
               ]).process(root, {
                 from: root.source.input.file
-              });
+              }).async();
             }
           }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tailwindcss-injector",
   "type": "module",
-  "version": "0.1.4",
+  "version": "0.1.6-alpha.0",
   "description": "tsup(esbuild) build package template",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -32,10 +32,11 @@
   ],
   "dependencies": {
     "fs-extra": "^11.2.0",
-    "htmlparser2": "^9.1.0",
-    "magic-string": "^0.30.15",
+    "htmlparser2": "^10.0.0",
+    "magic-string": "^0.30.17",
     "postcss": "^8.4.49",
-    "tailwindcss": "^3.4.16",
+    "tailwindcss": "^3.4.17",
+    "@weapp-tailwindcss/shared": "0.0.1-alpha.0",
     "tailwindcss-config": "0.0.0"
   },
   "scripts": {