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

package/dist/{vite-BDywuCjn.mjs → vite-fDM-UQpR.mjs}

@@ -1,10 +1,10 @@
-import { d as filterUnsupportedMiniProgramTailwindV4Candidates, f as loadTailwindV4DesignSystem, i as normalizeWeappTailwindcssGeneratorOptions, s as resolveTailwindV4SourceFromPatcher } from "./generator-Y-Ikv4Fu.mjs";
-import { r as resolveTailwindcssOptions } from "./patcher-options-DQfR5xxT.mjs";
-import { _ as refreshTailwindRuntimeState, a as createAttributeMatcher, c as isClassContextLiteralPath, d as traverse$1, f as toCustomAttributesEntities, h as collectRuntimeClassSet, i as generateCode, l as replaceWxml, m as vitePluginName, n as shouldSkipJsTransform, o as analyzeSource, r as getCompilerContext, s as JsTokenUpdater, t as setupPatchRecorder, u as babelParse, v as createDebug } from "./recorder-XdFvVASS.mjs";
+import { d as filterUnsupportedMiniProgramTailwindV4Candidates, f as loadTailwindV4DesignSystem, i as normalizeWeappTailwindcssGeneratorOptions, s as resolveTailwindV4SourceFromPatcher } from "./generator-Dpp-5s8z.mjs";
+import { r as resolveTailwindcssOptions } from "./patcher-options-GuOwX0-k.mjs";
+import { _ as refreshTailwindRuntimeState, a as createAttributeMatcher, c as isClassContextLiteralPath, d as traverse$1, f as toCustomAttributesEntities, h as collectRuntimeClassSet, i as generateCode, l as replaceWxml, m as vitePluginName, n as shouldSkipJsTransform, o as analyzeSource, r as getCompilerContext, s as JsTokenUpdater, t as setupPatchRecorder, u as babelParse, v as createDebug } from "./recorder-BIW3Kuke.mjs";
 import { o as resolveUniUtsPlatform } from "./utils-7DUGTFED.mjs";
-import { a as resolveUniAppXOptions, d as getRuntimeClassSetSignature, i as isUniAppXEnabled, l as findNearestPackageRoot, o as findTailwindConfig, t as logger$1 } from "./logger-BoVx1Dbt.mjs";
-import { i as processCachedTask, n as hasTailwindGeneratedCssMarkers, r as hasTailwindSourceDirectives, t as generateCssByGenerator } from "./generator-css-Bwy_Uz89.mjs";
-import { a as resolveDisabledOptions, c as toAbsoluteOutputPath, i as resolvePackageDir, n as rewriteTailwindcssImportsInCode, o as normalizeOutputPathKey, r as pushConcurrentTaskFactories, s as resolveOutputSpecifier, t as resolveTailwindcssImport } from "./css-imports-CSdPq_Sc.mjs";
+import { a as resolveUniAppXOptions, d as getRuntimeClassSetSignature, i as isUniAppXEnabled, l as findNearestPackageRoot, o as findTailwindConfig, t as logger$1 } from "./logger-1gx9UllH.mjs";
+import { i as processCachedTask, n as hasTailwindGeneratedCssMarkers, r as hasTailwindSourceDirectives, t as generateCssByGenerator } from "./generator-css-MyjZhF0z.mjs";
+import { a as resolveOutputSpecifier, i as normalizeOutputPathKey, n as resolvePackageDir, o as toAbsoluteOutputPath, r as resolvePluginDisabledState, t as pushConcurrentTaskFactories } from "./run-tasks-DUVrDJGl.mjs";
 import path from "node:path";
 import process from "node:process";
 import { extractRawCandidatesWithPositions, extractValidCandidates } from "tailwindcss-patch";
@@ -504,6 +504,22 @@ function createUniAppXAssetTask(file, originalSource, outDir, options) {
 }
 //#endregion
 //#region src/bundlers/vite/css-finalizer.ts
