weapp-tailwindcss 5.0.0-next.1 → 5.0.0-next.11

package/dist/vite.d.ts

@@ -1,4 +1,3 @@
 export * from './bundlers/vite/index';
-export { UnifiedViteWeappTailwindcssPlugin as WeappTailwindcss } from './bundlers/vite/index';
-export { UnifiedViteWeappTailwindcssPlugin as weappTailwindcss } from './bundlers/vite/index';
+export { WeappTailwindcss as weappTailwindcss } from './bundlers/vite/index';
 export type { UserDefinedOptions } from './types';

package/dist/vite.js

@@ -1,5 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_vite = require("./vite-BHpAqldo.js");
-exports.UnifiedViteWeappTailwindcssPlugin = require_vite.UnifiedViteWeappTailwindcssPlugin;
-exports.WeappTailwindcss = require_vite.UnifiedViteWeappTailwindcssPlugin;
-exports.weappTailwindcss = require_vite.UnifiedViteWeappTailwindcssPlugin;
+const require_vite = require("./vite-BEj9JOOA.js");
+exports.WeappTailwindcss = require_vite.WeappTailwindcss;
+exports.weappTailwindcss = require_vite.WeappTailwindcss;

package/dist/vite.mjs

@@ -1,2 +1,2 @@
-import { t as UnifiedViteWeappTailwindcssPlugin } from "./vite-C8JlHiyR.mjs";
-export { UnifiedViteWeappTailwindcssPlugin, UnifiedViteWeappTailwindcssPlugin as WeappTailwindcss, UnifiedViteWeappTailwindcssPlugin as weappTailwindcss };
+import { t as WeappTailwindcss } from "./vite-C8S1wfyQ.mjs";
+export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };

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

@@ -2,31 +2,31 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_chunk = require("./chunk-8l464Juk.js");
+const require_postcss = require("./postcss-Bs-RbNzK.js");
+let node_buffer = require("node:buffer");
 let node_process = require("node:process");
-node_process = require_chunk.__toESM(node_process);
+node_process = require_postcss.__toESM(node_process);
 let loader_utils = require("loader-utils");
-loader_utils = require_chunk.__toESM(loader_utils);
-let node_buffer = require("node:buffer");
+loader_utils = require_postcss.__toESM(loader_utils);
 let node_util = require("node:util");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 let node_path = require("node:path");
-node_path = require_chunk.__toESM(node_path);
+node_path = require_postcss.__toESM(node_path);
 //#region src/bundlers/shared/css-imports.ts
