weapp-vite 6.15.12 → 6.15.13

package/dist/auto-routes.mjs

@@ -1,4 +1,4 @@
-import { i as getCompilerContext, u as getRouteRuntimeGlobalKeys } from "./createContext-CySjzbQy.mjs";
+import { i as getCompilerContext, u as getRouteRuntimeGlobalKeys } from "./createContext-CBnOZ_FN.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 { S as isPathInside, _ as DEFAULT_MP_PLATFORM, b as resolveMiniPlatform, c as createSharedBuildConfig, d as resolveWeappConfigFile, f as checkRuntime, g as createCjsConfigLoadError, h as parseCommentJson, l as SHARED_CHUNK_VIRTUAL_PREFIX, m as loadViteConfigFile, n as syncProjectSupportFiles, p as getProjectConfigFileName, r as syncManagedTsconfigBootstrapFiles, s as formatBytes, t as createCompilerContext, v as getDefaultIdeProjectRoot, x as shouldPassPlatformArgToIdeOpen, y as normalizeMiniPlatform } from "./createContext-CySjzbQy.mjs";
+import { S as isPathInside, _ as DEFAULT_MP_PLATFORM, b as resolveMiniPlatform, c as createSharedBuildConfig, d as resolveWeappConfigFile, f as checkRuntime, g as createCjsConfigLoadError, h as parseCommentJson, l as SHARED_CHUNK_VIRTUAL_PREFIX, m as loadViteConfigFile, n as syncProjectSupportFiles, p as getProjectConfigFileName, r as syncManagedTsconfigBootstrapFiles, s as formatBytes, t as createCompilerContext, v as getDefaultIdeProjectRoot, x as shouldPassPlatformArgToIdeOpen, y as normalizeMiniPlatform } from "./createContext-CBnOZ_FN.mjs";
 import { r as logger_default, t as colors } from "./logger-CgxdNjvb.mjs";
-import { h as VERSION } from "./file-pbdfOAKg.mjs";
+import { h as VERSION } from "./file-CycxGM0E.mjs";
 import { a as resolveWeappMcpConfig, o as startWeappViteMcpServer } from "./mcp-DRlj32v4.mjs";
 import { createRequire } from "node:module";
 import path, { posix } from "pathe";
@@ -2125,7 +2125,7 @@ function registerPrepareCommand(cli) {
 }
 //#endregion
 //#region package.json
-var version = "6.15.12";
+var version = "6.15.13";
 //#endregion
 //#region src/cli/devHotkeys/format.ts
 const FULLWIDTH_ASCII_START = 65281;

package/dist/{createContext-CySjzbQy.mjs → createContext-CBnOZ_FN.mjs}

@@ -1,6 +1,6 @@
 import { n as applyWeappViteHostMeta } from "./pluginHost-BzPJL4F-.mjs";
 import { n as configureLogger, r as logger_default } from "./logger-CgxdNjvb.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-pbdfOAKg.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-CycxGM0E.mjs";
 import { createRequire, isBuiltin } from "node:module";
 import path, { posix } from "pathe";
 import path$1, { normalize, relative, win32 } from "node:path";
@@ -29265,6 +29265,18 @@ function matchesSubPackageDependency(dependencies, importee, fallbackDependencie
 }
 //#endregion
 //#region src/plugins/core/lifecycle/emit/rewrite/localRoot.ts