+function isAddWatchFileInvalidRollupPhaseError$1(error) {
+	const candidate = error;
+	return candidate?.code === "INVALID_ROLLUP_PHASE" || candidate?.pluginCode === "INVALID_ROLLUP_PHASE" || candidate?.message?.includes("Cannot call \"addWatchFile\" after the build has finished.") === true;
+}
+function registerGeneratorDependencies$1(ctx, dependencies) {
+	if (typeof ctx.addWatchFile !== "function") return;
+	for (const dependency of dependencies ?? []) try {
+		ctx.addWatchFile(dependency);
+	} catch (error) {
+		if (isAddWatchFileInvalidRollupPhaseError$1(error)) {
+			logger.debug("跳过生成模式依赖监听注册，当前 Rollup 阶段不允许 addWatchFile: %s", dependency);
+			continue;
+		}
+		throw error;
+	}
+}
 function createCssHandlerOptions(opts, majorVersion, file) {
 	return {
 		isMainChunk: opts.mainCssChunkMatcher(file, opts.appType),
@@ -516,7 +532,7 @@ function shouldGenerateCssByGenerator(opts, file, rawSource, processed) {
 	return processed && shouldFinalizeProcessedCssAsset(opts, file);
 }
 function shouldFinalizeProcessedCssAsset(opts, file) {
-	return normalizeWeappTailwindcssGeneratorOptions(opts.generator).mode !== "off" && opts.mainCssChunkMatcher(file, opts.appType);
+	return opts.mainCssChunkMatcher(file, opts.appType);
 }
 function createViteCssFinalizerOutputPlugin(context) {
 	return {
@@ -555,6 +571,7 @@ function createViteCssFinalizerOutputPlugin(context) {
 					}) : void 0;
 					const nextCss = generated?.css ?? (await opts.styleHandler(rawSource, cssHandlerOptions)).css;
 					if (generated) {
+						registerGeneratorDependencies$1(this, generated.dependencies);
 						debug("css finalizer generated result: %s bytes=%d", file, nextCss.length);
 						recordCssAssetResult?.(file, nextCss);
 						if (cssHandlerOptions.isMainChunk) rememberMainCssSource?.(file, rawSource);
@@ -921,7 +938,7 @@ function createCssTransformShareScope(file, rawSource) {
 	return "global";
 }
 function createCssTransformShareScopeKey(opts, file, rawSource) {
-	if (normalizeWeappTailwindcssGeneratorOptions(opts.generator).mode === "force" && opts.mainCssChunkMatcher(file, opts.appType)) return `main:${normalizeOutputPathKey(file)}`;
+	if (opts.mainCssChunkMatcher(file, opts.appType)) return `main:${normalizeOutputPathKey(file)}`;
 	return createCssTransformShareScope(file, rawSource);
 }
 function createCssRuntimeSignature(runtimeSignature, generatorCandidateSignature) {
@@ -939,6 +956,22 @@ function createReplayCssAsset(fileName, source) {
 		originalFileNames: []
 	};
 }
+function isAddWatchFileInvalidRollupPhaseError(error) {
+	const candidate = error;
+	return candidate?.code === "INVALID_ROLLUP_PHASE" || candidate?.pluginCode === "INVALID_ROLLUP_PHASE" || candidate?.message?.includes("Cannot call \"addWatchFile\" after the build has finished.") === true;
+}
+function registerGeneratorDependencies(ctx, dependencies) {
+	if (typeof ctx.addWatchFile !== "function") return;
+	for (const dependency of dependencies ?? []) try {
+		ctx.addWatchFile(dependency);
+	} catch (error) {
+		if (isAddWatchFileInvalidRollupPhaseError(error)) {
+			logger.debug("跳过生成模式依赖监听注册，当前 Rollup 阶段不允许 addWatchFile: %s", dependency);
+			continue;
+		}
+		throw error;
+	}
+}
 function hasOmittedKnownBundleFiles(currentBundleFiles, previousBundleFiles) {
 	const currentFileSet = new Set(currentBundleFiles);
 	for (const file of previousBundleFiles) if (!currentFileSet.has(file)) return true;
@@ -976,6 +1009,7 @@ function createGenerateBundleHook(context) {
 	const cssHandlerOptionsCache = /* @__PURE__ */ new Map();
 	const cssUserHandlerOptionsCache = /* @__PURE__ */ new Map();
 	return async function generateBundle(_opt, bundle) {
+		const addWatchFile = (id) => this.addWatchFile?.(id);
 		const { opts, runtimeState, ensureBundleRuntimeClassSet, debug, getResolvedConfig, markCssAssetProcessed, recordCssAssetResult, getSourceCandidates, waitForSourceCandidateSyncs, rememberMainCssSource, getRememberedMainCssSources, getRememberedMainCssSignature, setRememberedMainCssSignature, recordGeneratorCandidates } = context;
 		const { appType, cache, mainCssChunkMatcher, onEnd, onStart, onUpdate, styleHandler, templateHandler, jsHandler, uniAppX } = opts;
 		const generatorOptions = normalizeWeappTailwindcssGeneratorOptions(opts.generator);
@@ -1035,7 +1069,7 @@ function createGenerateBundleHook(context) {
 		const shouldFilterTailwindV4MiniProgramCandidates = runtimeState.twPatcher.majorVersion === 4 && generatorOptions.target === "weapp";
 		await waitForSourceCandidateSyncs?.();
 		const sourceCandidates = getSourceCandidates?.() ?? /* @__PURE__ */ new Set();
-		const collectedGeneratorCandidates = generatorOptions.mode === "force" ? new Set(sourceCandidates) : new Set([...runtime, ...sourceCandidates]);
+		const collectedGeneratorCandidates = new Set(sourceCandidates);
 		const generatorRuntime = collectLegacyContainerCompatCandidates(sourceCandidates, shouldFilterTailwindV4MiniProgramCandidates ? filterUnsupportedMiniProgramTailwindV4Candidates(collectedGeneratorCandidates) : collectedGeneratorCandidates);
 		const generatorCandidateSignature = createCandidateSignature(generatorRuntime);
 		recordGeneratorCandidates?.(generatorRuntime);
@@ -1157,6 +1191,7 @@ function createGenerateBundleHook(context) {
 								debug
 							});
 							if (generated) {
+								registerGeneratorDependencies({ addWatchFile }, generated.dependencies);
 								if (debugCssDiff) debug("css diff %s: %s", file, summarizeStringDiff(rawSource, generated.css));
 								debug("css generated result: %s bytes=%d", file, generated.css.length);
 								recordCssAssetResult?.(file, generated.css);
@@ -1280,7 +1315,7 @@ function createGenerateBundleHook(context) {
 			}
 		}
 		const cssRuntimeSignature = createCssRuntimeSignature(runtimeSignature, generatorCandidateSignature);
-		if (useIncrementalMode && generatorOptions.mode !== "off") for (const [file, rawSource] of getRememberedMainCssSources?.() ?? []) {
+		if (useIncrementalMode) for (const [file, rawSource] of getRememberedMainCssSources?.() ?? []) {
 			if (bundleFiles.includes(file) || getRememberedMainCssSignature?.(file) === cssRuntimeSignature) continue;
 			tasks.push((async () => {
 				const start = performance.now();
@@ -1299,6 +1334,7 @@ function createGenerateBundleHook(context) {
 				const css = generated?.css ?? (await styleHandler(rawSource, cssHandlerOptions)).css;
 				setRememberedMainCssSignature?.(file, cssRuntimeSignature);
 				if (generated) {
+					registerGeneratorDependencies({ addWatchFile }, generated.dependencies);
 					recordCssAssetResult?.(file, generated.css);
 					debug("css replay generated result: %s bytes=%d", file, css.length);
 				}
@@ -1551,6 +1587,34 @@ function resolveImplicitAppTypeFromViteRoot(root) {
 	}
 }
 //#endregion
+//#region src/bundlers/shared/css-imports.ts
+const tailwindcssImportRE = /^tailwindcss(?:\/.*)?$/;
+const tailwindcssCssImportStatementRE = /(@import\s+(?:url\(\s*)?)(["'])(tailwindcss(?:\/[^"']*)?\$?)(\2\s*\)?)/gi;
+function normalizeTailwindcssSpecifier(specifier) {
+	if (specifier === "tailwindcss$") return "tailwindcss";
+	return specifier;
+}
+function getTailwindcssSubpath(specifier) {
+	if (specifier === "tailwindcss") return "index.css";
+	return specifier.slice(12);
+}
+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";
+	return (options?.join ?? path.join)(pkgDir, getTailwindcssSubpath(normalized));
+}
+function rewriteTailwindcssImportsInCode(code, pkgDir, options) {
+	let hasReplacements = false;
+	const rewritten = code.replace(tailwindcssCssImportStatementRE, (full, prefix, quote, specifier, suffix) => {
+		const replacement = resolveTailwindcssImport(specifier, pkgDir, options);
+		if (!replacement) return full;
+		hasReplacements = true;
+		return `${prefix}${quote}${replacement}${suffix}`;
+	});
+	return hasReplacements ? rewritten : void 0;
+}
+//#endregion
 //#region src/bundlers/vite/rewrite-css-imports.ts
 function joinPosixPath(base, subpath) {
 	if (base.endsWith("/")) return `${base}${subpath}`;
@@ -1561,9 +1625,12 @@ function isCssLikeImporter(importer) {
 	const normalized = cleanUrl$1(importer);
 	return isCSSRequest(normalized) || normalized.endsWith("/*");
 }
+function stripTailwindConfigDirectives(code) {
+	return code.replace(/^\s*@config\s+(?:"[^"]+"|'[^']+')[^;\n]*;\s*$/gm, "");
+}
 function createRewriteCssImportsPlugins(options) {
 	if (!options.shouldRewrite) return [];
-	const { appType, getAppType, rootImport, weappTailwindcssDirPosix } = options;
+	const { appType, getAppType, rootImport, shouldOwnTailwindGeneration, weappTailwindcssDirPosix } = options;
 	const resolveAppType = () => getAppType?.() ?? appType;
 	return [{
 		name: `${vitePluginName}:rewrite-css-imports`,
@@ -1590,9 +1657,10 @@ function createRewriteCssImportsPlugins(options) {
 					appType: resolveAppType(),
 					rootImport
 				});
-				if (!rewritten) return null;
+				const nextCode = shouldOwnTailwindGeneration ? stripTailwindConfigDirectives(rewritten ?? code) : rewritten;
+				if (!nextCode || nextCode === code) return null;
 				return {
-					code: rewritten,
+					code: nextCode,
 					map: null
 				};
 			}
@@ -1856,24 +1924,24 @@ function resolveImplicitTailwindcssBasedirFromViteRoot(root) {
 	return resolvedRoot;
 }
 /**
-* @name UnifiedViteWeappTailwindcssPlugin
+* @name WeappTailwindcss
 * @description uni-app vite / uni-app-x 版本插件
 * @link https://tw.icebreaker.top/docs/quick-start/frameworks/uni-app-vite
 */
-function UnifiedViteWeappTailwindcssPlugin(options = {}) {
+function WeappTailwindcss(options = {}) {
 	const hasExplicitAppType = typeof options.appType === "string" && options.appType.trim().length > 0;
-	const rewriteCssImportsSpecified = Object.hasOwn(options, "rewriteCssImports");
 	const hasExplicitTailwindcssBasedir = typeof options.tailwindcssBasedir === "string" && options.tailwindcssBasedir.trim().length > 0;
 	const opts = getCompilerContext(options);
 	const { disabled, customAttributes, onLoad, mainCssChunkMatcher, styleHandler, jsHandler, twPatcher: initialTwPatcher, refreshTailwindcssPatcher, uniAppX, disabledDefaultTemplateHandler } = opts;
 	const uniAppXEnabled = isUniAppXEnabled(uniAppX);
-	const disabledOptions = resolveDisabledOptions(disabled);
+	const disabledOptions = resolvePluginDisabledState(disabled);
 	const tailwindcssMajorVersion = initialTwPatcher.majorVersion ?? 0;
-	const shouldOwnTailwindGeneration = normalizeWeappTailwindcssGeneratorOptions(opts.generator).mode !== "off" && !disabledOptions.plugin;
-	const shouldRewriteCssImports = opts.rewriteCssImports !== false && !disabledOptions.rewriteCssImports && (rewriteCssImportsSpecified || tailwindcssMajorVersion >= 4);
+	const shouldOwnTailwindGeneration = !disabledOptions.plugin;
+	const shouldRewriteCssImports = tailwindcssMajorVersion >= 4;
 	const rewritePlugins = createRewriteCssImportsPlugins({
 		getAppType: () => opts.appType,
 		rootImport: shouldOwnTailwindGeneration ? `${weappTailwindcssDirPosix}/generator-placeholder.css` : void 0,
+		shouldOwnTailwindGeneration,
 		shouldRewrite: shouldRewriteCssImports,
 		weappTailwindcssDirPosix
 	});
@@ -1910,8 +1978,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
 			uniAppX: uniAppXEnabled,
 			customAttributesEntities,
 			disabledDefaultTemplateHandler,
-			configPath,
-			rewriteCssImports: shouldRewriteCssImports
+			configPath
 		});
 		const changed = signature !== runtimeRefreshSignature || optionsKey !== runtimeRefreshOptionsKey;
 		runtimeRefreshSignature = signature;
@@ -2183,4 +2250,4 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
 	return plugins;
 }
 //#endregion
-export { UnifiedViteWeappTailwindcssPlugin as t };
+export { WeappTailwindcss as t };

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-DgRh_GXn.js");
-exports.UnifiedViteWeappTailwindcssPlugin = require_vite.UnifiedViteWeappTailwindcssPlugin;
-exports.WeappTailwindcss = require_vite.UnifiedViteWeappTailwindcssPlugin;
-exports.weappTailwindcss = require_vite.UnifiedViteWeappTailwindcssPlugin;
+const require_vite = require("./vite-BkMGwDeH.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-BDywuCjn.mjs";
-export { UnifiedViteWeappTailwindcssPlugin, UnifiedViteWeappTailwindcssPlugin as WeappTailwindcss, UnifiedViteWeappTailwindcssPlugin as weappTailwindcss };
+import { t as WeappTailwindcss } from "./vite-fDM-UQpR.mjs";
+export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };

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

@@ -47,7 +47,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), {