weapp-tailwindcss 5.0.0-next.3 → 5.0.0-next.7

package/dist/constants.d.ts

@@ -1,7 +1,6 @@
 export declare const runtimeAopLoader = "weapp-tw-runtime-aop-loader";
-export declare const ManglePluginHooks = "ManglePluginHooks";
 export declare const WeappTailwindcssWebpackPluginOptimizeChunkAssetsHooks = "WeappTailwindcssWebpackPluginOptimizeChunkAssetsHooks";
-export declare const pluginName = "weapp-tailwindcss-webpack-plugin";
+export declare const pluginName = "weapp-tailwindcss";
 export declare const vitePluginName = "weapp-tailwindcss:adaptor";
 export declare const WEAPP_TW_REQUIRED_NODE_VERSION = "20.19.0";
 export declare const WEAPP_TW_REQUIRED_NODE_VERSION_RANGE = "^20.19.0 || >=22.12.0";

package/dist/context/tailwindcss.d.ts

@@ -1,4 +1,4 @@
 import type { InternalUserDefinedOptions } from '../types';
 import { resolveTailwindcssBasedir } from './tailwindcss/basedir';
-export declare function createTailwindcssPatcherFromContext(ctx: InternalUserDefinedOptions): import("@/types").TailwindcssPatcherLike;
+export declare function createTailwindcssPatcherFromContext(ctx: InternalUserDefinedOptions): import("@/types").TailwindcssPatcherLike | undefined;
 export { resolveTailwindcssBasedir };

package/dist/core.js

@@ -1,8 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_chunk = require("./chunk-8l464Juk.js");
-const require_recorder = require("./recorder-GdTJ3QqX.js");
-let node_process = require("node:process");
-node_process = require_chunk.__toESM(node_process);
+require("./chunk-8l464Juk.js");
+const require_precheck = require("./precheck-Dka94ArV.js");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 //#region src/core.ts
 const DEFAULT_MAIN_CHUNK_STYLE_OPTIONS = Object.freeze({ isMainChunk: true });
