@weapp-tailwindcss/postcss 1.2.1 → 1.3.0

package/dist/index.d.mts

@@ -1,11 +1,11 @@
-import { I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions } from './types-C5X6IWCb.mjs';
-export { d as CssPreflightOptions, C as CustomRuleCallback, b as IPropValue, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions, c as createInjectPreflight } from './types-C5X6IWCb.mjs';
+import { I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions } from './types-3q99gNro.mjs';
+export { C as CssCalcOptions, e as CssPreflightOptions, b as CustomRuleCallback, d as IPropValue, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions, c as createInjectPreflight } from './types-3q99gNro.mjs';
 import postcss from 'postcss';
-export { PostCssCalcOptions as CssCalcOptions } from '@weapp-tailwindcss/postcss-calc';
 export { pluginOptions as PresetEnvOptions } from 'postcss-preset-env';
 export { PxtransformOptions as Px2rpxOptions } from 'postcss-pxtransform';
 export { UserDefinedOptions as Rem2rpxOptions } from 'postcss-rem-to-responsive-pixel';
 import '@weapp-tailwindcss/mangle';
+import '@weapp-tailwindcss/postcss-calc';
 import 'postcss-load-config';
 
 declare function createStyleHandler(options?: Partial<IStyleHandlerOptions>): (rawSource: string, opt?: Partial<IStyleHandlerOptions>) => Promise<postcss.Result<postcss.Document | postcss.Root>>;

package/dist/index.d.ts

@@ -1,11 +1,11 @@
-import { I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions } from './types-C5X6IWCb.js';
-export { d as CssPreflightOptions, C as CustomRuleCallback, b as IPropValue, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions, c as createInjectPreflight } from './types-C5X6IWCb.js';
+import { I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions } from './types-3q99gNro.js';
+export { C as CssCalcOptions, e as CssPreflightOptions, b as CustomRuleCallback, d as IPropValue, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions, c as createInjectPreflight } from './types-3q99gNro.js';
 import postcss from 'postcss';
-export { PostCssCalcOptions as CssCalcOptions } from '@weapp-tailwindcss/postcss-calc';
 export { pluginOptions as PresetEnvOptions } from 'postcss-preset-env';
 export { PxtransformOptions as Px2rpxOptions } from 'postcss-pxtransform';
 export { UserDefinedOptions as Rem2rpxOptions } from 'postcss-rem-to-responsive-pixel';
 import '@weapp-tailwindcss/mangle';
+import '@weapp-tailwindcss/postcss-calc';
 import 'postcss-load-config';
 
 declare function createStyleHandler(options?: Partial<IStyleHandlerOptions>): (rawSource: string, opt?: Partial<IStyleHandlerOptions>) => Promise<postcss.Result<postcss.Document | postcss.Root>>;

package/dist/index.js

@@ -17,7 +17,7 @@ function getDefaultOptions(options) {
         "oklab-function": true,
         "color-mix": true,
         // 在 calc 下，这个需要开启
-        "custom-properties": _optionalChain([options, 'optionalAccess', _ => _.cssCalc]) ? { preserve: false } : _nullishCoalesce(_optionalChain([options, 'optionalAccess', _2 => _2.cssPresetEnv, 'optionalAccess', _3 => _3.features, 'optionalAccess', _4 => _4["custom-properties"]]), () => ( false))
+        "custom-properties": _nullishCoalesce(_optionalChain([options, 'optionalAccess', _ => _.cssPresetEnv, 'optionalAccess', _2 => _2.features, 'optionalAccess', _3 => _3["custom-properties"]]), () => ( _optionalChain([options, 'optionalAccess', _4 => _4.cssCalc]))) ? { preserve: true } : false
       },
       autoprefixer: {
         add: false
@@ -37,9 +37,22 @@ function getDefaultOptions(options) {
 // src/plugins/index.ts
 var _postcsscalc = require('@weapp-tailwindcss/postcss-calc'); var _postcsscalc2 = _interopRequireDefault(_postcsscalc);
 
+
+// ../../node_modules/.pnpm/es-toolkit@1.39.10/node_modules/es-toolkit/dist/object/omit.mjs
+function omit(obj, keys) {
+  const result = { ...obj };
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    delete result[key];
+  }
+  return result;
+}
+
+// src/plugins/index.ts
 var _postcsspresetenv = require('postcss-preset-env'); var _postcsspresetenv2 = _interopRequireDefault(_postcsspresetenv);
 var _postcsspxtransform = require('postcss-pxtransform'); var _postcsspxtransform2 = _interopRequireDefault(_postcsspxtransform);
 var _postcssremtoresponsivepixel = require('postcss-rem-to-responsive-pixel'); var _postcssremtoresponsivepixel2 = _interopRequireDefault(_postcssremtoresponsivepixel);
+var _postcssvalueparser = require('postcss-value-parser'); var _postcssvalueparser2 = _interopRequireDefault(_postcssvalueparser);
 
 // src/plugins/ctx.ts
 function createContext() {
@@ -956,15 +969,41 @@ function getPlugins(options) {
       )
     );
   }
