weapp-tailwindcss 5.0.0-next.26 → 5.0.0-next.27

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

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_runtime_registry = require("./runtime-registry-CdCV3Opt.js");
+const require_runtime_registry = require("./runtime-registry-DpcR3IHI.js");
 let node_buffer = require("node:buffer");
 let node_process = require("node:process");
 node_process = require_runtime_registry.__toESM(node_process);
@@ -11,11 +11,11 @@ let node_path = require("node:path");
 node_path = require_runtime_registry.__toESM(node_path);
 let node_util = require("node:util");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
+let tailwindcss_patch = require("tailwindcss-patch");
 let node_fs = require("node:fs");
 node_fs = require_runtime_registry.__toESM(node_fs);
 let node_module = require("node:module");
 let _weapp_tailwindcss_logger = require("@weapp-tailwindcss/logger");
-let tailwindcss_patch = require("tailwindcss-patch");
 let node_url = require("node:url");
 let debug = require("debug");
 debug = require_runtime_registry.__toESM(debug);
@@ -4615,6 +4615,16 @@ function mergeScopedRuntimeWithCurrentRuntime(scopedRuntime, runtime, options) {
 function shouldIsolateMatchedCssSource(source, sourceEntries) {
 	return Boolean(source.__weappTailwindcssMeta?.matchedCssSourceFile && sourceEntries !== void 0);
 }
+function shouldScanTailwindV4Sources(majorVersion, target, generatorRuntime, isolateCssSource) {
+	if (majorVersion !== 4 || isolateCssSource) return false;
+	return target === "web" || generatorRuntime.size === 0;
+}
+function shouldAppendWebBundleCssFallback(target, options) {
+	return target === "web" && !options.hasMatchedCssSourceFile && !options.hasSourceDirectives;
+}
+function isEmptyCssSourceOrderParts(parts) {
+	return parts.before.trim().length === 0 && parts.after.trim().length === 0;
+}
 function resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorStyleOptions) {
 	const preflightStyleOptions = {
 		cssPreflight: opts.cssPreflight,
@@ -4754,9 +4764,11 @@ async function generateCssByGenerator(options) {
 	if (!SUPPORTED_GENERATOR_MAJOR_VERSIONS.has(majorVersion ?? 0) || !shouldGenerateCurrentCss || majorVersion === 3 && !hasSourceDirectives && !hasGeneratedCss && !hasGeneratedMarkers) return;
 	try {
 		await runtimeState.readyPromise;
+		const currentCssCandidates = majorVersion === 4 ? await (0, tailwindcss_patch.extractSourceCandidates)(effectiveRawSource, "css") : [];
+		const runtimeWithCurrentCss = currentCssCandidates.length > 0 ? new Set([...runtime, ...currentCssCandidates]) : runtime;
 		const sources = await resolveGeneratorSources(majorVersion, runtimeState, effectiveRawSource, file, cssHandlerOptions, generatorOptions, {
 			getSourceCandidatesForEntries,
-			runtime
+			runtime: runtimeWithCurrentCss
 		});
 		const generatorStyleOptions = resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorOptions.styleOptions);
 		const configuredContainerCompat = hasConfiguredContainerCompatSources(sources);
@@ -4765,15 +4777,15 @@ async function generateCssByGenerator(options) {
 			const sourceEntries = getSourceCandidatesForEntries && majorVersion === 4 ? await resolveGeneratorSourceEntries(source, runtimeState) : void 0;
 			const scopedRuntime = sourceEntries ? getSourceCandidatesForEntries?.(sourceEntries) : void 0;
 			const isolateCssSource = shouldIsolateMatchedCssSource(source, sourceEntries);
-			const sourceRuntime = scopedRuntime && (scopedRuntime.size > 0 || isolateCssSource) ? mergeScopedRuntimeWithCurrentRuntime(scopedRuntime, runtime, {
+			const sourceRuntime = scopedRuntime && (scopedRuntime.size > 0 || isolateCssSource) ? mergeScopedRuntimeWithCurrentRuntime(scopedRuntime, runtimeWithCurrentCss, {
 				cssHandlerOptions,
 				isolateCssSource
-			}) : runtime;
+			}) : runtimeWithCurrentCss;
 			const generatorRuntime = majorVersion === 4 && generatorOptions.target === "weapp" ? filterUnsupportedMiniProgramTailwindV4Candidates(sourceRuntime) : sourceRuntime;
 			return generator.generate({
 				candidates: generatorRuntime,
 				incrementalCache: majorVersion === 3 || majorVersion === 4,
-				scanSources: majorVersion === 4 && generatorRuntime.size === 0 && !isolateCssSource,
+				scanSources: shouldScanTailwindV4Sources(majorVersion, generatorOptions.target, generatorRuntime, isolateCssSource),
 				styleOptions: generatorStyleOptions,
 				tailwindcssV3Compatibility: generatorOptions.tailwindcssV3Compatibility,
 				target: generatorOptions.target
@@ -4819,6 +4831,13 @@ async function generateCssByGenerator(options) {
 			const beforeUserCss = await transformGeneratorUserCss(orderedExtraCss.before, userCssOptions);
 			const afterUserCss = await transformGeneratorUserCss(orderedExtraCss.after, userCssOptions);
 			css = createCssSourceOrderAppend(createCssSourceOrderAppend(beforeUserCss, css), afterUserCss);
+			if (isEmptyCssSourceOrderParts(orderedExtraCss) && shouldAppendWebBundleCssFallback(generated.target, {
+				hasSourceDirectives,
+				hasMatchedCssSourceFile
+			})) {
+				const userCss = await transformGeneratorUserCss(effectiveRawSource, userCssOptions);
+				css = createCssSourceOrderAppend(css, userCss);
+			}
 			if (generated.target === "weapp") {
 				css = await appendLegacyCompatCss(css, effectiveRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 				css = await appendLegacyContainerCompatCss(css, effectiveRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
@@ -4833,12 +4852,27 @@ async function generateCssByGenerator(options) {
 		debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
 		let css = stripTailwindBanner(generated.css);
 		if (generated.target === "weapp") css = inheritLegacyUnitConvertedDeclarations(css, effectiveRawSource);
-		if (hasMatchedCssSourceFile || generated.target === "web") return {
-			css: finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight),
-			target: generated.target,
-			source: "generator",
-			dependencies: generated.dependencies
-		};
+		if (hasMatchedCssSourceFile || generated.target === "web") {
+			if (shouldAppendWebBundleCssFallback(generated.target, {
+				hasSourceDirectives,
+				hasMatchedCssSourceFile
+			})) {
+				const userCss = await transformGeneratorUserCss(effectiveRawSource, {
+					generatorTarget: generated.target,
+					generatorStyleOptions,
+					cssUserHandlerOptions,
+					styleHandler,
+					importFallback: generatorOptions.importFallback
+				});
+				css = createCssSourceOrderAppend(css, userCss);
+			}
+			return {
+				css: finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight),
+				target: generated.target,
+				source: "generator",
+				dependencies: generated.dependencies
+			};
+		}
 		css = await appendLegacyCompatCss(css, effectiveRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 		css = await appendLegacyContainerCompatCss(css, effectiveRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 		return {

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

@@ -1,4 +1,4 @@
-const require_runtime_registry = require("./runtime-registry-CdCV3Opt.js");
+const require_runtime_registry = require("./runtime-registry-DpcR3IHI.js");
 let node_buffer = require("node:buffer");
 let node_process = require("node:process");
 node_process = require_runtime_registry.__toESM(node_process);

package/dist/{webpack-D--XZMBB.mjs → webpack-BdrjJf41.mjs}

@@ -1,10 +1,10 @@
-import { B as createDebug, W as resolveTailwindcssOptions, l as getRuntimeClassSetSignature } from "./v3-engine-CPJ9uGyr.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-iI_265gt.mjs";
-import { i as generateCssByGenerator, o as processCachedTask, r as emitHmrTiming, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-ECHyKwUL.mjs";
-import { b as refreshTailwindRuntimeState, d as _defineProperty, i as pluginName, n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise, y as ensureRuntimeClassSet } from "./precheck-BI8oBeUg.mjs";
-import { r as getGroupedEntries } from "./utils-B2SJgA1L.mjs";
-import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-DFa5Yes8.mjs";
-import { _ as stripRequestQuery, b as toAbsoluteOutputPath, d as resolvePluginDisabledState, g as isSourceStyleRequest, l as stripBundlerGeneratedCssMarkers, n as createBundleBuildState, o as pushConcurrentTaskFactories, r as updateBundleBuildState, t as buildBundleSnapshot, u as resolvePackageDir, y as resolveOutputSpecifier } from "./bundle-state-CWcrb3mH.mjs";
+import { B as createDebug, W as resolveTailwindcssOptions, l as getRuntimeClassSetSignature } from "./v3-engine-DcvCCHfs.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-CbpjNxJh.mjs";
+import { i as generateCssByGenerator, o as processCachedTask, r as emitHmrTiming, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-C4JgSgRY.mjs";
+import { b as refreshTailwindRuntimeState, d as _defineProperty, i as pluginName, n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise, y as ensureRuntimeClassSet } from "./precheck-uG16Cqaj.mjs";
+import { r as getGroupedEntries } from "./utils-DsaS975I.mjs";
+import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-C7dJHZ0G.mjs";
+import { _ as stripRequestQuery, b as toAbsoluteOutputPath, d as resolvePluginDisabledState, g as isSourceStyleRequest, l as stripBundlerGeneratedCssMarkers, n as createBundleBuildState, o as pushConcurrentTaskFactories, r as updateBundleBuildState, t as buildBundleSnapshot, u as resolvePackageDir, y as resolveOutputSpecifier } from "./bundle-state-7DRnJcJp.mjs";
 import Module, { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";
@@ -268,6 +268,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 	const { compiler, options: compilerOptions, appType, runtimeState, getRuntimeRefreshRequirement, refreshRuntimeMetadata, isWebpackProcessedCssAsset, consumeRuntimeRefreshRequirement, isWatchMode, runtimeClassSetManager, debug } = options;
 	const { Compilation, sources } = compiler.webpack;
 	const { ConcatSource } = sources;
+	const isWebGeneratorTarget = compilerOptions.generator?.target === "web";
 	const cssHandlerOptionsCache = /* @__PURE__ */ new Map();
 	const cssUserHandlerOptionsCache = /* @__PURE__ */ new Map();
 	const bundleBuildState = createBundleBuildState();
@@ -391,7 +392,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			const defaultTemplateHandlerOptions = { runtimeSet };
 			debug("get runtimeSet, class count: %d", runtimeSet.size);
 			const tasks = [];
-			if (Array.isArray(groupedEntries.html)) for (const element of groupedEntries.html) {
+			if (!isWebGeneratorTarget && Array.isArray(groupedEntries.html)) for (const element of groupedEntries.html) {
 				const [file, originalSource] = element;
 				const rawSource = originalSource.source().toString();
 				const cacheKey = file;
@@ -418,7 +419,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				}));
 			}
 			const jsTaskFactories = [];
-			if (Array.isArray(groupedEntries.js)) for (const [file] of groupedEntries.js) {
+			if (!isWebGeneratorTarget && Array.isArray(groupedEntries.js)) for (const [file] of groupedEntries.js) {
 				const cacheKey = getCacheKey(file);
 				const asset = compilation.getAsset(file);
 				if (!asset) continue;
@@ -533,7 +534,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 	});
 }
 //#endregion
-//#region ../../node_modules/.pnpm/tsdown@0.22.0_oxc-resolver@11.19.1_@emnapi+core@1.10.0_@emnapi+runtime@1.10.0__tsx@4.22_d9b0fe6ae33481a579c49980b4e80572/node_modules/tsdown/esm-shims.js
+//#region ../../node_modules/.pnpm/tsdown@0.22.1_oxc-resolver@11.19.1_@emnapi+core@1.10.0_@emnapi+runtime@1.10.0__tsx@4.22_e88dc79be62bec44963bb28b0067a399/node_modules/tsdown/esm-shims.js
 const getFilename = () => fileURLToPath(import.meta.url);
 const getDirname = () => path.dirname(getFilename());
 const __dirname = /* @__PURE__ */ getDirname();
@@ -669,11 +670,11 @@ function setupWebpackV5Loaders(options) {
 const debug = createDebug();
 const weappTailwindcssPackageDir = resolvePackageDir("weapp-tailwindcss");
 /**
-* @name UnifiedWebpackPluginV5
+* @name WeappTailwindcss
 * @description webpack5 核心转义插件
 * @link https://tw.icebreaker.top/docs/intro
 */
-var UnifiedWebpackPluginV5 = class {
+var WeappTailwindcss = class {
 	constructor(options = {}) {
 		_defineProperty(this, "options", void 0);
 		_defineProperty(this, "appType", void 0);
@@ -836,4 +837,4 @@ var UnifiedWebpackPluginV5 = class {
 	}
 };
 //#endregion
-export { weappTailwindcssPackageDir as n, UnifiedWebpackPluginV5 as t };
+export { weappTailwindcssPackageDir as n, WeappTailwindcss as t };

package/dist/{webpack-CfcuDhQ8.js → webpack-BzPDhzSz.js}

@@ -1,11 +1,11 @@
-const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-CGsbY81C.js");
-const require_generator = require("./generator-BH6a0xuB.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-mY0v1k-Y.js");
-const require_precheck = require("./precheck-DLJg0_pu.js");
-const require_utils = require("./utils-CSA174-I.js");
-const require_tailwindcss = require("./tailwindcss-Cm93idme.js");
-const require_bundle_state = require("./bundle-state-uCtqRm0p.js");
+const require_chunk = require("./chunk-D6vf50IK.js");
+const require_v3_engine = require("./v3-engine-B_33V3Lu.js");
+const require_generator = require("./generator-DRNbzjx5.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-BQPhkSov.js");
+const require_precheck = require("./precheck-B6xigu7s.js");
+const require_utils = require("./utils-nta4tfFs.js");
+const require_tailwindcss = require("./tailwindcss-DEEtJf4u.js");
+const require_bundle_state = require("./bundle-state-Nn90UQDa.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_module = require("node:module");
@@ -272,6 +272,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 	const { compiler, options: compilerOptions, appType, runtimeState, getRuntimeRefreshRequirement, refreshRuntimeMetadata, isWebpackProcessedCssAsset, consumeRuntimeRefreshRequirement, isWatchMode, runtimeClassSetManager, debug } = options;
 	const { Compilation, sources } = compiler.webpack;
 	const { ConcatSource } = sources;
+	const isWebGeneratorTarget = compilerOptions.generator?.target === "web";
 	const cssHandlerOptionsCache = /* @__PURE__ */ new Map();
 	const cssUserHandlerOptionsCache = /* @__PURE__ */ new Map();
 	const bundleBuildState = require_bundle_state.createBundleBuildState();
@@ -395,7 +396,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			const defaultTemplateHandlerOptions = { runtimeSet };
 			debug("get runtimeSet, class count: %d", runtimeSet.size);
 			const tasks = [];
-			if (Array.isArray(groupedEntries.html)) for (const element of groupedEntries.html) {
+			if (!isWebGeneratorTarget && Array.isArray(groupedEntries.html)) for (const element of groupedEntries.html) {
 				const [file, originalSource] = element;
 				const rawSource = originalSource.source().toString();
 				const cacheKey = file;
@@ -422,7 +423,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				}));
 			}
 			const jsTaskFactories = [];
-			if (Array.isArray(groupedEntries.js)) for (const [file] of groupedEntries.js) {
+			if (!isWebGeneratorTarget && Array.isArray(groupedEntries.js)) for (const [file] of groupedEntries.js) {
 				const cacheKey = getCacheKey(file);
 				const asset = compilation.getAsset(file);
 				if (!asset) continue;
@@ -668,11 +669,11 @@ function setupWebpackV5Loaders(options) {
 const debug = require_v3_engine.createDebug();
 const weappTailwindcssPackageDir = require_bundle_state.resolvePackageDir("weapp-tailwindcss");
 /**
-* @name UnifiedWebpackPluginV5
+* @name WeappTailwindcss
 * @description webpack5 核心转义插件
 * @link https://tw.icebreaker.top/docs/intro
 */
-var UnifiedWebpackPluginV5 = class {
+var WeappTailwindcss = class {
 	constructor(options = {}) {
 		require_precheck._defineProperty(this, "options", void 0);
 		require_precheck._defineProperty(this, "appType", void 0);
@@ -835,10 +836,10 @@ var UnifiedWebpackPluginV5 = class {
 	}
 };
 //#endregion
-Object.defineProperty(exports, "UnifiedWebpackPluginV5", {
+Object.defineProperty(exports, "WeappTailwindcss", {
 	enumerable: true,
 	get: function() {
-		return UnifiedWebpackPluginV5;
+		return WeappTailwindcss;
 	}
 });
 Object.defineProperty(exports, "weappTailwindcssPackageDir", {

package/dist/webpack.d.ts

@@ -1,4 +1,2 @@
-export * from './bundlers/webpack/index';
-export { UnifiedWebpackPluginV5 as WeappTailwindcss } from './bundlers/webpack/index';
-export { UnifiedWebpackPluginV5 as weappTailwindcss } from './bundlers/webpack/index';
+export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss, weappTailwindcssPackageDir, } from './bundlers/webpack/index';
 export type { UserDefinedOptions } from './types';

package/dist/webpack.js

@@ -1,6 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_webpack = require("./webpack-CfcuDhQ8.js");
-exports.UnifiedWebpackPluginV5 = require_webpack.UnifiedWebpackPluginV5;
-exports.WeappTailwindcss = require_webpack.UnifiedWebpackPluginV5;
-exports.weappTailwindcss = require_webpack.UnifiedWebpackPluginV5;
+const require_webpack = require("./webpack-BzPDhzSz.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 UnifiedWebpackPluginV5 } from "./webpack-D--XZMBB.mjs";
-export { UnifiedWebpackPluginV5, UnifiedWebpackPluginV5 as WeappTailwindcss, UnifiedWebpackPluginV5 as weappTailwindcss, weappTailwindcssPackageDir };
+import { n as weappTailwindcssPackageDir, t as WeappTailwindcss } from "./webpack-BdrjJf41.mjs";
+export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss, weappTailwindcssPackageDir };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.0.0-next.26",
+  "version": "5.0.0-next.27",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -179,16 +179,16 @@
     "debug": "~4.4.3",
     "fast-glob": "^3.3.3",
     "local-pkg": "^1.2.1",
-    "lru-cache": "11.5.0",
+    "lru-cache": "11.5.1",
     "magic-string": "0.30.21",
     "micromatch": "^4.0.8",
     "postcss-load-config": "^6.0.1",
     "semver": "~7.8.1",
     "tailwindcss-patch": "9.3.7",
     "yaml": "^2.9.0",
-    "@weapp-tailwindcss/postcss": "3.0.0-next.8",
-    "@weapp-tailwindcss/reset": "0.1.1-next.1",
     "@weapp-tailwindcss/logger": "2.0.0-next.0",
+    "@weapp-tailwindcss/reset": "0.1.1-next.1",
+    "@weapp-tailwindcss/postcss": "3.0.0-next.8",
     "@weapp-tailwindcss/shared": "2.0.0-next.0",
     "tailwindcss-config": "2.0.0-next.2"
   },