-const tailwindcssImportRE = /^tailwindcss(?:\/.*)?$/;
-const tailwindcssCssImportStatementRE = /(@import\s+(?:url\(\s*)?)(["'])(tailwindcss(?:\/[^"']*)?\$?)(\2\s*\)?)/gi;
+const tailwindcssImportRE = /^(?:tailwindcss|weapp-tailwindcss)(?:\/.*)?$/;
+const tailwindcssCssImportStatementRE = /(@import\s+(?:url\(\s*)?)(["'])((?:tailwindcss|weapp-tailwindcss)(?:\/[^"']*)?\$?)(\2\s*\)?)/gi;
 function normalizeTailwindcssSpecifier(specifier) {
-	if (specifier === "tailwindcss$") return "tailwindcss";
+	if (specifier === "tailwindcss$" || specifier === "weapp-tailwindcss$") return specifier.slice(0, -1);
 	return specifier;
 }
 function getTailwindcssSubpath(specifier) {
-	if (specifier === "tailwindcss") return "index.css";
-	return specifier.slice(12);
+	if (specifier === "tailwindcss" || specifier === "weapp-tailwindcss") return "index.css";
+	return specifier.replace(/^(?:tailwindcss|weapp-tailwindcss)\//, "");
 }
 function resolveTailwindcssImport(specifier, pkgDir, options) {
 	const normalized = normalizeTailwindcssSpecifier(specifier);
 	if (!tailwindcssImportRE.test(normalized)) return null;
-	if (normalized === "tailwindcss") return options?.rootImport ?? "weapp-tailwindcss/index.css";
+	if (normalized === "tailwindcss" || normalized === "weapp-tailwindcss") return options?.rootImport ?? (options?.join ?? node_path.default.join)(pkgDir, "index.css");
 	return (options?.join ?? node_path.default.join)(pkgDir, getTailwindcssSubpath(normalized));
 }
 function rewriteTailwindcssImportsInCode(code, pkgDir, options) {
@@ -40,6 +40,112 @@ function rewriteTailwindcssImportsInCode(code, pkgDir, options) {
 	return hasReplacements ? rewritten : void 0;
 }
 //#endregion
+//#region src/bundlers/shared/generator-css/markers.ts
+const GENERATOR_PLACEHOLDER_MARKER_GLOBAL_RE = /\/\*!\s*weapp-tailwindcss generator-placeholder\s*\*\/\s*/gi;
+function stripGeneratorPlaceholderMarkers(css) {
+	return css.replace(GENERATOR_PLACEHOLDER_MARKER_GLOBAL_RE, "");
+}
+//#endregion
+//#region src/bundlers/shared/generator-css/directives.ts
+const TAILWIND_ROOT_DIRECTIVE_NAMES = new Set([
+	"config",
+	"custom-variant",
+	"plugin",
+	"source",
+	"tailwind",
+	"theme",
+	"utility",
+	"variant"
+]);
+const TAILWIND_ROOT_DIRECTIVE_RE = /@(?:import\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|tailwind|config|custom-variant|plugin|source|theme|utility|variant)\b/;
+const TAILWIND_EXTRACTABLE_DIRECTIVE_RE = /^\s*@(?:import|tailwind|config|source|reference|plugin)\b[\s\S]*?(?:;|$)/;
+const TAILWIND_EXTRACTABLE_BLOCK_DIRECTIVE_RE = /^\s*@(?:theme|utility|variant|custom-variant)\b[\s\S]*$/;
+function parseImportRequest(params) {
+	return /^(?:url\(\s*)?(["']?)([^"')\s]+)\1\s*\)?/.exec(params.trim())?.[2];
+}
+function parseConfigRequest(params) {
+	return /^(["'])(.+)\1\s*;?$/.exec(params.trim())?.[2];
+}
+function isPackageJsonImportRequest(request) {
+	return typeof request === "string" && request.startsWith("#");
+}
+function isWeappTailwindcssImportRequest(request) {
+	return request === "weapp-tailwindcss" || request?.startsWith("weapp-tailwindcss/");
+}
+function normalizeTailwindImportRequest(request, options = {}) {
+	if (options.importFallback && isWeappTailwindcssImportRequest(request)) return request.replace(/^weapp-tailwindcss/, "tailwindcss");
+	return request;
+}
+function replaceImportRequest(params, request, replacement) {
+	const index = params.indexOf(request);
+	if (index === -1) return params;
+	return `${params.slice(0, index)}${replacement}${params.slice(index + request.length)}`;
+}
+function normalizeTailwindDirectiveLine(line, options = {}) {
+	if (!options.importFallback || !line.trimStart().startsWith("@import")) return line;
+	const request = parseImportRequest(line.trimStart().replace(/^@import\b/, ""));
+	if (!isWeappTailwindcssImportRequest(request)) return line;
+	return replaceImportRequest(line, request, request.replace(/^weapp-tailwindcss/, "tailwindcss"));
+}
+function extractTailwindDirectiveLines(rawSource, options = {}) {
+	const directives = [];
+	const seenImports = /* @__PURE__ */ new Set();
+	for (const line of stripGeneratorPlaceholderMarkers(rawSource).split(/\r?\n/)) {
+		const trimmed = line.trim();
+		if (!trimmed || trimmed.startsWith("//")) continue;
+		const directive = TAILWIND_EXTRACTABLE_DIRECTIVE_RE.exec(line)?.[0] ?? TAILWIND_EXTRACTABLE_BLOCK_DIRECTIVE_RE.exec(line)?.[0];
+		if (!directive) continue;
+		const normalized = normalizeTailwindDirectiveLine(directive.trimEnd(), options);
+		const normalizedTrimmed = normalized.trim();
+		if (options.removeConfig && normalizedTrimmed.startsWith("@config")) continue;
+		const request = /^@import\b/.test(normalizedTrimmed) ? parseImportRequest(normalizedTrimmed.replace(/^@import\b/, "")) : void 0;
+		if (request && !isTailwindImportRequest(request) && !isPackageJsonImportRequest(request)) continue;
+		if (/^@import\b/.test(normalizedTrimmed) && !request) continue;
+		if (request && isTailwindImportRequest(request)) {
+			const key = normalizedTrimmed;
+			if (seenImports.has(key)) continue;
+			seenImports.add(key);
+		}
+		directives.push(normalized);
+	}
+	return directives;
+}
+function extractTailwindSourceForPostcssFallback(rawSource, options = {}) {
+	const directives = extractTailwindDirectiveLines(rawSource, options);
+	return directives.length > 0 ? directives.join("\n") : void 0;
+}
+function hasPreprocessorOnlySyntax(rawSource) {
+	return /(?:^|\n)\s*(?:\/\/|\$[\w-]+\s*:|@[\w-]+\s*:|@(?:mixin|include|function|use|forward)\b)/.test(rawSource);
+}
+function normalizeTailwindSourceForGenerator(rawSource, options = {}) {
+	return hasPreprocessorOnlySyntax(rawSource) ? extractTailwindSourceForPostcssFallback(rawSource, options) ?? rawSource : rawSource;
+}
+function isTailwindImportRequest(request) {
+	return request === "tailwindcss" || request === "tailwindcss4" || request?.startsWith("tailwindcss/") || request?.startsWith("tailwindcss4/");
+}
+function isTailwindImportAtRule(node, options = {}) {
+	if (node.name === "tailwind") return true;
+	if (node.name !== "import") return false;
+	return isTailwindImportRequest(normalizeTailwindImportRequest(parseImportRequest(node.params), options));
+}
+function hasTailwindRootDirectives(rawSource, options = {}) {
+	if (!TAILWIND_ROOT_DIRECTIVE_RE.test(rawSource) && !(options.importFallback && rawSource.includes("weapp-tailwindcss"))) return false;
+	try {
+		const root = require_postcss.postcss_default.parse(rawSource);
+		let found = false;
+		root.walkAtRules((node) => {
+			const request = node.name === "import" ? parseImportRequest(node.params) : node.name === "config" || node.name === "plugin" ? parseConfigRequest(node.params) : void 0;
+			if (isTailwindImportAtRule(node, options) || isPackageJsonImportRequest(request) || TAILWIND_ROOT_DIRECTIVE_NAMES.has(node.name)) {
+				found = true;
+				return false;
+			}
+		});
+		return found;
+	} catch {
+		return extractTailwindDirectiveLines(rawSource, options).length > 0;
+	}
+}
+//#endregion
 //#region src/bundlers/webpack/loaders/weapp-tw-css-import-rewrite-loader.ts
 const getLoaderOptions = loader_utils.default.getOptions;
 function joinPosixPath(base, subpath) {
@@ -47,7 +153,7 @@ function joinPosixPath(base, subpath) {
 	return `${base}/${subpath}`;
 }
 function applyCssImportRewrite(source, options) {
-	const rewriteOptions = options?.rewriteCssImports;
+	const rewriteOptions = options?.tailwindcssImportRewrite;
 	const pkgDir = rewriteOptions?.pkgDir;
 	if (!pkgDir) return source;
 	return rewriteTailwindcssImportsInCode(source, (0, _weapp_tailwindcss_shared.ensurePosix)(pkgDir), {
@@ -59,15 +165,23 @@ function transformCssImportRewriteSource(source, options) {
 	const input = node_buffer.Buffer.isBuffer(source) ? source.toString("utf-8") : source;
 	const rewritten = applyCssImportRewrite(input, options);
 	if (rewritten === input) return source;
-	if (node_process.default.env.WEAPP_TW_LOADER_DEBUG) node_process.default.stdout.write(`[weapp-tw-css-import-rewrite-loader] rewritten import ${(0, node_util.inspect)({
+	if (node_process.default.env["WEAPP_TW_LOADER_DEBUG"]) node_process.default.stdout.write(`[weapp-tw-css-import-rewrite-loader] rewritten import ${(0, node_util.inspect)({
 		before: input.slice(0, 80),
 		after: rewritten.slice(0, 80)
 	})}\n`);
 	return rewritten;
 }
 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`);
-	return transformCssImportRewriteSource(source, getLoaderOptions(this));
+	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 = getLoaderOptions(this);
+	const input = node_buffer.Buffer.isBuffer(source) ? source.toString("utf-8") : source;
+	const registerTask = typeof input === "string" && hasTailwindRootDirectives(input, { importFallback: true }) ? opt?.tailwindcssImportRewrite?.registerCssSource?.({
+		file: this.resourcePath,
+		css: normalizeTailwindSourceForGenerator(input, { importFallback: true })
+	}) : void 0;
+	const transform = () => transformCssImportRewriteSource(source, opt);
+	if (registerTask && typeof registerTask.then === "function") return Promise.resolve(registerTask).then(transform);
+	return transform();
 };
 //#endregion
 exports.default = WeappTwCssImportRewriteLoader;

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

@@ -1,15 +1,53 @@
-const require_chunk = require("./chunk-8l464Juk.js");
+const require_postcss = require("./postcss-Bs-RbNzK.js");
+let node_buffer = require("node:buffer");
 let node_process = require("node:process");
-node_process = require_chunk.__toESM(node_process);
+node_process = require_postcss.__toESM(node_process);
 let loader_utils = require("loader-utils");
-loader_utils = require_chunk.__toESM(loader_utils);
+loader_utils = require_postcss.__toESM(loader_utils);
+//#region src/tailwindcss/remove-unsupported-css.ts
+/**
+* 移除小程序不支持的 cascade layer 语法，同时保留 layer 内的实际规则。
+*/
+function removeUnsupportedCascadeLayers(root) {
+	root.walkAtRules("layer", (atRule) => {
+		if (!atRule.nodes || atRule.nodes.length === 0) {
+			atRule.remove();
+			return;
+		}
+		atRule.replaceWith(...atRule.nodes);
+	});
+}
+//#endregion
 //#region src/bundlers/webpack/loaders/weapp-tw-runtime-classset-loader.ts
 function isPromiseLike(value) {
 	return Boolean(value && typeof value.then === "function");
 }
 const getLoaderOptions = loader_utils.default.getOptions;
+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(source) ? cleanRuntimeCss(source) : source;
+}
+function shouldCleanRuntimeCss(css) {
+	return css.includes("@layer") || css.includes("@theme");
+}
+function cleanRuntimeCss(css) {
+	const root = require_postcss.postcss_default.parse(css);
+	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();
+		});
+	});
+}
 const WeappTwRuntimeClassSetLoader = function(source) {
-	if (node_process.default.env.WEAPP_TW_LOADER_DEBUG) node_process.default.stdout.write(`[weapp-tw-runtime-classset-loader] executing for ${this.resourcePath}\n`);
+	if (node_process.default.env["WEAPP_TW_LOADER_DEBUG"]) node_process.default.stdout.write(`[weapp-tw-runtime-classset-loader] executing for ${this.resourcePath}\n`);
 	const opt = getLoaderOptions(this);
 	const maybePromise = opt?.getClassSet?.();
 	const applyWatchDependencies = (dependencies) => {
@@ -25,10 +63,10 @@ const WeappTwRuntimeClassSetLoader = function(source) {
 	};
 	if (isPromiseLike(maybePromise)) return Promise.resolve(maybePromise).then(async () => {
 		await resolveWatchDependencies();
-		return source;
+		return normalizeRuntimeCssSource(source);
 	});
 	resolveWatchDependencies();
-	return source;
+	return normalizeRuntimeCssSource(source);
 };
 //#endregion
 module.exports = WeappTwRuntimeClassSetLoader;