weapp-tailwindcss 2.4.3 → 2.4.4

package/dist/cli.js

@@ -1,15 +1,15 @@
 'use strict';
 
-var options = require('./options-2e71e6b3.js');
+var options = require('./options-887b74ca.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
 require('./replace.js');
-require('./shared-cdb5ee55.js');
+require('./shared-ae7dd073.js');
 require('postcss');
-require('./postcss-b8952a11.js');
+require('./postcss-33ef0bd0.js');
 require('postcss-selector-parser');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');

package/dist/cli.mjs

@@ -1,13 +1,13 @@
-import { g as getOptions, c as createPatch } from './options-a2ba3653.mjs';
+import { g as getOptions, c as createPatch } from './options-879de0a2.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
 import './replace.mjs';
-import './shared-fc50603a.mjs';
+import './shared-7c88fb94.mjs';
 import 'postcss';
-import './postcss-15e2ef2d.mjs';
+import './postcss-ea625621.mjs';
 import 'postcss-selector-parser';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';

package/dist/gulp.js

@@ -3,16 +3,16 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var stream = require('node:stream');
-var options = require('./options-2e71e6b3.js');
+var options = require('./options-887b74ca.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
 require('./replace.js');
-require('./shared-cdb5ee55.js');
+require('./shared-ae7dd073.js');
 require('postcss');
-require('./postcss-b8952a11.js');
+require('./postcss-33ef0bd0.js');
 require('postcss-selector-parser');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');

package/dist/gulp.mjs

@@ -1,14 +1,14 @@
 import stream from 'node:stream';
-import { g as getOptions, a as createTailwindcssPatcher } from './options-a2ba3653.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-879de0a2.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
 import './replace.mjs';
-import './shared-fc50603a.mjs';
+import './shared-7c88fb94.mjs';
 import 'postcss';
-import './postcss-15e2ef2d.mjs';
+import './postcss-ea625621.mjs';
 import 'postcss-selector-parser';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';

package/dist/index.js

@@ -5,16 +5,16 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var webpack = require('./webpack.js');
 var vite = require('./vite.js');
 var gulp = require('./gulp.js');
-require('./options-2e71e6b3.js');
+require('./options-887b74ca.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
 require('./replace.js');
-require('./shared-cdb5ee55.js');
+require('./shared-ae7dd073.js');
 require('postcss');
-require('./postcss-b8952a11.js');
+require('./postcss-33ef0bd0.js');
 require('postcss-selector-parser');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');

package/dist/index.mjs

@@ -1,16 +1,16 @@
 export { UnifiedWebpackPluginV5 } from './webpack.mjs';
 export { UnifiedViteWeappTailwindcssPlugin } from './vite.mjs';
 export { createPlugins } from './gulp.mjs';
-import './options-a2ba3653.mjs';
+import './options-879de0a2.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
 import './replace.mjs';
-import './shared-fc50603a.mjs';
+import './shared-7c88fb94.mjs';
 import 'postcss';
-import './postcss-15e2ef2d.mjs';
+import './postcss-ea625621.mjs';
 import 'postcss-selector-parser';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';

package/dist/{options-a2ba3653.mjs → options-879de0a2.mjs}

@@ -4,9 +4,9 @@ import generate from '@babel/generator';
 import { parse, parseExpression } from '@babel/parser';
 import traverse from '@babel/traverse';
 import { replaceJs as replaceWxml } from './replace.mjs';
-import { S as SimpleMappingChars2String, M as MappingChars2String } from './shared-fc50603a.mjs';
+import { S as SimpleMappingChars2String, M as MappingChars2String } from './shared-7c88fb94.mjs';
 import postcss from 'postcss';
-import { p as postcssWeappTailwindcss } from './postcss-15e2ef2d.mjs';
+import { p as postcssWeappTailwindcss } from './postcss-ea625621.mjs';
 import postcssIsPseudoClass from '@csstools/postcss-is-pseudo-class';
 import path from 'node:path';
 import fs from 'node:fs';
@@ -339,7 +339,8 @@ const defaultOptions = {
     appType: undefined,
     arbitraryValues: {
         allowDoubleQuotes: false
-    }
+    },
+    cssChildCombinatorReplaceValue: 'view + view'
 };
 
 function generateCode(match, options = {}) {
@@ -694,7 +695,7 @@ function getOptions(options = {}) {
     const result = defu(options, defaultOptions, {
         minifiedJs: isProd()
     });
-    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues } = result;
+    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue } = result;
     result.escapeMap = customReplaceDictionary;
     const cssInjectPreflight = createInjectPreflight(cssPreflight);
     const customAttributesEntities = isMap(options.customAttributes)
@@ -714,7 +715,8 @@ function getOptions(options = {}) {
         cssPreflightRange,
         replaceUniversalSelectorWith,
         escapeMap,
-        mangleContext
+        mangleContext,
+        cssChildCombinatorReplaceValue
     });
     result.jsHandler = createjsHandler({
         minifiedJs,

package/dist/{options-2e71e6b3.js → options-887b74ca.js}

@@ -6,9 +6,9 @@ var generate = require('@babel/generator');
 var parser = require('@babel/parser');
 var traverse = require('@babel/traverse');
 var replace = require('./replace.js');
-var shared = require('./shared-cdb5ee55.js');
+var shared = require('./shared-ae7dd073.js');
 var postcss = require('postcss');
-var postcss$1 = require('./postcss-b8952a11.js');
+var postcss$1 = require('./postcss-33ef0bd0.js');
 var postcssIsPseudoClass = require('@csstools/postcss-is-pseudo-class');
 var path = require('node:path');
 var fs = require('node:fs');
@@ -369,7 +369,8 @@ const defaultOptions = {
     appType: undefined,
     arbitraryValues: {
         allowDoubleQuotes: false
-    }
+    },
+    cssChildCombinatorReplaceValue: 'view + view'
 };
 
 function generateCode(match, options = {}) {
@@ -724,7 +725,7 @@ function getOptions(options = {}) {
     const result = defu(options, defaultOptions, {
         minifiedJs: isProd()
     });
-    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues } = result;
+    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue } = result;
     result.escapeMap = customReplaceDictionary;
     const cssInjectPreflight = createInjectPreflight(cssPreflight);
     const customAttributesEntities = isMap(options.customAttributes)
@@ -744,7 +745,8 @@ function getOptions(options = {}) {
         cssPreflightRange,
         replaceUniversalSelectorWith,
         escapeMap,
-        mangleContext
+        mangleContext,
+        cssChildCombinatorReplaceValue
     });
     result.jsHandler = createjsHandler({
         minifiedJs,

package/dist/postcss/plugin.d.ts

@@ -2,5 +2,5 @@ import type { PluginCreator } from 'postcss';
 import type { IStyleHandlerOptions } from "../types";
 export type PostcssWeappTailwindcssRenamePlugin = PluginCreator<IStyleHandlerOptions>;
 declare const postcssWeappTailwindcss: PostcssWeappTailwindcssRenamePlugin;
-export { postcssWeappTailwindcss, };
+export { postcssWeappTailwindcss };
 export { default as postcssIsPseudoClass } from '@csstools/postcss-is-pseudo-class';

package/dist/postcss/shared.d.ts

@@ -1,3 +1,3 @@
 import { InternalCssSelectorReplacerOptions } from "../types";
 export declare function internalCssSelectorReplacer(selectors: string, options?: InternalCssSelectorReplacerOptions): string;
-export declare function cssUnescape(value: string): string;
+export declare const cssUnescape: (str: string) => string;

package/dist/{postcss-b8952a11.js → postcss-33ef0bd0.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var selectorParser = require('postcss-selector-parser');
-var shared = require('./shared-cdb5ee55.js');
+var shared = require('./shared-ae7dd073.js');
 var postcss = require('postcss');
 require('@csstools/postcss-is-pseudo-class');
 
@@ -63,7 +63,15 @@ function testIfVariablesScope(node, count = 1) {
     return false;
 }
 function commonChunkPreflight(node, options) {
-    node.selector = node.selector.replaceAll(BROAD_MATCH_GLOBAL_REGEXP, 'view + view');
+    let childCombinatorReplaceValue = 'view + view';
+    if (Array.isArray(options.cssChildCombinatorReplaceValue)) {
+        const part = options.cssChildCombinatorReplaceValue.join(',');
+        childCombinatorReplaceValue = [part, ' + ', part].join('');
+    }
+    else if (typeof options.cssChildCombinatorReplaceValue === 'string') {
+        childCombinatorReplaceValue = options.cssChildCombinatorReplaceValue;
+    }
+    node.selector = node.selector.replaceAll(BROAD_MATCH_GLOBAL_REGEXP, childCombinatorReplaceValue);
     if (testIfVariablesScope(node)) {
         const selectorParts = node.selector.split(',');
         if (!selectorParts.includes('view')) {

package/dist/{postcss-15e2ef2d.mjs → postcss-ea625621.mjs}

@@ -1,5 +1,5 @@
 import selectorParser from 'postcss-selector-parser';
-import { i as internalCssSelectorReplacer } from './shared-fc50603a.mjs';
+import { i as internalCssSelectorReplacer } from './shared-7c88fb94.mjs';
 import { Rule, Declaration } from 'postcss';
 import '@csstools/postcss-is-pseudo-class';
 
@@ -57,7 +57,15 @@ function testIfVariablesScope(node, count = 1) {
     return false;
 }
 function commonChunkPreflight(node, options) {
-    node.selector = node.selector.replaceAll(BROAD_MATCH_GLOBAL_REGEXP, 'view + view');
+    let childCombinatorReplaceValue = 'view + view';
+    if (Array.isArray(options.cssChildCombinatorReplaceValue)) {
+        const part = options.cssChildCombinatorReplaceValue.join(',');
+        childCombinatorReplaceValue = [part, ' + ', part].join('');
+    }
+    else if (typeof options.cssChildCombinatorReplaceValue === 'string') {
+        childCombinatorReplaceValue = options.cssChildCombinatorReplaceValue;
+    }
+    node.selector = node.selector.replaceAll(BROAD_MATCH_GLOBAL_REGEXP, childCombinatorReplaceValue);
     if (testIfVariablesScope(node)) {
         const selectorParts = node.selector.split(',');
         if (!selectorParts.includes('view')) {

package/dist/postcss.js

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var postcss = require('./postcss-b8952a11.js');
+var postcss = require('./postcss-33ef0bd0.js');
 var postcssIsPseudoClass = require('@csstools/postcss-is-pseudo-class');
 require('postcss-selector-parser');
-require('./shared-cdb5ee55.js');
+require('./shared-ae7dd073.js');
 require('postcss');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

package/dist/postcss.mjs

@@ -1,5 +1,5 @@
-export { p as postcssWeappTailwindcss } from './postcss-15e2ef2d.mjs';
+export { p as postcssWeappTailwindcss } from './postcss-ea625621.mjs';
 export { default as postcssIsPseudoClass } from '@csstools/postcss-is-pseudo-class';
 import 'postcss-selector-parser';
-import './shared-fc50603a.mjs';
+import './shared-7c88fb94.mjs';
 import 'postcss';

package/dist/replace.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var shared = require('./shared-cdb5ee55.js');
+var shared = require('./shared-ae7dd073.js');
 
 function replaceWxml(original, options = {
     keepEOL: false,

package/dist/replace.mjs

@@ -1,5 +1,5 @@
-import { e as escape, S as SimpleMappingChars2String } from './shared-fc50603a.mjs';
-export { M as MappingChars2String, b as MappingChars2StringEntries, a as SYMBOL_TABLE, c as SimpleMappingChars2StringEntries, i as replaceCss } from './shared-fc50603a.mjs';
+import { e as escape, S as SimpleMappingChars2String } from './shared-7c88fb94.mjs';
+export { M as MappingChars2String, b as MappingChars2StringEntries, a as SYMBOL_TABLE, c as SimpleMappingChars2StringEntries, i as replaceCss } from './shared-7c88fb94.mjs';
 
 function replaceWxml(original, options = {
     keepEOL: false,

package/dist/{shared-fc50603a.mjs → shared-7c88fb94.mjs}

@@ -103,6 +103,9 @@ const SimpleMappingChars2String = {
 const SimpleMappingChars2StringEntries = Object.entries(SimpleMappingChars2String);
 
 const MAX_ASCII_CHAR_CODE = 127;
+function isAsciiNumber(code) {
+    return code >= 48 && code <= 57;
+}
 function escape(selectors, options = {
     map: SimpleMappingChars2String
 }) {
@@ -120,8 +123,22 @@ function escape(selectors, options = {
             else if (hit) {
                 sb[i] = hit;
             }
-            else if (i === 0 && code >= 48 && code <= 57) {
-                sb[i] = '_' + char;
+            else if (i === 0) {
+                if (isAsciiNumber(code)) {
+                    sb[i] = '_' + char;
+                }
+                else if (char === '-') {
+                    const nextChar = sb[i + 1];
+                    if (nextChar) {
+                        const nextCharCode = nextChar.codePointAt(0);
+                        if (nextCharCode && isAsciiNumber(nextCharCode)) {
+                            sb[i] = '_' + char;
+                        }
+                    }
+                    else if (nextChar === undefined) {
+                        sb[i] = '_' + char;
+                    }
+                }
             }
         }
     }

package/dist/{shared-cdb5ee55.js → shared-ae7dd073.js}

@@ -105,6 +105,9 @@ const SimpleMappingChars2String = {
 const SimpleMappingChars2StringEntries = Object.entries(SimpleMappingChars2String);
 
 const MAX_ASCII_CHAR_CODE = 127;
+function isAsciiNumber(code) {
+    return code >= 48 && code <= 57;
+}
 function escape(selectors, options = {
     map: SimpleMappingChars2String
 }) {
@@ -122,8 +125,22 @@ function escape(selectors, options = {
             else if (hit) {
                 sb[i] = hit;
             }
-            else if (i === 0 && code >= 48 && code <= 57) {
-                sb[i] = '_' + char;
+            else if (i === 0) {
+                if (isAsciiNumber(code)) {
+                    sb[i] = '_' + char;
+                }
+                else if (char === '-') {
+                    const nextChar = sb[i + 1];
+                    if (nextChar) {
+                        const nextCharCode = nextChar.codePointAt(0);
+                        if (nextCharCode && isAsciiNumber(nextCharCode)) {
+                            sb[i] = '_' + char;
+                        }
+                    }
+                    else if (nextChar === undefined) {
+                        sb[i] = '_' + char;
+                    }
+                }
             }
         }
     }

package/dist/types.d.ts

@@ -16,6 +16,7 @@ export type RequiredStyleHandlerOptions = {
     isMainChunk: boolean;
     cssInjectPreflight?: InjectPreflight;
     cssPreflightRange?: 'view' | 'all';
+    cssChildCombinatorReplaceValue?: string | string[];
     replaceUniversalSelectorWith?: string | false;
     escapeMap?: Record<string, string>;
 };
@@ -87,6 +88,7 @@ export interface UserDefinedOptions {
     minifiedJs?: boolean;
     mangle?: boolean | IMangleOptions;
     arbitraryValues?: IArbitraryValues;
+    cssChildCombinatorReplaceValue?: string | string[];
 }
 export interface IMangleScopeContext {
     rawOptions: UserDefinedOptions['mangle'];

package/dist/vite.js

@@ -2,15 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-2e71e6b3.js');
-var postcss = require('./postcss-b8952a11.js');
+var options = require('./options-887b74ca.js');
+var postcss = require('./postcss-33ef0bd0.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
 require('./replace.js');
-require('./shared-cdb5ee55.js');
+require('./shared-ae7dd073.js');
 require('postcss');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');

package/dist/vite.mjs

@@ -1,12 +1,12 @@
-import { g as getOptions, a as createTailwindcssPatcher, b as getGroupedEntries } from './options-a2ba3653.mjs';
-import { v as vitePluginName } from './postcss-15e2ef2d.mjs';
+import { g as getOptions, a as createTailwindcssPatcher, b as getGroupedEntries } from './options-879de0a2.mjs';
+import { v as vitePluginName } from './postcss-ea625621.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
 import './replace.mjs';
-import './shared-fc50603a.mjs';
+import './shared-7c88fb94.mjs';
 import 'postcss';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';

package/dist/webpack.js

@@ -2,15 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-2e71e6b3.js');
-var postcss = require('./postcss-b8952a11.js');
+var options = require('./options-887b74ca.js');
+var postcss = require('./postcss-33ef0bd0.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
 require('./replace.js');
-require('./shared-cdb5ee55.js');
+require('./shared-ae7dd073.js');
 require('postcss');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');

package/dist/webpack.mjs

@@ -1,12 +1,12 @@
-import { g as getOptions, a as createTailwindcssPatcher, b as getGroupedEntries } from './options-a2ba3653.mjs';
-import { a as pluginName, N as NS } from './postcss-15e2ef2d.mjs';
+import { g as getOptions, a as createTailwindcssPatcher, b as getGroupedEntries } from './options-879de0a2.mjs';
+import { a as pluginName, N as NS } from './postcss-ea625621.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
 import './replace.mjs';
-import './shared-fc50603a.mjs';
+import './shared-7c88fb94.mjs';
 import 'postcss';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "把tailwindcss jit引擎，带给小程序开发者们\nbring tailwindcss jit engine to our miniprogram developers!",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -114,7 +114,7 @@
     "@types/jest": "^29.5.2",
     "@types/lodash": "^4.14.195",
     "@types/micromatch": "^4.0.2",
-    "@types/node": "^20.2.6",
+    "@types/node": "^20.3.1",
     "@types/semver": "^7.5.0",
     "@types/vinyl": "^2.0.7",
     "@types/webpack": "^5.28.1",
@@ -140,7 +140,6 @@
     "html-loader": "^4.2.0",
     "jest": "^29.5.0",
     "lodash": "^4.17.21",
-    "memfs": "^3.5.3",
     "mini-css-extract-plugin": "^2.7.6",
     "miniprogram-automator": "^0.12.0",
     "pkg-types": "^1.0.3",
@@ -148,9 +147,8 @@
     "postcss-loader": "^7.3.3",
     "postcss-rem-to-responsive-pixel": "^5.1.3",
     "prettier": "^2.8.8",
-    "rollup": "^3.24.1",
-    "rollup-plugin-visualizer": "^5.9.0",
-    "simple-functional-loader": "^1.2.1",
+    "rollup": "^3.25.1",
+    "rollup-plugin-visualizer": "^5.9.2",
     "style-loader": "^3.3.3",
     "tailwind-children": "^0.5.0",
     "tailwindcss": "^3.3.2",
@@ -166,7 +164,8 @@
     "vite": "^4.3.9",
     "vitest": "^0.32.0",
     "weapp-tailwindcss-children": "^0.1.0",
-    "webpack": "^5.86.0"
+    "webpack": "^5.86.0",
+    "webpack-build-utils": "^0.0.1"
   },
   "dependencies": {
     "@babel/generator": "^7.21.4",
@@ -178,8 +177,8 @@
     "postcss": "8.4.24",
     "postcss-selector-parser": "^6.0.13",
     "semver": "^7.5.1",
-    "tailwindcss-mangle-shared": "^1.2.4",
-    "tailwindcss-patch": "^1.2.4"
+    "tailwindcss-mangle-shared": "^1.2.5",
+    "tailwindcss-patch": "^1.2.5"
   },
   "packageManager": "pnpm@8.6.1",
   "scripts": {