weapp-tailwindcss 2.11.0 → 3.0.1

package/dist/replace.mjs

@@ -1,7 +1,7 @@
 import { escape, SimpleMappingChars2String } from '@weapp-core/escape';
 export { MappingChars2String, MappingChars2StringEntries, SYMBOL_TABLE, SimpleMappingChars2String, SimpleMappingChars2StringEntries } from '@weapp-core/escape';
 import '@ast-core/escape';
-export { i as replaceCss } from './shared-S0v7ZvWs.mjs';
+export { i as replaceCss } from './shared-0D5OOeXo.mjs';
 
 function replaceWxml(original, options = {
     keepEOL: false,

package/dist/{shared-S0v7ZvWs.mjs → shared-0D5OOeXo.mjs}

@@ -12,5 +12,14 @@ function internalCssSelectorReplacer(selectors, options = {
         map: escapeMap
     });
 }
+function composeIsPseudo(strs) {
+    if (typeof strs === 'string') {
+        return strs;
+    }
+    if (strs.length > 1) {
+        return `:is(${strs.join(',')})`;
+    }
+    return strs.join('');
+}
 
-export { internalCssSelectorReplacer as i };
+export { composeIsPseudo as c, internalCssSelectorReplacer as i };

package/dist/{shared-nXoJWFdz.js → shared-AxeHlAoJ.js}

@@ -14,5 +14,15 @@ function internalCssSelectorReplacer(selectors, options = {
         map: escapeMap
     });
 }
+function composeIsPseudo(strs) {
+    if (typeof strs === 'string') {
+        return strs;
+    }
+    if (strs.length > 1) {
+        return `:is(${strs.join(',')})`;
+    }
+    return strs.join('');
+}
 
+exports.composeIsPseudo = composeIsPseudo;
 exports.internalCssSelectorReplacer = internalCssSelectorReplacer;

package/dist/types.d.ts

@@ -2,7 +2,9 @@ import type { Rule } from 'postcss';
 import type { IClassGeneratorOptions, ClassGenerator } from '@tailwindcss-mangle/shared';
 import type { SourceMap } from 'magic-string';
 import type { GeneratorResult } from '@babel/generator';
+import type { UserDefinedOptions as rem2rpxOptions } from 'postcss-rem-to-responsive-pixel';
 import type { InjectPreflight } from './postcss/preflight';
+import type { IContext as PostcssContext } from './postcss/plugins/ctx';
 import type { ICreateCacheReturnType } from "./cache";
 export type ItemOrItemArray<T> = T | T[];
 export type AppType = 'uni-app' | 'uni-app-vite' | 'taro' | 'remax' | 'rax' | 'native' | 'kbone' | 'mpx';
