tailwindcss-injector 0.1.2 → 0.1.4

package/dist/postcss.cjs

@@ -216,11 +216,14 @@ var require_set_value = __commonJS({
 // src/postcss.ts
 init_cjs_shims();
 var import_set_value = __toESM(require_set_value(), 1);
-var _process = require('process'); var _process2 = _interopRequireDefault(_process);
 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);
@@ -321,6 +324,27 @@ function md5(input) {
   return hash.digest("hex");
 }
 
+// src/config.ts
+function getDefaultConfig() {
+  return {
+    filter: () => true,
+    config: void 0,
+    // 倒叙插入
+    directiveParams: ["utilities", "components"],
+    cwd: _process2.default.cwd(),
+    extensions: ["wxml", "js", "ts"],
+    // @import and @use (scss)
+    insertAfterAtRulesNames: ["import", "use"]
+  };
+}
+function getConfig(options) {
+  return defuOverrideArray(options, getDefaultConfig());
+}
+
+// src/constants.ts
+init_cjs_shims();
+var postcssPlugin = "postcss-tailwindcss-injector";
+
 // src/wxml.ts
 init_cjs_shims();
 
@@ -419,25 +443,25 @@ async function getDepFiles(file) {
 
 // src/postcss.ts
 var creator = (options) => {
-  const { config, filter, directiveParams, cwd, extensions } = defuOverrideArray(options, {
-    filter: () => true,
-    config: void 0,
-    directiveParams: ["utilities", "components"],
-    cwd: _process2.default.cwd(),
-    extensions: ["wxml", "js", "ts"]
-  });
+  const { config, filter, directiveParams, cwd, extensions, insertAfterAtRulesNames } = getConfig(options);
   const extensionsGlob = `{${extensions.join(",")}}`;
   return {
-    postcssPlugin: "postcss-tailwindcss-injector",
+    postcssPlugin,
     plugins: [
       {
-        postcssPlugin: "post",
+        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));
             for (const params of directiveParams) {
               const node = root.nodes.find((x) => x.type === "atrule" && x.params === params);
               if (!node) {
-                root.prepend(helpers.atRule({ name: "tailwind", params }));
+                const atRule = helpers.atRule({ name: "tailwind", params });
+                if (lastIndex < 0) {
+                  root.prepend(atRule);
+                } else {
+                  root.insertAfter(lastIndex, atRule);
+                }
               }
             }
             const cfg = typeof config === "function" ? config(_optionalChain([root, 'access', _3 => _3.source, 'optionalAccess', _4 => _4.input])) : config;
@@ -463,12 +487,12 @@ var creator = (options) => {
                   tailwindcssConfig.content.push(`${removeFileExtension(dep)}.${extensionsGlob}`);
                 }
               }
+              await _postcss2.default.call(void 0, [
+                _tailwindcss2.default.call(void 0, tailwindcssConfig)
+              ]).process(root, {
+                from: root.source.input.file
+              });
             }
-            await _postcss2.default.call(void 0, [
-              _tailwindcss2.default.call(void 0, tailwindcssConfig)
-            ]).process(root, {
-              from: _optionalChain([root, 'access', _7 => _7.source, 'optionalAccess', _8 => _8.input, 'access', _9 => _9.file])
-            });
           }
         }
       }

package/dist/postcss.d.cts

@@ -8,6 +8,7 @@ interface Options {
     config: InlineTailwindcssOptions | ((input?: postcss.Input) => InlineTailwindcssOptions);
     directiveParams: ('base' | 'components' | 'utilities' | 'variants')[];
     extensions: string[];
+    insertAfterAtRulesNames: string[];
 }
 
 declare const creator: PluginCreator<Partial<Options>>;

package/dist/postcss.d.ts

@@ -8,6 +8,7 @@ interface Options {
     config: InlineTailwindcssOptions | ((input?: postcss.Input) => InlineTailwindcssOptions);
     directiveParams: ('base' | 'components' | 'utilities' | 'variants')[];
     extensions: string[];
+    insertAfterAtRulesNames: string[];
 }
 
 declare const creator: PluginCreator<Partial<Options>>;

package/dist/postcss.js

@@ -216,11 +216,14 @@ var require_set_value = __commonJS({
 // src/postcss.ts
 init_esm_shims();
 var import_set_value = __toESM(require_set_value(), 1);
-import process from "node:process";
 import postcss from "postcss";
 import tailwindcss from "tailwindcss";
 import { loadConfig } from "tailwindcss-config";
 
+// src/config.ts
+init_esm_shims();
+import process from "node:process";
+
 // src/utils.ts
 init_esm_shims();
 import crypto from "node:crypto";
@@ -321,6 +324,27 @@ function md5(input) {
   return hash.digest("hex");
 }
 
+// src/config.ts
+function getDefaultConfig() {
+  return {
+    filter: () => true,
+    config: void 0,
+    // 倒叙插入
+    directiveParams: ["utilities", "components"],
+    cwd: process.cwd(),
+    extensions: ["wxml", "js", "ts"],
+    // @import and @use (scss)
+    insertAfterAtRulesNames: ["import", "use"]
+  };
+}
+function getConfig(options) {
+  return defuOverrideArray(options, getDefaultConfig());
+}
+
+// src/constants.ts
+init_esm_shims();
+var postcssPlugin = "postcss-tailwindcss-injector";
+
 // src/wxml.ts
 init_esm_shims();
 import path2 from "node:path";
@@ -419,25 +443,25 @@ async function getDepFiles(file) {
 
 // src/postcss.ts
 var creator = (options) => {
-  const { config, filter, directiveParams, cwd, extensions } = defuOverrideArray(options, {
-    filter: () => true,
-    config: void 0,
-    directiveParams: ["utilities", "components"],
-    cwd: process.cwd(),
-    extensions: ["wxml", "js", "ts"]
-  });
+  const { config, filter, directiveParams, cwd, extensions, insertAfterAtRulesNames } = getConfig(options);
   const extensionsGlob = `{${extensions.join(",")}}`;
   return {
-    postcssPlugin: "postcss-tailwindcss-injector",
+    postcssPlugin,
     plugins: [
       {
-        postcssPlugin: "post",
+        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));
             for (const params of directiveParams) {
               const node = root.nodes.find((x) => x.type === "atrule" && x.params === params);
               if (!node) {
-                root.prepend(helpers.atRule({ name: "tailwind", params }));
+                const atRule = helpers.atRule({ name: "tailwind", params });
+                if (lastIndex < 0) {
+                  root.prepend(atRule);
+                } else {
+                  root.insertAfter(lastIndex, atRule);
+                }
               }
             }
             const cfg = typeof config === "function" ? config(root.source?.input) : config;
@@ -463,12 +487,12 @@ var creator = (options) => {
                   tailwindcssConfig.content.push(`${removeFileExtension(dep)}.${extensionsGlob}`);
                 }
               }
+              await postcss([
+                tailwindcss(tailwindcssConfig)
+              ]).process(root, {
+                from: root.source.input.file
+              });
             }
-            await postcss([
-              tailwindcss(tailwindcssConfig)
-            ]).process(root, {
-              from: root.source?.input.file
-            });
           }
         }
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tailwindcss-injector",
   "type": "module",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "tsup(esbuild) build package template",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -33,7 +33,7 @@
   "dependencies": {
     "fs-extra": "^11.2.0",
     "htmlparser2": "^9.1.0",
-    "magic-string": "^0.30.14",
+    "magic-string": "^0.30.15",
     "postcss": "^8.4.49",
     "tailwindcss": "^3.4.16",
     "tailwindcss-config": "0.0.0"