weapp-tailwindcss 5.2.10 → 5.2.12

package/dist/{style-options-COpQc8fr.cjs → style-options-D0NukP02.cjs}

@@ -1,17 +1,18 @@
-const require_generator = require("./generator-B0dCFlP1.cjs");
-const require_options = require("./options-zpZez7qe.cjs");
+const require_generator = require("./generator-CwMI20jy.cjs");
+const require_options = require("./options-CSqLm6U2.cjs");
 //#region src/context/style-options.ts
 function normalizeStyleHandlerMajorVersion(majorVersion) {
 	return majorVersion === 4 ? 4 : void 0;
 }
 function resolveStyleOptionsFromContext(ctx, tailwindcssMajorVersion) {
 	const resolvedUniAppXOptions = require_options.resolveUniAppXOptions(ctx.uniAppX);
-	const branch = require_generator.resolveGeneratorRuntimeBranch(require_generator.normalizeWeappTailwindcssGeneratorOptions(ctx.generator, {
+	const generatorOptions = require_generator.normalizeWeappTailwindcssGeneratorOptions(ctx.generator, {
 		appType: ctx.appType,
 		platform: ctx.cssOptions?.platform ?? ctx.platform,
 		tailwindcssMajorVersion,
 		uniAppX: resolvedUniAppXOptions
-	}), {
+	});
+	const branch = require_generator.resolveGeneratorRuntimeBranch(generatorOptions, {
 		appType: ctx.appType,
 		platform: ctx.cssOptions?.platform ?? ctx.platform,
 		tailwindcssMajorVersion,
@@ -27,7 +28,9 @@ function resolveStyleOptionsFromContext(ctx, tailwindcssMajorVersion) {
 		cssSelectorReplacement: ctx.cssOptions?.cssSelectorReplacement ?? ctx.cssSelectorReplacement,
 		rem2rpx,
 		cssRemoveProperty: ctx.cssOptions?.cssRemoveProperty ?? ctx.cssRemoveProperty,
+		cssRemoveActivePseudoClass: ctx.cssOptions?.cssRemoveActivePseudoClass ?? ctx.cssRemoveActivePseudoClass,
 		cssRemoveHoverPseudoClass: ctx.cssOptions?.cssRemoveHoverPseudoClass ?? ctx.cssRemoveHoverPseudoClass,
+		cssRemoveFocusPseudoClass: ctx.cssOptions?.cssRemoveFocusPseudoClass ?? ctx.cssRemoveFocusPseudoClass,
 		tailwindcssV4GradientFallback: ctx.cssOptions?.tailwindcssV4GradientFallback ?? ctx.tailwindcssV4GradientFallback,
 		cssPresetEnv: ctx.cssOptions?.cssPresetEnv ?? ctx.cssPresetEnv,
 		atRules: ctx.cssOptions?.atRules ?? ctx.atRules,
@@ -49,7 +52,9 @@ function resolveStyleOptionsFromContext(ctx, tailwindcssMajorVersion) {
 		rem2rpx: cssOptions.rem2rpx,
 		...hasCssOptions ? { cssOptions } : {},
 		cssRemoveProperty: cssOptions.cssRemoveProperty,
+		cssRemoveActivePseudoClass: cssOptions.cssRemoveActivePseudoClass,
 		cssRemoveHoverPseudoClass: cssOptions.cssRemoveHoverPseudoClass,
+		cssRemoveFocusPseudoClass: cssOptions.cssRemoveFocusPseudoClass,
 		tailwindcssV4GradientFallback: cssOptions.tailwindcssV4GradientFallback,
 		cssPresetEnv: cssOptions.cssPresetEnv,
 		atRules: cssOptions.atRules,

package/dist/{tailwindcss-LtnGCxF0.cjs → tailwindcss-B3lqgbln.cjs}

@@ -1,7 +1,7 @@
-const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
-const require_generator = require("./generator-B0dCFlP1.cjs");
-const require_object = require("./object-C_Vr6_S5.cjs");
-const require_options = require("./options-zpZez7qe.cjs");
+const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
+const require_generator = require("./generator-CwMI20jy.cjs");
+const require_object = require("./object-DbHtAXRk.cjs");
+const require_options = require("./options-CSqLm6U2.cjs");
 require("./utils-CuKLf1Zv.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
@@ -80,7 +80,8 @@ async function collectTailwindV4TrackedSourceFiles(tailwindRuntime) {
 	const files = /* @__PURE__ */ new Set();
 	for (const cssEntry of tailwindOptions?.v4?.cssEntries ?? []) {
 		if (!(0, node_fs.existsSync)(cssEntry)) continue;
-		const resolved = await require_options.resolveTailwindV4EntriesFromCssCached((0, node_fs.readFileSync)(cssEntry, "utf8"), node_path.default.dirname(cssEntry));
+		const css = (0, node_fs.readFileSync)(cssEntry, "utf8");
+		const resolved = await require_options.resolveTailwindV4EntriesFromCssCached(css, node_path.default.dirname(cssEntry));
 		const expanded = resolved?.entries?.length ? await require_generator.expandTailwindSourceEntries(resolved.entries) : [];
 		for (const file of expanded) files.add(file);
 	}
@@ -536,10 +537,11 @@ function createTailwindcssRuntime(options) {
 	};
 	const normalizedBasedir = basedir ? node_path.default.resolve(basedir) : void 0;
 	const cacheRoot = require_generator.findNearestPackageRoot(normalizedBasedir) ?? normalizedBasedir ?? node_process.default.cwd();
-	if (cacheDir) if (node_path.default.isAbsolute(cacheDir)) cache.dir = cacheDir;
-	else if (normalizedBasedir) cache.dir = node_path.default.resolve(normalizedBasedir, cacheDir);
-	else cache.dir = node_path.default.resolve(node_process.default.cwd(), cacheDir);
-	else cache.dir = node_path.default.join(cacheRoot, "node_modules", ".cache", "@tailwindcss-mangle", "engine");
+	if (cacheDir) {
+		if (node_path.default.isAbsolute(cacheDir)) cache.dir = cacheDir;
+		else if (normalizedBasedir) cache.dir = node_path.default.resolve(normalizedBasedir, cacheDir);
+		else cache.dir = node_path.default.resolve(node_process.default.cwd(), cacheDir);
+	} else cache.dir = node_path.default.join(cacheRoot, "node_modules", ".cache", "@tailwindcss-mangle", "engine");
 	if (normalizedBasedir) cache.cwd = normalizedBasedir;
 	const resolvePaths = createDefaultResolvePaths(cache.cwd ?? normalizedBasedir ?? node_process.default.cwd());
 	const normalizedUserOptions = require_generator.normalizeTailwindcssRuntimeOptions(tailwindcssRuntimeOptions);
@@ -589,10 +591,12 @@ function createTailwindcssRuntime(options) {
 			searchRoots.add(parentDir);
 		}
 		const configPath = findTailwindConfig(searchRoots);
-		if (!resolvedTailwindOptions.config) if (configPath) resolvedTailwindOptions.config = configPath;
-		else {
-			const fallbackConfig = resolveTailwindConfigFallback(resolvedTailwindOptions.packageName, resolvedTailwindOptions.resolve.paths ?? resolvePaths);
-			if (fallbackConfig) resolvedTailwindOptions.config = fallbackConfig;
+		if (!resolvedTailwindOptions.config) {
+			if (configPath) resolvedTailwindOptions.config = configPath;
+			else {
+				const fallbackConfig = resolveTailwindConfigFallback(resolvedTailwindOptions.packageName, resolvedTailwindOptions.resolve.paths ?? resolvePaths);
+				if (fallbackConfig) resolvedTailwindOptions.config = fallbackConfig;
+			}
 		}
 		if (!resolvedTailwindOptions.cwd && configPath) resolvedTailwindOptions.cwd = node_path.default.dirname(configPath);
 		resolvedOptions.tailwindcss = resolvedTailwindOptions;

package/dist/{tailwindcss-2zdmASlM.js → tailwindcss-vbApajUH.js}

@@ -1,5 +1,5 @@
-import { C as findWorkspacePackageDir, Ct as expandTailwindSourceEntries, D as resolveTailwindcssOptions, Dt as resolveCssSourceEntries, E as normalizeTailwindcssRuntimeOptions, Et as parseConfigParam, Lt as loadTailwindV4DesignSystem, Nt as resolveCssMacroTailwindV4Source, O as normalizeStringListOption, S as findNearestPackageRoot, St as createTailwindSourceEntryMatcher, T as normalizeExtendLengthUnits, Tt as normalizeLegacyContentEntries, b as isTailwindV4CssEntry, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, kt as resolveTailwindV4CssSourceBase, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as groupCssEntriesByBase, w as findWorkspaceRoot, x as normalizeCssEntries, xt as FULL_SOURCE_SCAN_PATTERN, y as guessBasedirFromEntries } from "./generator-BLpOsd5O.js";
-import { t as omitUndefined } from "./object-Bvy6-w9r.js";
+import { C as findWorkspacePackageDir, Ct as expandTailwindSourceEntries, D as resolveTailwindcssOptions, Dt as resolveCssSourceEntries, E as normalizeTailwindcssRuntimeOptions, Et as parseConfigParam, Lt as loadTailwindV4DesignSystem, Nt as resolveCssMacroTailwindV4Source, O as normalizeStringListOption, S as findNearestPackageRoot, St as createTailwindSourceEntryMatcher, T as normalizeExtendLengthUnits, Tt as normalizeLegacyContentEntries, b as isTailwindV4CssEntry, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, kt as resolveTailwindV4CssSourceBase, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as groupCssEntriesByBase, w as findWorkspaceRoot, x as normalizeCssEntries, xt as FULL_SOURCE_SCAN_PATTERN, y as guessBasedirFromEntries } from "./generator-C2UFjlZ1.js";
+import { t as omitUndefined } from "./object-B-8IHefx.js";
 import { n as defuOverrideArray$1 } from "./utils-MVwpU07P.js";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync, statSync } from "node:fs";
@@ -1200,10 +1200,11 @@ function createTailwindcssRuntime(options) {
 	};
 	const normalizedBasedir = basedir ? path.resolve(basedir) : void 0;
 	const cacheRoot = findNearestPackageRoot(normalizedBasedir) ?? normalizedBasedir ?? process.cwd();
-	if (cacheDir) if (path.isAbsolute(cacheDir)) cache.dir = cacheDir;
-	else if (normalizedBasedir) cache.dir = path.resolve(normalizedBasedir, cacheDir);
-	else cache.dir = path.resolve(process.cwd(), cacheDir);
-	else cache.dir = path.join(cacheRoot, "node_modules", ".cache", "@tailwindcss-mangle", "engine");
+	if (cacheDir) {
+		if (path.isAbsolute(cacheDir)) cache.dir = cacheDir;
+		else if (normalizedBasedir) cache.dir = path.resolve(normalizedBasedir, cacheDir);
+		else cache.dir = path.resolve(process.cwd(), cacheDir);
+	} else cache.dir = path.join(cacheRoot, "node_modules", ".cache", "@tailwindcss-mangle", "engine");
 	if (normalizedBasedir) cache.cwd = normalizedBasedir;
 	const resolvePaths = createDefaultResolvePaths(cache.cwd ?? normalizedBasedir ?? process.cwd());
 	const normalizedUserOptions = normalizeTailwindcssRuntimeOptions(tailwindcssRuntimeOptions);
@@ -1253,10 +1254,12 @@ function createTailwindcssRuntime(options) {
 			searchRoots.add(parentDir);
 		}
 		const configPath = findTailwindConfig(searchRoots);
-		if (!resolvedTailwindOptions.config) if (configPath) resolvedTailwindOptions.config = configPath;
-		else {
-			const fallbackConfig = resolveTailwindConfigFallback(resolvedTailwindOptions.packageName, resolvedTailwindOptions.resolve.paths ?? resolvePaths);
-			if (fallbackConfig) resolvedTailwindOptions.config = fallbackConfig;
+		if (!resolvedTailwindOptions.config) {
+			if (configPath) resolvedTailwindOptions.config = configPath;
+			else {
+				const fallbackConfig = resolveTailwindConfigFallback(resolvedTailwindOptions.packageName, resolvedTailwindOptions.resolve.paths ?? resolvePaths);
+				if (fallbackConfig) resolvedTailwindOptions.config = fallbackConfig;
+			}
 		}
 		if (!resolvedTailwindOptions.cwd && configPath) resolvedTailwindOptions.cwd = path.dirname(configPath);
 		resolvedOptions.tailwindcss = resolvedTailwindOptions;

package/dist/{transform-BlsDWgjt.js → transform-52FLRu-0.js}

@@ -1,5 +1,5 @@
-import { n as _defineProperty } from "./object-Bvy6-w9r.js";
-import { g as traverse$1, h as babelParse, i as analyzeSource, n as generateCode, o as JsTokenUpdater, p as replaceWxml, r as createAttributeMatcher, u as isClassContextLiteralPath } from "./wxml-CWJc0yY-.js";
+import { n as _defineProperty } from "./object-B-8IHefx.js";
+import { g as traverse$1, h as babelParse, i as analyzeSource, n as generateCode, o as JsTokenUpdater, p as replaceWxml, r as createAttributeMatcher, u as isClassContextLiteralPath } from "./wxml-B7OAVpXJ.js";
 import { splitCandidateTokens } from "@tailwindcss-mangle/engine";
 import MagicString from "magic-string";
 import { NodeTypes, parse } from "@vue/compiler-dom";

package/dist/{transform-9wbmvHcC.cjs → transform-BiHG42Rp.cjs}

@@ -1,5 +1,5 @@
-const require_object = require("./object-C_Vr6_S5.cjs");
-const require_wxml = require("./wxml-DUIdXCVa.cjs");
+const require_object = require("./object-DbHtAXRk.cjs");
+const require_wxml = require("./wxml-CQmBCjOR.cjs");
 let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
 let _vue_compiler_dom = require("@vue/compiler-dom");
 //#region src/uni-app-x/component-local-style-binding.ts

package/dist/types/user-defined-options/general.d.ts

@@ -35,7 +35,9 @@ export interface UserDefinedOptionsGeneralPart {
     cssChildCombinatorReplaceValue?: string | string[] | undefined;
     postcssOptions?: LoadedPostcssOptions | undefined;
     cssOptions?: CssOptions | undefined;
+    cssRemoveActivePseudoClass?: boolean | undefined;
     cssRemoveHoverPseudoClass?: boolean | undefined;
+    cssRemoveFocusPseudoClass?: boolean | undefined;
     cssRemoveProperty?: boolean | undefined;
     tailwindcssV4GradientFallback?: boolean | undefined;
     tailwindcssRuntimeOptions?: TailwindCssRuntimeOptions | undefined;

package/dist/{v4-generation-core-BVd_4348.cjs → v4-generation-core-2AuNMweK.cjs}

@@ -1,10 +1,10 @@
-const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
-const require_generator = require("./generator-B0dCFlP1.cjs");
+const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
+const require_generator = require("./generator-CwMI20jy.cjs");
 require("./auto-DtU6f3X6.cjs");
-const require_object = require("./object-C_Vr6_S5.cjs");
-const require_options = require("./options-zpZez7qe.cjs");
-const require_wxml = require("./wxml-DUIdXCVa.cjs");
-const require_style_options = require("./style-options-COpQc8fr.cjs");
+const require_object = require("./object-DbHtAXRk.cjs");
+const require_options = require("./options-CSqLm6U2.cjs");
+const require_wxml = require("./wxml-CQmBCjOR.cjs");
+const require_style_options = require("./style-options-D0NukP02.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
@@ -201,12 +201,13 @@ async function extractScriptStringCandidates(source, extension, options) {
 	if (!SCRIPT_SOURCE_CANDIDATE_EXTENSIONS.has(extension)) return [];
 	const values = /* @__PURE__ */ new Set();
 	try {
-		require_wxml.traverse(require_wxml.babelParse(source, {
+		const ast = require_wxml.babelParse(source, {
 			cache: true,
 			cacheKey: `source-candidates:${extension}`,
 			plugins: ["jsx", "typescript"],
 			sourceType: "unambiguous"
-		}), {
+		});
+		require_wxml.traverse(ast, {
 			noScope: true,
 			StringLiteral(path) {
 				values.add(path.node.value);
@@ -3511,7 +3512,8 @@ function isSameTailwindV4CssSource(a, b) {
 //#endregion
 //#region src/bundlers/shared/generator-css/source-resolver/single-source.ts
 async function resolveSingleTailwindV4CssSource(cssSource, sourceOptions, options = {}) {
-	const sourceBase = require_generator.resolveTailwindV4CssSourceBase(cssSource, sourceOptions.base ?? sourceOptions.projectRoot ?? node_process.default.cwd());
+	const sourceBaseFallback = sourceOptions.base ?? sourceOptions.projectRoot ?? node_process.default.cwd();
+	const sourceBase = require_generator.resolveTailwindV4CssSourceBase(cssSource, sourceBaseFallback);
 	const normalizedCssSource = normalizeTailwindV4CssSourceConfig(cssSource, sourceBase);
 	const source = await require_generator.resolveTailwindV4Source(createSingleTailwindV4SourceOptions(sourceOptions, {
 		base: sourceBase,
@@ -3529,7 +3531,8 @@ async function resolveSingleTailwindV4CssSource(cssSource, sourceOptions, option
 }
 async function resolveTailwindV4CssSourceEntries(cssSource, sourceOptions) {
 	if (typeof cssSource.css !== "string" || cssSource.css.length === 0) return;
-	const sourceBase = require_generator.resolveTailwindV4CssSourceBase(cssSource, sourceOptions.base ?? sourceOptions.projectRoot ?? node_process.default.cwd());
+	const sourceBaseFallback = sourceOptions.base ?? sourceOptions.projectRoot ?? node_process.default.cwd();
+	const sourceBase = require_generator.resolveTailwindV4CssSourceBase(cssSource, sourceBaseFallback);
 	return require_options.resolveTailwindV4EntriesFromCss(cssSource.css, sourceBase);
 }
 function countRuntimeCandidateHits(candidates, runtime) {
@@ -3775,7 +3778,8 @@ async function resolveGeneratorSource(_majorVersion, runtimeState, rawSource, fi
 //#endregion
 //#region src/bundlers/shared/generator-css/source-resolver/resolve-sources.ts
 async function resolveGeneratorResolvedSources(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions, selectionOptions) {
-	const cssEntrySource = require_generator.resolveCssEntrySource(rawSource, resolveCssSourceBase(file, cssHandlerOptions), {
+	const base = resolveCssSourceBase(file, cssHandlerOptions);
+	const cssEntrySource = require_generator.resolveCssEntrySource(rawSource, base, {
 		importFallback: generatorOptions?.importFallback ?? false,
 		removeConfig: false
 	});
@@ -3992,7 +3996,9 @@ function removeTailwindApplyRules(rawSource) {
 function resolveLegacyCompatCssSource(rawSource) {
 	const cached = legacyCompatSourceCache.get(rawSource);
 	if (cached !== void 0) return cached;
-	const resolved = closeTrailingUnclosedBlocks(require_generator.removeTailwindV4GeneratedUserCssArtifacts((0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(removeTailwindApplyRules(require_generator.removeTailwindSourceDirectives(closeTrailingUnclosedBlocks(require_generator.stripTailwindBanners(rawSource)))))));
+	const parseableSource = closeTrailingUnclosedBlocks(require_generator.stripTailwindBanners(rawSource));
+	const source = require_generator.removeTailwindSourceDirectives(parseableSource);
+	const resolved = closeTrailingUnclosedBlocks(require_generator.removeTailwindV4GeneratedUserCssArtifacts((0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(removeTailwindApplyRules(source))));
 	setLimitedCacheValue(legacyCompatSourceCache, rawSource, resolved);
 	return resolved;
 }
@@ -4022,7 +4028,8 @@ function hasContainerConfigToken(rawSource) {
 }
 function hasConfiguredContainerCompat(rawSource, file, cssHandlerOptions) {
 	if (hasContainerConfigToken(rawSource)) return true;
-	const cssEntrySource = require_generator.resolveCssEntrySource(rawSource, resolveCssSourceBase(file, cssHandlerOptions));
+	const base = resolveCssSourceBase(file, cssHandlerOptions);
+	const cssEntrySource = require_generator.resolveCssEntrySource(rawSource, base);
 	if (!cssEntrySource?.config) return false;
 	try {
 		return /\bcontainer\b/.test((0, node_fs.readFileSync)(cssEntrySource.config, "utf8"));
@@ -4510,13 +4517,15 @@ async function finalizeDeferredGeneratorCss(context) {
 				const cssWithBeforeUserCss = createCssSourceOrderAppend((0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, beforeUserCss), css);
 				return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend(cssWithBeforeUserCss, (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(cssWithBeforeUserCss, afterUserCss)));
 			}
-			return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend(css, (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, await transformDeferredUserCss(generatedUserCssRawSource))));
+			const userCss = await transformDeferredUserCss(generatedUserCssRawSource);
+			return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend(css, (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss)));
 		};
 		const canAppendIncrementalCss = generated.target !== "weapp" || !require_generator.hasUserCssLayerBlocks(generatorRawSource);
 		const incrementalRawCss = generated.incrementalRawCss ?? generated.incrementalCss;
 		const shouldAppendIncrementalCss = canAppendIncrementalCss && typeof options.previousCss === "string" && typeof incrementalRawCss === "string";
 		const normalizedCss = shouldAppendIncrementalCss ? incrementalRawCss.trim().length > 0 ? require_generator.createCssAppend(options.previousCss, await normalizeDeferredGeneratedCss(incrementalRawCss)) : options.previousCss : await normalizeDeferredGeneratedCss(generated.rawCss ?? generated.css);
-		const css = (0, _weapp_tailwindcss_postcss.restoreLocalCssImports)(shouldAppendIncrementalCss ? normalizedCss : await restoreDeferredUserCss(normalizedCss), localImports, { outputFile: file });
+		const intermediateCss = shouldAppendIncrementalCss ? normalizedCss : await restoreDeferredUserCss(normalizedCss);
+		const css = (0, _weapp_tailwindcss_postcss.restoreLocalCssImports)(intermediateCss, localImports, { outputFile: file });
 		return {
 			css,
 			classSet: resolveGeneratedCssClassSet(generated.target, generated.classSet, runtimeWithCurrentCss, css, opts.escapeMap, options.previousClassSet),
@@ -4601,7 +4610,8 @@ async function finalizeFallbackGeneratorCss(context) {
 			css = createCssSourceOrderAppend(css, missingUserCss);
 		} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasGeneratedMarkers && !hasGeneratedCss) {
 			const cleanedUserCssRawSource = require_generator.removeTailwindV4GeneratedUserCssArtifacts(userCssRawSource);
-			const userCss = await require_generator.transformGeneratorUserCss(restoredDistinctUserLayerCss && require_generator.hasUserCssLayerBlocks(cleanedUserCssRawSource) ? require_generator.splitUserCssLayerBlocks(cleanedUserCssRawSource).rest : cleanedUserCssRawSource, {
+			const cleanedUserCssRestSource = restoredDistinctUserLayerCss && require_generator.hasUserCssLayerBlocks(cleanedUserCssRawSource) ? require_generator.splitUserCssLayerBlocks(cleanedUserCssRawSource).rest : cleanedUserCssRawSource;
+			const userCss = await require_generator.transformGeneratorUserCss(cleanedUserCssRestSource, {
 				generatorTarget: generated.target,
 				generatorStyleOptions,
 				cssUserHandlerOptions,
@@ -5185,12 +5195,17 @@ async function validateCandidatesByGeneratorWithOwner(options) {
 //#endregion
 //#region src/bundlers/shared/v4-generation-core.ts
 function resolveGenerationOptions(options, mode) {
-	if (mode === "legacy") return options;
-	const scopeId = options.scope?.id ?? options.outputFile ?? options.file;
-	const compilationChanges = mergeCompilationDependencyChanges(options.compilationChanges, consumeCompilationScopeChanges(options.runtimeState, scopeId));
-	if (compilationChanges.length === 0) return options;
-	return {
+	const physicalFile = stripRequestQuery(options.file);
+	const normalizedOptions = physicalFile === options.file ? options : {
 		...options,
+		file: physicalFile
+	};
+	if (mode === "legacy") return normalizedOptions;
+	const scopeId = normalizedOptions.scope?.id ?? normalizedOptions.outputFile ?? normalizedOptions.file;
+	const compilationChanges = mergeCompilationDependencyChanges(normalizedOptions.compilationChanges, consumeCompilationScopeChanges(normalizedOptions.runtimeState, scopeId));
+	if (compilationChanges.length === 0) return normalizedOptions;
+	return {
+		...normalizedOptions,
 		compilationChanges,
 		previousClassSet: void 0,
 		previousCss: void 0