@@ -17,18 +15,13 @@ function resolveTransformWxssOptions(options) {
 * @returns 返回一个包含 transformWxss、transformWxml 和 transformJs 方法的对象
 */
 function createContext(options = {}) {
-	const opts = require_recorder.getCompilerContext(options);
-	const { templateHandler, styleHandler, jsHandler, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = opts;
-	const patchRecorderState = require_recorder.setupPatchRecorder(initialTwPatcher, opts.tailwindcssBasedir, {
-		source: "runtime",
-		cwd: opts.tailwindcssBasedir ?? node_process.default.cwd()
-	});
+	const { templateHandler, styleHandler, jsHandler, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = require_precheck.getCompilerContext(options);
+	const readyPromise = require_precheck.createTailwindRuntimeReadyPromise(initialTwPatcher);
 	let runtimeSet = /* @__PURE__ */ new Set();
 	const runtimeState = {
 		twPatcher: initialTwPatcher,
-		patchPromise: patchRecorderState.patchPromise,
-		refreshTailwindcssPatcher,
-		onPatchCompleted: patchRecorderState.onPatchCompleted
+		readyPromise,
+		refreshTailwindcssPatcher
 	};
 	const defaultJsHandlerOptionsCache = /* @__PURE__ */ new Map();
 	function getDefaultJsHandlerOptions(majorVersion = runtimeState.twPatcher.majorVersion) {
@@ -112,25 +105,25 @@ function createContext(options = {}) {
 		});
 	}
 	async function transformWxss(rawCss, options) {
-		await runtimeState.patchPromise;
+		await runtimeState.readyPromise;
 		const result = await styleHandler(rawCss, resolveTransformWxssOptions(options));
-		runtimeSet = await require_recorder.ensureRuntimeClassSet(runtimeState, {
+		runtimeSet = await require_precheck.ensureRuntimeClassSet(runtimeState, {
 			forceRefresh: true,
 			forceCollect: true
 		});
 		return result;
 	}
 	async function transformJs(rawJs, options) {
-		await runtimeState.patchPromise;
+		await runtimeState.readyPromise;
 		if (options?.runtimeSet) runtimeSet = options.runtimeSet;
-		else if (runtimeSet.size === 0) runtimeSet = await require_recorder.ensureRuntimeClassSet(runtimeState, { forceCollect: true });
+		else if (runtimeSet.size === 0) runtimeSet = await require_precheck.ensureRuntimeClassSet(runtimeState, { forceCollect: true });
 		const resolvedOptions = resolveTransformJsOptions(options);
-		if (require_recorder.shouldSkipJsTransform(rawJs, resolvedOptions)) return { code: rawJs };
+		if (require_precheck.shouldSkipJsTransform(rawJs, resolvedOptions)) return { code: rawJs };
 		return await jsHandler(rawJs, runtimeSet, resolvedOptions);
 	}
 	async function transformWxml(rawWxml, options) {
-		await runtimeState.patchPromise;
-		if (!options?.runtimeSet && runtimeSet.size === 0) runtimeSet = await require_recorder.ensureRuntimeClassSet(runtimeState, { forceCollect: true });
+		await runtimeState.readyPromise;
+		if (!options?.runtimeSet && runtimeSet.size === 0) runtimeSet = await require_precheck.ensureRuntimeClassSet(runtimeState, { forceCollect: true });
 		return templateHandler(rawWxml, resolveTransformWxmlOptions(options));
 	}
 	return {

package/dist/core.mjs

@@ -1,5 +1,4 @@
-import { g as ensureRuntimeClassSet, n as shouldSkipJsTransform, r as getCompilerContext, t as setupPatchRecorder } from "./recorder-XdFvVASS.mjs";
-import process from "node:process";
+import { _ as ensureRuntimeClassSet, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, t as shouldSkipJsTransform } from "./precheck-DlrmwCc-.mjs";
 import { defuOverrideArray } from "@weapp-tailwindcss/shared";
 //#region src/core.ts
 const DEFAULT_MAIN_CHUNK_STYLE_OPTIONS = Object.freeze({ isMainChunk: true });
@@ -14,18 +13,13 @@ function resolveTransformWxssOptions(options) {
 * @returns 返回一个包含 transformWxss、transformWxml 和 transformJs 方法的对象
 */
 function createContext(options = {}) {
-	const opts = getCompilerContext(options);
-	const { templateHandler, styleHandler, jsHandler, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = opts;
-	const patchRecorderState = setupPatchRecorder(initialTwPatcher, opts.tailwindcssBasedir, {
-		source: "runtime",
-		cwd: opts.tailwindcssBasedir ?? process.cwd()
-	});
+	const { templateHandler, styleHandler, jsHandler, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = getCompilerContext(options);
+	const readyPromise = createTailwindRuntimeReadyPromise(initialTwPatcher);
 	let runtimeSet = /* @__PURE__ */ new Set();
 	const runtimeState = {
 		twPatcher: initialTwPatcher,
-		patchPromise: patchRecorderState.patchPromise,
-		refreshTailwindcssPatcher,
-		onPatchCompleted: patchRecorderState.onPatchCompleted
+		readyPromise,
+		refreshTailwindcssPatcher
 	};
 	const defaultJsHandlerOptionsCache = /* @__PURE__ */ new Map();
 	function getDefaultJsHandlerOptions(majorVersion = runtimeState.twPatcher.majorVersion) {
@@ -109,7 +103,7 @@ function createContext(options = {}) {
 		});
 	}
 	async function transformWxss(rawCss, options) {
-		await runtimeState.patchPromise;
+		await runtimeState.readyPromise;
 		const result = await styleHandler(rawCss, resolveTransformWxssOptions(options));
 		runtimeSet = await ensureRuntimeClassSet(runtimeState, {
 			forceRefresh: true,
@@ -118,7 +112,7 @@ function createContext(options = {}) {
 		return result;
 	}
 	async function transformJs(rawJs, options) {
-		await runtimeState.patchPromise;
+		await runtimeState.readyPromise;
 		if (options?.runtimeSet) runtimeSet = options.runtimeSet;
 		else if (runtimeSet.size === 0) runtimeSet = await ensureRuntimeClassSet(runtimeState, { forceCollect: true });
 		const resolvedOptions = resolveTransformJsOptions(options);
@@ -126,7 +120,7 @@ function createContext(options = {}) {
 		return await jsHandler(rawJs, runtimeSet, resolvedOptions);
 	}
 	async function transformWxml(rawWxml, options) {
-		await runtimeState.patchPromise;
+		await runtimeState.readyPromise;
 		if (!options?.runtimeSet && runtimeSet.size === 0) runtimeSet = await ensureRuntimeClassSet(runtimeState, { forceCollect: true });
 		return templateHandler(rawWxml, resolveTransformWxmlOptions(options));
 	}

package/dist/css-macro/postcss.js

@@ -1,4 +1,4 @@
-const require_constants = require("../constants-p1dyh1x1.js");
+const require_constants = require("../constants-BoB_6lFw.js");
 //#region src/css-macro/postcss.ts
 const IFDEF_ENDIF_RE = /#(?:ifn?def|endif)/;
 const creator = () => {

package/dist/css-macro/postcss.mjs

@@ -1,4 +1,4 @@
-import { a as matchCustomPropertyFromValue, i as ifndef, r as ifdef } from "../constants-B-_T5UnW.mjs";
+import { a as matchCustomPropertyFromValue, i as ifndef, r as ifdef } from "../constants-E_loJC49.mjs";
 //#region src/css-macro/postcss.ts
 const IFDEF_ENDIF_RE = /#(?:ifn?def|endif)/;
 const creator = () => {

package/dist/css-macro.d.ts

@@ -1 +1,2 @@
+export { default } from './css-macro/index'
 export * from './css-macro/index'

package/dist/css-macro.js

@@ -1,6 +1,6 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-require("./utils-DmC9_In3.js");
-const require_constants = require("./constants-p1dyh1x1.js");
+require("./utils-VZvGusYs.js");
+const require_constants = require("./constants-BoB_6lFw.js");
 let tailwindcss_plugin = require("tailwindcss/plugin");
 tailwindcss_plugin = require_chunk.__toESM(tailwindcss_plugin);
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");

package/dist/css-macro.mjs

@@ -1,5 +1,5 @@
-import { t as defu } from "./utils-7DUGTFED.mjs";
-import { n as createNegativeMediaQuery, t as createMediaQuery } from "./constants-B-_T5UnW.mjs";
+import { t as defu } from "./utils-BJjKRQgf.mjs";
+import { n as createNegativeMediaQuery, t as createMediaQuery } from "./constants-E_loJC49.mjs";
 import plugin from "tailwindcss/plugin";
 //#region src/css-macro/index.ts
 const defaultOptions = {

package/dist/defaults.d.ts

@@ -1,2 +1,16 @@
-import type { UserDefinedOptions } from './types';
+import type { CssPreflightOptions, UserDefinedOptions } from './types';
+export declare const TAILWIND_V3_CSS_PREFLIGHT: {
+    'box-sizing': string;
+    'border-width': string;
+    'border-style': string;
+    'border-color': string;
+};
+export declare const TAILWIND_V4_CSS_PREFLIGHT: {
+    'box-sizing': string;
+    margin: string;
+    padding: string;
+    border: string;
+};
+export declare function getDefaultCssPreflight(tailwindcssMajorVersion?: number): Exclude<CssPreflightOptions, false>;
+export declare function resolveDefaultCssPreflight(cssPreflight: CssPreflightOptions | undefined, tailwindcssMajorVersion?: number): CssPreflightOptions;
 export declare function getDefaultOptions(): UserDefinedOptions;

package/dist/defaults.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./chunk-8l464Juk.js");
-require("./utils-DmC9_In3.js");
+require("./utils-VZvGusYs.js");
 let _weapp_core_escape = require("@weapp-core/escape");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 //#region src/defaults.ts
@@ -31,6 +31,28 @@ const MAIN_CSS_CHUNK_MATCHERS = {
 	"kbone": (file) => KBONE_MAIN_CSS_RE.test(file)
 };
 const alwaysFalse = () => false;
+const TAILWIND_V3_CSS_PREFLIGHT = {
+	"box-sizing": "border-box",
+	"border-width": "0",
+	"border-style": "solid",
+	"border-color": "currentColor"
+};
+const TAILWIND_V4_CSS_PREFLIGHT = {
+	"box-sizing": "border-box",
+	"margin": "0",
+	"padding": "0",
+	"border": "0 solid"
+};
+function getDefaultCssPreflight(tailwindcssMajorVersion) {
+	return { ...tailwindcssMajorVersion === 4 ? TAILWIND_V4_CSS_PREFLIGHT : TAILWIND_V3_CSS_PREFLIGHT };
+}
+function resolveDefaultCssPreflight(cssPreflight, tailwindcssMajorVersion) {
+	if (cssPreflight === false) return false;
+	return {
+		...getDefaultCssPreflight(tailwindcssMajorVersion),
+		...cssPreflight ?? {}
+	};
+}
 function createMainCssChunkMatcher() {
 	return (file, appType) => {
 		if (!appType) {
@@ -71,12 +93,7 @@ function getDefaultOptions() {
 		},
 		mainCssChunkMatcher: createMainCssChunkMatcher(),
 		wxsMatcher: alwaysFalse,
-		cssPreflight: {
-			"box-sizing": "border-box",
-			"border-width": "0",
-			"border-style": "solid",
-			"border-color": "currentColor"
-		},
+		cssPreflight: getDefaultCssPreflight(3),
 		disabled: false,
 		onLoad: _weapp_tailwindcss_shared.noop,
 		onStart: _weapp_tailwindcss_shared.noop,
@@ -85,11 +102,13 @@ function getDefaultOptions() {
 		customAttributes: {},
 		customReplaceDictionary: _weapp_core_escape.MappingChars2String,
 		appType: void 0,
-		arbitraryValues: { allowDoubleQuotes: false },
+		arbitraryValues: {
+			allowDoubleQuotes: false,
+			bareArbitraryValues: false
+		},
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		inlineWxs: false,
 		injectAdditionalCssVarScope: false,
-		rewriteCssImports: true,
 		jsPreserveClass: (keyword) => {
 			/**
 			* 默认保留 keyword
@@ -97,7 +116,6 @@ function getDefaultOptions() {
 			if (keyword === "*") return true;
 			return false;
 		},
-		staleClassNameFallback: void 0,
 		disabledDefaultTemplateHandler: false,
 		cssSelectorReplacement: {
 			root: [
@@ -118,10 +136,7 @@ function getDefaultOptions() {
 		ignoreCallExpressionIdentifiers: [],
 		ignoreTaggedTemplateExpressionIdentifiers: ["weappTwIgnore"],
 		replaceRuntimePackages: false,
-		generator: {
-			mode: "auto",
-			target: "weapp"
-		},
+		generator: { target: "weapp" },
 		tailwindcssPatcherOptions: { filter(className) {
 			return !(0, _weapp_core_escape.isAllowedClassName)(className);
 		} },
@@ -129,4 +144,8 @@ function getDefaultOptions() {
 	};
 }
 //#endregion
+exports.TAILWIND_V3_CSS_PREFLIGHT = TAILWIND_V3_CSS_PREFLIGHT;
+exports.TAILWIND_V4_CSS_PREFLIGHT = TAILWIND_V4_CSS_PREFLIGHT;
+exports.getDefaultCssPreflight = getDefaultCssPreflight;
 exports.getDefaultOptions = getDefaultOptions;
+exports.resolveDefaultCssPreflight = resolveDefaultCssPreflight;

package/dist/defaults.mjs

@@ -1,4 +1,4 @@
-import { a as noop } from "./utils-7DUGTFED.mjs";
+import { a as noop } from "./utils-BJjKRQgf.mjs";
 import { MappingChars2String, isAllowedClassName } from "@weapp-core/escape";
 //#region src/defaults.ts
 const CSS_FILE_PATTERN = /.+\.(?:wx|ac|jx|tt|q|c|ty)ss$/;
@@ -28,6 +28,28 @@ const MAIN_CSS_CHUNK_MATCHERS = {
 	"kbone": (file) => KBONE_MAIN_CSS_RE.test(file)
 };
 const alwaysFalse = () => false;
+const TAILWIND_V3_CSS_PREFLIGHT = {
+	"box-sizing": "border-box",
+	"border-width": "0",
+	"border-style": "solid",
+	"border-color": "currentColor"
+};
+const TAILWIND_V4_CSS_PREFLIGHT = {
+	"box-sizing": "border-box",
+	"margin": "0",
+	"padding": "0",
+	"border": "0 solid"
+};
+function getDefaultCssPreflight(tailwindcssMajorVersion) {
+	return { ...tailwindcssMajorVersion === 4 ? TAILWIND_V4_CSS_PREFLIGHT : TAILWIND_V3_CSS_PREFLIGHT };
+}
+function resolveDefaultCssPreflight(cssPreflight, tailwindcssMajorVersion) {
+	if (cssPreflight === false) return false;
+	return {
+		...getDefaultCssPreflight(tailwindcssMajorVersion),
+		...cssPreflight ?? {}
+	};
+}
 function createMainCssChunkMatcher() {
 	return (file, appType) => {
 		if (!appType) {
@@ -68,12 +90,7 @@ function getDefaultOptions() {
 		},
 		mainCssChunkMatcher: createMainCssChunkMatcher(),
 		wxsMatcher: alwaysFalse,
-		cssPreflight: {
-			"box-sizing": "border-box",
-			"border-width": "0",
-			"border-style": "solid",
-			"border-color": "currentColor"
-		},
+		cssPreflight: getDefaultCssPreflight(3),
 		disabled: false,
 		onLoad: noop,
 		onStart: noop,
@@ -82,11 +99,13 @@ function getDefaultOptions() {
 		customAttributes: {},
 		customReplaceDictionary: MappingChars2String,
 		appType: void 0,
-		arbitraryValues: { allowDoubleQuotes: false },
+		arbitraryValues: {
+			allowDoubleQuotes: false,
+			bareArbitraryValues: false
+		},
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		inlineWxs: false,
 		injectAdditionalCssVarScope: false,
-		rewriteCssImports: true,
 		jsPreserveClass: (keyword) => {
 			/**
 			* 默认保留 keyword
@@ -94,7 +113,6 @@ function getDefaultOptions() {
 			if (keyword === "*") return true;
 			return false;
 		},
-		staleClassNameFallback: void 0,
 		disabledDefaultTemplateHandler: false,
 		cssSelectorReplacement: {
 			root: [
@@ -115,10 +133,7 @@ function getDefaultOptions() {
 		ignoreCallExpressionIdentifiers: [],
 		ignoreTaggedTemplateExpressionIdentifiers: ["weappTwIgnore"],
 		replaceRuntimePackages: false,
-		generator: {
-			mode: "auto",
-			target: "weapp"
-		},
+		generator: { target: "weapp" },
 		tailwindcssPatcherOptions: { filter(className) {
 			return !isAllowedClassName(className);
 		} },
@@ -126,4 +141,4 @@ function getDefaultOptions() {
 	};
 }
 //#endregion
-export { getDefaultOptions };
+export { TAILWIND_V3_CSS_PREFLIGHT, TAILWIND_V4_CSS_PREFLIGHT, getDefaultCssPreflight, getDefaultOptions, resolveDefaultCssPreflight };

package/dist/generator/index.d.ts

@@ -7,5 +7,5 @@ export declare function resolveTailwindSourceFromPatcher(patcher: TailwindcssPat
 export declare function createWeappTailwindcssGeneratorFromPatcher(patcher: TailwindcssPatcherLike): Promise<WeappTailwindcssGenerator>;
 export { normalizeWeappTailwindcssGeneratorOptions, } from './options';
 export { resolveTailwindV3Source, resolveTailwindV3SourceFromPatcher, resolveTailwindV3SourceOptionsFromPatcher, resolveTailwindV4Source, resolveTailwindV4SourceFromPatcher, resolveTailwindV4SourceFromPatchOptions, resolveTailwindV4SourceOptionsFromPatcher, transformTailwindV3CssByTarget, transformTailwindV3CssToWeapp, transformTailwindV4CssByTarget, transformTailwindV4CssToWeapp, };
-export type { NormalizedWeappTailwindcssGeneratorOptions, WeappTailwindcssGeneratorMode, WeappTailwindcssGeneratorOptions, WeappTailwindcssGeneratorUserOptions, } from './options';
+export type { NormalizedWeappTailwindcssGeneratorOptions, WeappTailwindcssGeneratorOptions, WeappTailwindcssGeneratorUserOptions, } from './options';
 export type { TailwindCandidateSource, TailwindGeneratorVersion, TailwindResolvedSource, TailwindV3CandidateSource, TailwindV3Engine, TailwindV3GenerateOptions, TailwindV3GenerateResult, TailwindV3GenerateTarget, TailwindV3ResolvedSource, TailwindV3SourceOptions, TailwindV4CandidateSource, TailwindV4DesignSystem, TailwindV4Engine, TailwindV4GenerateOptions, TailwindV4GenerateResult, TailwindV4GenerateTarget, TailwindV4ResolvedSource, TailwindV4SourceOptions, WeappTailwindcssGenerateOptions, WeappTailwindcssGenerateResult, WeappTailwindcssGenerator, WeappTailwindcssGeneratorTarget, } from './types';

package/dist/generator/options.d.ts

@@ -1,16 +1,15 @@
 import type { IStyleHandlerOptions } from '@weapp-tailwindcss/postcss/types';
 import type { WeappTailwindcssGeneratorTarget } from './types';
-export type WeappTailwindcssGeneratorMode = 'auto' | 'force' | 'off';
 export interface WeappTailwindcssGeneratorOptions {
-    mode?: WeappTailwindcssGeneratorMode;
     target?: WeappTailwindcssGeneratorTarget;
+    config?: string;
     styleOptions?: Partial<IStyleHandlerOptions>;
     tailwindcssV3Compatibility?: boolean;
 }
-export type WeappTailwindcssGeneratorUserOptions = boolean | WeappTailwindcssGeneratorOptions;
+export type WeappTailwindcssGeneratorUserOptions = WeappTailwindcssGeneratorOptions;
 export interface NormalizedWeappTailwindcssGeneratorOptions {
-    mode: WeappTailwindcssGeneratorMode;
     target: WeappTailwindcssGeneratorTarget;
+    config?: string;
     styleOptions?: Partial<IStyleHandlerOptions>;
     tailwindcssV3Compatibility: boolean;
 }