+  const includeCustomProperties = Array.isArray(options.cssCalc) ? options.cssCalc : typeof options.cssCalc === "object" ? options.cssCalc.includeCustomProperties : [];
   if (options.cssCalc) {
     plugins.push(
       // 核心在 OnceExit 的时候去执行的
       _postcsscalc2.default.call(void 0, 
-        typeof options.cssCalc === "object" ? options.cssCalc : {}
+        Array.isArray(options.cssCalc) ? {} : typeof options.cssCalc === "object" ? omit(options.cssCalc, ["includeCustomProperties"]) : {}
       )
     );
   }
   plugins.push(postcssWeappTailwindcssPostPlugin(options));
+  if (includeCustomProperties) {
+    plugins.push({
+      postcssPlugin: "postcss-remove-include-custom-properties",
+      OnceExit(root) {
+        root.walkDecls((decl, idx) => {
+          if (idx > 0 && _shared.regExpTest.call(void 0, includeCustomProperties, decl.value)) {
+            const prevNode = _optionalChain([decl, 'access', _42 => _42.parent, 'optionalAccess', _43 => _43.nodes, 'access', _44 => _44[idx - 1]]);
+            if (prevNode && prevNode.prop === decl.prop) {
+              const parsed = _postcssvalueparser2.default.call(void 0, decl.value);
+              parsed.walk((node) => {
+                if (node.type === "function" && node.value === "var") {
+                  const item = node.nodes.find((x) => {
+                    return x.type === "word" && _shared.regExpTest.call(void 0, includeCustomProperties, x.value);
+                  });
+                  if (item) {
+                    decl.remove();
+                  }
+                }
+              });
+            }
+          }
+        });
+      }
+    });
+  }
   return plugins;
 }
 
