weapp-vite 6.16.21 → 6.16.23

package/dist/auto-routes.mjs

@@ -1,4 +1,4 @@
-import { g as getRouteRuntimeGlobalKeys, i as getCompilerContext } from "./createContext-9Iyp31bM.mjs";
+import { g as getRouteRuntimeGlobalKeys, i as getCompilerContext } from "./createContext-NXrQuj5y.mjs";
 //#region src/auto-routes.ts
 const ROUTE_RUNTIME_OVERRIDE_KEY = Symbol.for("weapp-vite.route-runtime");
 function createGetter(resolver) {

package/dist/cli.mjs

@@ -1,6 +1,6 @@
-import { C as createCjsConfigLoadError, E as isPathInside, S as parseCommentJson, T as shouldPassPlatformArgToIdeOpen, _ as createBuildScopeConfigFromCli, b as getProjectConfigFileName, f as resolveWeappViteTarget, h as resolveHmrProfileJsonPath, m as SHARED_CHUNK_VIRTUAL_PREFIX, n as syncProjectSupportFiles, p as createSharedBuildConfig, r as syncManagedTsconfigBootstrapFiles, s as formatBytes, t as createCompilerContext, v as resolveWeappConfigFile, w as getDefaultIdeProjectRoot, x as loadViteConfigFile, y as checkRuntime } from "./createContext-9Iyp31bM.mjs";
+import { C as createCjsConfigLoadError, E as isPathInside, S as parseCommentJson, T as shouldPassPlatformArgToIdeOpen, _ as createBuildScopeConfigFromCli, b as getProjectConfigFileName, f as resolveWeappViteTarget, h as resolveHmrProfileJsonPath, m as SHARED_CHUNK_VIRTUAL_PREFIX, n as syncProjectSupportFiles, p as createSharedBuildConfig, r as syncManagedTsconfigBootstrapFiles, s as formatBytes, t as createCompilerContext, v as resolveWeappConfigFile, w as getDefaultIdeProjectRoot, x as loadViteConfigFile, y as checkRuntime } from "./createContext-NXrQuj5y.mjs";
 import { r as logger_default, t as colors } from "./logger-mt4mSTqV.mjs";
-import { h as VERSION } from "./file-Dv_e5yIa.mjs";
+import { h as VERSION } from "./file-C-eN8D-v.mjs";
 import { o as resolveWeappMcpConfig, s as startWeappViteMcpServer } from "./mcp-qmDOTH07.mjs";
 import { createRequire } from "node:module";
 import path, { posix } from "pathe";
@@ -3708,7 +3708,7 @@ function resolveRunnableHotkeyDefinition(input) {
 }
 //#endregion
 //#region package.json
-var version = "6.16.21";
+var version = "6.16.23";
 //#endregion
 //#region src/cli/devHotkeys/format.ts
 const FULLWIDTH_ASCII_START = 65281;

package/dist/{createContext-9Iyp31bM.mjs → createContext-NXrQuj5y.mjs}

@@ -1,6 +1,6 @@
 import { n as applyWeappViteHostMeta } from "./pluginHost--CaeyWpA.mjs";
 import { n as configureLogger, r as logger_default } from "./logger-mt4mSTqV.mjs";
-import { _ as jsExtensions, a as findJsonEntry, b as vueExtensions, c as isJsOrTs, d as touch, g as configExtensions, i as findJsEntry, l as isTemplate, n as changeFileExtension, o as findTemplateEntry, p as inlineAutoRoutesImports, r as findCssEntry, s as findVueEntry, t as extractConfigFromVue, v as supportedCssLangs, y as templateExtensions } from "./file-Dv_e5yIa.mjs";
+import { _ as jsExtensions, a as findJsonEntry, b as vueExtensions, c as isJsOrTs, d as touch, g as configExtensions, i as findJsEntry, l as isTemplate, n as changeFileExtension, o as findTemplateEntry, p as inlineAutoRoutesImports, r as findCssEntry, s as findVueEntry, t as extractConfigFromVue, v as supportedCssLangs, y as templateExtensions } from "./file-C-eN8D-v.mjs";
 import { createRequire, isBuiltin } from "node:module";
 import path, { posix } from "pathe";
 import path$1, { normalize, relative, win32 } from "node:path";
@@ -17041,9 +17041,32 @@ function injectSharedStyleImports(css, modulePath, fileName, sharedStyles, confi
 //#endregion
 //#region src/plugins/css.ts
 const LEADING_BLANK_LINES_RE = /^(?:[ \t]*\r?\n)+/;
+const SOURCE_STYLE_ASSET_RE = /\.(?:wxss|css|less|sass|scss|styl|stylus|pcss|postcss|sss)$/;
+const VITE_PREPROCESS_STYLE_RE = /\.(?:css|less|sass|scss|styl|stylus|pcss|postcss|sss)$/;
 function stripLeadingBlankLines(code) {
 	return code.replace(LEADING_BLANK_LINES_RE, "");
 }
+function isSourceStyleAsset(fileName) {
+	return SOURCE_STYLE_ASSET_RE.test(fileName);
+}
+function shouldPreprocessWithVite(fileName) {
+	return VITE_PREPROCESS_STYLE_RE.test(fileName);
+}
+async function preprocessStyleSource(code, fileName, resolvedConfig, options) {
+	const normalizedCss = stripLeadingBlankLines(code);
+	if (!resolvedConfig || options?.enabled === false || !shouldPreprocessWithVite(fileName)) return {
+		css: normalizedCss,
+		dependencies: []
+	};
+	const processed = await preprocessCSS(normalizedCss, fileName, resolvedConfig);
+	return {
+		css: stripLeadingBlankLines(processed.code),
+		dependencies: processed.deps ? Array.from(processed.deps) : []
+	};
+}
+function resolveOutputStyleFileName(configService, stylePath) {
+	return configService.relativeOutputPath(changeFileExtension(stylePath, configService.outputExtensions.wxss));
+}
 function emitCssAssetIfChanged(ctx, pluginCtx, bundle, fileName, source) {
 	const normalizedFileName = toPosixPath(fileName);
 	const cache = ctx.runtimeState?.css.emittedSource;
@@ -17062,13 +17085,15 @@ function emitCssAssetIfChanged(ctx, pluginCtx, bundle, fileName, source) {
 	cache?.set(normalizedFileName, source);
 	return true;
 }
-async function emitStyleSidecarAsset(ctx, pluginCtx, bundle, stylePath) {
+async function emitStyleSidecarAsset(ctx, pluginCtx, bundle, stylePath, resolvedConfig) {
 	const { configService } = ctx;
-	const fileName = configService.relativeOutputPath(stylePath);
+	const fileName = resolveOutputStyleFileName(configService, stylePath);
 	if (!fileName) return false;
-	return emitCssAssetIfChanged(ctx, pluginCtx, bundle, fileName, injectSharedStyleImports(await processCssWithCache(stripLeadingBlankLines(await fs.readFile(stylePath, "utf8")), configService), stylePath, fileName, collectSharedStyleEntries(ctx, configService), configService));
+	const { css, dependencies } = await preprocessStyleSource(await fs.readFile(stylePath, "utf8"), stylePath, resolvedConfig);
+	if (typeof pluginCtx.addWatchFile === "function") for (const dependency of dependencies) pluginCtx.addWatchFile(normalizeWatchPath(dependency));
+	return emitCssAssetIfChanged(ctx, pluginCtx, bundle, fileName, injectSharedStyleImports(await processCssWithCache(css, configService), stylePath, fileName, collectSharedStyleEntries(ctx, configService), configService));
 }
-async function handleBundleEntry(ctx, bundle, bundleKey, asset, configService, sharedStyles, emitted) {
+async function handleBundleEntry(ctx, bundle, bundleKey, asset, configService, sharedStyles, emitted, resolvedConfig) {
 	if (asset.type !== "asset") return;
 	const toAbsolute = (id) => {
 		return toAbsoluteId(id, configService, void 0, { base: "cwd" }) || id;
@@ -17086,36 +17111,55 @@ async function handleBundleEntry(ctx, bundle, bundleKey, asset, configService, s
 		}
 		return owners;
 	};
-	if (bundleKey.endsWith(".wxss")) {
+	const resolveOriginalStylePath = () => {
 		const [rawOriginal] = asset.originalFileNames ?? [];
-		const absOriginal = rawOriginal ? toAbsolute(rawOriginal) : path.resolve(configService.absoluteSrcRoot, bundleKey);
-		const fileName = configService.relativeOutputPath(absOriginal);
+		return rawOriginal ? toAbsolute(rawOriginal) : path.resolve(configService.absoluteSrcRoot, bundleKey);
+	};
+	const emitStyleAssetForOwner = async (owner, preprocessId, shouldPreprocess) => {
+		const fileName = resolveOutputStyleFileName(configService, owner);
+		if (!fileName) return;
+		const normalizedFileName = toPosixPath(fileName);
+		const { css, dependencies } = await preprocessStyleSource(asset.source.toString(), preprocessId, resolvedConfig, { enabled: shouldPreprocess });
+		if (typeof this.addWatchFile === "function") for (const dependency of dependencies) this.addWatchFile(normalizeWatchPath(dependency));
+		const cssWithImports = injectSharedStyleImports(await processCssWithCache(css, configService), owner, fileName, sharedStyles, configService);
+		emitCssAssetIfChanged(ctx, this, bundle, fileName, cssWithImports);
+		emitted.add(normalizedFileName);
+	};
+	const isFinalStyleAsset = bundleKey.endsWith(`.${configService.outputExtensions.wxss}`);
+	const isCssAsset = bundleKey.endsWith(".css");
+	const isSourceStyleAssetKey = isSourceStyleAsset(bundleKey);
+	if (isFinalStyleAsset) {
+		const absOriginal = resolveOriginalStylePath();
+		const fileName = resolveOutputStyleFileName(configService, absOriginal);
 		if (fileName) emitted.add(toPosixPath(fileName));
-		if (fileName && fileName !== bundleKey) {
-			delete bundle[bundleKey];
-			const css = await fs.readFile(absOriginal, "utf8");
-			emitCssAssetIfChanged(ctx, this, bundle, fileName, css);
+		if (fileName) {
+			const source = asset.source.toString();
+			const { css, dependencies } = await preprocessStyleSource(source, absOriginal, resolvedConfig, { enabled: shouldPreprocessWithVite(absOriginal) });
+			if (typeof this.addWatchFile === "function") for (const dependency of dependencies) this.addWatchFile(normalizeWatchPath(dependency));
+			const processedCss = await processCssWithCache(css, configService);
+			if (fileName !== bundleKey) {
+				delete bundle[bundleKey];
+				emitCssAssetIfChanged(ctx, this, bundle, fileName, processedCss);
+			} else if (processedCss !== source) asset.source = processedCss;
 		}
 		return;
 	}
-	if (!bundleKey.endsWith(".css")) return;
+	if (!isCssAsset && !isSourceStyleAssetKey) return;
 	const ownersFromChunks = collectCssOwnersFromChunks();
 	const owners = ownersFromChunks.size ? ownersFromChunks : new Set((asset.originalFileNames ?? []).map(normalizeOwnerId).filter((originalFileName) => {
 		return isJsOrTs(originalFileName) || originalFileName.endsWith(".vue");
 	}).map(toAbsolute));
 	if (!owners.size) {
+		if (isSourceStyleAssetKey && !isCssAsset) {
+			await emitStyleAssetForOwner(resolveOriginalStylePath(), resolveOriginalStylePath(), !isCssAsset);
+			delete bundle[bundleKey];
+			return;
+		}
 		delete bundle[bundleKey];
 		return;
 	}
 	await Promise.all(Array.from(owners).map(async (owner) => {
-		const modulePath = owner;
-		const converted = changeFileExtension(modulePath, configService.outputExtensions.wxss);
-		const fileName = configService.relativeOutputPath(converted);
-		if (!fileName) return;
-		const normalizedFileName = toPosixPath(fileName);
-		const cssWithImports = injectSharedStyleImports(await processCssWithCache(stripLeadingBlankLines(asset.source.toString()), configService), modulePath, fileName, sharedStyles, configService);
-		emitCssAssetIfChanged(ctx, this, bundle, fileName, cssWithImports);
-		emitted.add(normalizedFileName);
+		await emitStyleAssetForOwner(owner, resolveOriginalStylePath(), !isCssAsset);
 	}));
 	delete bundle[bundleKey];
 }
@@ -17161,7 +17205,7 @@ async function generateBundleSharedCss(ctx, configService, bundle, resolvedConfi
 	const sharedStyles = collectSharedStyleEntries(ctx, configService);
 	const emitted = /* @__PURE__ */ new Set();
 	const tasks = Object.entries(bundle).map(([bundleKey, asset]) => {
-		return handleBundleEntry.call(this, ctx, bundle, bundleKey, asset, configService, sharedStyles, emitted);
+		return handleBundleEntry.call(this, ctx, bundle, bundleKey, asset, configService, sharedStyles, emitted, resolvedConfig);
 	});
 	await Promise.all(tasks);
 	await emitSharedStyleEntries.call(this, ctx, sharedStyles, emitted, configService, bundle, resolvedConfig);
@@ -17588,6 +17632,33 @@ function injectRequestGlobalsIntoSfc(source, targets, options) {
 	return source;
 }
 //#endregion
+//#region src/plugins/outputFinalizer.ts
+const PREPROCESSOR_STYLE_ASSET_RE = /\.(?:less|sass|scss|styl|stylus|pcss|postcss|sss)$/i;
+function normalizePreprocessorStyleAssets(bundle, styleExtension) {
+	if (!styleExtension) return;
+	for (const [bundleFileName, output] of Object.entries(bundle)) {
+		if (output?.type !== "asset") continue;
+		const fileName = output.fileName || bundleFileName;
+		if (!PREPROCESSOR_STYLE_ASSET_RE.test(fileName)) continue;
+		const outputFileName = changeFileExtension(fileName, styleExtension);
+		if (!outputFileName || outputFileName === fileName) continue;
+		const existingOutput = bundle[outputFileName];
+		delete bundle[bundleFileName];
+		if (existingOutput) continue;
+		output.fileName = outputFileName;
+		bundle[outputFileName] = output;
+	}
+}
+function createOutputFinalizerPlugin(ctx) {
+	return {
+		name: "weapp-vite:output-finalizer",
+		enforce: "post",
+		generateBundle(_options, bundle) {
+			normalizePreprocessorStyleAssets(bundle, ctx.configService.outputExtensions?.wxss);
+		}
+	};
+}
+//#endregion
 //#region src/plugins/core/lifecycle/transform/importMeta.ts
 function hasOwn$2(source, key) {
 	return Object.prototype.hasOwnProperty.call(source, key);
@@ -18735,6 +18806,7 @@ function createGenerateBundleHook(state, isPluginBuild) {
 				});
 				rewriteJsonNpmImportsToLocalRoot(rolldownBundle, "", void 0, npmBuildCandidateDependencies, configService.cwd);
 			}
+			normalizePreprocessorStyleAssets(rolldownBundle, state.ctx.configService.outputExtensions?.wxss);
 			return;
 		}
 		if (!subPackageMeta) {
@@ -18896,6 +18968,7 @@ function createGenerateBundleHook(state, isPluginBuild) {
 		stabilizeWevuRuntimeChunkAccess(rolldownBundle);
 		syncChunkImportsFromRequireCalls(rolldownBundle);
 		prunePartialHmrStableSharedChunks(rolldownBundle, state);
+		normalizePreprocessorStyleAssets(rolldownBundle, state.ctx.configService.outputExtensions?.wxss);
 		refreshModuleGraph(this, state);
 		if (configService.weappViteConfig?.debug?.watchFiles) {
 			const watcherService = ctx.watcherService;
@@ -18919,7 +18992,7 @@ function createRenderStartHook(state) {
 	return async function renderStart() {
 		if (isCurrentStyleSidecarUpdate(state)) {
 			const currentFile = ctx.runtimeState.build.hmr.profile.file;
-			if (typeof currentFile === "string" && path.extname(currentFile)) await emitStyleSidecarAsset(ctx, this, {}, currentFile);
+			if (typeof currentFile === "string" && path.extname(currentFile)) await emitStyleSidecarAsset(ctx, this, {}, currentFile, state.resolvedConfig);
 		}
 		emitJsonAssets.call(this, state);
 		state.watchFilesSnapshot = emitWxmlAssetsWithCache({
@@ -20061,6 +20134,9 @@ function createCoreLifecyclePlugin(state) {
 	return {
 		name: "weapp-vite:pre",
 		enforce: "pre",
+		configResolved(config) {
+			state.resolvedConfig = config;
+		},
 		buildStart: createBuildStartHook(state),
 		watchChange: createWatchChangeHook(state),
 		options: createOptionsHook(state),
@@ -22972,6 +23048,7 @@ function vitePluginWeapp(ctx, subPackageMeta) {
 		groups.push(autoImport(ctx));
 	}
 	groups.push(weappVite(ctx, subPackageMeta), wxs(ctx), css(ctx));
+	groups.push([createOutputFinalizerPlugin(ctx)]);
 	const assembled = attachRuntimePlugins(ctx, flatten(groups));
 	if (subPackageMeta) return assembled;
 	return applyInspect(ctx, assembled);
@@ -22985,6 +23062,7 @@ function vitePluginWeappWorkers(ctx) {
 }
 //#endregion
 //#region src/runtime/config/internal/merge/plugins.ts
+const WEAPP_VITE_OUTPUT_FINALIZER_PLUGIN_NAME = "weapp-vite:output-finalizer";
 function normalizePluginOptions(option) {
 	const normalized = [];
 	if (!option) return normalized;
@@ -23000,21 +23078,31 @@ function isNamedPlugin(option, name) {
 }
 function arrangePlugins(config, ctx, subPackageMeta) {
 	const existing = normalizePluginOptions(config.plugins);
+	const internal = normalizePluginOptions(vitePluginWeapp(ctx, subPackageMeta));
 	const tsconfigPlugins = [];
 	const others = [];
+	const finalizers = [];
+	for (const entry of internal) {
+		if (!entry) continue;
+		if (isNamedPlugin(entry, WEAPP_VITE_OUTPUT_FINALIZER_PLUGIN_NAME)) {
+			finalizers.push(entry);
+			continue;
+		}
+		others.push(entry);
+	}
 	for (const entry of existing) {
 		if (!entry) continue;
 		if (isNamedPlugin(entry, "vite-tsconfig-paths")) {
 			tsconfigPlugins.push(entry);
 			continue;
 		}
-		if (isNamedPlugin(entry, "weapp-vite:context")) continue;
+		if (isNamedPlugin(entry, "weapp-vite:context") || isNamedPlugin(entry, WEAPP_VITE_OUTPUT_FINALIZER_PLUGIN_NAME)) continue;
 		others.push(entry);
 	}
 	config.plugins = [
-		vitePluginWeapp(ctx, subPackageMeta),
 		...others,
-		...tsconfigPlugins
+		...tsconfigPlugins,
+		...finalizers
 	];
 }
 //#endregion
@@ -24101,7 +24189,7 @@ async function loadAppEntry(ctx, scanState) {
 	const vueAppPath = await findVueEntry(appBasename);
 	let configFromVue;
 	if (!appConfigFile && vueAppPath) {
-		const { extractConfigFromVue } = await import("./file-IuX99F00.mjs");
+		const { extractConfigFromVue } = await import("./file-S0TAbkhK.mjs");
 		configFromVue = await extractConfigFromVue(vueAppPath);
 		if (configFromVue) appConfigFile = vueAppPath;
 	}

package/dist/{file-Dv_e5yIa.mjs → file-C-eN8D-v.mjs}

@@ -84,7 +84,7 @@ function resolveAutoRoutesMacroImportPath() {
 }
 async function resolveAutoRoutesInlineSnapshot() {
 	try {
-		const { getCompilerContext } = await import("./getInstance-DS0CkWYU.mjs");
+		const { getCompilerContext } = await import("./getInstance-MmgTcalc.mjs");
 		const compilerContext = getCompilerContext();
 		const service = compilerContext.autoRoutesService;
 		const reference = service?.getReference?.();

package/dist/file-S0TAbkhK.mjs

@@ -0,0 +1,2 @@
+import { t as extractConfigFromVue } from "./file-C-eN8D-v.mjs";
+export { extractConfigFromVue };

package/dist/getInstance-MmgTcalc.mjs

@@ -0,0 +1,2 @@
+import { i as getCompilerContext } from "./createContext-NXrQuj5y.mjs";
+export { getCompilerContext };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { a as defineThemeJson, i as defineSitemapJson, n as defineComponentJson, r as definePageJson, t as defineAppJson } from "./json-BL8Dhhk6.mjs";
 import { a as resolveWeappViteHostMeta, i as isWeappViteHost, n as applyWeappViteHostMeta, r as createWeappViteHostMeta, t as WEAPP_VITE_HOST_NAME } from "./pluginHost--CaeyWpA.mjs";
 import { t as defineConfig } from "./config-DRGcCi3h.mjs";
-import { c as WEB_PLATFORM_ALIASES, d as isWebPlatform, f as resolveWeappViteTarget, l as getSupportedWeappVitePlatforms, t as createCompilerContext, u as getSupportedWeappViteTargetDescriptors } from "./createContext-9Iyp31bM.mjs";
+import { c as WEB_PLATFORM_ALIASES, d as isWebPlatform, f as resolveWeappViteTarget, l as getSupportedWeappVitePlatforms, t as createCompilerContext, u as getSupportedWeappViteTargetDescriptors } from "./createContext-NXrQuj5y.mjs";
 import { i as createWevuComponent, n as defineProps, r as setPageLayout, t as defineEmits } from "./runtime-C3z9pDQB.mjs";
 export { WEAPP_VITE_HOST_NAME, WEB_PLATFORM_ALIASES, applyWeappViteHostMeta, createCompilerContext, createWeappViteHostMeta, createWevuComponent, defineAppJson, defineComponentJson, defineConfig, defineEmits, definePageJson, defineProps, defineSitemapJson, defineThemeJson, getSupportedWeappVitePlatforms, getSupportedWeappViteTargetDescriptors, isWeappViteHost, isWebPlatform, resolveWeappViteHostMeta, resolveWeappViteTarget, setPageLayout };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "6.16.21",
+  "version": "6.16.23",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -122,17 +122,17 @@
     "@weapp-core/logger": "3.1.1",
     "@weapp-core/schematics": "6.0.4",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.16.21",
-    "@weapp-vite/mcp": "1.3.5",
-    "@weapp-vite/miniprogram-automator": "1.1.2",
+    "@weapp-vite/ast": "6.16.23",
+    "@weapp-vite/mcp": "1.3.6",
+    "@weapp-vite/miniprogram-automator": "1.1.3",
     "@weapp-vite/volar": "2.1.0",
     "@weapp-vite/web": "1.3.25",
     "@wevu/api": "0.2.9",
     "@wevu/web-apis": "1.2.16",
     "rolldown-require": "2.0.17",
     "vite-plugin-performance": "2.0.1",
-    "weapp-ide-cli": "5.3.1",
-    "wevu": "6.16.21"
+    "weapp-ide-cli": "5.3.2",
+    "wevu": "6.16.23"
   },
   "publishConfig": {
     "access": "public",

package/dist/file-IuX99F00.mjs

@@ -1,2 +0,0 @@
-import { t as extractConfigFromVue } from "./file-Dv_e5yIa.mjs";
-export { extractConfigFromVue };

package/dist/getInstance-DS0CkWYU.mjs

@@ -1,2 +0,0 @@
-import { i as getCompilerContext } from "./createContext-9Iyp31bM.mjs";
-export { getCompilerContext };