@@ -18,7 +20,7 @@ export type RequiredStyleHandlerOptions = {
     isMainChunk: boolean;
     cssInjectPreflight?: InjectPreflight;
     escapeMap?: Record<string, string>;
-} & Pick<UserDefinedOptions, 'cssPreflightRange' | 'cssChildCombinatorReplaceValue' | 'replaceUniversalSelectorWith' | 'injectAdditionalCssVarScope' | 'cssSelectorReplacement'>;
+} & Pick<UserDefinedOptions, 'cssPreflightRange' | 'cssChildCombinatorReplaceValue' | 'injectAdditionalCssVarScope' | 'cssSelectorReplacement' | 'rem2rpx'>;
 export type CustomRuleCallback = (node: Rule, options: Readonly<RequiredStyleHandlerOptions>) => void;
 export interface InternalCssSelectorReplacerOptions {
     mangleContext?: IMangleScopeContext;
@@ -27,6 +29,7 @@ export interface InternalCssSelectorReplacerOptions {
 export type IStyleHandlerOptions = {
     customRuleCallback?: CustomRuleCallback;
     mangleContext?: IMangleScopeContext;
+    ctx?: PostcssContext;
 } & RequiredStyleHandlerOptions;
 export type JsHandlerReplaceResult = {
     code: string;
@@ -38,11 +41,9 @@ export type ICustomAttributesEntities = [string | RegExp, ItemOrItemArray<string
 export type IJsHandlerOptions = {
     escapeMap?: Record<string, string>;
     classNameSet: Set<string>;
-    minifiedJs?: boolean;
     arbitraryValues?: IArbitraryValues;
     mangleContext?: IMangleScopeContext;
     jsPreserveClass?: (keyword: string) => boolean | undefined;
-    strategy?: UserDefinedOptions['jsEscapeStrategy'];
     needEscaped?: boolean;
     generateMap?: boolean;
 };
@@ -74,13 +75,12 @@ export interface IArbitraryValues {
     allowDoubleQuotes?: boolean;
 }
 export interface UserDefinedOptions {
-    htmlMatcher?: ((name: string) => boolean) | string | string[];
-    cssMatcher?: ((name: string) => boolean) | string | string[];
-    jsMatcher?: ((name: string) => boolean) | string | string[];
-    mainCssChunkMatcher?: ((name: string, appType?: AppType) => boolean) | string | string[];
+    htmlMatcher?: (name: string) => boolean;
+    cssMatcher?: (name: string) => boolean;
+    jsMatcher?: (name: string) => boolean;
+    mainCssChunkMatcher?: (name: string, appType?: AppType) => boolean;
     cssPreflight?: CssPreflightOptions;
-    cssPreflightRange?: 'view' | 'all';
-    replaceUniversalSelectorWith?: string | false;
+    cssPreflightRange?: 'all';
     disabled?: boolean;
     customRuleCallback?: CustomRuleCallback;
     onLoad?: () => void;
@@ -88,25 +88,24 @@ export interface UserDefinedOptions {
     onUpdate?: (filename: string, oldVal: string, newVal: string) => void;
     onEnd?: () => void;
     customAttributes?: ICustomAttributes;
-    customReplaceDictionary?: 'simple' | 'complex' | Record<string, string>;
-    supportCustomLengthUnitsPatch?: ILengthUnitsPatchOptions | boolean;
+    customReplaceDictionary?: 'simple' | Record<string, string>;
+    supportCustomLengthUnitsPatch?: ILengthUnitsPatchOptions;
     appType?: AppType;
-    minifiedJs?: boolean;
     mangle?: boolean | IMangleOptions;
     arbitraryValues?: IArbitraryValues;
     cssChildCombinatorReplaceValue?: string | string[];
-    wxsMatcher?: ((name: string) => boolean) | string | string[];
+    wxsMatcher?: (name: string) => boolean;
     inlineWxs?: boolean;
     injectAdditionalCssVarScope?: boolean;
     jsPreserveClass?: (keyword: string) => boolean | undefined;
     disabledDefaultTemplateHandler?: boolean;
-    jsEscapeStrategy?: 'regenerate' | 'replace';
     runtimeLoaderPath?: string;
     cssSelectorReplacement?: {
-        root?: string | false;
-        universal?: string | false;
+        root?: string | string[] | false;
+        universal?: string | string[] | false;
     };
     tailwindcssBasedir?: string;
+    rem2rpx?: boolean | rem2rpxOptions;
 }
 export type JsHandler = (rawSource: string, set: Set<string>, options?: CreateJsHandlerOptions) => JsHandlerResult;
 export interface IMangleScopeContext {
@@ -132,10 +131,7 @@ export interface ITemplateHandlerOptions extends ICommonReplaceOptions {
     disabledDefaultTemplateHandler?: boolean;
     quote?: string | null;
 }
-export type GlobOrFunctionMatchers = 'htmlMatcher' | 'cssMatcher' | 'jsMatcher' | 'mainCssChunkMatcher' | 'wxsMatcher';
-export type InternalUserDefinedOptions = Required<Omit<UserDefinedOptions, GlobOrFunctionMatchers | 'supportCustomLengthUnitsPatch' | 'customReplaceDictionary'> & {
-    [K in GlobOrFunctionMatchers]: K extends 'mainCssChunkMatcher' ? (name: string, appType?: AppType) => boolean : (name: string) => boolean;
-} & {
+export type InternalUserDefinedOptions = Required<Omit<UserDefinedOptions, 'supportCustomLengthUnitsPatch' | 'customReplaceDictionary'> & {
     supportCustomLengthUnitsPatch: ILengthUnitsPatchOptions | false;
     templateHandler: (rawSource: string, options?: ITemplateHandlerOptions) => string;
     styleHandler: (rawSource: string, options: IStyleHandlerOptions) => Promise<string>;
@@ -146,7 +142,7 @@ export type InternalUserDefinedOptions = Required<Omit<UserDefinedOptions, GlobO
     setMangleRuntimeSet: (runtimeSet: Set<string>) => void;
     cache: ICreateCacheReturnType;
 }>;
-export type InternalPostcssOptions = Pick<UserDefinedOptions, 'cssMatcher' | 'mainCssChunkMatcher' | 'cssPreflight' | 'replaceUniversalSelectorWith' | 'cssPreflightRange' | 'customRuleCallback' | 'disabled'>;
+export type InternalPostcssOptions = Pick<UserDefinedOptions, 'cssMatcher' | 'mainCssChunkMatcher' | 'cssPreflight' | 'cssPreflightRange' | 'customRuleCallback' | 'disabled'>;
 export interface IBaseWebpackPlugin {
     options: InternalUserDefinedOptions;
     appType?: AppType;

package/dist/utils.d.ts

@@ -7,3 +7,12 @@ export declare function groupBy<T>(arr: T[], cb: (arg: T) => string): Record<str
 export declare function getGroupedEntries<T>(entries: [string, T][], options: InternalUserDefinedOptions): Record<"css" | "html" | "js" | "other", [string, T][]>;
 export declare function removeExt(file: string): string;
 export { default as defu } from 'defu';
+export declare const defuOverrideArray: <Source extends {
+    [x: string]: any;
+    [x: number]: any;
+    [x: symbol]: any;
+}, Defaults extends ({
+    [x: string]: any;
+    [x: number]: any;
+    [x: symbol]: any;
+} | (number | boolean | any[] | Record<never, any> | null | undefined))[]>(source: Source, ...defaults: Defaults) => import("defu").Defu<Source, Defaults>;

package/dist/vite.d.ts

@@ -1 +1 @@
-export * from './vite/index';
+export * from './bundlers/vite/index';

package/dist/vite.js

@@ -2,25 +2,22 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-lXV72tWf.js');
-var postcss = require('./postcss-Et8j4ugT.js');
-var defaults = require('./defaults-0O-zKoXE.js');
+var options = require('./options-M6TutRrF.js');
+var postcss = require('./postcss-XAQSRPqF.js');
+var defaults = require('./defaults-QOAV8NSV.js');
 var index = require('./index-z25r_Htj.js');
-require('micromatch');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
 require('@ast-core/escape');
-require('./shared-nXoJWFdz.js');
+require('./shared-AxeHlAoJ.js');
 require('@weapp-core/regex');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
-require('./defu-VMJMz2AB.js');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
-require('@csstools/postcss-is-pseudo-class');
 require('node:path');
 require('node:fs');
 require('semver');
@@ -28,7 +25,10 @@ require('tailwindcss-patch');
 require('@tailwindcss-mangle/shared');
 require('lru-cache');
 require('md5');
+require('@csstools/postcss-is-pseudo-class');
+require('postcss-rem-to-responsive-pixel');
 require('postcss-selector-parser');
+require('./defu-KWuJnZLV.js');
 require('debug');
 
 const debug = index.createDebug('generateBundle: ');

package/dist/vite.mjs

@@ -1,22 +1,19 @@
-import { g as getOptions, a as createTailwindcssPatcher, _ as __awaiter } from './options-M8pGfjj_.mjs';
-import { v as vitePluginName } from './postcss-W8i3cl5I.mjs';
-import { g as getGroupedEntries } from './defaults-dz6xGhOP.mjs';
+import { g as getOptions, a as createTailwindcssPatcher, _ as __awaiter } from './options-mJwenBmV.mjs';
+import { v as vitePluginName } from './postcss-kpIT_QQe.mjs';
+import { g as getGroupedEntries } from './defaults-TZpmwtzd.mjs';
 import { c as createDebug } from './index-06BoOZig.mjs';
-import 'micromatch';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
 import '@ast-core/escape';
-import './shared-S0v7ZvWs.mjs';
+import './shared-0D5OOeXo.mjs';
 import '@weapp-core/regex';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
-import './defu-NLkZUlr9.mjs';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
-import '@csstools/postcss-is-pseudo-class';
 import 'node:path';
 import 'node:fs';
 import 'semver';
@@ -24,7 +21,10 @@ import 'tailwindcss-patch';
 import '@tailwindcss-mangle/shared';
 import 'lru-cache';
 import 'md5';
+import '@csstools/postcss-is-pseudo-class';
+import 'postcss-rem-to-responsive-pixel';
 import 'postcss-selector-parser';
+import './defu-ms_ZBCiB.mjs';
 import 'debug';
 
 const debug = createDebug('generateBundle: ');

package/dist/webpack.d.ts

@@ -1 +1 @@
-export * from './webpack/index';
+export * from './bundlers/webpack/index';

package/dist/webpack.js

@@ -2,33 +2,33 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-lXV72tWf.js');
+var options = require('./options-M6TutRrF.js');
 var path = require('node:path');
 var fs = require('node:fs');
-var postcss = require('./postcss-Et8j4ugT.js');
-var defaults = require('./defaults-0O-zKoXE.js');
+var postcss = require('./postcss-XAQSRPqF.js');
+var defaults = require('./defaults-QOAV8NSV.js');
 var index = require('./index-z25r_Htj.js');
-require('micromatch');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
 require('@ast-core/escape');
-require('./shared-nXoJWFdz.js');
+require('./shared-AxeHlAoJ.js');
 require('@weapp-core/regex');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
-require('./defu-VMJMz2AB.js');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
-require('@csstools/postcss-is-pseudo-class');
 require('semver');
 require('tailwindcss-patch');
 require('@tailwindcss-mangle/shared');
 require('lru-cache');
 require('md5');
+require('@csstools/postcss-is-pseudo-class');
+require('postcss-rem-to-responsive-pixel');
 require('postcss-selector-parser');
+require('./defu-KWuJnZLV.js');
 require('debug');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

package/dist/webpack.mjs

@@ -1,30 +1,30 @@
-import { g as getOptions, a as createTailwindcssPatcher, _ as __awaiter } from './options-M8pGfjj_.mjs';
+import { g as getOptions, a as createTailwindcssPatcher, _ as __awaiter } from './options-mJwenBmV.mjs';
 import path from 'node:path';
 import fs from 'node:fs';
-import { a as pluginName } from './postcss-W8i3cl5I.mjs';
-import { g as getGroupedEntries, r as removeExt } from './defaults-dz6xGhOP.mjs';
+import { p as pluginName } from './postcss-kpIT_QQe.mjs';
+import { g as getGroupedEntries, r as removeExt } from './defaults-TZpmwtzd.mjs';
 import { c as createDebug } from './index-06BoOZig.mjs';
-import 'micromatch';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
 import '@ast-core/escape';
-import './shared-S0v7ZvWs.mjs';
+import './shared-0D5OOeXo.mjs';
 import '@weapp-core/regex';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
-import './defu-NLkZUlr9.mjs';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
-import '@csstools/postcss-is-pseudo-class';
 import 'semver';
 import 'tailwindcss-patch';
 import '@tailwindcss-mangle/shared';
 import 'lru-cache';
 import 'md5';
+import '@csstools/postcss-is-pseudo-class';
+import 'postcss-rem-to-responsive-pixel';
 import 'postcss-selector-parser';
+import './defu-ms_ZBCiB.mjs';
 import 'debug';
 
 const debug = createDebug('processAssets: ');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "2.11.0",
+  "version": "3.0.1",
   "description": "把tailwindcss jit引擎，带给小程序开发者们! bring tailwindcss jit engine to miniprogram developers!",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -120,7 +120,7 @@
     "@babel/core": "^7.23.3",
     "@icebreakers/cli": "0.1.1",
     "@icebreakers/readme": "0.1.0",
-    "@rollup/plugin-alias": "^5.0.1",
+    "@rollup/plugin-alias": "^5.1.0",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
@@ -134,16 +134,15 @@
     "@types/fs-extra": "^11.0.4",
     "@types/gulp": "^4.0.17",
     "@types/gulp-postcss": "^8.0.6",
-    "@types/jest": "^29.5.8",
     "@types/js-beautify": "^1.14.3",
     "@types/klaw": "^3.0.6",
     "@types/loader-utils": "^2.0.6",
-    "@types/lodash": "^4.14.201",
+    "@types/lodash": "^4.14.202",
     "@types/md5": "^2.3.5",
-    "@types/micromatch": "^4.0.5",
-    "@types/node": "^20.9.0",
-    "@types/semver": "^7.5.5",
-    "@types/vinyl": "^2.0.10",
+    "@types/micromatch": "^4.0.6",
+    "@types/node": "^20.10.0",
+    "@types/semver": "^7.5.6",
+    "@types/vinyl": "^2.0.11",
     "@types/webpack": "^5.28.5",
     "@types/webpack-sources": "^3.2.3",
     "@vitest/coverage-v8": "^0.34.6",
@@ -159,7 +158,7 @@
     "del": "^7.1.0",
     "diff": "^5.1.0",
     "domhandler": "^5.0.3",
-    "eslint": "8.53.0",
+    "eslint": "8.54.0",
     "eslint-config-icebreaker": "^1.2.2",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.1",
@@ -169,44 +168,40 @@
     "gulp": "^4.0.2",
     "gulp-postcss": "^9.0.1",
     "html-loader": "^4.2.0",
-    "jest": "^29.7.0",
     "js-beautify": "^1.14.11",
     "klaw": "^4.1.0",
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^2.7.6",
     "miniprogram-automator": "^0.12.1",
     "pkg-types": "^1.0.3",
-    "postcss-load-config": "^4.0.1",
+    "postcss-load-config": "^4.0.2",
     "postcss-loader": "^7.3.3",
-    "postcss-rem-to-responsive-pixel": "^5.1.3",
     "prettier": "^3.1.0",
-    "promisify-loader-runner": "^1.0.0",
-    "rollup": "^4.4.0",
-    "rollup-plugin-visualizer": "^5.9.2",
+    "promisify-loader-runner": "^1.0.1",
+    "rollup": "^4.6.0",
+    "rollup-plugin-visualizer": "^5.9.3",
     "sass": "^1.69.5",
     "style-loader": "^3.3.3",
-    "tailwind-children": "^0.5.0",
     "tailwindcss": "^3.3.5",
-    "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
     "ts-patch": "^3.0.2",
     "tsd": "^0.29.0",
     "tslib": "^2.6.2",
-    "typescript": "^5.2.2",
+    "typescript": "^5.3.2",
     "typescript-transform-paths": "^3.4.6",
     "vinyl": "^3.0.0",
-    "vite": "^4.5.0",
+    "vite": "^5.0.2",
     "vitest": "^0.34.6",
     "weapp-tailwindcss-children": "^0.1.0",
     "webpack": "^5.89.0",
-    "webpack-build-utils": "^0.0.4"
+    "webpack-build-utils": "^0.0.7"
   },
   "dependencies": {
     "@ast-core/escape": "^1.0.1",
-    "@babel/generator": "^7.23.3",
-    "@babel/parser": "^7.23.3",
-    "@babel/traverse": "^7.23.3",
-    "@babel/types": "^7.23.3",
+    "@babel/generator": "^7.23.4",
+    "@babel/parser": "^7.23.4",
+    "@babel/traverse": "^7.23.4",
+    "@babel/types": "^7.23.4",
     "@csstools/postcss-is-pseudo-class": "^4.0.3",
     "@tailwindcss-mangle/shared": "^2.2.2",
     "@weapp-core/escape": "^2.0.0",
@@ -214,11 +209,11 @@
     "debug": "^4.3.4",
     "htmlparser2": "^9.0.0",
     "loader-utils": "^2.0.3",
-    "lru-cache": "^10.0.2",
+    "lru-cache": "^10.1.0",
     "magic-string": "^0.30.5",
     "md5": "^2.3.0",
-    "micromatch": "^4.0.5",
     "postcss": "8.4.31",
+    "postcss-rem-to-responsive-pixel": "^6.0.1",
     "postcss-selector-parser": "^6.0.13",
     "semver": "^7.5.4",
     "tailwindcss-patch": "^2.2.2"
@@ -228,23 +223,20 @@
     "node": ">=16.6.0"
   },
   "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",
-    "build:demo": "yarn demo:del-dist && cross-env NODE_ENV=demo rollup -c rollup.config.ts --configPlugin typescript && yarn demo:sync-dist",
+    "dev": "pnpm clean && pnpm dts && cross-env NODE_ENV=development rollup -c rollup.config.ts --configPlugin typescript -w",
+    "build": "pnpm clean && cross-env NODE_ENV=production rollup -c rollup.config.ts --configPlugin typescript && pnpm dts",
+    "build:demo": "pnpm demo:del-dist && cross-env NODE_ENV=demo rollup -c rollup.config.ts --configPlugin typescript && pnpm demo:sync-dist",
     "build:tsc": "cross-env NODE_ENV=development tsc --build tsconfig.json",
     "dts": "tsc --emitDeclarationOnly -p tsconfig.dts.json",
-    "test": "npm run postinstall && cross-env DEBUG=weapp-tw jest && vitest run",
-    "jest-u": "jest -u",
-    "jest:u": "jest -u",
+    "test": "npm run postinstall && vitest run",
     "test:dev": "vitest",
     "vitest:coverage": "vitest run --coverage",
     "e2e": "vitest run -c ./vitest.e2e.config.ts",
     "e2e:dev": "vitest -c ./vitest.e2e.config.ts",
     "e2e:u": "vitest run -u -c ./vitest.e2e.config.ts",
-    "test:all": "cross-env JEST_INVALID_SKIP_CASES=1 jest",
     "init:rename": "node scripts/init/rename.js",
     "clean": "node scripts/clean.js",
-    "debug:web": "cd demo/web && yarn dev",
+    "debug:web": "cd demo/web && pnpm dev",
     "raw": "ts-node scripts/raw",
     "get-decl": "ts-node scripts/get-decl.ts",
     "demo:dev": "node scripts/demo/dev.js",

package/dist/postcss/plugin.d.ts

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