@weapp-tailwindcss/postcss 2.1.6-alpha.2 → 2.1.6

package/dist/index.js

@@ -3,6 +3,135 @@
 // src/handler.ts
 var _shared = require('@weapp-tailwindcss/shared');
 
+// src/compat/uni-app-x.ts
+var _postcss = require('postcss'); var _postcss2 = _interopRequireDefault(_postcss);
+var UNI_APP_X_BASE_CARRIER_SELECTORS = /* @__PURE__ */ new Set([
+  "*",
+  "view",
+  "text",
+  "::before",
+  "::after",
+  ":before",
+  ":after",
+  "::backdrop"
+]);
+var REQUIRED_TW_VAR_RE = /var\(\s*(--tw-[\w-]+)\s*\)/g;
+var CLASS_SELECTOR_RE = /\.[\w-]+/;
+var SELECTOR_WHITESPACE_RE = /\s+/g;
+function isUniAppXEnabled(options) {
+  return Boolean(_optionalChain([options, 'optionalAccess', _ => _.uniAppX]));
+}
+function normalizeSelector(selector) {
+  return selector.replace(SELECTOR_WHITESPACE_RE, "").toLowerCase();
+}
+function isBaseCarrierSelector(selector) {
+  return UNI_APP_X_BASE_CARRIER_SELECTORS.has(normalizeSelector(selector));
+}
+function isBaseCarrierRule(rule) {
+  return Array.isArray(rule.selectors) && rule.selectors.length > 0 && rule.selectors.every(isBaseCarrierSelector);
+}
+function hasClassSelector(rule) {
+  return Array.isArray(rule.selectors) && rule.selectors.some((selector) => CLASS_SELECTOR_RE.test(selector));
+}
+function collectRequiredTwVars(value) {
+  const result = /* @__PURE__ */ new Set();
+  for (const match of value.matchAll(REQUIRED_TW_VAR_RE)) {
+    const variableName = match[1];
+    if (variableName) {
+      result.add(variableName);
+    }
+  }
+  return result;
+}
+function extractUniAppXBaseDefaults(result) {
+  const defaults = /* @__PURE__ */ new Map();
+  result.root.walkRules((rule) => {
+    if (!isBaseCarrierRule(rule)) {
+      return;
+    }
+    rule.walkDecls((decl) => {
+      if (!decl.prop.startsWith("--tw-") || defaults.has(decl.prop)) {
+        return;
+      }
+      defaults.set(decl.prop, {
+        prop: decl.prop,
+        value: decl.value,
+        important: decl.important
+      });
+    });
+    rule.remove();
+  });
+  return defaults;
+}
+function injectUniAppXBaseDefaults(result, defaults) {
+  if (defaults.size === 0) {
+    return;
+  }
+  result.root.walkRules((rule) => {
+    if (!hasClassSelector(rule)) {
+      return;
+    }
+    const declaredProps = /* @__PURE__ */ new Set();
+    const requiredProps = /* @__PURE__ */ new Set();
+    rule.walkDecls((decl) => {
+      declaredProps.add(decl.prop);
+      for (const variableName of collectRequiredTwVars(decl.value)) {
+        requiredProps.add(variableName);
+      }
+    });
+    const prependDecls = [];
+    for (const variableName of requiredProps) {
+      if (declaredProps.has(variableName)) {
+        continue;
+      }
+      const declaration = defaults.get(variableName);
+      if (declaration) {
+        prependDecls.push(declaration);
+      }
+    }
+    for (const declaration of prependDecls.reverse()) {
+      rule.prepend(_postcss2.default.decl({
+        prop: declaration.prop,
+        value: declaration.value,
+        important: declaration.important
+      }));
+    }
+  });
+}
+function applyUniAppXBaseCompatibility(result, options) {
+  if (!isUniAppXEnabled(options)) {
+    return result;
+  }
+  const defaults = extractUniAppXBaseDefaults(result);
+  injectUniAppXBaseDefaults(result, defaults);
+  if (defaults.size === 0) {
+    return result;
+  }
+  return result.root.toResult(result.opts);
+}
+function stripUnsupportedPseudoForUniAppX(node, enabled) {
+  if (!enabled) {
+    return;
+  }
+  if (node.value === ":host") {
+    return;
+  }
+  node.remove();
+}
+function stripUnsupportedNodeForUniAppX(node, options) {
+  if (!isUniAppXEnabled(options)) {
+    return false;
+  }
+  if (node.type === "attribute" || node.type === "pseudo") {
+    node.remove();
+    return true;
+  }
+  return false;
+}
+function shouldRemoveEmptyRuleForUniAppX(rule, options) {
+  return isUniAppXEnabled(options) && rule.nodes.length === 0;
+}
+
 // src/defaults.ts
 function getDefaultOptions(options) {
   return {
@@ -15,9 +144,9 @@ function getDefaultOptions(options) {
         },
         "oklab-function": true,
         "color-mix": true,
-        "color-functional-notation": _nullishCoalesce(_optionalChain([options, 'optionalAccess', _ => _.cssPresetEnv, 'optionalAccess', _2 => _2.features, 'optionalAccess', _3 => _3["color-functional-notation"]]), () => ( { preserve: false })),
+        "color-functional-notation": _nullishCoalesce(_optionalChain([options, 'optionalAccess', _2 => _2.cssPresetEnv, 'optionalAccess', _3 => _3.features, 'optionalAccess', _4 => _4["color-functional-notation"]]), () => ( { preserve: false })),
         // 在 calc 下，这个需要开启
-        "custom-properties": _nullishCoalesce(_optionalChain([options, 'optionalAccess', _4 => _4.cssPresetEnv, 'optionalAccess', _5 => _5.features, 'optionalAccess', _6 => _6["custom-properties"]]), () => ( _optionalChain([options, 'optionalAccess', _7 => _7.cssCalc]))) ? { preserve: true } : false
+        "custom-properties": _nullishCoalesce(_optionalChain([options, 'optionalAccess', _5 => _5.cssPresetEnv, 'optionalAccess', _6 => _6.features, 'optionalAccess', _7 => _7["custom-properties"]]), () => ( _optionalChain([options, 'optionalAccess', _8 => _8.cssCalc]))) ? { preserve: true } : false
       },
       autoprefixer: {
         add: false
@@ -253,7 +382,7 @@ function createInjectPreflight(options) {
 }
 
 // src/processor-cache.ts
-var _postcss = require('postcss'); var _postcss2 = _interopRequireDefault(_postcss);
+
 
 // src/pipeline.ts
 var _postcsspresetenv = require('postcss-preset-env'); var _postcsspresetenv2 = _interopRequireDefault(_postcsspresetenv);
@@ -265,10 +394,10 @@ var isSlashDiv = (node) => node.type === "div" && node.value === "/";
 function trimNodes(nodes2) {
   let start = 0;
   let end = nodes2.length;
-  while (start < end && _optionalChain([nodes2, 'access', _8 => _8[start], 'optionalAccess', _9 => _9.type]) === "space") {
+  while (start < end && _optionalChain([nodes2, 'access', _9 => _9[start], 'optionalAccess', _10 => _10.type]) === "space") {
     start += 1;
   }
-  while (end > start && _optionalChain([nodes2, 'access', _10 => _10[end - 1], 'optionalAccess', _11 => _11.type]) === "space") {
+  while (end > start && _optionalChain([nodes2, 'access', _11 => _11[end - 1], 'optionalAccess', _12 => _12.type]) === "space") {
     end -= 1;
   }
   return nodes2.slice(start, end);
@@ -553,7 +682,7 @@ function getUnitsToPxPlugin(options) {
 // src/compat/tailwindcss-rpx.ts
 var LENGTH_VALUE_REGEXP = /^[+-]?(?:\d+(?:\.\d+)?|\.\d+)(?:e[+-]?\d+)?rpx$/i;
 function normalizeTailwindcssRpxDeclaration(decl, options) {
-  const majorVersion = _optionalChain([options, 'optionalAccess', _12 => _12.majorVersion]);
+  const majorVersion = _optionalChain([options, 'optionalAccess', _13 => _13.majorVersion]);
   const normalizedValue = decl.value.trim();
   if (LENGTH_VALUE_REGEXP.test(normalizedValue) && (majorVersion === void 0 || majorVersion === 2 || majorVersion === 3 || majorVersion === 4)) {
     const lowerProp = decl.prop.toLowerCase();
@@ -740,7 +869,7 @@ var MODERN_CHECK_COLOR_RGB_RE = /color\s*:\s*rgb\(\s*from\s+red\s+r\s+g\s+b\s*\)
 var RADIUS_VALUE_RE = /\b([+-]?(?:\d+(?:\.\d+)?|\.\d+)(?:e[+-]?\d+)?)\s*(r?px)\b/gi;
 var SCIENTIFIC_NOTATION_RE = /e/i;
 function isTailwindcssV4(options) {
-  return _optionalChain([options, 'optionalAccess', _13 => _13.majorVersion]) === 4;
+  return _optionalChain([options, 'optionalAccess', _14 => _14.majorVersion]) === 4;
 }
 function testIfRootHostForV4(node) {
   return node.type === "rule" && node.selector.includes(":root") && node.selector.includes(":host");
@@ -786,33 +915,6 @@ function normalizeTailwindcssV4Declaration(decl) {
   return false;
 }
 
-// src/compat/uni-app-x.ts
-function isUniAppXEnabled(options) {
-  return Boolean(_optionalChain([options, 'optionalAccess', _14 => _14.uniAppX]));
-}
-function stripUnsupportedPseudoForUniAppX(node, enabled) {
-  if (!enabled) {
-    return;
-  }
-  if (node.value === ":host") {
-    return;
-  }
-  node.remove();
-}
-function stripUnsupportedNodeForUniAppX(node, options) {
-  if (!isUniAppXEnabled(options)) {
-    return false;
-  }
-  if (node.type === "attribute" || node.type === "pseudo") {
-    node.remove();
-    return true;
-  }
-  return false;
-}
-function shouldRemoveEmptyRuleForUniAppX(rule, options) {
-  return isUniAppXEnabled(options) && rule.nodes.length === 0;
-}
-
 // src/constants.ts
 var postcssPlugin = "postcss-weapp-tailwindcss-rename-plugin";
 
@@ -2481,7 +2583,7 @@ function createStyleHandler(options) {
     return processor.process(
       rawSource,
       processOptions
-    ).async();
+    ).async().then((result) => applyUniAppXBaseCompatibility(result, resolvedOptions));
   });
   handler.getPipeline = (opt) => {
     const resolvedOptions = resolver.resolve(opt);

package/dist/index.mjs

@@ -3,6 +3,135 @@ import "./chunk-WAXGOBY2.mjs";
 // src/handler.ts
 import { defuOverrideArray as defuOverrideArray4 } from "@weapp-tailwindcss/shared";
 
+// src/compat/uni-app-x.ts
+import postcss from "postcss";
+var UNI_APP_X_BASE_CARRIER_SELECTORS = /* @__PURE__ */ new Set([
+  "*",
+  "view",
+  "text",
+  "::before",
+  "::after",
+  ":before",
+  ":after",
+  "::backdrop"
+]);
+var REQUIRED_TW_VAR_RE = /var\(\s*(--tw-[\w-]+)\s*\)/g;
+var CLASS_SELECTOR_RE = /\.[\w-]+/;
+var SELECTOR_WHITESPACE_RE = /\s+/g;
+function isUniAppXEnabled(options) {
+  return Boolean(options?.uniAppX);
+}
+function normalizeSelector(selector) {
+  return selector.replace(SELECTOR_WHITESPACE_RE, "").toLowerCase();
+}
+function isBaseCarrierSelector(selector) {
+  return UNI_APP_X_BASE_CARRIER_SELECTORS.has(normalizeSelector(selector));
+}
+function isBaseCarrierRule(rule) {
+  return Array.isArray(rule.selectors) && rule.selectors.length > 0 && rule.selectors.every(isBaseCarrierSelector);
+}
+function hasClassSelector(rule) {
+  return Array.isArray(rule.selectors) && rule.selectors.some((selector) => CLASS_SELECTOR_RE.test(selector));
+}
+function collectRequiredTwVars(value) {
+  const result = /* @__PURE__ */ new Set();
+  for (const match of value.matchAll(REQUIRED_TW_VAR_RE)) {
+    const variableName = match[1];
+    if (variableName) {
+      result.add(variableName);
+    }
+  }
+  return result;
+}
+function extractUniAppXBaseDefaults(result) {
+  const defaults = /* @__PURE__ */ new Map();
+  result.root.walkRules((rule) => {
+    if (!isBaseCarrierRule(rule)) {
+      return;
+    }
+    rule.walkDecls((decl) => {
+      if (!decl.prop.startsWith("--tw-") || defaults.has(decl.prop)) {
+        return;
+      }
+      defaults.set(decl.prop, {
+        prop: decl.prop,
+        value: decl.value,
+        important: decl.important
+      });
+    });
+    rule.remove();
+  });
+  return defaults;
+}
+function injectUniAppXBaseDefaults(result, defaults) {
+  if (defaults.size === 0) {
+    return;
+  }
+  result.root.walkRules((rule) => {
+    if (!hasClassSelector(rule)) {
+      return;
+    }
+    const declaredProps = /* @__PURE__ */ new Set();
+    const requiredProps = /* @__PURE__ */ new Set();
+    rule.walkDecls((decl) => {
+      declaredProps.add(decl.prop);
+      for (const variableName of collectRequiredTwVars(decl.value)) {
+        requiredProps.add(variableName);
+      }
+    });
+    const prependDecls = [];
+    for (const variableName of requiredProps) {
+      if (declaredProps.has(variableName)) {
+        continue;
+      }
+      const declaration = defaults.get(variableName);
+      if (declaration) {
+        prependDecls.push(declaration);
+      }
+    }
+    for (const declaration of prependDecls.reverse()) {
+      rule.prepend(postcss.decl({
+        prop: declaration.prop,
+        value: declaration.value,
+        important: declaration.important
+      }));
+    }
+  });
+}
+function applyUniAppXBaseCompatibility(result, options) {
+  if (!isUniAppXEnabled(options)) {
+    return result;
+  }
+  const defaults = extractUniAppXBaseDefaults(result);
+  injectUniAppXBaseDefaults(result, defaults);
+  if (defaults.size === 0) {
+    return result;
+  }
+  return result.root.toResult(result.opts);
+}
+function stripUnsupportedPseudoForUniAppX(node, enabled) {
+  if (!enabled) {
+    return;
+  }
+  if (node.value === ":host") {
+    return;
+  }
+  node.remove();
+}
+function stripUnsupportedNodeForUniAppX(node, options) {
+  if (!isUniAppXEnabled(options)) {
+    return false;
+  }
+  if (node.type === "attribute" || node.type === "pseudo") {
+    node.remove();
+    return true;
+  }
+  return false;
+}
+function shouldRemoveEmptyRuleForUniAppX(rule, options) {
+  return isUniAppXEnabled(options) && rule.nodes.length === 0;
+}
+
 // src/defaults.ts
 function getDefaultOptions(options) {
   return {
@@ -253,7 +382,7 @@ function createInjectPreflight(options) {
 }
 
 // src/processor-cache.ts
-import postcss from "postcss";
+import postcss2 from "postcss";
 
 // src/pipeline.ts
 import postcssPresetEnv from "postcss-preset-env";
@@ -786,33 +915,6 @@ function normalizeTailwindcssV4Declaration(decl) {
   return false;
 }
 
-// src/compat/uni-app-x.ts
-function isUniAppXEnabled(options) {
-  return Boolean(options?.uniAppX);
-}
-function stripUnsupportedPseudoForUniAppX(node, enabled) {
-  if (!enabled) {
-    return;
-  }
-  if (node.value === ":host") {
-    return;
-  }
-  node.remove();
-}
-function stripUnsupportedNodeForUniAppX(node, options) {
-  if (!isUniAppXEnabled(options)) {
-    return false;
-  }
-  if (node.type === "attribute" || node.type === "pseudo") {
-    node.remove();
-    return true;
-  }
-  return false;
-}
-function shouldRemoveEmptyRuleForUniAppX(rule, options) {
-  return isUniAppXEnabled(options) && rule.nodes.length === 0;
-}
-
 // src/constants.ts
 var postcssPlugin = "postcss-weapp-tailwindcss-rename-plugin";
 
@@ -2453,7 +2555,7 @@ var StyleProcessorCache = class {
       processor = this.processorCacheByKey.get(cacheKey);
       if (!processor) {
         const pipeline = this.getPipeline(options);
-        processor = postcss(pipeline.plugins);
+        processor = postcss2(pipeline.plugins);
         this.processorCacheByKey.set(cacheKey, processor);
       }
       this.processorCache.set(options, processor);
@@ -2481,7 +2583,7 @@ function createStyleHandler(options) {
     return processor.process(
       rawSource,
       processOptions
-    ).async();
+    ).async().then((result) => applyUniAppXBaseCompatibility(result, resolvedOptions));
   });
   handler.getPipeline = (opt) => {
     const resolvedOptions = resolver.resolve(opt);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/postcss",
-  "version": "2.1.6-alpha.2",
+  "version": "2.1.6",
   "description": "@weapp-tailwindcss/postcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -65,7 +65,7 @@
     "postcss-selector-parser": "~7.1.1",
     "postcss-units-to-px": "^0.2.0",
     "postcss-value-parser": "^4.2.0",
-    "@weapp-tailwindcss/shared": "1.1.3-alpha.1"
+    "@weapp-tailwindcss/shared": "1.1.3"
   },
   "devDependencies": {
     "@csstools/postcss-is-pseudo-class": "^6.0.0",