weapp-tailwindcss 5.5.5 → 5.5.7

package/dist/vite-web.d.ts

@@ -1,4 +1,4 @@
 import type { UserDefinedOptions } from './types/index.js';
-export declare function WeappTailwindcssWeb(options?: UserDefinedOptions): any[] | undefined;
+export declare function WeappTailwindcssWeb(options?: UserDefinedOptions): import("vite").Plugin<any>[] | undefined;
 export declare const weappTailwindcssWeb: typeof WeappTailwindcssWeb;
 export type { UserDefinedOptions };

package/dist/vite.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_vite = require("./vite-CaH7WjX6.cjs");
+const require_vite = require("./vite-BxW0qd7J.cjs");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.weappTailwindcss = require_vite.WeappTailwindcss;

package/dist/vite.js

@@ -1,2 +1,2 @@
-import { t as WeappTailwindcss } from "./vite-CuYntLZP.js";
+import { t as WeappTailwindcss } from "./vite-D-RGkmOE.js";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };

package/dist/{watch-dependencies-GbC14Rlt.cjs → watch-dependencies-C1so1whD.cjs}

@@ -1,7 +1,8 @@
-const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
+const require_rolldown_runtime = require("./rolldown-runtime-fg3euq-1.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
+let _weapp_tailwindcss_source_scan = require("@weapp-tailwindcss/source-scan");
 //#region src/bundlers/webpack/loaders/watch-dependencies.ts
 function normalizeWebpackWatchPath(file) {
 	return node_path.default.resolve(file);
@@ -28,7 +29,19 @@ function registerWebpackWatchFile(loaderContext, file) {
 function registerWebpackWatchContext(loaderContext, context) {
 	loaderContext.addContextDependency?.(normalizeWebpackWatchPath(context));
 }
+async function registerWebpackSourceContexts(loaderContext, options) {
+	const entries = await Promise.all((0, _weapp_tailwindcss_source_scan.expandSourceEntryBraces)(options.entries.filter((entry) => !entry.negated)).map((entry) => (0, _weapp_tailwindcss_source_scan.resolveTailwindSourceEntry)(entry.pattern, entry.base, false)));
+	const roots = new Set(entries.map((entry) => entry.base));
+	if (!options.explicit && roots.size === 0) roots.add(options.root);
+	for (const root of roots) await registerWebpackWatchFile(loaderContext, (0, _weapp_tailwindcss_source_scan.resolveSourceScanPath)(root));
+}
 //#endregion
+Object.defineProperty(exports, "registerWebpackSourceContexts", {
+	enumerable: true,
+	get: function() {
+		return registerWebpackSourceContexts;
+	}
+});
 Object.defineProperty(exports, "registerWebpackWatchContext", {
 	enumerable: true,
 	get: function() {

package/dist/weapp-tw-css-generation-loader.cjs

@@ -1,12 +1,13 @@
-const require_generator = require("./generator-BdSIvFEO.cjs");
-const require_css_imports = require("./css-imports-FRZwX4P6.cjs");
+require("./generated-css-marker-jMNbQHpy.cjs");
+const require_css_imports = require("./css-imports-R_RDMjPz.cjs");
 const require_weapp_tw_css_import_rewrite_loader = require("./weapp-tw-css-import-rewrite-loader.cjs");
 let node_buffer = require("node:buffer");
+let _weapp_tailwindcss_postcss_transform = require("@weapp-tailwindcss/postcss/transform");
 //#region src/bundlers/webpack/loaders/weapp-tw-css-generation-loader.ts
 const WeappTwCssGenerationLoader = async function(source) {
 	const options = require_weapp_tw_css_import_rewrite_loader.resolveWebpackCssPipelineLoaderOptions(this.getOptions());
 	const input = require_css_imports.normalizeResolvedTailwindcssImports(node_buffer.Buffer.isBuffer(source) ? source.toString("utf-8") : source, options?.tailwindcssImportRewrite?.pkgDir);
-	if (!(require_generator.hasTailwindRootDirectives(input, { importFallback: true }) || require_generator.hasTailwindApplyDirective(input))) return source;
+	if (!((0, _weapp_tailwindcss_postcss_transform.hasTailwindRootDirectives)(input, { importFallback: true }) || (0, _weapp_tailwindcss_postcss_transform.hasTailwindApplyDirective)(input))) return source;
 	await require_weapp_tw_css_import_rewrite_loader.registerWebpackCssGeneratorSource(input, this.resourcePath, options);
 	return await require_weapp_tw_css_import_rewrite_loader.generateCssForWebpackPipeline(input, this, options) ?? source;
 };

package/dist/weapp-tw-css-import-rewrite-loader.cjs

@@ -2,23 +2,23 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
-const require_generator = require("./generator-BdSIvFEO.cjs");
-const require_tailwindcss = require("./tailwindcss-9e6ZuYgS.cjs");
-const require_v4_generation_core = require("./v4-generation-core-DJBWZ_D0.cjs");
-const require_compiler = require("./compiler-Cc0JXfbw.cjs");
-const require_css_imports = require("./css-imports-FRZwX4P6.cjs");
-const require_pipeline_helpers = require("./pipeline-helpers-BHagysZY.cjs");
+const require_rolldown_runtime = require("./rolldown-runtime-fg3euq-1.cjs");
+const require_generator = require("./generator-CxauQbx3.cjs");
+const require_compiler = require("./compiler-DkGY5Nmh.cjs");
+const require_tailwindcss = require("./tailwindcss-U3KIUegn.cjs");
+const require_generated_css_marker = require("./generated-css-marker-jMNbQHpy.cjs");
+const require_css_imports = require("./css-imports-R_RDMjPz.cjs");
+require("./pipeline-helpers-zMPmp5F3.cjs");
 const require_runtime_registry = require("./runtime-registry-BlIjpImP.cjs");
-const require_watch_dependencies = require("./watch-dependencies-GbC14Rlt.cjs");
+const require_watch_dependencies = require("./watch-dependencies-C1so1whD.cjs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
 let node_process = require("node:process");
 node_process = require_rolldown_runtime.__toESM(node_process, 1);
-let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
+let _weapp_tailwindcss_postcss_transform = require("@weapp-tailwindcss/postcss/transform");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
-let node_util = require("node:util");
 let node_buffer = require("node:buffer");
+let node_util = require("node:util");
 //#region src/bundlers/webpack/loaders/weapp-tw-css-import-rewrite-loader.ts
 function resolveWebpackCssPipelineLoaderOptions(options) {
 	const runtime = (require_runtime_registry.getWebpackLoaderRuntime(options?.tailwindcssImportRewriteRuntimeKey) ?? require_runtime_registry.getLatestWebpackLoaderRuntime())?.cssImportRewrite;
@@ -46,14 +46,14 @@ function isPackageJsonImportRequest(request) {
 function normalizeCssConfigDirectives(source, resourcePath) {
 	if (!resourcePath) return source;
 	const base = node_path.default.dirname(resourcePath);
-	return source.replace(/@config\s+(["'])(.+?)\1\s*;?/g, (full, quote, request) => {
-		if (node_path.default.isAbsolute(request) || isPackageJsonImportRequest(request)) return full;
+	return (0, _weapp_tailwindcss_postcss_transform.rewriteCssConfigRequests)(source, (request) => {
+		if (node_path.default.isAbsolute(request) || isPackageJsonImportRequest(request)) return;
 		const resolved = node_path.default.resolve(base, request);
-		return `@config ${quote}${(0, _weapp_tailwindcss_shared.ensurePosix)(resolved)}${quote};`;
+		return (0, _weapp_tailwindcss_shared.ensurePosix)(resolved);
 	});
 }
 function createCssHandlerOptions(options, majorVersion, file, appType) {
-	const tailwindOptions = require_generator.resolveTailwindcssOptions(options.tailwindRuntimeOptions);
+	const tailwindOptions = require_generator.resolveTailwindcssOptions(options.tailwindcssRuntimeOptions);
 	const cssEntries = [...options.cssEntries ?? [], ...tailwindOptions?.v4?.cssEntries ?? []].filter((entry) => typeof entry === "string" && entry.length > 0).map((entry) => node_path.default.resolve(entry));
 	const resolvedFile = node_path.default.resolve(file);
 	const matchedCssEntryIndex = cssEntries.findIndex((entry) => entry === resolvedFile);
@@ -70,22 +70,27 @@ async function resolveWebpackLoaderSourceCandidates(source, loaderContext, optio
 	const file = loaderContext.resourcePath;
 	const resolved = await require_tailwindcss.resolveTailwindV4EntriesFromCssCached(source, node_path.default.dirname(file));
 	if (!resolved) return;
-	const collector = require_v4_generation_core.createSourceCandidateStore({
+	const collector = require_generated_css_marker.createSourceCandidateStore({
 		bareArbitraryValues: compilerOptions.arbitraryValues?.bareArbitraryValues,
 		customAttributesEntities: compilerOptions.customAttributesEntities,
 		disabledDefaultTemplateHandler: compilerOptions.disabledDefaultTemplateHandler
 	});
 	collector.syncInline(resolved.inlineCandidates);
-	const outDir = loaderContext.rootContext ? node_path.default.resolve(loaderContext.rootContext, "dist") : void 0;
-	const scanFiles = await require_v4_generation_core.resolveSourceCandidateScanFiles({
+	const outDir = loaderContext._compiler?.options.output.path;
+	await require_watch_dependencies.registerWebpackSourceContexts(loaderContext, {
+		...resolved,
+		root
+	});
+	for (const dependency of resolved.dependencies) await require_watch_dependencies.registerWebpackWatchFile(loaderContext, dependency);
+	const scanFiles = await require_generated_css_marker.resolveSourceCandidateScanFiles({
 		entries: resolved.entries,
 		explicit: resolved.explicit,
-		filter: require_v4_generation_core.isSourceCandidateRequest,
+		filter: require_generated_css_marker.isSourceCandidateRequest,
 		outDir,
 		root
 	});
 	await Promise.all(scanFiles.map(async (file) => {
-		const normalizedFile = require_generator.resolveSourceScanPath(file);
+		const normalizedFile = (0, require_tailwindcss.source_scan_exports.resolveSourceScanPath)(file);
 		await require_watch_dependencies.registerWebpackWatchFile(loaderContext, normalizedFile);
 		await collector.syncFile(normalizedFile);
 	}));
@@ -117,7 +122,7 @@ async function generateCssForWebpackPipeline(source, loaderContext, options) {
 	const normalizedSource = normalizeCssConfigDirectives(source, file);
 	const cssHandlerOptions = createCssHandlerOptions(compilerOptions, runtimeState.tailwindRuntime.majorVersion, file, rewriteOptions.appType);
 	const sourceCandidateScan = await resolveWebpackLoaderSourceCandidates(normalizedSource, loaderContext, options);
-	const generated = await require_v4_generation_core.generateTailwindV4Css({
+	const generated = await require_generated_css_marker.generateTailwindV4Css({
 		opts: compilerOptions,
 		runtimeState,
 		runtime,
@@ -140,12 +145,12 @@ async function generateCssForWebpackPipeline(source, loaderContext, options) {
 	if (!generated) return;
 	rewriteOptions.markGeneratedCssSource?.(file);
 	for (const dependency of generated.dependencies) await require_watch_dependencies.registerWebpackWatchFile(loaderContext, dependency);
-	const generatedCssSource = require_generator.removeTailwindSourceDirectives(generated.css, { importFallback: true });
-	const generatedCss = (compilerOptions.cssOptions?.platform ?? compilerOptions.platform) === "lynx" ? (0, _weapp_tailwindcss_postcss.transformLynxCssCompat)(generatedCssSource) : generatedCssSource;
-	const bareUserCss = generatorTarget === "web" ? "" : require_pipeline_helpers.collectWebpackBareSelectorUserCss(normalizedSource);
-	const missingBareUserCss = bareUserCss.trim().length === 0 ? "" : (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(generatedCss, bareUserCss);
+	const generatedCssSource = (0, _weapp_tailwindcss_postcss_transform.removeTailwindSourceDirectives)(generated.css, { importFallback: true });
+	const generatedCss = (compilerOptions.cssOptions?.platform ?? compilerOptions.platform) === "lynx" ? (0, _weapp_tailwindcss_postcss_transform.transformLynxCssCompat)(generatedCssSource) : generatedCssSource;
+	const bareUserCss = generatorTarget === "web" ? "" : (0, _weapp_tailwindcss_postcss_transform.collectWebpackBareSelectorUserCss)(normalizedSource);
+	const missingBareUserCss = bareUserCss.trim().length === 0 ? "" : (0, _weapp_tailwindcss_postcss_transform.filterExistingCssRules)(generatedCss, bareUserCss);
 	const combinedCss = missingBareUserCss.trim().length === 0 ? generatedCss : `${generatedCss}\n${missingBareUserCss}`;
-	const css = generatorTarget === "weapp" && runtimeState.tailwindRuntime.majorVersion === 4 ? (0, _weapp_tailwindcss_postcss.normalizeTailwindcssV4InfinityRadiusCss)(combinedCss) : combinedCss;
+	const css = generatorTarget === "weapp" && runtimeState.tailwindRuntime.majorVersion === 4 ? (0, _weapp_tailwindcss_postcss_transform.normalizeTailwindcssV4InfinityRadiusCss)(combinedCss) : combinedCss;
 	if (node_process.default.env["WEAPP_TW_LOADER_DEBUG"]) node_process.default.stdout.write(`[weapp-tw-css-import-rewrite-loader] generated ${(0, node_util.inspect)({
 		classes: generated.classSet.size,
 		cssLength: css.length,
@@ -159,10 +164,10 @@ async function generateCssForWebpackPipeline(source, loaderContext, options) {
 		dependencies: generated.dependencies,
 		file
 	});
-	return `${require_v4_generation_core.createBundlerGeneratedCssMarker("webpack", file)}\n${css}`;
+	return `${(0, _weapp_tailwindcss_postcss_transform.createBundlerGeneratedCssMarker)("webpack", file)}\n${css}`;
 }
 function registerWebpackCssGeneratorSource(source, resourcePath, options) {
-	const css = normalizeCssConfigDirectives(require_generator.normalizeTailwindSourceForGenerator(source, { importFallback: true }), resourcePath);
+	const css = normalizeCssConfigDirectives((0, _weapp_tailwindcss_postcss_transform.normalizeTailwindSourceForGenerator)(source, { importFallback: true }), resourcePath);
 	if (node_process.default.env["WEAPP_TW_LOADER_DEBUG"]) node_process.default.stdout.write(`[weapp-tw-css-import-rewrite-loader] register source ${(0, node_util.inspect)({
 		cssLength: css.length,
 		file: resourcePath,
@@ -192,9 +197,9 @@ const WeappTwCssImportRewriteLoader = function(source) {
 	if (node_process.default.env["WEAPP_TW_LOADER_DEBUG"]) node_process.default.stdout.write(`[weapp-tw-css-import-rewrite-loader] executing for ${this.resourcePath}\n`);
 	const opt = resolveWebpackCssPipelineLoaderOptions(this.getOptions());
 	const input = node_buffer.Buffer.isBuffer(source) ? source.toString("utf-8") : source;
-	const hasTailwindGeneratorSource = typeof input === "string" && (require_generator.hasTailwindRootDirectives(input, { importFallback: true }) || require_generator.hasTailwindApplyDirective(input));
+	const hasTailwindGeneratorSource = typeof input === "string" && ((0, _weapp_tailwindcss_postcss_transform.hasTailwindRootDirectives)(input, { importFallback: true }) || (0, _weapp_tailwindcss_postcss_transform.hasTailwindApplyDirective)(input));
 	const isLynxPipeline = opt?.tailwindcssImportRewrite?.compilerOptions?.platform === "lynx";
-	const hasLynxEntrySource = !isLynxPipeline || require_generator.hasTailwindRootImportDirectives(input, { importFallback: true }) || require_generator.hasTailwindApplyDirective(input);
+	const hasLynxEntrySource = !isLynxPipeline || (0, _weapp_tailwindcss_postcss_transform.hasTailwindRootImportDirectives)(input, { importFallback: true }) || (0, _weapp_tailwindcss_postcss_transform.hasTailwindApplyDirective)(input);
 	const register = hasTailwindGeneratorSource && hasLynxEntrySource && (!isLynxPipeline || opt?.generateCss === true) ? () => registerWebpackCssGeneratorSource(input, this.resourcePath, opt) : void 0;
 	const transform = () => {
 		const transformed = transformCssImportRewriteSource(source, opt);

package/dist/weapp-tw-runtime-classset-loader.cjs

@@ -1,13 +1,13 @@
-const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
+const require_rolldown_runtime = require("./rolldown-runtime-fg3euq-1.cjs");
 const require_css_loader_runtime = require("./css-loader-runtime-DGqsWVua.cjs");
 const require_runtime_registry = require("./runtime-registry-BlIjpImP.cjs");
-const require_watch_dependencies = require("./watch-dependencies-GbC14Rlt.cjs");
+const require_watch_dependencies = require("./watch-dependencies-C1so1whD.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
 let node_process = require("node:process");
 node_process = require_rolldown_runtime.__toESM(node_process, 1);
-let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
+let _weapp_tailwindcss_postcss_transform = require("@weapp-tailwindcss/postcss/transform");
 let node_buffer = require("node:buffer");
 //#region src/bundlers/webpack/loaders/weapp-tw-runtime-classset-loader.ts
 function isPromiseLike(value) {
@@ -16,26 +16,13 @@ function isPromiseLike(value) {
 function normalizeRuntimeCssSource(source) {
 	if (node_buffer.Buffer.isBuffer(source)) {
 		const css = source.toString("utf8");
-		return shouldCleanRuntimeCss(css) ? node_buffer.Buffer.from(cleanRuntimeCss(css)) : source;
+		return shouldCleanRuntimeCss(css) ? node_buffer.Buffer.from((0, _weapp_tailwindcss_postcss_transform.normalizeTailwindV4RuntimeCss)(css)) : source;
 	}
-	return shouldCleanRuntimeCss(source) ? cleanRuntimeCss(source) : source;
+	return shouldCleanRuntimeCss(source) ? (0, _weapp_tailwindcss_postcss_transform.normalizeTailwindV4RuntimeCss)(source) : source;
 }
 function shouldCleanRuntimeCss(css) {
 	return !require_css_loader_runtime.isWebpackCssLoaderRuntimeSource(css) && (css.includes("@layer") || css.includes("@theme"));
 }
-function cleanRuntimeCss(css) {
-	const root = _weapp_tailwindcss_postcss.postcss.parse(css);
-	(0, _weapp_tailwindcss_postcss.removeUnsupportedCascadeLayers)(root);
-	removeUnsupportedThemeKeyframes(root);
-	return root.toString();
-}
-function removeUnsupportedThemeKeyframes(root) {
-	root.walkAtRules("theme", (themeRule) => {
-		themeRule.walkAtRules((atRule) => {
-			if (atRule.name.startsWith("-") && atRule.name.endsWith("keyframes")) atRule.remove();
-		});
-	});
-}
 function resolveOriginalCssSource(file, source) {
 	if (isPlainCssResource(file)) try {
 		return (0, node_fs.readFileSync)(file, "utf8");