+function isRelativeMiniprogramNpmImport(importee) {
+	return importee === "miniprogram_npm" || importee.startsWith("./miniprogram_npm/") || importee.startsWith("../miniprogram_npm/") || importee.includes("/miniprogram_npm/");
+}
+function isToEsmCall(node) {
+	const callee = node?.callee;
+	if (!callee) return false;
+	if (callee.type === "Identifier") return callee.name === "__toESM";
+	return callee.type === "MemberExpression" && !callee.computed && callee.property?.type === "Identifier" && callee.property.name === "__toESM";
+}
+function isNumericOneLiteral(node) {
+	return (node?.type === "NumericLiteral" || node?.type === "Literal") && node.value === 1;
+}
 function toRelativeRuntimeNpmImport(fileName, root, importee, basedir) {
 	const normalized = normalizeWeappLocalNpmImport(importee, basedir);
 	const target = root ? `${root}/miniprogram_npm/${normalized}` : `miniprogram_npm/${normalized}`;
@@ -29276,20 +29288,54 @@ function rewriteChunkNpmImportsToLocalRoot(chunk, root, dependencyPatterns, depe
 	try {
 		const ast = parseJsLike(chunk.code);
 		let mutated = false;
-		traverse(ast, { CallExpression(path) {
-			const callee = path.node?.callee;
-			if (!callee || callee.type !== "Identifier" || callee.name !== "require") return;
-			if (path.scope?.hasBinding?.("require")) return;
-			const args = path.node.arguments;
-			if (!Array.isArray(args) || args.length === 0) return;
-			const firstArg = args[0];
-			const currentValue = getRequireImportLiteral(firstArg);
-			if (typeof currentValue !== "string" || !matchesSubPackageDependency(dependencyPatterns, currentValue, dependencies)) return;
-			const nextValue = toRelativeRuntimeNpmImport(chunk.fileName, root, currentValue, options?.basedir);
-			if (nextValue === currentValue) return;
-			setRequireImportLiteral(firstArg, nextValue);
-			mutated = true;
-		} });
+		const localizedRequireBindings = /* @__PURE__ */ new Set();
+		traverse(ast, {
+			VariableDeclarator(path) {
+				const id = path.node?.id;
+				const init = path.node?.init;
+				if (!id || id.type !== "Identifier" || !init || init.type !== "CallExpression") return;
+				const callee = init.callee;
+				if (!callee || callee.type !== "Identifier" || callee.name !== "require") return;
+				if (path.scope?.hasBinding?.("require")) return;
+				const currentValue = getRequireImportLiteral(init.arguments?.[0]);
+				if (typeof currentValue === "string" && isRelativeMiniprogramNpmImport(currentValue)) localizedRequireBindings.add(id.name);
+			},
+			AssignmentExpression(path) {
+				const left = path.node?.left;
+				const right = path.node?.right;
+				if (!left || left.type !== "Identifier" || !right || right.type !== "CallExpression") return;
+				const callee = right.callee;
+				if (!callee || callee.type !== "Identifier" || callee.name !== "require") return;
+				if (path.scope?.hasBinding?.("require")) return;
+				const currentValue = getRequireImportLiteral(right.arguments?.[0]);
+				if (typeof currentValue === "string" && isRelativeMiniprogramNpmImport(currentValue)) localizedRequireBindings.add(left.name);
+			},
+			CallExpression(path) {
+				const callee = path.node?.callee;
+				if (callee?.type === "Identifier" && callee.name === "require") {
+					if (path.scope?.hasBinding?.("require")) return;
+					const args = path.node.arguments;
+					if (!Array.isArray(args) || args.length === 0) return;
+					const firstArg = args[0];
+					const currentValue = getRequireImportLiteral(firstArg);
+					if (typeof currentValue !== "string" || !matchesSubPackageDependency(dependencyPatterns, currentValue, dependencies)) return;
+					const nextValue = toRelativeRuntimeNpmImport(chunk.fileName, root, currentValue, options?.basedir);
+					if (nextValue === currentValue) return;
+					setRequireImportLiteral(firstArg, nextValue);
+					if (isRelativeMiniprogramNpmImport(nextValue) && path.parentPath?.node?.type === "VariableDeclarator" && path.parentPath.node.id?.type === "Identifier") localizedRequireBindings.add(path.parentPath.node.id.name);
+					if (isRelativeMiniprogramNpmImport(nextValue) && path.parentPath?.node?.type === "AssignmentExpression" && path.parentPath.node.left?.type === "Identifier") localizedRequireBindings.add(path.parentPath.node.left.name);
+					mutated = true;
+					return;
+				}
+				if (!isToEsmCall(path.node)) return;
+				const args = path.node.arguments;
+				if (!Array.isArray(args) || args.length < 2 || !isNumericOneLiteral(args[1])) return;
+				const firstArg = args[0];
+				if (!(firstArg?.type === "Identifier" ? localizedRequireBindings.has(firstArg.name) : firstArg?.type === "CallExpression" && firstArg.callee?.type === "Identifier" && firstArg.callee.name === "require" && typeof getRequireImportLiteral(firstArg.arguments?.[0]) === "string" && isRelativeMiniprogramNpmImport(String(getRequireImportLiteral(firstArg.arguments?.[0]))))) return;
+				path.node.arguments = [firstArg];
+				mutated = true;
+			}
+		});
 		if (mutated) chunk.code = generate(ast).code;
 	} catch {}
 }
@@ -35311,7 +35357,7 @@ async function loadAppEntry(ctx, scanState) {
 	const vueAppPath = await findVueEntry(appBasename);
 	let configFromVue;
 	if (!appConfigFile && vueAppPath) {
-		const { extractConfigFromVue } = await import("./file-slN_aOEg.mjs");
+		const { extractConfigFromVue } = await import("./file-BbtjekFm.mjs");
 		configFromVue = await extractConfigFromVue(vueAppPath);
 		if (configFromVue) appConfigFile = vueAppPath;
 	}

package/dist/file-BbtjekFm.mjs

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

package/dist/{file-pbdfOAKg.mjs → file-CycxGM0E.mjs}

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

package/dist/getInstance-BN1eXe7O.mjs

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

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { t as createCompilerContext } from "./createContext-CySjzbQy.mjs";
+import { t as createCompilerContext } from "./createContext-CBnOZ_FN.mjs";
 import { a as defineThemeJson, i as defineSitemapJson, n as defineComponentJson, r as definePageJson, t as defineAppJson } from "./json-wnfVS9jE.mjs";
 import { a as resolveWeappViteHostMeta, i as isWeappViteHost, n as applyWeappViteHostMeta, r as createWeappViteHostMeta, t as WEAPP_VITE_HOST_NAME } from "./pluginHost-BzPJL4F-.mjs";
 import { t as defineConfig } from "./config-B2xtjEug.mjs";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "6.15.12",
+  "version": "6.15.13",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -122,7 +122,7 @@
     "@weapp-core/logger": "3.1.1",
     "@weapp-core/schematics": "6.0.4",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.15.12",
+    "@weapp-vite/ast": "6.15.13",
     "@weapp-vite/mcp": "1.2.1",
     "@weapp-vite/miniprogram-automator": "1.0.3",
     "@weapp-vite/volar": "2.1.0",
@@ -132,7 +132,7 @@
     "rolldown-require": "2.0.14",
     "vite-plugin-performance": "2.0.1",
     "weapp-ide-cli": "5.2.4",
-    "wevu": "6.15.12"
+    "wevu": "6.15.13"
   },
   "publishConfig": {
     "access": "public",

package/dist/file-slN_aOEg.mjs

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

package/dist/getInstance-BGGhJCLI.mjs

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