weapp-vite 6.1.11 → 6.2.1

package/dist/auto-routes.mjs

@@ -1,8 +1,8 @@
 import {
   getCompilerContext
-} from "./chunk-KB3SOFHU.mjs";
-import "./chunk-5PIOVA35.mjs";
-import "./chunk-5HAJ3FAL.mjs";
+} from "./chunk-QVXE3ABR.mjs";
+import "./chunk-2GIOG6RC.mjs";
+import "./chunk-FC2MZYU3.mjs";
 import "./chunk-AZBN7A5I.mjs";
 import "./chunk-V5RMQ6TF.mjs";
 import {

package/dist/{chunk-5PIOVA35.mjs → chunk-2GIOG6RC.mjs}

@@ -3,7 +3,7 @@ import {
   jsExtensions,
   require_src,
   vueExtensions
-} from "./chunk-5HAJ3FAL.mjs";
+} from "./chunk-FC2MZYU3.mjs";
 import {
   __commonJS,
   __toESM,
@@ -559,9 +559,9 @@ function declaredNamesInStatement(statement) {
   }
   return out;
 }
-function collectTopLevelReferencedNames(path11) {
+function collectTopLevelReferencedNames(path12) {
   const names = /* @__PURE__ */ new Set();
-  path11.traverse({
+  path12.traverse({
     Identifier(p) {
       if (!p.isReferencedIdentifier()) {
         return;
@@ -626,7 +626,7 @@ var import_merge = __toESM(require_src(), 1);
 import * as t3 from "@babel/types";
 import fs5 from "fs-extra";
 import MagicString2 from "magic-string";
-import path10 from "pathe";
+import path11 from "pathe";
 import { bundleRequire } from "rolldown-require";
 
 // src/plugins/vue/transform/tempDirLock.ts
@@ -655,7 +655,7 @@ async function withTempDirLock(tempDir, fn) {
 init_esm_shims();
 import * as t2 from "@babel/types";
 import MagicString from "magic-string";
-import path8 from "pathe";
+import path9 from "pathe";
 
 // src/utils/index.ts
 init_esm_shims();
@@ -736,10 +736,70 @@ function getReadFileCheckMtime(config) {
   return Boolean(config?.isDev);
 }
 
+// src/utils/configErrors.ts
+init_esm_shims();
+import path from "pathe";
+var CJS_ERROR_PATTERNS = [
+  "__dirname is not defined",
+  "__filename is not defined",
+  "require is not defined",
+  "module is not defined",
+  "exports is not defined",
+  "es module scope"
+];
+function collectErrorText(error, texts) {
+  if (!error) {
+    return;
+  }
+  if (typeof error === "string") {
+    texts.push(error);
+    return;
+  }
+  if (typeof error === "object") {
+    const err = error;
+    if (err.message) {
+      texts.push(String(err.message));
+    }
+    if (err.stack) {
+      texts.push(String(err.stack));
+    }
+    if ("cause" in err) {
+      collectErrorText(err.cause, texts);
+    }
+  }
+}
+function formatConfigPath(configPath, cwd) {
+  if (!configPath) {
+    return "vite.config.ts";
+  }
+  const relative = path.relative(cwd, configPath);
+  if (relative && !relative.startsWith("..") && !path.isAbsolute(relative)) {
+    return relative;
+  }
+  return configPath;
+}
+function createCjsConfigLoadError(options) {
+  const texts = [];
+  collectErrorText(options.error, texts);
+  const haystack = texts.join("\n").toLowerCase();
+  const isCjsError = CJS_ERROR_PATTERNS.some((pattern) => haystack.includes(pattern));
+  if (!isCjsError) {
+    return void 0;
+  }
+  const target = formatConfigPath(options.configPath, options.cwd);
+  const message = `${target} \u4E3A CJS \u683C\u5F0F\uFF0C\u9700\u8981\u6539\u4E3A ESM \u5199\u6CD5\uFF08\u53EF\u53C2\u8003 import.meta.dirname \u7B49\u7528\u6CD5\uFF09\u3002`;
+  const error = new Error(message);
+  if (options.error instanceof Error) {
+    ;
+    error.cause = options.error;
+  }
+  return error;
+}
+
 // src/utils/entryResolve.ts
 init_esm_shims();
 import fs from "fs-extra";
-import path from "pathe";
+import path2 from "pathe";
 function buildCandidates(base, extensions) {
   return extensions.map((ext) => changeFileExtension(base, ext));
 }
@@ -747,7 +807,7 @@ async function resolveEntryPath(input, options) {
   if (!input || typeof input !== "string") {
     return void 0;
   }
-  if (path.extname(input)) {
+  if (path2.extname(input)) {
     return void 0;
   }
   const kind = options?.kind ?? "default";
@@ -762,7 +822,7 @@ async function resolveEntryPath(input, options) {
     isDir = false;
   }
   if (isDir) {
-    base = path.join(input, indexBaseName);
+    base = path2.join(input, indexBaseName);
   }
   const jsFirst = kind === "named" || isDir;
   const extensions = jsFirst ? [...jsExtensions, ...vueExtensions] : [...vueExtensions, ...jsExtensions];
@@ -778,7 +838,7 @@ async function resolveEntryPath(input, options) {
 init_esm_shims();
 import { get, isObject, set } from "@weapp-core/shared";
 import { parse as parseJson, stringify } from "comment-json";
-import path2 from "pathe";
+import path3 from "pathe";
 function parseCommentJson(json) {
   return parseJson(json, void 0, true);
 }
@@ -826,7 +886,7 @@ function resolveImportee(importee, jsonPath, aliasEntries) {
       return importee;
     }
     const updatedId = importee.replace(matchedEntry.find, matchedEntry.replacement);
-    return path2.relative(path2.dirname(jsonPath), updatedId);
+    return path3.relative(path3.dirname(jsonPath), updatedId);
   }
   return importee;
 }
@@ -870,7 +930,7 @@ import crypto from "crypto";
 // src/utils/path.ts
 init_esm_shims();
 import { sep } from "path";
-import path3 from "pathe";
+import path4 from "pathe";
 var BACKSLASH_RE = /\\/g;
 var LEADING_SLASH_RE = /^[\\/]+/;
 var DUPLICATE_SLASH_RE = /\/{2,}/g;
@@ -891,17 +951,17 @@ function isPathInside(parent, target) {
   if (!parent) {
     return false;
   }
-  const relative = path3.relative(parent, target);
-  return relative === "" || !relative.startsWith("..") && !path3.isAbsolute(relative);
+  const relative = path4.relative(parent, target);
+  return relative === "" || !relative.startsWith("..") && !path4.isAbsolute(relative);
 }
 
 // src/utils/projectConfig.ts
 init_esm_shims();
 import fs2 from "fs-extra";
-import path4 from "pathe";
+import path5 from "pathe";
 async function getProjectConfig(root, options) {
-  const baseJsonPath = path4.resolve(root, "project.config.json");
-  const privateJsonPath = path4.resolve(root, "project.private.config.json");
+  const baseJsonPath = path5.resolve(root, "project.config.json");
+  const privateJsonPath = path5.resolve(root, "project.private.config.json");
   let baseJson = {};
   let privateJson = {};
   if (await fs2.pathExists(baseJsonPath)) {
@@ -1114,33 +1174,33 @@ function normalizeFsResolvedId(id, options) {
 
 // src/utils/toAbsoluteId.ts
 init_esm_shims();
-import path5 from "pathe";
+import path6 from "pathe";
 function toAbsoluteId(id, configService, importer, options) {
   const cleanId = normalizeFsResolvedId(id);
   if (!cleanId || isSkippableResolvedId(cleanId)) {
     return cleanId;
   }
-  if (path5.isAbsolute(cleanId)) {
+  if (path6.isAbsolute(cleanId)) {
     return cleanId;
   }
   const cleanImporter = importer ? normalizeFsResolvedId(importer) : void 0;
-  if (cleanImporter && !isSkippableResolvedId(cleanImporter) && path5.isAbsolute(cleanImporter)) {
-    return path5.resolve(path5.dirname(cleanImporter), cleanId);
+  if (cleanImporter && !isSkippableResolvedId(cleanImporter) && path6.isAbsolute(cleanImporter)) {
+    return path6.resolve(path6.dirname(cleanImporter), cleanId);
   }
   const baseDir = options?.base === "cwd" ? configService.cwd : configService.absoluteSrcRoot;
-  return path5.resolve(baseDir, cleanId);
+  return path6.resolve(baseDir, cleanId);
 }
 
 // src/utils/usingComponentFrom.ts
 init_esm_shims();
 import { removeExtensionDeep } from "@weapp-core/shared";
-import path6 from "pathe";
+import path7 from "pathe";
 function usingComponentFromResolvedFile(resolvedFile, configService) {
   if (!resolvedFile) {
     return void 0;
   }
   const normalized = normalizeFsResolvedId(resolvedFile);
-  if (!normalized || isSkippableResolvedId(normalized) || !path6.isAbsolute(normalized)) {
+  if (!normalized || isSkippableResolvedId(normalized) || !path7.isAbsolute(normalized)) {
     return void 0;
   }
   const base = removeExtensionDeep(normalized);
@@ -1199,7 +1259,7 @@ function checkRuntime(minVersions) {
 // src/utils/weappConfig.ts
 init_esm_shims();
 import fs3 from "fs-extra";
-import path7 from "pathe";
+import path8 from "pathe";
 var WEAPP_VITE_CONFIG_CANDIDATES = [
   "weapp-vite.config.ts",
   "weapp-vite.config.mts",
@@ -1212,7 +1272,7 @@ var WEAPP_VITE_CONFIG_CANDIDATES = [
 var WEAPP_VITE_CONFIG_SET = new Set(WEAPP_VITE_CONFIG_CANDIDATES);
 async function findWeappConfigInDirectory(directory) {
   for (const filename of WEAPP_VITE_CONFIG_CANDIDATES) {
-    const candidatePath = path7.resolve(directory, filename);
+    const candidatePath = path8.resolve(directory, filename);
     if (await fs3.pathExists(candidatePath)) {
       return candidatePath;
     }
@@ -1222,15 +1282,15 @@ async function findWeappConfigInDirectory(directory) {
 async function resolveWeappConfigFile(options) {
   const { root, specified } = options;
   if (specified) {
-    const resolvedSpecified = path7.isAbsolute(specified) ? specified : path7.resolve(root, specified);
-    const specifiedBaseName = path7.basename(resolvedSpecified);
+    const resolvedSpecified = path8.isAbsolute(specified) ? specified : path8.resolve(root, specified);
+    const specifiedBaseName = path8.basename(resolvedSpecified);
     if (WEAPP_VITE_CONFIG_SET.has(specifiedBaseName)) {
       if (await fs3.pathExists(resolvedSpecified)) {
         return resolvedSpecified;
       }
       return void 0;
     }
-    const fromSpecifiedDirectory = await findWeappConfigInDirectory(path7.dirname(resolvedSpecified));
+    const fromSpecifiedDirectory = await findWeappConfigInDirectory(path8.dirname(resolvedSpecified));
     if (fromSpecifiedDirectory) {
       return fromSpecifiedDirectory;
     }
@@ -1243,8 +1303,8 @@ function rewriteRelativeImportSource(source, fromDir, tempDir) {
   if (!source.startsWith(".")) {
     return source;
   }
-  const abs = path8.resolve(fromDir, source);
-  let next = toPosixPath(path8.relative(tempDir, abs));
+  const abs = path9.resolve(fromDir, source);
+  let next = toPosixPath(path9.relative(tempDir, abs));
   if (!next.startsWith(".")) {
     next = `./${next}`;
   }
@@ -1312,23 +1372,23 @@ import { createHash } from "crypto";
 import fs4 from "fs";
 import os from "os";
 import process3 from "process";
-import path9 from "pathe";
+import path10 from "pathe";
 function getWevuConfigCacheRoot() {
   const env = process3.env.WEAPP_VITE_WEVU_CONFIG_DIR?.trim();
   if (env) {
-    return path9.resolve(env);
+    return path10.resolve(env);
   }
   const cwd = process3.cwd();
-  const nodeModulesDir = path9.join(cwd, "node_modules");
+  const nodeModulesDir = path10.join(cwd, "node_modules");
   if (fs4.existsSync(nodeModulesDir)) {
-    return path9.join(nodeModulesDir, ".cache", "weapp-vite", "wevu-config");
+    return path10.join(nodeModulesDir, ".cache", "weapp-vite", "wevu-config");
   }
-  return path9.join(os.tmpdir(), "weapp-vite", "wevu-config");
+  return path10.join(os.tmpdir(), "weapp-vite", "wevu-config");
 }
 function resolveWevuConfigTempDir(fromDir) {
   const root = getWevuConfigCacheRoot();
-  const key = createHash("sha256").update(path9.normalize(fromDir)).digest("hex").slice(0, 8);
-  return path9.join(root, key);
+  const key = createHash("sha256").update(path10.normalize(fromDir)).digest("hex").slice(0, 8);
+  return path10.join(root, key);
 }
 
 // src/plugins/vue/transform/jsonMacros/execute.ts
@@ -1364,7 +1424,7 @@ async function evaluateScriptSetupJsonMacro(params) {
     options
   } = params;
   const ms = new MagicString2(originalContent);
-  const dir = path10.dirname(filename);
+  const dir = path11.dirname(filename);
   const tempDir = resolveWevuConfigTempDir(dir);
   for (const statementPath of keptStatementPaths) {
     if (!statementPath.isImportDeclaration()) {
@@ -1414,12 +1474,12 @@ export default __weapp_json_macro_values
   const extension = resolveScriptSetupExtension(lang);
   return await withTempDirLock(tempDir, async () => {
     await fs5.ensureDir(tempDir);
-    const basename = path10.basename(filename, path10.extname(filename));
+    const basename = path11.basename(filename, path11.extname(filename));
     const unique = `${Date.now()}-${Math.random().toString(16).slice(2)}`;
-    const tempFile = path10.join(tempDir, `${basename}.json-macro.${unique}.${extension}`);
+    const tempFile = path11.join(tempDir, `${basename}.json-macro.${unique}.${extension}`);
     await fs5.writeFile(tempFile, evalSource, "utf8");
     try {
-      const { mod } = await bundleRequire({
+      const { mod, dependencies } = await bundleRequire({
         filepath: tempFile,
         cwd: dir
       });
@@ -1453,9 +1513,9 @@ export default __weapp_json_macro_values
         }
       }
       if (!Object.keys(accumulator).length) {
-        return void 0;
+        return { dependencies };
       }
-      return accumulator;
+      return { config: accumulator, dependencies };
     } finally {
       try {
         await fs5.remove(tempFile);
@@ -1488,20 +1548,20 @@ function collectMacroCallPaths(ast, filename) {
   const macroNames = /* @__PURE__ */ new Set();
   const macroStatements = [];
   traverse(ast, {
-    CallExpression(path11) {
-      const callee = path11.node.callee;
+    CallExpression(path12) {
+      const callee = path12.node.callee;
       if (!t4.isIdentifier(callee)) {
         return;
       }
       if (!JSON_MACROS.has(callee.name)) {
         return;
       }
-      const isTopLevelStatement = path11.parentPath?.isExpressionStatement() && path11.parentPath.parentPath?.isProgram();
+      const isTopLevelStatement = path12.parentPath?.isExpressionStatement() && path12.parentPath.parentPath?.isProgram();
       if (!isTopLevelStatement) {
         throw new Error(`${callee.name}() \u5FC5\u987B\u5728 <script setup> \u9876\u5C42\u8BED\u53E5\u4E2D\u4F7F\u7528\uFF08${filename}\uFF09\u3002`);
       }
       macroNames.add(callee.name);
-      macroStatements.push(path11.parentPath);
+      macroStatements.push(path12.parentPath);
     }
   });
   return { macroNames, macroStatements };
@@ -1515,9 +1575,9 @@ function assertSingleMacro(macroNames, filename) {
 function findProgramPath(ast) {
   let programPath;
   traverse(ast, {
-    Program(path11) {
-      programPath = path11;
-      path11.stop();
+    Program(path12) {
+      programPath = path12;
+      path12.stop();
     }
   });
   return programPath;
@@ -1572,16 +1632,16 @@ function stripJsonMacroCallsFromCode(code, filename) {
   }
   const ms = new MagicString3(code);
   traverse(ast, {
-    ExpressionStatement(path11) {
-      const expr = path11.node.expression;
+    ExpressionStatement(path12) {
+      const expr = path12.node.expression;
       if (!t5.isCallExpression(expr) || !t5.isIdentifier(expr.callee)) {
         return;
       }
       if (!JSON_MACROS.has(expr.callee.name)) {
         return;
       }
-      const start = path11.node.start;
-      const end = path11.node.end;
+      const start = path12.node.start;
+      const end = path12.node.end;
       if (typeof start === "number" && typeof end === "number") {
         ms.remove(start, end);
       }
@@ -1600,8 +1660,8 @@ async function extractJsonMacroFromScriptSetup(content, filename, lang, options)
     return { stripped };
   }
   const macroHash = createHash2("sha256").update(macroStatementSources.join("\n")).digest("hex").slice(0, 12);
-  const config = await evaluateJsonMacroConfig(content, filename, lang, options);
-  return config ? { stripped, config, macroHash } : { stripped, macroHash };
+  const result = await evaluateJsonMacroConfig(content, filename, lang, options);
+  return result ? { stripped, config: result.config, macroHash, dependencies: result.dependencies } : { stripped, macroHash };
 }
 async function evaluateJsonMacroConfig(content, filename, lang, options) {
   const ast = parseScriptSetupAst(content, filename);
@@ -1642,6 +1702,7 @@ export {
   parseJsLike,
   getPathExistsTtlMs,
   getReadFileCheckMtime,
+  createCjsConfigLoadError,
   withTempDirLock,
   rewriteJsLikeImportsForTempDir,
   resolveWevuConfigTempDir,

package/dist/{chunk-5HAJ3FAL.mjs → chunk-FC2MZYU3.mjs}

@@ -113,6 +113,9 @@ var templateExtensions = ["wxml", "html"];
 
 // src/utils/file.ts
 var pathExistsInFlight = /* @__PURE__ */ new Map();
+var vueConfigCache = /* @__PURE__ */ new Map();
+var configMtimeInFlight = /* @__PURE__ */ new Map();
+var NODE_MODULES_RE = /[\\/]node_modules[\\/]/;
 function pathExistsCached(filePath) {
   const pending = pathExistsInFlight.get(filePath);
   if (pending) {
@@ -124,6 +127,37 @@ function pathExistsCached(filePath) {
   pathExistsInFlight.set(filePath, next);
   return next;
 }
+function getMtimeCached(filePath) {
+  const pending = configMtimeInFlight.get(filePath);
+  if (pending) {
+    return pending;
+  }
+  const next = fs.stat(filePath).then((stat) => stat.mtimeMs).catch(() => void 0).finally(() => {
+    configMtimeInFlight.delete(filePath);
+  });
+  configMtimeInFlight.set(filePath, next);
+  return next;
+}
+async function isVueConfigCacheValid(vueFilePath, cache) {
+  const nextMtime = await getMtimeCached(vueFilePath);
+  if (nextMtime === void 0 || cache.fileMtimeMs === void 0) {
+    return false;
+  }
+  if (nextMtime !== cache.fileMtimeMs) {
+    return false;
+  }
+  if (cache.dependencies.length === 0) {
+    return true;
+  }
+  for (const dep of cache.dependencies) {
+    const nextDepMtime = await getMtimeCached(dep);
+    const cachedDepMtime = cache.dependencyMtimeMs.get(dep);
+    if (nextDepMtime === void 0 || cachedDepMtime === void 0 || nextDepMtime !== cachedDepMtime) {
+      return false;
+    }
+  }
+  return true;
+}
 function isJsOrTs(name) {
   if (typeof name === "string") {
     return /\.[jt]s$/.test(name);
@@ -240,12 +274,17 @@ async function touch(filename) {
 }
 async function extractConfigFromVue(vueFilePath) {
   try {
+    const cached = vueConfigCache.get(vueFilePath);
+    if (cached && await isVueConfigCacheValid(vueFilePath, cached)) {
+      return cached.config;
+    }
     const content = await fs.readFile(vueFilePath, "utf-8");
     const { descriptor, errors } = parse(content, { filename: vueFilePath });
     if (errors.length > 0) {
       return void 0;
     }
     const mergedConfig = {};
+    const macroDependencies = [];
     const { parse: parseJson } = await import("comment-json");
     const jsonBlocks = descriptor.customBlocks.filter((block) => block.type === "json");
     for (const block of jsonBlocks) {
@@ -264,13 +303,16 @@ async function extractConfigFromVue(vueFilePath) {
     const setupContent = descriptor.scriptSetup?.content;
     const hasMacroHint = typeof setupContent === "string" && /\bdefine(?:App|Page|Component)Json\s*\(/.test(setupContent);
     if (hasMacroHint) {
-      const { extractJsonMacroFromScriptSetup } = await import("./jsonMacros-HN23LCSO.mjs");
+      const { extractJsonMacroFromScriptSetup } = await import("./jsonMacros-VSJW5D23.mjs");
       try {
         const extracted = await extractJsonMacroFromScriptSetup(
           setupContent,
           vueFilePath,
           descriptor.scriptSetup?.lang
         );
+        if (extracted.dependencies?.length) {
+          macroDependencies.push(...extracted.dependencies);
+        }
         if (extracted.config && typeof extracted.config === "object" && !Array.isArray(extracted.config)) {
           (0, import_merge.recursive)(mergedConfig, extracted.config);
         }
@@ -280,7 +322,29 @@ async function extractConfigFromVue(vueFilePath) {
         }
       }
     }
-    return Object.keys(mergedConfig).length > 0 ? mergedConfig : void 0;
+    const normalizedDependencies = Array.from(
+      new Set(
+        macroDependencies.filter((dep) => dep && !NODE_MODULES_RE.test(dep)).map((dep) => path.normalize(dep))
+      )
+    );
+    const dependencyMtimeMs = /* @__PURE__ */ new Map();
+    await Promise.all(
+      normalizedDependencies.map(async (dep) => {
+        const mtime = await getMtimeCached(dep);
+        if (mtime !== void 0) {
+          dependencyMtimeMs.set(dep, mtime);
+        }
+      })
+    );
+    const fileMtimeMs = await getMtimeCached(vueFilePath);
+    const hasConfig = Object.keys(mergedConfig).length > 0;
+    vueConfigCache.set(vueFilePath, {
+      config: hasConfig ? mergedConfig : void 0,
+      fileMtimeMs,
+      dependencies: normalizedDependencies,
+      dependencyMtimeMs
+    });
+    return hasConfig ? mergedConfig : void 0;
   } catch {
     return void 0;
   }

package/dist/{chunk-QOUJL7WX.mjs → chunk-M2DQHZBW.mjs}

@@ -2,7 +2,7 @@ import {
   getCompilerContext,
   resetCompilerContext,
   setActiveCompilerContextKey
-} from "./chunk-KB3SOFHU.mjs";
+} from "./chunk-QVXE3ABR.mjs";
 import {
   init_esm_shims
 } from "./chunk-AOUAT7U3.mjs";