weapp-tailwindcss 2.5.2 → 2.6.1

package/dist/postcss.mjs

@@ -1,5 +1,6 @@
-export { p as postcssWeappTailwindcss } from './postcss-9a63df9d.mjs';
+export { p as postcssWeappTailwindcss } from './postcss-53e2ad95.mjs';
 export { default as postcssIsPseudoClass } from '@csstools/postcss-is-pseudo-class';
 import 'postcss-selector-parser';
-import './shared-7c88fb94.mjs';
+import './shared-686bfc32.mjs';
+import './dic-3790a3a4.mjs';
 import 'postcss';

package/dist/replace.js

@@ -2,11 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var shared = require('./shared-ae7dd073.js');
+var dic = require('./dic-05980807.js');
+var shared = require('./shared-4eed0e5c.js');
 
 function replaceWxml(original, options = {
     keepEOL: false,
-    escapeMap: shared.SimpleMappingChars2String
+    escapeMap: dic.SimpleMappingChars2String
 }) {
     const { keepEOL, escapeMap, mangleContext } = options;
     let res = original;
@@ -23,10 +24,10 @@ function replaceWxml(original, options = {
     return res;
 }
 
-exports.MappingChars2String = shared.MappingChars2String;
-exports.MappingChars2StringEntries = shared.MappingChars2StringEntries;
-exports.SYMBOL_TABLE = shared.SYMBOL_TABLE;
-exports.SimpleMappingChars2String = shared.SimpleMappingChars2String;
-exports.SimpleMappingChars2StringEntries = shared.SimpleMappingChars2StringEntries;
+exports.MappingChars2String = dic.MappingChars2String;
+exports.MappingChars2StringEntries = dic.MappingChars2StringEntries;
+exports.SYMBOL_TABLE = dic.SYMBOL_TABLE;
+exports.SimpleMappingChars2String = dic.SimpleMappingChars2String;
+exports.SimpleMappingChars2StringEntries = dic.SimpleMappingChars2StringEntries;
 exports.replaceCss = shared.internalCssSelectorReplacer;
 exports.replaceJs = replaceWxml;

package/dist/replace.mjs

@@ -1,5 +1,7 @@
-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';
+import { S as SimpleMappingChars2String } from './dic-3790a3a4.mjs';
+export { M as MappingChars2String, b as MappingChars2StringEntries, a as SYMBOL_TABLE, c as SimpleMappingChars2StringEntries } from './dic-3790a3a4.mjs';
+import { e as escape } from './shared-686bfc32.mjs';
+export { i as replaceCss } from './shared-686bfc32.mjs';
 
 function replaceWxml(original, options = {
     keepEOL: false,

package/dist/shared-4eed0e5c.js

@@ -0,0 +1,62 @@
+'use strict';
+
+var dic = require('./dic-05980807.js');
+
+const MAX_ASCII_CHAR_CODE = 127;
+function isAsciiNumber(code) {
+    return code >= 48 && code <= 57;
+}
+function escape(selectors, options = {
+    map: dic.SimpleMappingChars2String
+}) {
+    const { map = dic.SimpleMappingChars2String } = options;
+    const sb = [...selectors];
+    for (let i = 0; i < sb.length; i++) {
+        const char = sb[i];
+        const code = char.codePointAt(0);
+        const isCodeExisted = code !== undefined;
+        const hit = map[char];
+        if (isCodeExisted) {
+            if (code > MAX_ASCII_CHAR_CODE) {
+                sb[i] = 'u' + Number(code).toString(16);
+            }
+            else if (hit) {
+                sb[i] = hit;
+            }
+            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;
+                    }
+                }
+            }
+        }
+    }
+    const res = sb.join('');
+    return res;
+}
+
+function internalCssSelectorReplacer(selectors, options = {
+    escapeMap: dic.SimpleMappingChars2String
+}) {
+    const { mangleContext, escapeMap } = options;
+    if (mangleContext) {
+        selectors = mangleContext.cssHandler(selectors);
+    }
+    return escape(selectors, {
+        map: escapeMap
+    });
+}
+
+exports.escape = escape;
+exports.internalCssSelectorReplacer = internalCssSelectorReplacer;

package/dist/shared-686bfc32.mjs

@@ -0,0 +1,59 @@
+import { S as SimpleMappingChars2String } from './dic-3790a3a4.mjs';
+
+const MAX_ASCII_CHAR_CODE = 127;
+function isAsciiNumber(code) {
+    return code >= 48 && code <= 57;
+}
+function escape(selectors, options = {
+    map: SimpleMappingChars2String
+}) {
+    const { map = SimpleMappingChars2String } = options;
+    const sb = [...selectors];
+    for (let i = 0; i < sb.length; i++) {
+        const char = sb[i];
+        const code = char.codePointAt(0);
+        const isCodeExisted = code !== undefined;
+        const hit = map[char];
+        if (isCodeExisted) {
+            if (code > MAX_ASCII_CHAR_CODE) {
+                sb[i] = 'u' + Number(code).toString(16);
+            }
+            else if (hit) {
+                sb[i] = hit;
+            }
+            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;
+                    }
+                }
+            }
+        }
+    }
+    const res = sb.join('');
+    return res;
+}
+
+function internalCssSelectorReplacer(selectors, options = {
+    escapeMap: SimpleMappingChars2String
+}) {
+    const { mangleContext, escapeMap } = options;
+    if (mangleContext) {
+        selectors = mangleContext.cssHandler(selectors);
+    }
+    return escape(selectors, {
+        map: escapeMap
+    });
+}
+
+export { escape as e, internalCssSelectorReplacer as i };

