weapp-tailwindcss 5.1.1 → 5.1.3

package/dist/{webpack-CGgBOx9l.js → webpack-hvSFaicc.js}

@@ -1,23 +1,23 @@
-const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v4_engine = require("./v4-engine-ON_oSLfO.js");
-const require_generator = require("./generator-6oMJtTDO.js");
-const require_utils = require("./utils-BCa37Wqj.js");
-const require_context = require("./context-B6hVF7dr.js");
-const require_tailwindcss = require("./tailwindcss-dbrbY4cd.js");
-const require_hmr_timing = require("./hmr-timing-CegXR9O4.js");
-const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-BKYb9jxa.js");
+const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
+const require_v4_engine = require("./v4-engine-CKbS27-o.js");
+const require_generator = require("./generator-CV_0irKO.js");
+const require_utils = require("./utils-D3h8j7Mk.js");
+const require_context = require("./context-D75pwtBW.js");
+const require_tailwindcss = require("./tailwindcss-BSCvrs1p.js");
+const require_hmr_timing = require("./hmr-timing-DOoHun3i.js");
+const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-DzwebZrf.js");
 let node_fs = require("node:fs");
-node_fs = require_chunk.__toESM(node_fs);
+node_fs = require_rolldown_runtime.__toESM(node_fs);
 let node_path = require("node:path");
-node_path = require_chunk.__toESM(node_path);
+node_path = require_rolldown_runtime.__toESM(node_path);
 let node_process = require("node:process");
-node_process = require_chunk.__toESM(node_process);
+node_process = require_rolldown_runtime.__toESM(node_process);
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 let node_fs_promises = require("node:fs/promises");
 let micromatch = require("micromatch");
-micromatch = require_chunk.__toESM(micromatch);
+micromatch = require_rolldown_runtime.__toESM(micromatch);
 let node_module = require("node:module");
-node_module = require_chunk.__toESM(node_module);
+node_module = require_rolldown_runtime.__toESM(node_module);
 let _weapp_core_escape = require("@weapp-core/escape");
 let _weapp_tailwindcss_shared_node = require("@weapp-tailwindcss/shared/node");
 //#region src/shared/tailwindcss-css-redirect.ts
