weapp-vite 6.7.1 → 6.7.2

package/dist/auto-routes.mjs

@@ -1,7 +1,7 @@
 import {
   getCompilerContext
-} from "./chunk-2OSU4ACJ.mjs";
-import "./chunk-4XSCGSZ5.mjs";
+} from "./chunk-FVM35BZA.mjs";
+import "./chunk-W5TTICYZ.mjs";
 import "./chunk-O4WHKAL4.mjs";
 import "./chunk-IWKOTXCO.mjs";
 import "./chunk-3STNMT72.mjs";

package/dist/{chunk-UUC4PK4V.mjs → chunk-7JSOF7N2.mjs}

@@ -2,7 +2,7 @@ import {
   getCompilerContext,
   resetCompilerContext,
   setActiveCompilerContextKey
-} from "./chunk-2OSU4ACJ.mjs";
+} from "./chunk-FVM35BZA.mjs";
 import {
   init_esm_shims
 } from "./chunk-QBSVUTNO.mjs";

package/dist/{chunk-2OSU4ACJ.mjs → chunk-FVM35BZA.mjs}

@@ -14,7 +14,7 @@ import {
   templateExtensions,
   touch,
   vueExtensions
-} from "./chunk-4XSCGSZ5.mjs";
+} from "./chunk-W5TTICYZ.mjs";
 import {
   configureLogger,
   default as default2
@@ -16848,6 +16848,9 @@ function createRelativeImport(fromFile, toFile) {
 function findChunkImporters(bundle, target) {
   const importers = /* @__PURE__ */ new Set();
   for (const [fileName, output] of Object.entries(bundle)) {
+    if (fileName === target) {
+      continue;
+    }
     if (output?.type !== "chunk") {
       continue;
     }
@@ -16870,7 +16873,7 @@ function findChunkImporters(bundle, target) {
       }
     }
     const potentialImport = createRelativeImport(fileName, target);
-    if (potentialImport && containsImportSpecifier(chunk.code ?? "", potentialImport)) {
+    if (potentialImport && potentialImport !== "./" && containsImportSpecifier(chunk.code ?? "", potentialImport)) {
       importers.add(fileName);
     }
   }
@@ -17272,6 +17275,13 @@ function applySharedChunkStrategy(bundle, options) {
       let finalFileName = chunk.fileName;
       if (fileName.startsWith(`${SHARED_CHUNK_VIRTUAL_PREFIX}/`)) {
         const newFileName = fileName.slice(SHARED_CHUNK_VIRTUAL_PREFIX.length + 1);
+        chunk.code = rewriteChunkImportSpecifiersInCode(chunk.code ?? "", {
+          sourceFileNames: createChunkSourceFileNameCandidates(fileName),
+          targetFileName: newFileName,
+          imports: chunk.imports,
+          dynamicImports: chunk.dynamicImports,
+          runtimeFileName: ROLLDOWN_RUNTIME_FILE_NAME
+        });
         chunk.fileName = newFileName;
         if (typeof chunk.sourcemapFileName === "string" && chunk.sourcemapFileName) {
           chunk.sourcemapFileName = `${newFileName}.map`;
@@ -17305,6 +17315,13 @@ function applySharedChunkStrategy(bundle, options) {
     }
     if (shouldRetainOriginalChunk && fileName.startsWith(`${SHARED_CHUNK_VIRTUAL_PREFIX}/`)) {
       const newFileName = fileName.slice(SHARED_CHUNK_VIRTUAL_PREFIX.length + 1);
+      chunk.code = rewriteChunkImportSpecifiersInCode(chunk.code ?? "", {
+        sourceFileNames: createChunkSourceFileNameCandidates(fileName),
+        targetFileName: newFileName,
+        imports: chunk.imports,
+        dynamicImports: chunk.dynamicImports,
+        runtimeFileName: ROLLDOWN_RUNTIME_FILE_NAME
+      });
       chunk.fileName = newFileName;
       if (typeof chunk.sourcemapFileName === "string" && chunk.sourcemapFileName) {
         chunk.sourcemapFileName = `${newFileName}.map`;
@@ -17335,8 +17352,11 @@ function applySharedChunkStrategy(bundle, options) {
     }
     for (const [root, { newFileName, importers: importerFiles }] of importerMap.entries()) {
       const runtimeFileName = path28.join(root, ROLLDOWN_RUNTIME_FILE_NAME);
-      const duplicatedSource = rewriteRuntimeImportInCode(originalCode, {
-        fromFileName: newFileName,
+      const duplicatedSource = rewriteChunkImportSpecifiersInCode(originalCode, {
+        sourceFileNames: createChunkSourceFileNameCandidates(fileName),
+        targetFileName: newFileName,
+        imports: chunk.imports,
+        dynamicImports: chunk.dynamicImports,
         runtimeFileName
       });
       this.emitFile({
@@ -17371,10 +17391,16 @@ function applySharedChunkStrategy(bundle, options) {
     }
     const chunkBytes = typeof originalCode === "string" ? Buffer3.byteLength(originalCode, "utf8") : void 0;
     const redundantBytes = typeof chunkBytes === "number" ? chunkBytes * Math.max(duplicates.length - 1, 0) : void 0;
+    const requiresRuntimeLocalization = chunkReferencesRuntime(
+      chunk,
+      ROLLDOWN_RUNTIME_FILE_NAME,
+      /* @__PURE__ */ new Set([ROLLDOWN_RUNTIME_FILE_NAME])
+    );
     options.onDuplicate?.({
       sharedFileName: originalSharedFileName,
       duplicates,
       ignoredMainImporters: diagnostics?.ignoredMainImporters,
+      requiresRuntimeLocalization,
       chunkBytes,
       redundantBytes,
       retainedInMain: shouldRetainOriginalChunk
@@ -17484,6 +17510,20 @@ function createCrossSubPackageDuplicateBaseName(sourceRoot, fileName) {
   const rootTag = sourceRoot.replace(/[\\/]+/g, "_");
   return `${rootTag}.${path28.basename(fileName)}`;
 }
+function createChunkSourceFileNameCandidates(fileName) {
+  const candidates = [fileName];
+  const normalized = resolveChunkSourceFileNameForRewrite(fileName);
+  if (normalized !== fileName) {
+    candidates.push(normalized);
+  }
+  return candidates;
+}
+function resolveChunkSourceFileNameForRewrite(fileName) {
+  if (!fileName.startsWith(`${SHARED_CHUNK_VIRTUAL_PREFIX}/`)) {
+    return fileName;
+  }
+  return fileName.slice(SHARED_CHUNK_VIRTUAL_PREFIX.length + 1);
+}
 function reserveUniqueFileName(reservedFileNames, fileName) {
   if (!reservedFileNames.has(fileName)) {
     reservedFileNames.add(fileName);
@@ -17538,6 +17578,15 @@ function applyRuntimeChunkLocalization(bundle, options) {
       rootToImporters.set(root, [fileName]);
     }
   }
+  const forceRoots = Array.from(options.forceRoots ?? []).filter(Boolean);
+  for (const root of forceRoots) {
+    if (!subPackageRoots.includes(root)) {
+      continue;
+    }
+    if (!rootToImporters.has(root)) {
+      rootToImporters.set(root, []);
+    }
+  }
   if (!rootToImporters.size) {
     return;
   }
@@ -17659,38 +17708,37 @@ function dedupeLookupKeys(values) {
 function isRuntimeBundleOutput(output) {
   return output?.type === "chunk" || output?.type === "asset";
 }
-function rewriteRuntimeImportInCode(sourceCode, options) {
-  const { fromFileName, runtimeFileName } = options;
-  if (!sourceCode.includes(ROLLDOWN_RUNTIME_FILE_NAME)) {
-    return sourceCode;
-  }
-  const importPath = createRelativeImportPath(fromFileName, runtimeFileName);
-  if (!importPath) {
-    return sourceCode;
-  }
-  return sourceCode.replace(
-    /(['"`])([^'"`]*rolldown-runtime\.js)\1/g,
-    (_match, quote) => `${quote}${importPath}${quote}`
-  );
-}
 function rewriteChunkImportSpecifiersInCode(sourceCode, options) {
-  const { sourceFileName, targetFileName, imports, dynamicImports, runtimeFileName } = options;
+  const { sourceFileName, sourceFileNames, targetFileName, imports, dynamicImports, runtimeFileName } = options;
+  const sourceFileNameCandidates = (sourceFileNames ?? [sourceFileName ?? ""]).filter(Boolean);
   const specifiers = new Set([...imports, ...dynamicImports].filter(Boolean));
   let rewrittenCode = sourceCode;
   for (const specifier of specifiers) {
-    const sourceImportPath = createRelativeImportPath(sourceFileName, specifier);
-    if (!sourceImportPath) {
-      continue;
-    }
     const resolvedTargetSpecifier = path28.basename(specifier) === ROLLDOWN_RUNTIME_FILE_NAME ? runtimeFileName : specifier;
     const targetImportPath = createRelativeImportPath(targetFileName, resolvedTargetSpecifier);
-    if (!targetImportPath || sourceImportPath === targetImportPath) {
+    if (!targetImportPath) {
       continue;
     }
-    rewrittenCode = replaceAll(rewrittenCode, sourceImportPath, targetImportPath);
+    for (const sourceCandidate of sourceFileNameCandidates) {
+      const sourceImportPath = createRelativeImportPath(sourceCandidate, specifier);
+      if (!sourceImportPath || sourceImportPath === targetImportPath) {
+        continue;
+      }
+      rewrittenCode = replaceQuotedImportLiteralValue(rewrittenCode, sourceImportPath, targetImportPath);
+    }
   }
   return rewrittenCode;
 }
+function replaceQuotedImportLiteralValue(sourceCode, sourcePath, targetPath) {
+  const escapedSourcePath = escapeRegExpForPattern(sourcePath);
+  return sourceCode.replace(
+    new RegExp(`(['"\`])${escapedSourcePath}\\1`, "g"),
+    (_match, quote) => `${quote}${targetPath}${quote}`
+  );
+}
+function escapeRegExpForPattern(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
 function createRelativeImportPath(fromFileName, toFileName) {
   const relativePath = path28.relative(path28.dirname(fromFileName), toFileName);
   if (!relativePath || relativePath.startsWith(".")) {
@@ -27922,30 +27970,48 @@ function createGenerateBundleHook(state, isPluginBuild) {
         const suffix = remaining > 0 ? ` \u7B49 ${moduleLabels.length} \u4E2A\u6A21\u5757` : "";
         return `${preview.join("\u3001")}${suffix}`;
       };
-      const handleDuplicate = shouldLogChunks || shouldWarnOnDuplicate ? ({ duplicates, ignoredMainImporters, chunkBytes, redundantBytes, retainedInMain, sharedFileName }) => {
+      const runtimeLocalizationRoots = /* @__PURE__ */ new Set();
+      const handleDuplicate = ({
+        duplicates,
+        ignoredMainImporters,
+        chunkBytes,
+        redundantBytes,
+        retainedInMain,
+        sharedFileName,
+        requiresRuntimeLocalization
+      }) => {
         if (shouldWarnOnDuplicate) {
           const duplicateCount = duplicates.length;
           const computedRedundant = typeof redundantBytes === "number" ? redundantBytes : typeof chunkBytes === "number" ? chunkBytes * Math.max(duplicateCount - 1, 0) : 0;
           redundantBytesTotal += computedRedundant;
         }
-        if (shouldLogChunks) {
-          const subPackageSet = /* @__PURE__ */ new Set();
-          let totalReferences = 0;
-          for (const { fileName, importers } of duplicates) {
-            totalReferences += importers.length;
+        if (requiresRuntimeLocalization) {
+          for (const { fileName } of duplicates) {
             const match = matchSubPackage2(fileName);
             if (match) {
-              subPackageSet.add(match);
+              runtimeLocalizationRoots.add(match);
             }
           }
-          const subPackageList = Array.from(subPackageSet).join("\u3001") || "\u76F8\u5173\u5206\u5305";
-          const ignoredHint = ignoredMainImporters?.length ? `\uFF0C\u5FFD\u7565\u4E3B\u5305\u5F15\u7528\uFF1A${ignoredMainImporters.join("\u3001")}` : "";
-          default2.info(`[\u5206\u5305] \u5206\u5305 ${subPackageList} \u5171\u4EAB\u6A21\u5757\u5DF2\u590D\u5236\u5230\u5404\u81EA weapp-shared/common.js\uFF08${totalReferences} \u5904\u5F15\u7528${ignoredHint}\uFF09`);
-          if (retainedInMain) {
-            default2.warn(`[\u5206\u5305] \u6A21\u5757 ${sharedFileName} \u540C\u65F6\u88AB\u4E3B\u5305\u5F15\u7528\uFF0C\u56E0\u6B64\u4ECD\u4FDD\u7559\u5728\u4E3B\u5305 common.js\uFF0C\u5E76\u590D\u5236\u5230 ${subPackageList}\uFF0C\u8BF7\u786E\u8BA4\u662F\u5426\u9700\u8981\u5C06\u6E90\u4EE3\u7801\u79FB\u52A8\u5230\u4E3B\u5305\u6216\u516C\u5171\u76EE\u5F55\u3002`);
+        }
+        if (!shouldLogChunks) {
+          return;
+        }
+        const subPackageSet = /* @__PURE__ */ new Set();
+        let totalReferences = 0;
+        for (const { fileName, importers } of duplicates) {
+          totalReferences += importers.length;
+          const match = matchSubPackage2(fileName);
+          if (match) {
+            subPackageSet.add(match);
           }
         }
-      } : void 0;
+        const subPackageList = Array.from(subPackageSet).join("\u3001") || "\u76F8\u5173\u5206\u5305";
+        const ignoredHint = ignoredMainImporters?.length ? `\uFF0C\u5FFD\u7565\u4E3B\u5305\u5F15\u7528\uFF1A${ignoredMainImporters.join("\u3001")}` : "";
+        default2.info(`[\u5206\u5305] \u5206\u5305 ${subPackageList} \u5171\u4EAB\u6A21\u5757\u5DF2\u590D\u5236\u5230\u5404\u81EA weapp-shared/common.js\uFF08${totalReferences} \u5904\u5F15\u7528${ignoredHint}\uFF09`);
+        if (retainedInMain) {
+          default2.warn(`[\u5206\u5305] \u6A21\u5757 ${sharedFileName} \u540C\u65F6\u88AB\u4E3B\u5305\u5F15\u7528\uFF0C\u56E0\u6B64\u4ECD\u4FDD\u7559\u5728\u4E3B\u5305 common.js\uFF0C\u5E76\u590D\u5236\u5230 ${subPackageList}\uFF0C\u8BF7\u786E\u8BA4\u662F\u5426\u9700\u8981\u5C06\u6E90\u4EE3\u7801\u79FB\u52A8\u5230\u4E3B\u5305\u6216\u516C\u5171\u76EE\u5F55\u3002`);
+        }
+      };
       applySharedChunkStrategy.call(this, rolldownBundle, {
         strategy: sharedStrategy,
         subPackageRoots,
@@ -27979,6 +28045,7 @@ function createGenerateBundleHook(state, isPluginBuild) {
       });
       applyRuntimeChunkLocalization.call(this, rolldownBundle, {
         subPackageRoots,
+        forceRoots: runtimeLocalizationRoots,
         onDuplicate: shouldLogChunks ? ({ duplicates, runtimeFileName }) => {
           const subPackageSet = /* @__PURE__ */ new Set();
           for (const { fileName } of duplicates) {
@@ -37327,7 +37394,7 @@ function createScanService(ctx) {
       vueAppPath = await findVueEntry(appBasename);
     }
     if (!appConfigFile && vueAppPath) {
-      const { extractConfigFromVue: extractConfigFromVue2 } = await import("./file-QSNQC5V4.mjs");
+      const { extractConfigFromVue: extractConfigFromVue2 } = await import("./file-X4XT4UCA.mjs");
       configFromVue = await extractConfigFromVue2(vueAppPath);
       if (configFromVue) {
         appConfigFile = vueAppPath;

package/dist/{chunk-4XSCGSZ5.mjs → chunk-W5TTICYZ.mjs}

@@ -145,7 +145,7 @@ function resolveAutoRoutesMacroImportPath() {
 }
 async function resolveAutoRoutesInlineSnapshot() {
   try {
-    const { getCompilerContext } = await import("./getInstance-ENQVNR4D.mjs");
+    const { getCompilerContext } = await import("./getInstance-FVRAZQTP.mjs");
     const service = getCompilerContext().autoRoutesService;
     await service?.ensureFresh?.();
     const reference = service?.getReference?.();

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 import {
   createCompilerContext
-} from "./chunk-UUC4PK4V.mjs";
+} from "./chunk-7JSOF7N2.mjs";
 import {
   DEFAULT_MP_PLATFORM,
   SHARED_CHUNK_VIRTUAL_PREFIX,
@@ -12,10 +12,10 @@ import {
   normalizeMiniPlatform,
   resolveMiniPlatform,
   resolveWeappConfigFile
-} from "./chunk-2OSU4ACJ.mjs";
+} from "./chunk-FVM35BZA.mjs";
 import {
   VERSION
-} from "./chunk-4XSCGSZ5.mjs";
+} from "./chunk-W5TTICYZ.mjs";
 import {
   resolveWeappMcpConfig,
   startWeappViteMcpServer
@@ -2349,13 +2349,23 @@ var SKIP_COMMANDS = /* @__PURE__ */ new Set([
   "ide",
   "mcp"
 ]);
+var DEV_COMMANDS = /* @__PURE__ */ new Set([
+  "dev",
+  "serve"
+]);
 var started = false;
 function shouldAutoStartMcp(argv) {
   const command = argv[0];
   if (!command || command.startsWith("-")) {
     return true;
   }
-  return !SKIP_COMMANDS.has(command);
+  if (SKIP_COMMANDS.has(command)) {
+    return false;
+  }
+  if (DEV_COMMANDS.has(command)) {
+    return true;
+  }
+  return command.includes("/") || command.includes("\\") || command.startsWith(".");
 }
 async function maybeAutoStartMcpServer(argv, cliOptions) {
   if (started || !shouldAutoStartMcp(argv)) {
@@ -2385,7 +2395,9 @@ async function maybeAutoStartMcpServer(argv, cliOptions) {
       workspaceRoot: process9.cwd()
     });
     started = true;
-    default2.info(`[mcp] \u5DF2\u81EA\u52A8\u542F\u52A8\uFF1Ahttp://${resolvedMcp.host}:${resolvedMcp.port}${resolvedMcp.endpoint}`);
+    const mcpUrl = `http://${resolvedMcp.host}:${resolvedMcp.port}${resolvedMcp.endpoint}`;
+    default2.success("MCP \u670D\u52A1\u5DF2\u81EA\u52A8\u542F\u52A8\uFF1A");
+    default2.info(`  \u279C  ${colors.cyan(mcpUrl)}`);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     if (/EADDRINUSE/.test(message)) {

package/dist/{file-QSNQC5V4.mjs → file-X4XT4UCA.mjs}

@@ -11,7 +11,7 @@ import {
   isTemplateRequest,
   touch,
   touchSync
-} from "./chunk-4XSCGSZ5.mjs";
+} from "./chunk-W5TTICYZ.mjs";
 import "./chunk-QBSVUTNO.mjs";
 export {
   changeFileExtension,

package/dist/{getInstance-ENQVNR4D.mjs → getInstance-FVRAZQTP.mjs}

@@ -4,8 +4,8 @@ import {
   getCompilerContext,
   resetCompilerContext,
   setActiveCompilerContextKey
-} from "./chunk-2OSU4ACJ.mjs";
-import "./chunk-4XSCGSZ5.mjs";
+} from "./chunk-FVM35BZA.mjs";
+import "./chunk-W5TTICYZ.mjs";
 import "./chunk-3STNMT72.mjs";
 import "./chunk-QBSVUTNO.mjs";
 export {

package/dist/index.mjs

@@ -1,9 +1,9 @@
 import "./chunk-2Q4QRCG5.mjs";
 import {
   createCompilerContext
-} from "./chunk-UUC4PK4V.mjs";
-import "./chunk-2OSU4ACJ.mjs";
-import "./chunk-4XSCGSZ5.mjs";
+} from "./chunk-7JSOF7N2.mjs";
+import "./chunk-FVM35BZA.mjs";
+import "./chunk-W5TTICYZ.mjs";
 import {
   defineConfig
 } from "./chunk-O4WHKAL4.mjs";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "6.7.1",
+  "version": "6.7.2",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -97,7 +97,7 @@
     "comment-json": "^4.6.2",
     "debug": "^4.4.3",
     "fdir": "^6.5.0",
-    "fs-extra": "^11.3.3",
+    "fs-extra": "^11.3.4",
     "magic-string": "^0.30.21",
     "oxc-parser": "^0.116.0",
     "oxc-walker": "^0.7.0",
@@ -112,17 +112,17 @@
     "vue": "^3.5.29",
     "vue-tsc": "^3.2.5",
     "@weapp-core/init": "6.0.1",
-    "@weapp-core/logger": "3.1.0",
     "@weapp-core/schematics": "6.0.2",
+    "@weapp-core/logger": "3.1.0",
+    "@weapp-vite/volar": "2.0.4",
     "@weapp-core/shared": "3.0.1",
     "@weapp-vite/mcp": "1.1.0",
-    "@weapp-vite/volar": "2.0.4",
     "@weapp-vite/web": "1.3.0",
     "@wevu/api": "0.1.1",
     "rolldown-require": "2.0.6",
     "vite-plugin-performance": "2.0.1",
     "weapp-ide-cli": "5.1.0",
-    "wevu": "6.7.1"
+    "wevu": "6.7.2"
   },
   "publishConfig": {
     "access": "public",