@@ -993,7 +1032,7 @@ function styleHandler(rawSource, options) {
     getPlugins(options)
   ).process(
     rawSource,
-    _shared.defu.call(void 0, _optionalChain([options, 'access', _42 => _42.postcssOptions, 'optionalAccess', _43 => _43.options]), {
+    _shared.defu.call(void 0, _optionalChain([options, 'access', _45 => _45.postcssOptions, 'optionalAccess', _46 => _46.options]), {
       from: void 0
     })
   ).async();

package/dist/index.mjs

@@ -17,7 +17,7 @@ function getDefaultOptions(options) {
         "oklab-function": true,
         "color-mix": true,
         // 在 calc 下，这个需要开启
-        "custom-properties": options?.cssCalc ? { preserve: false } : options?.cssPresetEnv?.features?.["custom-properties"] ?? false
+        "custom-properties": options?.cssPresetEnv?.features?.["custom-properties"] ?? options?.cssCalc ? { preserve: true } : false
       },
       autoprefixer: {
         add: false
@@ -36,10 +36,23 @@ function getDefaultOptions(options) {
 
 // src/plugins/index.ts
 import postcssCalc from "@weapp-tailwindcss/postcss-calc";
-import { defuOverrideArray as defuOverrideArray2 } from "@weapp-tailwindcss/shared";
+import { defuOverrideArray as defuOverrideArray2, regExpTest } from "@weapp-tailwindcss/shared";
+
+// ../../node_modules/.pnpm/es-toolkit@1.39.10/node_modules/es-toolkit/dist/object/omit.mjs
+function omit(obj, keys) {
+  const result = { ...obj };
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    delete result[key];
+  }
+  return result;
+}
+
+// src/plugins/index.ts
 import postcssPresetEnv from "postcss-preset-env";
 import postcssPxtransform from "postcss-pxtransform";
 import postcssRem2rpx from "postcss-rem-to-responsive-pixel";
+import valueParser from "postcss-value-parser";
 
 // src/plugins/ctx.ts
 function createContext() {
@@ -956,15 +969,41 @@ function getPlugins(options) {
       )
     );
   }
+  const includeCustomProperties = Array.isArray(options.cssCalc) ? options.cssCalc : typeof options.cssCalc === "object" ? options.cssCalc.includeCustomProperties : [];
   if (options.cssCalc) {
     plugins.push(
       // 核心在 OnceExit 的时候去执行的
       postcssCalc(
-        typeof options.cssCalc === "object" ? options.cssCalc : {}
+        Array.isArray(options.cssCalc) ? {} : typeof options.cssCalc === "object" ? omit(options.cssCalc, ["includeCustomProperties"]) : {}
       )
     );
   }
   plugins.push(postcssWeappTailwindcssPostPlugin(options));
+  if (includeCustomProperties) {
+    plugins.push({
+      postcssPlugin: "postcss-remove-include-custom-properties",
+      OnceExit(root) {
+        root.walkDecls((decl, idx) => {
+          if (idx > 0 && regExpTest(includeCustomProperties, decl.value)) {
+            const prevNode = decl.parent?.nodes[idx - 1];
+            if (prevNode && prevNode.prop === decl.prop) {
+              const parsed = valueParser(decl.value);
+              parsed.walk((node) => {
+                if (node.type === "function" && node.value === "var") {
+                  const item = node.nodes.find((x) => {
+                    return x.type === "word" && regExpTest(includeCustomProperties, x.value);
+                  });
+                  if (item) {
+                    decl.remove();
+                  }
+                }
+              });
+            }
+          }
+        });
+      }
+    });
+  }
   return plugins;
 }
 

package/dist/{types-C5X6IWCb.d.mts → types-3q99gNro.d.mts}

@@ -38,6 +38,9 @@ interface InternalCssSelectorReplacerOptions {
     mangleContext?: IMangleScopeContext;
     escapeMap?: Record<string, string>;
 }
+interface CssCalcOptions extends PostCssCalcOptions {
+    includeCustomProperties?: (string | RegExp)[];
+}
 type IStyleHandlerOptions = {
     customRuleCallback?: CustomRuleCallback;
     mangleContext?: IMangleScopeContext;
@@ -46,7 +49,7 @@ type IStyleHandlerOptions = {
     cssRemoveProperty?: boolean;
     cssRemoveHoverPseudoClass?: boolean;
     cssPresetEnv?: pluginOptions;
-    cssCalc?: boolean | PostCssCalcOptions;
+    cssCalc?: boolean | CssCalcOptions | (string | RegExp)[];
     atRules?: {
         property?: boolean;
         supports?: boolean;
@@ -74,4 +77,4 @@ interface UserDefinedPostcssOptions {
     uniAppX?: boolean;
 }
 
-export { type CustomRuleCallback as C, type IStyleHandlerOptions as I, type LoadedPostcssOptions as L, type RequiredStyleHandlerOptions as R, type UserDefinedPostcssOptions as U, type InternalCssSelectorReplacerOptions as a, type IPropValue as b, createInjectPreflight as c, type CssPreflightOptions as d };
+export { type CssCalcOptions as C, type IStyleHandlerOptions as I, type LoadedPostcssOptions as L, type RequiredStyleHandlerOptions as R, type UserDefinedPostcssOptions as U, type InternalCssSelectorReplacerOptions as a, type CustomRuleCallback as b, createInjectPreflight as c, type IPropValue as d, type CssPreflightOptions as e };

package/dist/{types-C5X6IWCb.d.ts → types-3q99gNro.d.ts}

@@ -38,6 +38,9 @@ interface InternalCssSelectorReplacerOptions {
     mangleContext?: IMangleScopeContext;
     escapeMap?: Record<string, string>;
 }
+interface CssCalcOptions extends PostCssCalcOptions {
+    includeCustomProperties?: (string | RegExp)[];
+}
 type IStyleHandlerOptions = {
     customRuleCallback?: CustomRuleCallback;
     mangleContext?: IMangleScopeContext;
@@ -46,7 +49,7 @@ type IStyleHandlerOptions = {
     cssRemoveProperty?: boolean;
     cssRemoveHoverPseudoClass?: boolean;
     cssPresetEnv?: pluginOptions;
-    cssCalc?: boolean | PostCssCalcOptions;
+    cssCalc?: boolean | CssCalcOptions | (string | RegExp)[];
     atRules?: {
         property?: boolean;
         supports?: boolean;
@@ -74,4 +77,4 @@ interface UserDefinedPostcssOptions {
     uniAppX?: boolean;
 }
 
-export { type CustomRuleCallback as C, type IStyleHandlerOptions as I, type LoadedPostcssOptions as L, type RequiredStyleHandlerOptions as R, type UserDefinedPostcssOptions as U, type InternalCssSelectorReplacerOptions as a, type IPropValue as b, createInjectPreflight as c, type CssPreflightOptions as d };
+export { type CssCalcOptions as C, type IStyleHandlerOptions as I, type LoadedPostcssOptions as L, type RequiredStyleHandlerOptions as R, type UserDefinedPostcssOptions as U, type InternalCssSelectorReplacerOptions as a, type CustomRuleCallback as b, createInjectPreflight as c, type IPropValue as d, type CssPreflightOptions as e };

package/dist/types.d.mts

@@ -1,8 +1,8 @@
 import '@weapp-tailwindcss/mangle';
-export { PostCssCalcOptions as CssCalcOptions } from '@weapp-tailwindcss/postcss-calc';
+import '@weapp-tailwindcss/postcss-calc';
 import 'postcss';
 import 'postcss-load-config';
 export { pluginOptions as PresetEnvOptions } from 'postcss-preset-env';
 export { PxtransformOptions as Px2rpxOptions } from 'postcss-pxtransform';
 export { UserDefinedOptions as Rem2rpxOptions } from 'postcss-rem-to-responsive-pixel';
-export { d as CssPreflightOptions, C as CustomRuleCallback, b as IPropValue, I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions } from './types-C5X6IWCb.mjs';
+export { C as CssCalcOptions, e as CssPreflightOptions, b as CustomRuleCallback, d as IPropValue, I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions } from './types-3q99gNro.mjs';

package/dist/types.d.ts

@@ -1,8 +1,8 @@
 import '@weapp-tailwindcss/mangle';
-export { PostCssCalcOptions as CssCalcOptions } from '@weapp-tailwindcss/postcss-calc';
+import '@weapp-tailwindcss/postcss-calc';
 import 'postcss';
 import 'postcss-load-config';
 export { pluginOptions as PresetEnvOptions } from 'postcss-preset-env';
 export { PxtransformOptions as Px2rpxOptions } from 'postcss-pxtransform';
 export { UserDefinedOptions as Rem2rpxOptions } from 'postcss-rem-to-responsive-pixel';
-export { d as CssPreflightOptions, C as CustomRuleCallback, b as IPropValue, I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions } from './types-C5X6IWCb.js';
+export { C as CssCalcOptions, e as CssPreflightOptions, b as CustomRuleCallback, d as IPropValue, I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions } from './types-3q99gNro.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/postcss",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "@weapp-tailwindcss/postcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -46,12 +46,13 @@
     "postcss-pxtransform": "^4.1.6",
     "postcss-rem-to-responsive-pixel": "~6.1.0",
     "postcss-selector-parser": "~7.1.0",
+    "postcss-value-parser": "^4.2.0",
     "@weapp-tailwindcss/shared": "1.0.3"
   },
   "devDependencies": {
     "@csstools/postcss-is-pseudo-class": "^5.0.3",
     "postcss-calc": "^10.1.1",
-    "postcss-value-parser": "^4.2.0",
+    "postcss-custom-properties": "^14.0.6",
     "@weapp-tailwindcss/mangle": "1.0.5"
   },
   "scripts": {