package/dist/types.d.ts

@@ -19,6 +19,7 @@ export type RequiredStyleHandlerOptions = {
     cssChildCombinatorReplaceValue?: string | string[];
     replaceUniversalSelectorWith?: string | false;
     escapeMap?: Record<string, string>;
+    injectAdditionalCssVarScope?: boolean;
 };
 export type CustomRuleCallback = (node: Rule, options: Readonly<RequiredStyleHandlerOptions>) => void;
 export interface InternalCssSelectorReplacerOptions {
@@ -37,6 +38,7 @@ export type IJsHandlerOptions = {
     minifiedJs?: boolean;
     arbitraryValues?: IArbitraryValues;
     mangleContext?: IMangleScopeContext;
+    jsPreserveClass?: (keyword: string) => boolean | undefined;
 };
 export interface RawSource {
     start: number;
@@ -89,6 +91,8 @@ export interface UserDefinedOptions {
     cssChildCombinatorReplaceValue?: string | string[];
     wxsMatcher?: ((name: string) => boolean) | string | string[];
     inlineWxs?: boolean;
+    injectAdditionalCssVarScope?: boolean;
+    jsPreserveClass?: (keyword: string) => boolean | undefined;
 }
 export interface IMangleScopeContext {
     rawOptions: UserDefinedOptions['mangle'];

package/dist/vite.js

@@ -2,15 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-ad127e0c.js');
-var postcss = require('./postcss-fbdc673b.js');
+var options = require('./options-6a265426.js');
+var postcss = require('./postcss-cf8b998a.js');
+var defaults = require('./defaults-0d9846f4.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
 require('./replace.js');
-require('./shared-ae7dd073.js');
+require('./dic-05980807.js');
+require('./shared-4eed0e5c.js');
 require('postcss');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');
@@ -40,7 +42,7 @@ function UnifiedViteWeappTailwindcssPlugin(options$1 = {}) {
         },
         generateBundle(opt, bundle, isWrite) {
             const entries = Object.entries(bundle);
-            const groupedEntries = options.getGroupedEntries(entries, opts);
+            const groupedEntries = defaults.getGroupedEntries(entries, opts);
             const runtimeSet = twPatcher.getClassSet();
             setMangleRuntimeSet(runtimeSet);
             if (Array.isArray(groupedEntries.html)) {

package/dist/vite.mjs

@@ -1,12 +1,14 @@
-import { g as getOptions, a as createTailwindcssPatcher, b as getGroupedEntries } from './options-1e3a224a.mjs';
-import { v as vitePluginName } from './postcss-9a63df9d.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-800ea85a.mjs';
+import { v as vitePluginName } from './postcss-53e2ad95.mjs';
+import { g as getGroupedEntries } from './defaults-c7f00aae.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
 import './replace.mjs';
-import './shared-7c88fb94.mjs';
+import './dic-3790a3a4.mjs';
+import './shared-686bfc32.mjs';
 import 'postcss';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';

package/dist/webpack.js

@@ -4,15 +4,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var path = require('node:path');
 var fs = require('node:fs');
-var options = require('./options-ad127e0c.js');
-var postcss = require('./postcss-fbdc673b.js');
+var options = require('./options-6a265426.js');
+var postcss = require('./postcss-cf8b998a.js');
+var defaults = require('./defaults-0d9846f4.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
 require('./replace.js');
-require('./shared-ae7dd073.js');
+require('./dic-05980807.js');
+require('./shared-4eed0e5c.js');
 require('postcss');
 require('@csstools/postcss-is-pseudo-class');
 require('semver');
@@ -71,7 +73,7 @@ class UnifiedWebpackPluginV5 {
             }, (assets) => {
                 onStart();
                 const entries = Object.entries(assets);
-                const groupedEntries = options.getGroupedEntries(entries, this.options);
+                const groupedEntries = defaults.getGroupedEntries(entries, this.options);
                 const runtimeSet = getClassSet();
                 setMangleRuntimeSet(runtimeSet);
                 if (Array.isArray(groupedEntries.html)) {

package/dist/webpack.mjs

@@ -1,14 +1,16 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import { g as getOptions, a as createTailwindcssPatcher, b as getGroupedEntries } from './options-1e3a224a.mjs';
-import { a as pluginName } from './postcss-9a63df9d.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-800ea85a.mjs';
+import { a as pluginName } from './postcss-53e2ad95.mjs';
+import { g as getGroupedEntries } from './defaults-c7f00aae.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
 import './replace.mjs';
-import './shared-7c88fb94.mjs';
+import './dic-3790a3a4.mjs';
+import './shared-686bfc32.mjs';
 import 'postcss';
 import '@csstools/postcss-is-pseudo-class';
 import 'semver';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "2.5.2",
+  "version": "2.6.1",
   "description": "把tailwindcss jit引擎，带给小程序开发者们\nbring tailwindcss jit engine to our miniprogram developers!",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -36,6 +36,11 @@
       "require": "./dist/gulp.js",
       "import": "./dist/gulp.mjs"
     },
+    "./defaults": {
+      "types": "./dist/defaults.d.ts",
+      "require": "./dist/defaults.js",
+      "import": "./dist/defaults.mjs"
+    },
     "./*": "./*"
   },
   "typesVersions": {
@@ -96,54 +101,54 @@
   },
   "homepage": "https://weapp-tw.icebreaker.top",
   "devDependencies": {
-    "@babel/core": "^7.21.4",
+    "@babel/core": "^7.22.9",
     "@icebreakers/cli": "^0.1.1",
     "@icebreakers/readme": "0.1.0",
     "@rollup/plugin-alias": "^5.0.0",
-    "@rollup/plugin-commonjs": "^25.0.1",
+    "@rollup/plugin-commonjs": "^25.0.3",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.1.0",
     "@rollup/plugin-terser": "^0.4.3",
-    "@rollup/plugin-typescript": "^11.1.1",
+    "@rollup/plugin-typescript": "^11.1.2",
     "@tsconfig/recommended": "^1.0.2",
     "@types/babel__generator": "^7.6.4",
-    "@types/babel__traverse": "^7.18.5",
+    "@types/babel__traverse": "^7.20.1",
     "@types/fs-extra": "^11.0.1",
-    "@types/gulp": "^4.0.11",
+    "@types/gulp": "^4.0.13",
     "@types/gulp-postcss": "^8.0.3",
-    "@types/jest": "^29.5.2",
+    "@types/jest": "^29.5.3",
     "@types/klaw": "^3.0.3",
     "@types/loader-utils": "^2.0.3",
     "@types/lodash": "^4.14.195",
     "@types/micromatch": "^4.0.2",
-    "@types/node": "^20.3.1",
+    "@types/node": "^20.4.2",
     "@types/semver": "^7.5.0",
     "@types/vinyl": "^2.0.7",
     "@types/webpack": "^5.28.1",
     "@types/webpack-sources": "^3.2.0",
-    "@vitest/coverage-v8": "^0.32.2",
+    "@vitest/coverage-v8": "^0.33.0",
     "autoprefixer": "^10.4.14",
-    "babel-loader": "^9.1.2",
+    "babel-loader": "^9.1.3",
     "bumpp": "^9.1.1",
     "chalk": "4.1.2",
     "cross-env": "^7.0.3",
     "css-loader": "^6.8.1",
     "defu": "6.1.2",
     "del": "^6.1.1",
-    "eslint": "8.43.0",
+    "eslint": "8.45.0",
     "eslint-config-icebreaker": "^1.1.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "execa": "5",
-    "fast-glob": "^3.2.12",
+    "fast-glob": "^3.3.0",
     "fs-extra": "^11.1.1",
     "gulp": "^4.0.2",
     "gulp-postcss": "^9.0.1",
     "html-loader": "^4.2.0",
-    "jest": "^29.5.0",
+    "jest": "^29.6.1",
     "klaw": "^4.1.0",
     "lodash": "^4.17.21",
-    "magic-string": "^0.30.0",
+    "magic-string": "^0.30.1",
     "mini-css-extract-plugin": "^2.7.6",
     "miniprogram-automator": "^0.12.0",
     "pkg-types": "^1.0.3",
@@ -152,40 +157,40 @@
     "postcss-rem-to-responsive-pixel": "^5.1.3",
     "prettier": "^2.8.8",
     "promisify-loader-runner": "^1.0.0",
-    "rollup": "^3.25.1",
+    "rollup": "^3.26.2",
     "rollup-plugin-visualizer": "^5.9.2",
     "style-loader": "^3.3.3",
     "tailwind-children": "^0.5.0",
-    "tailwindcss": "^3.3.2",
-    "ts-jest": "^29.1.0",
+    "tailwindcss": "^3.3.3",
+    "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
-    "ts-patch": "^3.0.0",
+    "ts-patch": "^3.0.1",
     "tsd": "^0.28.1",
-    "tslib": "^2.5.3",
-    "typescript": "^5.1.3",
+    "tslib": "^2.6.0",
+    "typescript": "^5.1.6",
     "typescript-transform-paths": "^3.4.6",
     "vinyl": "^3.0.0",
-    "vite": "^4.3.9",
-    "vitest": "^0.32.2",
+    "vite": "^4.4.4",
+    "vitest": "^0.33.0",
     "weapp-tailwindcss-children": "^0.1.0",
-    "webpack": "^5.87.0",
+    "webpack": "^5.88.1",
     "webpack-build-utils": "^0.0.4"
   },
   "dependencies": {
-    "@babel/generator": "^7.21.4",
-    "@babel/parser": "^7.21.4",
-    "@babel/traverse": "^7.21.4",
-    "@babel/types": "^7.21.4",
-    "@csstools/postcss-is-pseudo-class": "^3.2.1",
+    "@babel/generator": "^7.22.9",
+    "@babel/parser": "^7.22.7",
+    "@babel/traverse": "^7.22.8",
+    "@babel/types": "^7.22.5",
+    "@csstools/postcss-is-pseudo-class": "^4.0.0",
     "loader-utils": "^2.0.3",
     "micromatch": "^4.0.5",
-    "postcss": "8.4.24",
+    "postcss": "8.4.26",
     "postcss-selector-parser": "^6.0.13",
-    "semver": "^7.5.2",
+    "semver": "^7.5.4",
     "tailwindcss-mangle-shared": "^1.2.6",
     "tailwindcss-patch": "^1.2.6"
   },
-  "packageManager": "pnpm@8.6.2",
+  "packageManager": "pnpm@8.6.3",
   "scripts": {
     "dev": "yarn clean && yarn dts && cross-env NODE_ENV=development rollup -c rollup.config.ts --configPlugin typescript -w",
     "build": "yarn clean && cross-env NODE_ENV=production rollup -c rollup.config.ts --configPlugin typescript && yarn dts",
@@ -205,6 +210,7 @@
     "clean": "node scripts/clean.js",
     "debug:web": "cd demo/web && yarn dev",
     "raw": "ts-node scripts/raw",
+    "get-decl": "ts-node scripts/get-decl.ts",
     "demo:dev": "node scripts/demo/dev.js",
     "demo:build": "node scripts/demo/build.js",
     "demo:build:local": "node scripts/demo/build.js --local",

package/dist/postcss-9a63df9d.mjs

@@ -1,115 +0,0 @@
-import selectorParser from 'postcss-selector-parser';
-import { i as internalCssSelectorReplacer } from './shared-7c88fb94.mjs';
-import { Rule, Declaration } from 'postcss';
-import '@csstools/postcss-is-pseudo-class';
-
-const createTransform = (rule, options) => {
-    const { replaceUniversalSelectorWith, escapeMap, mangleContext } = options;
-    const replaceFlag = replaceUniversalSelectorWith !== false;
-    const transform = (selectors) => {
-        selectors.walk((selector) => {
-            if (selector.type === 'universal' && replaceFlag) {
-                selector.value = replaceUniversalSelectorWith;
-            }
-            if (selector.type === 'selector') {
-                const node = selector.nodes.find((x) => x.type === 'pseudo' && x.value === ':hover');
-                node && selector.remove();
-            }
-            if (selector.type === 'class') {
-                selector.value = internalCssSelectorReplacer(selector.value, {
-                    escapeMap,
-                    mangleContext
-                });
-            }
-        });
-        if (selectors.length === 0) {
-            rule.remove();
-        }
-    };
-    return transform;
-};
-const getTransformer = (rule, options) => {
-    return selectorParser(createTransform(rule, options));
-};
-const transformSync = (rule, options) => {
-    const transformer = getTransformer(rule, options);
-    return transformer.transformSync(rule, {
-        lossless: false,
-        updateSelector: true
-    });
-};
-
-const PATTERNS = [/:not\(template\)\s*~\s*:not\(template\)/.source, /:not\(\[hidden\]\)\s*~\s*:not\(\[hidden\]\)/.source].join('|');
-const BROAD_MATCH_GLOBAL_REGEXP = new RegExp(PATTERNS, 'g');
-function testIfVariablesScope(node, count = 1) {
-    if (/:?:before/.test(node.selector) && /:?:after/.test(node.selector)) {
-        for (let i = 0; i < count; i++) {
-            const tryTestDecl = node.nodes[i];
-            if (tryTestDecl && tryTestDecl.type === 'decl' && tryTestDecl.prop.startsWith('--tw-')) {
-                continue;
-            }
-            else {
-                return false;
-            }
-        }
-        return true;
-    }
-    return false;
-}
-function commonChunkPreflight(node, options) {
-    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')) {
-            selectorParts.push('view');
-        }
-        if (options.cssPreflightRange === 'all' &&
-            !selectorParts.includes(':not(not)')) {
-            selectorParts.push(':not(not)');
-        }
-        node.selector = selectorParts.join(',');
-        if (typeof options.cssInjectPreflight === 'function') {
-            node.append(...options.cssInjectPreflight());
-        }
-        const pseudoVarRule = new Rule({
-            selector: '::before,::after'
-        });
-        pseudoVarRule.append(new Declaration({
-            prop: '--tw-content',
-            value: '""'
-        }));
-        node.before(pseudoVarRule);
-    }
-}
-
-const postcssPlugin = 'postcss-weapp-tailwindcss-rename-plugin';
-const pluginName = 'weapp-tailwindcss-webpack-plugin';
-const vitePluginName = 'vite-plugin-uni-app-weapp-tailwindcss-adaptor';
-
-const postcssWeappTailwindcss = (options = {
-    isMainChunk: true
-}) => {
-    const { customRuleCallback, isMainChunk } = options;
-    const flag = typeof customRuleCallback === 'function';
-    return {
-        postcssPlugin,
-        Once(css) {
-            css.walkRules((rule) => {
-                transformSync(rule, options);
-                isMainChunk && commonChunkPreflight(rule, options);
-                flag && customRuleCallback(rule, options);
-            });
-        }
-    };
-};
-postcssWeappTailwindcss.postcss = true;
-
-export { pluginName as a, postcssWeappTailwindcss as p, vitePluginName as v };