@@ -27,7 +27,7 @@ function installTailwindcssCssRedirect(pkgDir) {
 	const target = node_path.default.join(pkgDir, "index.css");
 	const original = moduleWithMutableResolve._resolveFilename;
 	if (patched.has(original)) return;
-	const replacements = new Set(["tailwindcss", "tailwindcss$"]);
+	const replacements = /* @__PURE__ */ new Set(["tailwindcss", "tailwindcss$"]);
 	const resolveTailwindcssCss = (request, parent, isMain, options) => {
 		if (replacements.has(request)) return target;
 		if (request.startsWith("tailwindcss/")) return node_path.default.join(pkgDir, request.slice(12));
@@ -404,6 +404,45 @@ function normalizeWebpackGeneratorCssSources(cssSources) {
 	const normalized = cssSources.filter((source) => typeof source?.css === "string" && source.css.length > 0);
 	return normalized.length > 0 ? normalized : void 0;
 }
+function scopeWebpackGeneratorOptionsToCssSource(compilerOptions, sourceFile, options = {}) {
+	const withoutCssEntries = () => ({
+		...compilerOptions,
+		...compilerOptions.cssEntries?.length ? { cssEntries: [] } : {},
+		tailwindcss: {
+			...compilerOptions.tailwindcss,
+			v4: {
+				...compilerOptions.tailwindcss?.v4,
+				...compilerOptions.tailwindcss?.v4?.cssEntries?.length || compilerOptions.cssEntries?.length ? { cssEntries: [] } : {}
+			}
+		}
+	});
+	if (!sourceFile) {
+		if (options.disableUnmatchedCssEntries !== true) return compilerOptions;
+		if (!compilerOptions.cssEntries?.length && !compilerOptions.tailwindcss?.v4?.cssEntries?.length) return compilerOptions;
+		return withoutCssEntries();
+	}
+	const resolvedSourceFile = node_path.default.resolve(sourceFile);
+	if (options.disableUnmatchedCssEntries === true) {
+		const configuredEntries = [...compilerOptions.cssEntries ?? [], ...compilerOptions.tailwindcss?.v4?.cssEntries ?? []];
+		if (configuredEntries.length > 0 && !configuredEntries.some((entry) => node_path.default.resolve(entry) === resolvedSourceFile)) return withoutCssEntries();
+	}
+	const cssEntries = compilerOptions.cssEntries?.filter((entry) => node_path.default.resolve(entry) === resolvedSourceFile);
+	const runtimeCssEntries = compilerOptions.tailwindcss?.v4?.cssEntries?.filter((entry) => node_path.default.resolve(entry) === resolvedSourceFile);
+	const hasScopedCssEntries = Boolean(cssEntries?.length);
+	const hasScopedRuntimeCssEntries = Boolean(runtimeCssEntries?.length);
+	if (!hasScopedCssEntries && !hasScopedRuntimeCssEntries) return compilerOptions;
+	return {
+		...compilerOptions,
+		...hasScopedCssEntries ? { cssEntries } : {},
+		tailwindcss: {
+			...compilerOptions.tailwindcss,
+			v4: {
+				...compilerOptions.tailwindcss?.v4,
+				...hasScopedRuntimeCssEntries ? { cssEntries: runtimeCssEntries } : hasScopedCssEntries ? { cssEntries } : {}
+			}
+		}
+	};
+}
 function hasProcessedCssAssetUrl(css) {
 	return /url\(\s*["']?data:/i.test(css);
 }
@@ -430,7 +469,7 @@ function collectWebpackAssetUserCssMarkers(source) {
 	} catch {}
 	return markers;
 }
-const WEBPACK_TAILWIND_GENERATED_LAYER_NAMES = new Set([
+const WEBPACK_TAILWIND_GENERATED_LAYER_NAMES = /* @__PURE__ */ new Set([
 	"theme",
 	"base",
 	"utilities"
@@ -793,6 +832,7 @@ function createWebpackCssSourceResolvers(options) {
 	const activeWebpackCssSourceFiles = /* @__PURE__ */ new Set();
 	const resolveConfiguredMainCssSourceFile = (file) => {
 		if (!isMainCssChunk(file)) return;
+		if (configuredMainCssEntryFiles.length !== 1) return;
 		for (const sourceFile of configuredMainCssEntryFiles) if (cssSources.has(sourceFile)) {
 			activeWebpackCssSourceFiles.add(sourceFile);
 			return sourceFile;
@@ -1770,7 +1810,9 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							if (require_hmr_timing.isPureLocalCssImportWrapper(currentRawSource)) return { result: new ConcatSource(require_v4_engine.removeTailwindSourceDirectives(require_source_candidate_scan_signature.stripBundlerGeneratedCssMarkers(currentRawSource), { importFallback: true })) };
 							const fallbackGeneratorRuntimeSet = getGeneratorRuntimeSet();
 							const hasExplicitTailwindV4SourceCss = sourceCss !== void 0 && (require_v4_engine.hasTailwindSourceDirectives(sourceCss, { importFallback: true }) || sourceCss.includes("@config"));
-							const shouldForceTailwindV4Generation = cssHandlerOptions.isMainChunk && hasConfiguredTailwindV4SourceRoots() && (configuredMainCssEntryFiles.length > 0 || require_v4_engine.hasTailwindRootDirectives(generatorRawSource, { importFallback: true }) || require_v4_engine.hasTailwindSourceDirectives(generatorRawSource, { importFallback: true }) || require_v4_engine.hasTailwindApplyDirective(generatorRawSource) || hasExplicitTailwindV4SourceCss);
+							const currentAssetHasTailwindDirectives = require_v4_engine.hasTailwindRootDirectives(generatorRawSource, { importFallback: true }) || require_v4_engine.hasTailwindSourceDirectives(generatorRawSource, { importFallback: true }) || require_v4_engine.hasTailwindApplyDirective(generatorRawSource);
+							const shouldForceTailwindV4Generation = cssHandlerOptions.isMainChunk && hasConfiguredTailwindV4SourceRoots() && (configuredMainCssEntryFiles.length > 0 || currentAssetHasTailwindDirectives || hasExplicitTailwindV4SourceCss);
+							const shouldSkipUnmatchedMainCssGeneration = !isWebGeneratorTarget && cssHandlerOptions.isMainChunk && sourceFile === void 0 && configuredMainCssEntryFiles.length > 0 && !currentAssetHasTailwindDirectives;
 							const resolvedScopedGeneratorRuntimeSet = await require_source_candidate_scan_signature.createScopedGeneratorRuntime({
 								cssHandlerOptions,
 								fallbackRuntime: hasExplicitTailwindV4SourceCss ? /* @__PURE__ */ new Set() : fallbackGeneratorRuntimeSet,
@@ -1782,8 +1824,9 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								sourceFile: sourceFile ?? file,
 								scopedSourceCandidateGetter: webpackSourceCandidates?.getSourceCandidatesForEntries
 							});
-							const scopedGeneratorRuntimeSet = !hasExplicitTailwindV4SourceCss && resolvedScopedGeneratorRuntimeSet !== fallbackGeneratorRuntimeSet ? new Set([...fallbackGeneratorRuntimeSet, ...resolvedScopedGeneratorRuntimeSet]) : resolvedScopedGeneratorRuntimeSet;
+							const scopedGeneratorRuntimeSet = !hasExplicitTailwindV4SourceCss && resolvedScopedGeneratorRuntimeSet !== fallbackGeneratorRuntimeSet ? /* @__PURE__ */ new Set([...fallbackGeneratorRuntimeSet, ...resolvedScopedGeneratorRuntimeSet]) : resolvedScopedGeneratorRuntimeSet;
 							const generatorCssSources = normalizeWebpackGeneratorCssSources(cssHandlerOptions.sourceOptions?.cssSources);
+							const scopedGeneratorCompilerOptions = scopeWebpackGeneratorOptionsToCssSource(compilerOptions, sourceFile, { disableUnmatchedCssEntries: !isWebGeneratorTarget && cssHandlerOptions.isMainChunk });
 							const generatorCssHandlerOptions = generatorCssSources === void 0 ? cssHandlerOptions : {
 								...cssHandlerOptions,
 								sourceOptions: {
@@ -1792,7 +1835,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								}
 							};
 							const generatorOptions = {
-								opts: compilerOptions,
+								opts: scopedGeneratorCompilerOptions,
 								runtimeState,
 								runtime: scopedGeneratorRuntimeSet,
 								rawSource: generatorRawSource,
@@ -1810,7 +1853,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								debug
 							};
 							let generated;
-							try {
+							if (!shouldSkipUnmatchedMainCssGeneration) try {
 								generated = await require_source_candidate_scan_signature.generateTailwindV4Css({
 									...generatorOptions,
 									outputFile: file
@@ -1824,6 +1867,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								debug("css generator skipped for plain webpack css asset: %s %O", file, error);
 								generated = void 0;
 							}
+							else debug("css generator skipped for unmatched webpack main css asset: %s", file);
 							const source = new ConcatSource(finalizeTracedCss(generated ? finalizeCssAssetSource(isWebGeneratorTarget && currentRawSource.includes("tailwindcss v4.") ? createWebpackGeneratorUserCssSourceAppend({
 								css: generated.css,
 								processed: true
@@ -1856,7 +1900,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			});
 			const activeCssFiles = new Set(groupedEntries.css.map(([file]) => file));
 			pruneWebpackCssHandlerOptionCaches(cssHandlerOptionsCache, cssUserHandlerOptionsCache, activeCssFiles);
-			if (activeCssFiles.size > 0) pruneWebpackCssSources?.(new Set([
+			if (activeCssFiles.size > 0) pruneWebpackCssSources?.(/* @__PURE__ */ new Set([
 				...registeredWebpackCssSourceFiles,
 				...activeWebpackCssSourceFiles,
 				...[...cssAssetResources.values()].flatMap((resources) => [...resources])
@@ -2002,7 +2046,11 @@ function setupWebpackV5Loaders(options) {
 			};
 			if (cssImportRewriteLoaderOptions && runtimeCssImportRewriteLoaderExists && runtimeCssImportRewriteLoader && isCssModule) {
 				const existingIndex = loaderEntries.findIndex((entry) => entry.loader?.includes?.(runtimeCssImportRewriteLoader));
-				const rewriteLoaderEntry = existingIndex !== -1 ? loaderEntries.splice(existingIndex, 1)[0] : createCssImportRewriteLoaderEntry();
+				const rewriteLoaderEntry = existingIndex !== -1 ? {
+					...loaderEntries.splice(existingIndex, 1)[0],
+					loader: runtimeCssImportRewriteLoader,
+					options: cssImportRewriteLoaderOptions
+				} : createCssImportRewriteLoaderEntry();
 				if (rewriteLoaderEntry) {
 					const anchorIndex = findRewriteAnchor(loaderEntries);
 					if (anchorIndex === -1) anchorlessInsert(rewriteLoaderEntry, "after");
@@ -2165,7 +2213,7 @@ var WeappTailwindcss = class {
 		};
 		const collectWatchChangedFiles = () => {
 			const compilerLike = compiler;
-			return new Set([...compilerLike.modifiedFiles ?? [], ...compilerLike.removedFiles ?? []]);
+			return /* @__PURE__ */ new Set([...compilerLike.modifiedFiles ?? [], ...compilerLike.removedFiles ?? []]);
 		};
 		const hasRuntimeDependencyChanges = (files) => {
 			for (const file of files) if (isWatchFileInRuntimeDependencies(file, {
@@ -2235,7 +2283,7 @@ var WeappTailwindcss = class {
 			const configuredSourceFiles = /* @__PURE__ */ new Set();
 			for (const entry of tailwindOptions?.v4?.cssEntries ?? []) configuredSourceFiles.add(node_path.default.resolve(entry));
 			for (const source of tailwindOptions?.v4?.cssSources ?? []) if (source.file) configuredSourceFiles.add(node_path.default.resolve(source.file));
-			const activeSourceFiles = new Set([
+			const activeSourceFiles = /* @__PURE__ */ new Set([
 				...configuredSourceFiles,
 				...currentWebpackCssSourceModules,
 				...activeAssetResources,

package/dist/webpack.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_webpack = require("./webpack-CGgBOx9l.js");
+const require_webpack = require("./webpack-hvSFaicc.js");
 exports.WeappTailwindcss = require_webpack.WeappTailwindcss;
 exports.weappTailwindcss = require_webpack.WeappTailwindcss;
 exports.weappTailwindcssPackageDir = require_webpack.weappTailwindcssPackageDir;

package/dist/webpack.mjs

@@ -1,2 +1,2 @@
-import { n as weappTailwindcssPackageDir, t as WeappTailwindcss } from "./webpack-8PaV1gG3.mjs";
+import { n as weappTailwindcssPackageDir, t as WeappTailwindcss } from "./webpack-DEag6ueE.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss, weappTailwindcssPackageDir };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -60,6 +60,11 @@
       "import": "./dist/webpack.mjs",
       "require": "./dist/webpack.js"
     },
+    "./rspack": {
+      "types": "./dist/rspack.d.ts",
+      "import": "./dist/rspack.mjs",
+      "require": "./dist/rspack.js"
+    },
     "./core": {
       "types": "./dist/core.d.ts",
       "import": "./dist/core.mjs",
@@ -177,7 +182,7 @@
     "@babel/traverse": "~7.29.7",
     "@babel/types": "~7.29.7",
     "@tailwindcss-mangle/engine": "0.1.1",
-    "@vue/compiler-dom": "^3.5.38",
+    "@vue/compiler-dom": "^3.5.39",
     "@weapp-core/escape": "~8.0.0",
     "comment-json": "^5.0.0",
     "debug": "~4.4.3",
@@ -189,10 +194,10 @@
     "semver": "~7.8.5",
     "yaml": "^2.9.0",
     "@weapp-tailwindcss/logger": "2.0.0",
-    "@weapp-tailwindcss/postcss": "3.1.1",
+    "@weapp-tailwindcss/postcss": "3.1.3",
     "@weapp-tailwindcss/reset": "0.1.1",
-    "tailwindcss-config": "2.0.0",
-    "@weapp-tailwindcss/shared": "2.0.0"
+    "@weapp-tailwindcss/shared": "2.0.0",
+    "tailwindcss-config": "2.0.0"
   },
   "devDependencies": {
     "htmlparser2": "12.0.0"