weapp-vite 7.5.0 → 7.6.0

package/dist/{session-PskhD-nZ.mjs → session-D3zsdzIy.mjs}

@@ -1,13 +1,14 @@
-import { C as attachStatefulHmrHost, D as resolveHmrRuntimeDecision, E as createSharedBuildConfig, T as getStatefulHmrHost, _ as getPackNpmRelationList, b as createOxcRuntimeSupport, g as captureWatchDependencies, h as checkAppWorkersOptions, m as syncManagedTsconfigFiles, u as CompilerSession, v as createPackageBuilder, w as createStatefulHmrHostPlugins, y as settlePackageBuilds } from "./createCompilerContextInstance-DJH_P_nZ.mjs";
-import { c as resolveRealpath } from "./protocol-vg8HGJ4n.mjs";
-import { F as resolveNpmDistDirName, L as resolveTargetDependencies, M as resolveMainBuildDependencyPatterns, N as resolveNpmBuildCandidateDependenciesSync, f as attachDevModuleGraphHost } from "./devProvider-BGBkw28J.mjs";
-import { v as loadHostRolldownBuild, y as pruneOwnedAssetFiles } from "./utils-CJSCgEj6.mjs";
+import { B as resolveHmrRuntimeDecision, D as getStatefulHmrHost, E as createStatefulHmrHostPlugins, F as prepareClassicIdeConfig, I as attachHmrRuntimeSession, L as createHmrRuntimeSession, N as syncManagedTsconfigFiles, O as createSharedBuildConfig, P as getInitialBuildInputObservation, S as createOxcRuntimeSupport, T as attachStatefulHmrHost, _ as clearStatefulHmrSnapshot, b as createPackageBuilder, d as buildStatefulHmrSnapshot, f as prepareStatefulHmrSnapshot, g as StatefulHmrSnapshotHandoff, h as prepareStatefulClassicHandoff, k as getHmrRuntimeCapabilityFallback, m as captureWatchDependencies, p as checkAppWorkersOptions, u as CompilerSession, v as offerStatefulHmrSnapshot, x as settlePackageBuilds, y as getPackNpmRelationList, z as findSkylineRendererFiles } from "./createCompilerContextInstance-aYwi8wQt.mjs";
+import { t as resolveRealpath } from "./realpathScope-Tf9mz-fh.mjs";
+import { F as resolveNpmDistDirName, L as resolveTargetDependencies, M as resolveMainBuildDependencyPatterns, N as resolveNpmBuildCandidateDependenciesSync, f as attachDevModuleGraphHost } from "./devProvider-D-hTfsEO.mjs";
+import { g as pruneOwnedAssetFiles } from "./utils-Dy51PYAC.mjs";
+import { n as loadHostRolldownBuild } from "./engine-C66J0HLz.mjs";
 import path from "pathe";
 import { mkdtemp, readFile, readdir, rm } from "node:fs/promises";
 import { build } from "vite";
 import { createHash } from "node:crypto";
-import { Buffer } from "node:buffer";
 import os from "node:os";
+import { Buffer } from "node:buffer";
 //#region src/vite/npm/sourcemap.ts
 const URL_SCHEME = /^[a-z][a-z\d+.-]*:/i;
 const INLINE_MAP = /(\/\/[#@]\s*sourceMappingURL=data:application\/json(?:;charset=[^;,]*)?;base64,)([a-z\d+/=]+)/gi;
@@ -277,12 +278,23 @@ async function publishOwnedNpmAssets(cwd, hostOutDir, external) {
 }
 //#endregion
 //#region src/vite/session.ts
+const runtimeOwners = /* @__PURE__ */ new WeakMap();
 /** 标准插件的目标校验和依赖准备，共享底层编译会话生命周期。 */
 var WeappBuildSession = class extends CompilerSession {
+	hmrRuntimeSession;
 	dependencyBuild;
 	validating;
+	hostClosing;
+	terminalClosing;
 	isWeb = false;
 	statefulController;
+	constructor(hmrRuntimeSession = createHmrRuntimeSession()) {
+		super();
+		this.hmrRuntimeSession = hmrRuntimeSession;
+		runtimeOwners.set(hmrRuntimeSession, this);
+		this.onClose(attachHmrRuntimeSession(this.context, hmrRuntimeSession));
+		this.onClose(() => clearStatefulHmrSnapshot(this.context));
+	}
 	async prepare(config, cwd, mode, isDev = false) {
 		if (!config.resolve?.preserveSymlinks) try {
 			cwd = resolveRealpath(cwd);
@@ -307,16 +319,61 @@ var WeappBuildSession = class extends CompilerSession {
 			if (!merged) throw new Error("[weapp-vite] Web 目标不能禁用 weapp.web。");
 			return merged;
 		}
-		if (isDev && resolveHmrRuntimeDecision({
+		await prepareClassicIdeConfig(this.context);
+		if (isDev && this.hmrRuntimeSession.resolve(resolveHmrRuntimeDecision({
 			platform: service.platform,
 			configured: service.weappViteConfig.hmr?.runtime,
 			compileHotReLoad: service.projectPrivateConfig.setting?.compileHotReLoad
-		}).runtime === "stateful-experimental") {
-			if (service.platform !== "weapp") throw new Error("[weapp-vite] stateful-experimental 仅支持微信；其他平台请配置 hmr.runtime=classic。");
-			this.statefulController = createStatefulHmrHostPlugins(this.context);
+		})).runtime === "stateful-experimental") {
+			if (service.platform !== "weapp") this.hmrRuntimeSession.requestClassic({
+				code: "platform",
+				message: "当前小程序平台不支持状态保持热更新。"
+			});
+			else await this.run(async () => {
+				try {
+					const snapshot = prepareStatefulHmrSnapshot(await buildStatefulHmrSnapshot(service.loadOptions, void 0, this.context, void 0, []));
+					const skylineFiles = findSkylineRendererFiles(snapshot.output);
+					if (skylineFiles.length) {
+						this.hmrRuntimeSession.requestClassic({
+							code: "skyline",
+							message: "微信 Skyline 暂不支持状态保持 HMR。",
+							files: skylineFiles
+						});
+						return;
+					}
+					await offerStatefulHmrSnapshot(this.context, new StatefulHmrSnapshotHandoff(snapshot, snapshot.inputs));
+					this.statefulController = createStatefulHmrHostPlugins(this.context);
+				} catch (error) {
+					const fallback = getHmrRuntimeCapabilityFallback(error);
+					if (!fallback) throw error;
+					this.hmrRuntimeSession.requestClassic(fallback);
+				}
+			});
 		}
 		return this.context.configService.merge(void 0, createSharedBuildConfig(this.context.configService, this.context.scanService));
 	}
+	/** 只关闭本代资源；宿主负责在原生 watcher 和服务器均退出后恢复 IDE 设置。 */
+	closeHostGeneration(reason) {
+		if (!this.hostClosing) {
+			if (reason === "restart" && this.hmrRuntimeSession.fallback) prepareStatefulClassicHandoff(this.context);
+			this.hostClosing = super.close();
+		}
+		return this.hostClosing;
+	}
+	/** 无宿主的构建或首次配置失败可直接释放，已绑定宿主必须走其关闭门禁。 */
+	close(reason = "close") {
+		return reason === "restart" ? this.closeHostGeneration(reason) : this.terminalClosing ??= this.closeHostGeneration(reason).then(() => this.releaseClassicIdeConfig());
+	}
+	/** 只释放仍未被替换宿主接管的 owner，初始化失败和遗弃交接使用同一关闭门禁。 */
+	async releaseClassicIdeConfig() {
+		await super.close();
+		if (runtimeOwners.get(this.hmrRuntimeSession) === this) await this.hmrRuntimeSession.classicIdeConfig.close();
+	}
+	/** 原生宿主链已完全退出后，连同尚未绑定宿主的失败替换代一起释放。 */
+	async releaseHostClassicIdeConfig() {
+		await runtimeOwners.get(this.hmrRuntimeSession)?.closeHostGeneration("close");
+		await this.hmrRuntimeSession.classicIdeConfig.close();
+	}
 	validateEntries() {
 		if (this.validating && !this.isClosing) return this.validating;
 		if (this.state !== "ready" && this.state !== "building") return Promise.reject(/* @__PURE__ */ new Error(`[weapp-vite] 无法从 ${this.state} 状态开始构建。`));
@@ -330,6 +387,9 @@ var WeappBuildSession = class extends CompilerSession {
 			await syncManagedTsconfigFiles(this.context);
 			if (this.isClosing) throw new Error("[weapp-vite] 构建会话已关闭。");
 			this.state = "building";
+		}).catch((error) => {
+			getInitialBuildInputObservation(this.context.configService)?.close();
+			throw error;
 		}).finally(() => {
 			this.validating = void 0;
 		});
@@ -345,7 +405,9 @@ var WeappBuildSession = class extends CompilerSession {
 		let reportedReady = false;
 		const reportReady = () => {
 			if (started && successful && !reportedReady && !this.isClosing) {
+				if (this.statefulController && this.hmrRuntimeSession.phase === "switching") return;
 				reportedReady = true;
+				if (!this.statefulController) this.hmrRuntimeSession.markClassic();
 				server.config.logger.info(`[weapp-vite] 小程序开发产物已就绪 (${this.statefulController ? "stateful-experimental" : "classic"})`);
 			}
 		};

package/dist/test.mjs

@@ -1,10 +1,11 @@
-import { g as captureWatchDependencies, u as CompilerSession } from "./createCompilerContextInstance-DJH_P_nZ.mjs";
-import { a as parseSidecarModuleId, i as parseLogicalEntryId } from "./protocol-vg8HGJ4n.mjs";
+import { m as captureWatchDependencies, u as CompilerSession } from "./createCompilerContextInstance-aYwi8wQt.mjs";
+import { a as parseSidecarModuleId, i as parseLogicalEntryId } from "./protocol-Cg6Jdlvb.mjs";
+import { Q as chokidar_default } from "./devProvider-D-hTfsEO.mjs";
+import { n as normalizePath, t as isPathInside } from "./path-CYYIQGS7.mjs";
 import process from "node:process";
 import path from "node:path";
 import fs from "node:fs/promises";
 import { createHash, randomUUID } from "node:crypto";
-import chokidar from "chokidar";
 //#region src/testArtifact/inputs.ts
 const sessionId = randomUUID();
 const excludedDirectories = /* @__PURE__ */ new Set([
@@ -137,10 +138,11 @@ async function buildTestArtifact(options = {}) {
 				sourceRootPath: ctx.configService.absoluteSrcRoot
 			};
 			const paths = [...dependencies, outDir];
+			const fingerprint = await fingerprintPaths(paths);
 			const stable = (await Promise.all([...discoveredInputs].map(async ([file, fingerprint]) => await fingerprint === await fingerprintPaths([file])))).every(Boolean) && before === await fingerprintPaths(initialInputs, [outDir]);
 			artifactInputs.set(artifact, {
 				paths,
-				fingerprint: stable ? await fingerprintPaths(paths) : ""
+				fingerprint: stable ? fingerprint : ""
 			});
 			return artifact;
 		} finally {
@@ -156,13 +158,13 @@ async function watchTestArtifact(options = {}) {
 	let dirty = false;
 	let forced = false;
 	let closing;
-	const watchedInputs = () => artifactInputs.get(artifact).paths.filter((file) => file !== artifact.miniprogramRootPath && (file === artifact.sourceRootPath || !file.startsWith(`${artifact.sourceRootPath}${path.sep}`)));
+	const watchedInputs = () => [...new Map(artifactInputs.get(artifact).paths.map((file) => [normalizePath(file), file])).values()].filter((file) => !isPathInside(artifact.miniprogramRootPath, file) && (normalizePath(file) === normalizePath(artifact.sourceRootPath) || !isPathInside(artifact.sourceRootPath, file)));
 	let watched = watchedInputs();
-	const watcher = chokidar.watch(watched, {
+	const watcher = chokidar_default.watch(watched, {
 		ignoreInitial: true,
 		ignored(file) {
-			if (watched.some((input) => input === file || input.startsWith(`${file}${path.sep}`))) return false;
-			return /[/\\](?:node_modules|\.git|\.weapp-vite)(?:[/\\]|$)/.test(file) || file === artifact.miniprogramRootPath || file.startsWith(`${artifact.miniprogramRootPath}${path.sep}`);
+			if (watched.some((input) => isPathInside(file, input))) return false;
+			return /[/\\](?:node_modules|\.git|\.weapp-vite)(?:[/\\]|$)/.test(file) || isPathInside(artifact.miniprogramRootPath, file);
 		}
 	});
 	const requestRebuild = (force) => {

package/dist/{types-CgZn5X6j.d.mts → types-D-kfuyVa.d.mts}

@@ -1,5 +1,4 @@
-import "@weapp-vite/i18n/compiler";
-import "@weapp-vite/i18n";
+import "@weapp-vite/i18n/types";
 //#region src/i18n/types.d.ts
 interface WeappI18nConfig {
   defaultLocale: string;

package/dist/types-D0FFexRF.d.mts

@@ -0,0 +1,39 @@
+//#region src/analyze/glassEasel/types.d.ts
+type GlassEaselDiagnosticCode = 'GE001' | 'GE002' | 'GE003' | 'GE004' | 'GE005' | 'GE006';
+type GlassEaselDiagnosticSeverity = 'error' | 'warning';
+interface GlassEaselDiagnostic {
+  code: GlassEaselDiagnosticCode;
+  severity: GlassEaselDiagnosticSeverity;
+  message: string;
+  file: string;
+  line?: number;
+  column?: number;
+  normalized?: boolean;
+}
+/** 每个 source/output owner 的最近分析事实；日志去重状态不属于当前事实。 */
+interface GlassEaselAnalysisFact {
+  kind: 'output' | 'source';
+  scope?: string;
+  detected: boolean;
+  diagnostics: Map<string, GlassEaselDiagnostic>;
+  sourceIds: Set<string>;
+}
+interface GlassEaselAnalyzeResult {
+  detected: boolean;
+  minimumBaseLibrary: '3.8.12';
+  migrationGuide: string;
+  diagnostics: GlassEaselDiagnostic[];
+  summary: {
+    errors: number;
+    warnings: number;
+  };
+}
+interface GlassEaselTemplateFinding {
+  code: Extract<GlassEaselDiagnosticCode, 'GE002' | 'GE003' | 'GE004'>;
+  severity: GlassEaselDiagnosticSeverity;
+  message: string;
+  start: number;
+  normalized?: boolean;
+}
+//#endregion
+export { GlassEaselAnalyzeResult as n, GlassEaselTemplateFinding as r, GlassEaselAnalysisFact as t };

package/dist/types.d.mts

@@ -1,5 +1,5 @@
 import { f as Resolver } from "./index-CaXAtb9e.mjs";
 import { n as AutoRoutesSubPackage, t as AutoRoutes } from "./routes-C7fCmf92.mjs";
-import { $ as WeappCompilerHmrRequest, $n as NpmMainPackageConfig, $t as WeappSubPackageConfig, A as PluginOption, An as DeprecatedInlineDynamicImports, Ar as WeappWebConfig, At as ScanWxmlOptions, B as ViteDevServer, Bn as GenerateTemplateFileSource, Bt as WeappInjectRequestGlobalsTarget, Cn as Alias, Cr as WeappLibInternalDtsOptions, Ct as WeappViteConfig, D as InlineConfig, Dn as ChunksConfig, Dr as WeappManagedServerTsconfigConfig, Dt as EnhanceWxmlOptions, E as ConfigEnv, En as BuildNpmPackageMeta, Er as WeappManagedNodeTsconfigConfig, Et as EnhanceOptions, F as RolldownOutput, Fn as GenerateOptions, Ft as WeappAutoRoutesIncludePattern, G as Entry, Gn as JsonConfig, Gt as WeappNpmConfig, H as AppEntry, Hn as GenerateTemplateScope, Ht as WeappInjectWebRuntimeGlobalsConfig, I as RolldownPlugin, In as GenerateTemplate, It as WeappBuildScopeConfig, J as ComponentsMap, Jn as JsonMergeStage, Jt as WeappReactCompilerConfig, K as EntryJsonFragment, Kn as JsonMergeContext, Kt as WeappPreloadNetwork, L as RolldownPluginOption, Ln as GenerateTemplateContext, Lt as WeappBuildScopeObjectConfig, M as ResolvedConfig, Mn as GenerateExtensionsOptions, Mr as WeappViteHostMeta, Mt as WeappAppPreludeMode, N as RolldownBuild, Nn as GenerateFileType, Nt as WeappAutoRoutesConfig, O as MethodDefinitions, On as CopyGlobs, Or as WeappManagedSharedTsconfigConfig, Ot as HandleWxmlOptions, P as RolldownOptions, Pn as GenerateFilenamesOptions, Pt as WeappAutoRoutesInclude, Q as WeappCompilerHmrPreparation, Qn as NpmDependencyPattern, Qt as WeappRouteRules, R as RolldownWatchOptions, Rn as GenerateTemplateEntry, Rt as WeappHmrConfig, Sn as MultiPlatformProjectConfigs, Sr as WeappLibFileName, St as WeappUploadConfig, T as ComputedDefinitions, Tn as AlipayNpmMode, Tr as WeappManagedAppTsconfigConfig, Tt as AutoImportComponentsOption, U as BaseEntry, Un as GenerateTemplatesConfig, Ut as WeappInjectWebRuntimeGlobalsTarget, V as BindingErrorLike, Vn as GenerateTemplateInlineSource, Vr as WeappViteRuntime, Vt as WeappInjectWeapiConfig, W as ComponentEntry, Wn as JsFormat, Wt as WeappMcpConfig, X as WxmlDep, Xn as MpPlatform, Xt as WeappRequestRuntimeConfig, Y as ScanComponentItem, Yn as JsonMergeStrategy, Yt as WeappReactConfig, Z as WeappCompilerHmrAsset, Zn as NpmBuildOptions, Zt as WeappRouteRule, _n as WxmlTransformContext, _r as SubPackageStyleScope, _t as WeappAnalyzeHistoryConfig, an as WeappWorkerConfig, ar as SharedChunkDynamicImports, at as WeappCompilerPluginFactory, b as ChangeEvent, bn as WxmlTransformVisitor, br as WeappLibDtsOptions, bt as WeappForwardConsoleLogLevel, cn as WxmlValidate, cr as SharedChunkStrategy, ct as WeappCompilerResourceKind, dn as WxmlValidationVisitor, dr as StyleEntry, dt as WeappCompilerTransformResult, en as WeappUniAppConfig, er as NpmPackageFilesConfig, et as WeappCompilerOutputRequest, fn as WxmlAttribute, fr as StyleScope, ft as ProjectConfig, gn as WxmlTransform, gr as SubPackageStyleEntry, gt as WeappAnalyzeConfig, hn as WxmlSourceLocation, hr as SubPackageStyleConfigObject, ht as WeappAnalyzeBudgetConfig, in as WeappWevuConfig, ir as ResolvedAlias, it as WeappCompilerPluginController, j as Ref, jn as GenerateDirsOptions, jt as WeappAppPreludeConfig, k as Plugin, kn as CopyOptions, kr as WeappManagedTypeScriptConfig, kt as MultiPlatformConfig, ln as WxmlValidationContext, lr as StyleConfigEntry, lt as WeappCompilerSourceClaim, mn as WxmlElementInfo, mr as SubPackageStyleConfigEntry, mt as UserConfig, nn as WeappVueTemplateConfig, nr as NpmStrategy, nt as WeappCompilerPluginCapabilities, on as WxmlRemoveAttrRule, or as SharedChunkMode, ot as WeappCompilerPluginOption, pn as WxmlAttributeValue, pr as SubPackage, pt as SubPackageMetaValue, q as PageEntry, qn as JsonMergeFunction, qt as WeappPreloadRule, rn as WeappWebRuntimeConfig, rr as NpmSubPackageConfig, rt as WeappCompilerPluginContext, sn as WxmlRemoveOptions, sr as SharedChunkOverride, st as WeappCompilerPluginPhase, tn as WeappVueConfig, tr as NpmPluginPackageConfig, tt as WeappCompilerPlugin, un as WxmlValidationDiagnostic, ur as StyleConfigObject, ut as WeappCompilerSourceRequest, vn as WxmlTransformNode, vr as WeappLibComponentJson, vt as WeappDebugConfig, wn as AliasOptions, wr as WeappLibVueTscOptions, wt as AutoImportComponents, x as WeappVitePluginApi, xn as MultiPlatformProjectConfig, xr as WeappLibEntryContext, xt as WeappTailwindcssOptions, yn as WxmlTransformResult, yr as WeappLibConfig, yt as WeappForwardConsoleConfig, z as RolldownWatcher, zn as GenerateTemplateFactory, zt as WeappInjectRequestGlobalsConfig } from "./config-V0L-IAJf.mjs";
-import { t as WeappI18nConfig } from "./types-CgZn5X6j.mjs";
+import { $ as WeappCompilerOutputRequest, $n as NpmPackageFilesConfig, $t as WeappUniAppConfig, A as Ref, An as GenerateDirsOptions, At as WeappAppPreludeConfig, B as BindingErrorLike, Bn as GenerateTemplateInlineSource, Br as WeappViteRuntime, Bt as WeappInjectWeapiConfig, Cn as AliasOptions, Cr as WeappLibVueTscOptions, Ct as AutoImportComponents, D as MethodDefinitions, Dn as CopyGlobs, Dr as WeappManagedSharedTsconfigConfig, Dt as HandleWxmlOptions, E as InlineConfig, En as ChunksConfig, Er as WeappManagedServerTsconfigConfig, Et as EnhanceWxmlOptions, F as RolldownPlugin, Fn as GenerateTemplate, Ft as WeappBuildScopeConfig, G as EntryJsonFragment, Gn as JsonMergeContext, Gt as WeappPreloadNetwork, H as BaseEntry, Hn as GenerateTemplatesConfig, Ht as WeappInjectWebRuntimeGlobalsTarget, I as RolldownPluginOption, In as GenerateTemplateContext, It as WeappBuildScopeObjectConfig, J as ScanComponentItem, Jn as JsonMergeStrategy, Jt as WeappReactConfig, K as PageEntry, Kn as JsonMergeFunction, Kt as WeappPreloadRule, L as RolldownWatchOptions, Ln as GenerateTemplateEntry, Lt as WeappHmrConfig, M as RolldownBuild, Mn as GenerateFileType, Mt as WeappAutoRoutesConfig, N as RolldownOptions, Nn as GenerateFilenamesOptions, Nt as WeappAutoRoutesInclude, O as Plugin, On as CopyOptions, Or as WeappManagedTypeScriptConfig, Ot as MultiPlatformConfig, P as RolldownOutput, Pn as GenerateOptions, Pt as WeappAutoRoutesIncludePattern, Q as WeappCompilerHmrRequest, Qn as NpmMainPackageConfig, Qt as WeappSubPackageConfig, R as RolldownWatcher, Rn as GenerateTemplateFactory, Rt as WeappInjectRequestGlobalsConfig, Sn as Alias, Sr as WeappLibInternalDtsOptions, St as WeappViteConfig, T as ConfigEnv, Tn as BuildNpmPackageMeta, Tr as WeappManagedNodeTsconfigConfig, Tt as EnhanceOptions, U as ComponentEntry, Un as JsFormat, Ut as WeappMcpConfig, V as AppEntry, Vn as GenerateTemplateScope, Vt as WeappInjectWebRuntimeGlobalsConfig, W as Entry, Wn as JsonConfig, Wt as WeappNpmConfig, X as WeappCompilerHmrAsset, Xn as NpmBuildOptions, Xt as WeappRouteRule, Y as WxmlDep, Yn as MpPlatform, Yt as WeappRequestRuntimeConfig, Z as WeappCompilerHmrPreparation, Zn as NpmDependencyPattern, Zt as WeappRouteRules, _n as WxmlTransformNode, _r as WeappLibComponentJson, _t as WeappDebugConfig, an as WxmlRemoveAttrRule, ar as SharedChunkMode, at as WeappCompilerPluginOption, b as ChangeEvent, bn as MultiPlatformProjectConfig, br as WeappLibEntryContext, bt as WeappTailwindcssOptions, cn as WxmlValidationContext, cr as StyleConfigEntry, ct as WeappCompilerSourceClaim, dn as WxmlAttribute, dr as StyleScope, dt as ProjectConfig, en as WeappVueConfig, er as NpmPluginPackageConfig, et as WeappCompilerPlugin, fn as WxmlAttributeValue, fr as SubPackage, ft as SubPackageMetaValue, gn as WxmlTransformContext, gr as SubPackageStyleScope, gt as WeappAnalyzeHistoryConfig, hn as WxmlTransform, hr as SubPackageStyleEntry, ht as WeappAnalyzeConfig, in as WeappWorkerConfig, ir as SharedChunkDynamicImports, it as WeappCompilerPluginFactory, j as ResolvedConfig, jn as GenerateExtensionsOptions, jr as WeappViteHostMeta, jt as WeappAppPreludeMode, k as PluginOption, kn as DeprecatedInlineDynamicImports, kr as WeappWebConfig, kt as ScanWxmlOptions, ln as WxmlValidationDiagnostic, lr as StyleConfigObject, lt as WeappCompilerSourceRequest, mn as WxmlSourceLocation, mr as SubPackageStyleConfigObject, mt as WeappAnalyzeBudgetConfig, nn as WeappWebRuntimeConfig, nr as NpmSubPackageConfig, nt as WeappCompilerPluginContext, on as WxmlRemoveOptions, or as SharedChunkOverride, ot as WeappCompilerPluginPhase, pn as WxmlElementInfo, pr as SubPackageStyleConfigEntry, pt as UserConfig, q as ComponentsMap, qn as JsonMergeStage, qt as WeappReactCompilerConfig, rn as WeappWevuConfig, rr as ResolvedAlias, rt as WeappCompilerPluginController, sn as WxmlValidate, sr as SharedChunkStrategy, st as WeappCompilerResourceKind, tn as WeappVueTemplateConfig, tr as NpmStrategy, tt as WeappCompilerPluginCapabilities, un as WxmlValidationVisitor, ur as StyleEntry, ut as WeappCompilerTransformResult, vn as WxmlTransformResult, vr as WeappLibConfig, vt as WeappForwardConsoleConfig, w as ComputedDefinitions, wn as AlipayNpmMode, wr as WeappManagedAppTsconfigConfig, wt as AutoImportComponentsOption, x as WeappVitePluginApi, xn as MultiPlatformProjectConfigs, xr as WeappLibFileName, xt as WeappUploadConfig, yn as WxmlTransformVisitor, yr as WeappLibDtsOptions, yt as WeappForwardConsoleLogLevel, z as ViteDevServer, zn as GenerateTemplateFileSource, zt as WeappInjectRequestGlobalsTarget } from "./config-Bf6DWhyb.mjs";
+import { t as WeappI18nConfig } from "./types-D-kfuyVa.mjs";
 export { Alias, AliasOptions, AlipayNpmMode, AppEntry, AutoImportComponents, AutoImportComponentsOption, AutoRoutes, AutoRoutesSubPackage, BaseEntry, BindingErrorLike, BuildNpmPackageMeta, ChangeEvent, ChunksConfig, ComponentEntry, ComponentsMap, type ComputedDefinitions, type ConfigEnv, CopyGlobs, CopyOptions, DeprecatedInlineDynamicImports, EnhanceOptions, EnhanceWxmlOptions, Entry, EntryJsonFragment, GenerateDirsOptions, GenerateExtensionsOptions, GenerateFileType, GenerateFilenamesOptions, GenerateOptions, GenerateTemplate, GenerateTemplateContext, GenerateTemplateEntry, GenerateTemplateFactory, GenerateTemplateFileSource, GenerateTemplateInlineSource, GenerateTemplateScope, GenerateTemplatesConfig, HandleWxmlOptions, type InlineConfig, JsFormat, type JsonConfig, type JsonMergeContext, type JsonMergeFunction, type JsonMergeStage, type JsonMergeStrategy, type MethodDefinitions, MpPlatform, MultiPlatformConfig, MultiPlatformProjectConfig, MultiPlatformProjectConfigs, NpmBuildOptions, NpmDependencyPattern, NpmMainPackageConfig, NpmPackageFilesConfig, NpmPluginPackageConfig, NpmStrategy, NpmSubPackageConfig, PageEntry, type Plugin, type PluginOption, ProjectConfig, type Ref, ResolvedAlias, type ResolvedConfig, type Resolver, type RolldownBuild, type RolldownOptions, type RolldownOutput, type RolldownPlugin, type RolldownPluginOption, type RolldownWatchOptions, type RolldownWatcher, ScanComponentItem, ScanWxmlOptions, SharedChunkDynamicImports, SharedChunkMode, SharedChunkOverride, SharedChunkStrategy, StyleConfigEntry, StyleConfigObject, StyleEntry, StyleScope, SubPackage, SubPackageMetaValue, SubPackageStyleConfigEntry, SubPackageStyleConfigObject, SubPackageStyleEntry, SubPackageStyleScope, UserConfig, type ViteDevServer, WeappAnalyzeBudgetConfig, WeappAnalyzeConfig, WeappAnalyzeHistoryConfig, WeappAppPreludeConfig, WeappAppPreludeMode, WeappAutoRoutesConfig, WeappAutoRoutesInclude, WeappAutoRoutesIncludePattern, WeappBuildScopeConfig, WeappBuildScopeObjectConfig, type WeappCompilerHmrAsset, type WeappCompilerHmrPreparation, type WeappCompilerHmrRequest, WeappCompilerOutputRequest, WeappCompilerPlugin, WeappCompilerPluginCapabilities, WeappCompilerPluginContext, WeappCompilerPluginController, WeappCompilerPluginFactory, WeappCompilerPluginOption, WeappCompilerPluginPhase, WeappCompilerResourceKind, WeappCompilerSourceClaim, WeappCompilerSourceRequest, WeappCompilerTransformResult, WeappDebugConfig, WeappForwardConsoleConfig, WeappForwardConsoleLogLevel, WeappHmrConfig, type WeappI18nConfig, WeappInjectRequestGlobalsConfig, WeappInjectRequestGlobalsTarget, WeappInjectWeapiConfig, WeappInjectWebRuntimeGlobalsConfig, WeappInjectWebRuntimeGlobalsTarget, WeappLibComponentJson, WeappLibConfig, WeappLibDtsOptions, WeappLibEntryContext, WeappLibFileName, WeappLibInternalDtsOptions, WeappLibVueTscOptions, WeappManagedAppTsconfigConfig, WeappManagedNodeTsconfigConfig, WeappManagedServerTsconfigConfig, WeappManagedSharedTsconfigConfig, WeappManagedTypeScriptConfig, WeappMcpConfig, WeappNpmConfig, WeappPreloadNetwork, WeappPreloadRule, WeappReactCompilerConfig, WeappReactConfig, WeappRequestRuntimeConfig, WeappRouteRule, WeappRouteRules, WeappSubPackageConfig, WeappTailwindcssOptions, WeappUniAppConfig, WeappUploadConfig, WeappViteConfig, type WeappViteHostMeta, WeappVitePluginApi, type WeappViteRuntime, WeappVueConfig, WeappVueTemplateConfig, WeappWebConfig, WeappWebRuntimeConfig, WeappWevuConfig, WeappWorkerConfig, WxmlAttribute, WxmlAttributeValue, WxmlDep, WxmlElementInfo, WxmlRemoveAttrRule, WxmlRemoveOptions, WxmlSourceLocation, WxmlTransform, WxmlTransformContext, WxmlTransformNode, WxmlTransformResult, WxmlTransformVisitor, WxmlValidate, WxmlValidationContext, WxmlValidationDiagnostic, WxmlValidationVisitor };

package/dist/{upload-D4msblBf.mjs → upload-DozK8UdN.mjs}

@@ -6,17 +6,121 @@ import { pathToFileURL } from "node:url";
 import path from "node:path";
 import { mkdir, readFile, stat } from "node:fs/promises";
 import { getPackageInfo } from "local-pkg";
+import { Buffer } from "node:buffer";
+import { performance } from "node:perf_hooks";
 import { execFile, execFileSync } from "node:child_process";
+//#region src/cli/upload/processTreeDiagnostics.ts
+const diagnostics = /* @__PURE__ */ new WeakMap();
+const MARKER_PREFIX = "[weapp-vite:upload-process-tree:v1]";
+const MARKER_RE = /^\[weapp-vite:upload-process-tree:v1\] (script-enter|parent-query-start|parent-query-end|children-query-start|children-query-end) (\d{1,9}) (\d{1,16})$/;
+const ERROR_CODES = /* @__PURE__ */ new Set([
+	"ETIMEDOUT",
+	"ENOENT",
+	"EACCES",
+	"EPERM",
+	"ENOBUFS",
+	"EIO",
+	"UNKNOWN"
+]);
+const SIGNALS = /* @__PURE__ */ new Set([
+	"SIGTERM",
+	"SIGKILL",
+	"SIGINT",
+	"SIGABRT"
+]);
+/** 标记只写入诊断管道，不进入供清理使用的 PID 输出。 */
+const WINDOWS_PROCESS_TREE_DIAGNOSTIC_SETUP = `\$wvTreeClock = [Diagnostics.Stopwatch]::StartNew(); function Write-WvTreeStage([string]\$stage) { [Console]::Error.WriteLine('${MARKER_PREFIX} ' + $stage + ' ' + $wvTreeClock.ElapsedMilliseconds + ' ' + [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds()) }; `;
+function processTreeStageCommand(stage) {
+	return `Write-WvTreeStage '${stage}'; `;
+}
+function readMarkers(stderr, elapsedMs) {
+	const text = Buffer.isBuffer(stderr) ? stderr.subarray(0, 8192).toString("utf8") : typeof stderr === "string" ? Buffer.from(stderr.slice(0, 8192)).subarray(0, 8192).toString("utf8") : "";
+	const markers = [];
+	for (const line of text.split(/\r?\n/)) {
+		const match = MARKER_RE.exec(line);
+		if (!match) continue;
+		const elapsed = Number(match[2]);
+		const utc = Number(match[3]);
+		if (!Number.isSafeInteger(elapsed) || elapsed > elapsedMs || !Number.isSafeInteger(utc) || markers.length >= 8) return [];
+		markers.push({
+			stage: match[1],
+			elapsedMs: elapsed,
+			utcMs: utc
+		});
+	}
+	const expected = markers[1]?.stage === "parent-query-start" ? [
+		"script-enter",
+		"parent-query-start",
+		"parent-query-end",
+		"children-query-start",
+		"children-query-end"
+	] : [
+		"script-enter",
+		"children-query-start",
+		"children-query-end"
+	];
+	return markers.every((marker, index) => marker.stage === expected[index] && marker.elapsedMs >= (markers[index - 1]?.elapsedMs ?? 0)) ? markers : [];
+}
+function describeQuery(error, elapsedMs, utcStart, utcEnd) {
+	const failure = error;
+	const markers = readMarkers(failure.stderr, elapsedMs);
+	const first = markers[0];
+	const last = markers.at(-1);
+	const result = {
+		elapsedMs,
+		stage: last?.stage ?? "before-script-entry-or-unobserved"
+	};
+	if (typeof failure.code === "string" && ERROR_CODES.has(failure.code)) result.code = failure.code;
+	if (typeof failure.signal === "string" && SIGNALS.has(failure.signal)) result.signal = failure.signal;
+	if (typeof failure.status === "number" && Number.isSafeInteger(failure.status)) result.status = failure.status;
+	const startupMs = first && first.utcMs - utcStart;
+	if (first && startupMs !== void 0 && startupMs >= 0 && startupMs <= elapsedMs && Math.abs(utcEnd - utcStart - elapsedMs) <= 5 && markers.every((marker) => Math.abs(marker.utcMs - first.utcMs - (marker.elapsedMs - first.elapsedMs)) <= 5)) {
+		result.startupMs = startupMs;
+		if (last?.stage === "parent-query-start" || last?.stage === "children-query-start") result.activeQueryMs = Math.max(0, elapsedMs - startupMs - (last.elapsedMs - first.elapsedMs));
+	}
+	for (const [name, key] of [["parent", "parentQueryMs"], ["children", "childrenQueryMs"]]) {
+		const start = markers.find((marker) => marker.stage === `${name}-query-start`);
+		const end = markers.find((marker) => marker.stage === `${name}-query-end`);
+		if (start && end) result[key] = end.elapsedMs - start.elapsedMs;
+	}
+	return result;
+}
+/** 只附带标量诊断，保持清理失败的原始异常身份与控制流。 */
+function observeWindowsProcessTreeQuery(run) {
+	const startedAt = performance.now();
+	const utcStart = Date.now();
+	try {
+		return run();
+	} catch (error) {
+		if (error && typeof error === "object") {
+			const elapsedMs = Math.max(0, Math.round(performance.now() - startedAt));
+			diagnostics.set(error, {
+				elapsedMs,
+				stage: "before-script-entry-or-unobserved"
+			});
+			try {
+				diagnostics.set(error, describeQuery(error, elapsedMs, utcStart, Date.now()));
+			} catch {}
+		}
+		throw error;
+	}
+}
+/** Windows 查询只展示白名单诊断，不能回显异常中携带的命令或原始 stderr。 */
+function describeUploadProcessTreeError(error) {
+	const diagnostic = error && typeof error === "object" ? diagnostics.get(error) : void 0;
+	return diagnostic ? `PowerShell 进程归属查询失败 ${JSON.stringify(diagnostic)}` : String(error);
+}
+//#endregion
 //#region src/cli/upload/processTree.ts
 function childPids(pid, lifetime) {
 	if (process.platform === "win32") {
 		const since = lifetime ? `[DateTimeOffset]::FromUnixTimeMilliseconds(${lifetime.start}).UtcDateTime` : `(Get-CimInstance Win32_Process -Filter 'ProcessId = ${pid}').CreationDate.ToUniversalTime()`;
 		const until = lifetime ? `[DateTimeOffset]::FromUnixTimeMilliseconds(${lifetime.end}).UtcDateTime` : "[DateTime]::UtcNow";
-		return execFileSync("powershell.exe", [
+		return observeWindowsProcessTreeQuery(() => execFileSync("powershell.exe", [
 			"-NoProfile",
 			"-NonInteractive",
 			"-Command",
-			`$ErrorActionPreference = 'Stop'; $since = ${since}; $until = ${until}; Get-CimInstance Win32_Process -Filter 'ParentProcessId = ${pid}' | Where-Object { \$_.CreationDate.ToUniversalTime() -ge \$since -and \$_.CreationDate.ToUniversalTime() -le \$until } | Select-Object -ExpandProperty ProcessId`
+			`$ErrorActionPreference = 'Stop'; ${WINDOWS_PROCESS_TREE_DIAGNOSTIC_SETUP}${processTreeStageCommand("script-enter")}${lifetime ? "" : processTreeStageCommand("parent-query-start")}$since = ${since}; ${lifetime ? "" : processTreeStageCommand("parent-query-end")}$until = ${until}; ${processTreeStageCommand("children-query-start")}Get-CimInstance Win32_Process -Filter 'ParentProcessId = ${pid}' | Where-Object { $_.CreationDate.ToUniversalTime() -ge $since -and $_.CreationDate.ToUniversalTime() -le $until } | Select-Object -ExpandProperty ProcessId; ${processTreeStageCommand("children-query-end")}`
 		], {
 			encoding: "utf8",
 			windowsHide: true,
@@ -24,9 +128,9 @@ function childPids(pid, lifetime) {
 			stdio: [
 				"ignore",
 				"pipe",
-				"ignore"
+				"pipe"
 			]
-		}).split(/\s+/).map(Number).filter((value) => Number.isSafeInteger(value) && value > 0);
+		})).split(/\s+/).map(Number).filter((value) => Number.isSafeInteger(value) && value > 0);
 	}
 	const output = execFileSync("ps", [
 		"-A",
@@ -559,4 +663,4 @@ function prepareUpload(platform, context, action = "upload") {
 	return providers[platform](context, action);
 }
 //#endregion
-export { terminateUploadProcess as a, terminateUploadDescendants as i, resolveUploadPlatforms as n, redactUploadSecrets as r, prepareUpload as t };
+export { terminateUploadProcess as a, terminateUploadDescendants as i, resolveUploadPlatforms as n, describeUploadProcessTreeError as o, redactUploadSecrets as r, prepareUpload as t };

package/dist/upload-worker.mjs

@@ -1,4 +1,4 @@
-import { i as terminateUploadDescendants, r as redactUploadSecrets, t as prepareUpload } from "./upload-D4msblBf.mjs";
+import { i as terminateUploadDescendants, r as redactUploadSecrets, t as prepareUpload } from "./upload-DozK8UdN.mjs";
 import process from "node:process";
 //#region src/cli/upload/uploadResult.ts
 function record(value) {