@weapp-vite/web 1.2.0 → 1.2.1

package/dist/index.mjs

@@ -28,6 +28,7 @@ import * as t from "@babel/types";
 import fs from "fs-extra";
 import MagicString from "magic-string";
 import { dirname as dirname2, extname, join, normalize, posix, relative as relative2, resolve } from "pathe";
+import { bundleRequire } from "rolldown-require";
 
 // src/compiler/wxml.ts
 import { readFileSync } from "fs";
@@ -756,7 +757,8 @@ function toRelativeImport(from, target) {
   const fromDir = dirname(from);
   const rel = relative(fromDir, target);
   if (!rel || rel.startsWith(".")) {
-    return rel || `./${target.split("/").pop() ?? ""}`;
+    const fallback = normalizeTemplatePath(target).split("/").pop() ?? "";
+    return rel || `./${fallback}`;
   }
   return `./${rel}`;
 }
@@ -952,7 +954,8 @@ function appendWxsQuery(pathname) {
   return `${pathname}${pathname.includes("?") ? "&" : "?"}wxs`;
 }
 function isSupportedRequirePath(request) {
-  return request.startsWith(".") || request.startsWith("/");
+  const normalized = request.replace(/\\/g, "/");
+  return normalized.startsWith(".") || normalized.startsWith("/");
 }
 function transformWxsToEsm(code, id, options) {
   const dependencies = [];
@@ -974,7 +977,8 @@ function transformWxsToEsm(code, id, options) {
       warnings.push(`[@weapp-vite/web] WXS require \u4EC5\u652F\u6301\u76F8\u5BF9\u6216\u7EDD\u5BF9\u8DEF\u5F84: ${request} (from ${id})`);
       continue;
     }
-    const resolved = options.resolvePath(request, id);
+    const normalizedRequest = request.replace(/\\/g, "/");
+    const resolved = options.resolvePath(normalizedRequest, id);
     if (!resolved) {
       warnings.push(`[@weapp-vite/web] \u65E0\u6CD5\u89E3\u6790 WXS require: ${request} (from ${id})`);
       continue;
@@ -1071,6 +1075,7 @@ function weappWebPlugin(options = {}) {
   const moduleMeta = /* @__PURE__ */ new Map();
   const pageNavigationMap = /* @__PURE__ */ new Map();
   const templateComponentMap = /* @__PURE__ */ new Map();
+  const templatePathSet = /* @__PURE__ */ new Set();
   const componentTagMap = /* @__PURE__ */ new Map();
   const componentIdMap = /* @__PURE__ */ new Map();
   let appNavigationDefaults = {};
@@ -1116,7 +1121,18 @@ function weappWebPlugin(options = {}) {
     transform(code, id) {
       const clean = cleanUrl(id);
       if (isTemplateFile(clean)) {
+        if (isHtmlEntry(clean, root)) {
+          return null;
+        }
         const normalizedId = normalizePath2(clean);
+        if (templatePathSet.size > 0) {
+          if (!isInsideDir(clean, srcRoot)) {
+            return null;
+          }
+          if (!templatePathSet.has(normalizedId)) {
+            return null;
+          }
+        }
         const navigationConfig = pageNavigationMap.get(normalizedId);
         const componentTags = templateComponentMap.get(normalizedId);
         const { code: compiled, dependencies, warnings } = compileWxml({
@@ -1288,6 +1304,7 @@ if (import.meta.hot) { import.meta.hot.accept() }
     moduleMeta.clear();
     pageNavigationMap.clear();
     templateComponentMap.clear();
+    templatePathSet.clear();
     componentTagMap.clear();
     componentIdMap.clear();
     appNavigationDefaults = {};
@@ -1315,8 +1332,9 @@ if (import.meta.hot) { import.meta.hot.accept() }
         }
       );
     }
-    const appJsonPath = join(srcRoot, "app.json");
-    if (await fs.pathExists(appJsonPath)) {
+    const appJsonBasePath = join(srcRoot, "app.json");
+    const appJsonPath = await resolveJsonPath(appJsonBasePath);
+    if (appJsonPath) {
       const appJson = await readJsonFile(appJsonPath);
       if (appJson) {
         appComponentTags = await collectComponentTagsFromConfig(appJson, srcRoot, appJsonPath, reportWarning, (tags) => {
@@ -1363,9 +1381,13 @@ if (import.meta.hot) { import.meta.hot.accept() }
         return;
       }
       const template = await resolveTemplateFile(base);
+      if (template) {
+        templatePathSet.add(normalizePath2(template));
+      }
       const style = await resolveStyleFile(base);
-      const pageJsonPath = join(srcRoot, `${pageId}.json`);
-      const pageJson = await readJsonFile(pageJsonPath);
+      const pageJsonBasePath = join(srcRoot, `${pageId}.json`);
+      const pageJsonPath = await resolveJsonPath(pageJsonBasePath);
+      const pageJson = pageJsonPath ? await readJsonFile(pageJsonPath) : void 0;
       moduleMeta.set(
         normalizePath2(script),
         {
@@ -1380,7 +1402,7 @@ if (import.meta.hot) { import.meta.hot.accept() }
         script,
         id: toPosixId(pageId)
       });
-      const pageComponentTags = pageJson ? await collectComponentTagsFromConfig(pageJson, dirname2(script), pageJsonPath, reportWarning) : await collectComponentTagsFromJson(pageJsonPath, dirname2(script), reportWarning);
+      const pageComponentTags = pageJson && pageJsonPath ? await collectComponentTagsFromConfig(pageJson, dirname2(script), pageJsonPath, reportWarning) : await collectComponentTagsFromJson(pageJsonBasePath, dirname2(script), reportWarning);
       if (template) {
         const mergedTags = mergeComponentTags(appComponentTags, pageComponentTags);
         if (Object.keys(mergedTags).length > 0) {
@@ -1410,6 +1432,9 @@ if (import.meta.hot) { import.meta.hot.accept() }
       const idRelative = relative2(srcRoot, script).replace(new RegExp(`${extname(script)}$`), "");
       const componentIdPosix = toPosixId(idRelative);
       const template = await resolveTemplateFile(script);
+      if (template) {
+        templatePathSet.add(normalizePath2(template));
+      }
       const style = await resolveStyleFile(script);
       moduleMeta.set(
         normalizePath2(script),
@@ -1425,8 +1450,8 @@ if (import.meta.hot) { import.meta.hot.accept() }
         script,
         id: componentIdPosix
       });
-      const componentJsonPath = `${script.replace(new RegExp(`${extname(script)}$`), "")}.json`;
-      const componentTags = await collectComponentTagsFromJson(componentJsonPath, dirname2(script), reportWarning);
+      const componentJsonBasePath = `${script.replace(new RegExp(`${extname(script)}$`), "")}.json`;
+      const componentTags = await collectComponentTagsFromJson(componentJsonBasePath, dirname2(script), reportWarning);
       if (template) {
         const mergedTags = mergeComponentTags(appComponentTags, componentTags);
         if (Object.keys(mergedTags).length > 0) {
@@ -1468,12 +1493,16 @@ if (import.meta.hot) { import.meta.hot.accept() }
       }
       return tags;
     }
-    async function collectComponentTagsFromJson(jsonPath, importerDir, warn2) {
-      const json = await readJsonFile(jsonPath);
+    async function collectComponentTagsFromJson(jsonBasePath, importerDir, warn2) {
+      const resolvedPath = await resolveJsonPath(jsonBasePath);
+      if (!resolvedPath) {
+        return {};
+      }
+      const json = await readJsonFile(resolvedPath);
       if (!json) {
         return {};
       }
-      return collectComponentTagsFromConfig(json, importerDir, jsonPath, warn2);
+      return collectComponentTagsFromConfig(json, importerDir, resolvedPath, warn2);
     }
     function mergeComponentTags(base, overrides) {
       if (!Object.keys(base).length && !Object.keys(overrides).length) {
@@ -1539,14 +1568,44 @@ function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 async function readJsonFile(pathname) {
-  if (!await fs.pathExists(pathname)) {
-    return void 0;
+  const candidates = [pathname];
+  if (pathname.endsWith(".json")) {
+    candidates.push(`${pathname}.ts`, `${pathname}.js`);
   }
-  const json = await fs.readJson(pathname).catch(() => void 0);
-  if (!isRecord(json)) {
-    return void 0;
+  for (const candidate of candidates) {
+    if (!await fs.pathExists(candidate)) {
+      continue;
+    }
+    if (candidate.endsWith(".json")) {
+      const json = await fs.readJson(candidate).catch(() => void 0);
+      if (!isRecord(json)) {
+        return void 0;
+      }
+      return json;
+    }
+    const { mod } = await bundleRequire({
+      filepath: candidate,
+      preserveTemporaryFile: true
+    });
+    const resolved = typeof mod.default === "function" ? await mod.default() : mod.default;
+    if (!isRecord(resolved)) {
+      return void 0;
+    }
+    return resolved;
+  }
+  return void 0;
+}
+async function resolveJsonPath(basePath) {
+  const candidates = [basePath];
+  if (basePath.endsWith(".json")) {
+    candidates.push(`${basePath}.ts`, `${basePath}.js`);
+  }
+  for (const candidate of candidates) {
+    if (await fs.pathExists(candidate)) {
+      return candidate;
+    }
   }
-  return json;
+  return void 0;
 }
 function pickNavigationConfig(source) {
   const config = {};
@@ -1576,6 +1635,16 @@ function mergeNavigationConfig(base, overrides) {
 function normalizePath2(p) {
   return posix.normalize(p.split("\\").join("/"));
 }
+function isInsideDir(filePath, dir) {
+  const rel = relative2(dir, filePath);
+  return rel === "" || !rel.startsWith("..") && !posix.isAbsolute(rel);
+}
+function isHtmlEntry(filePath, root) {
+  if (!filePath.toLowerCase().endsWith(".html")) {
+    return false;
+  }
+  return normalizePath2(filePath) === normalizePath2(resolve(root, "index.html"));
+}
 function resolveImportBase(raw, importer, srcRoot) {
   if (!raw) {
     return void 0;

package/dist/plugin.mjs

@@ -6,6 +6,7 @@ import * as t from "@babel/types";
 import fs from "fs-extra";
 import MagicString from "magic-string";
 import { dirname as dirname2, extname, join, normalize, posix, relative as relative2, resolve } from "pathe";
+import { bundleRequire } from "rolldown-require";
 
 // src/compiler/wxml.ts
 import { readFileSync } from "fs";
@@ -734,7 +735,8 @@ function toRelativeImport(from, target) {
   const fromDir = dirname(from);
   const rel = relative(fromDir, target);
   if (!rel || rel.startsWith(".")) {
-    return rel || `./${target.split("/").pop() ?? ""}`;
+    const fallback = normalizeTemplatePath(target).split("/").pop() ?? "";
+    return rel || `./${fallback}`;
   }
   return `./${rel}`;
 }
@@ -930,7 +932,8 @@ function appendWxsQuery(pathname) {
   return `${pathname}${pathname.includes("?") ? "&" : "?"}wxs`;
 }
 function isSupportedRequirePath(request) {
-  return request.startsWith(".") || request.startsWith("/");
+  const normalized = request.replace(/\\/g, "/");
+  return normalized.startsWith(".") || normalized.startsWith("/");
 }
 function transformWxsToEsm(code, id, options) {
   const dependencies = [];
@@ -952,7 +955,8 @@ function transformWxsToEsm(code, id, options) {
       warnings.push(`[@weapp-vite/web] WXS require \u4EC5\u652F\u6301\u76F8\u5BF9\u6216\u7EDD\u5BF9\u8DEF\u5F84: ${request} (from ${id})`);
       continue;
     }
-    const resolved = options.resolvePath(request, id);
+    const normalizedRequest = request.replace(/\\/g, "/");
+    const resolved = options.resolvePath(normalizedRequest, id);
     if (!resolved) {
       warnings.push(`[@weapp-vite/web] \u65E0\u6CD5\u89E3\u6790 WXS require: ${request} (from ${id})`);
       continue;
@@ -1071,6 +1075,7 @@ function weappWebPlugin(options = {}) {
   const moduleMeta = /* @__PURE__ */ new Map();
   const pageNavigationMap = /* @__PURE__ */ new Map();
   const templateComponentMap = /* @__PURE__ */ new Map();
+  const templatePathSet = /* @__PURE__ */ new Set();
   const componentTagMap = /* @__PURE__ */ new Map();
   const componentIdMap = /* @__PURE__ */ new Map();
   let appNavigationDefaults = {};
@@ -1116,7 +1121,18 @@ function weappWebPlugin(options = {}) {
     transform(code, id) {
       const clean = cleanUrl(id);
       if (isTemplateFile(clean)) {
+        if (isHtmlEntry(clean, root)) {
+          return null;
+        }
         const normalizedId = normalizePath2(clean);
+        if (templatePathSet.size > 0) {
+          if (!isInsideDir(clean, srcRoot)) {
+            return null;
+          }
+          if (!templatePathSet.has(normalizedId)) {
+            return null;
+          }
+        }
         const navigationConfig = pageNavigationMap.get(normalizedId);
         const componentTags = templateComponentMap.get(normalizedId);
         const { code: compiled, dependencies, warnings } = compileWxml({
@@ -1288,6 +1304,7 @@ if (import.meta.hot) { import.meta.hot.accept() }
     moduleMeta.clear();
     pageNavigationMap.clear();
     templateComponentMap.clear();
+    templatePathSet.clear();
     componentTagMap.clear();
     componentIdMap.clear();
     appNavigationDefaults = {};
@@ -1315,8 +1332,9 @@ if (import.meta.hot) { import.meta.hot.accept() }
         }
       );
     }
-    const appJsonPath = join(srcRoot, "app.json");
-    if (await fs.pathExists(appJsonPath)) {
+    const appJsonBasePath = join(srcRoot, "app.json");
+    const appJsonPath = await resolveJsonPath(appJsonBasePath);
+    if (appJsonPath) {
       const appJson = await readJsonFile(appJsonPath);
       if (appJson) {
         appComponentTags = await collectComponentTagsFromConfig(appJson, srcRoot, appJsonPath, reportWarning, (tags) => {
@@ -1363,9 +1381,13 @@ if (import.meta.hot) { import.meta.hot.accept() }
         return;
       }
       const template = await resolveTemplateFile(base);
+      if (template) {
+        templatePathSet.add(normalizePath2(template));
+      }
       const style = await resolveStyleFile(base);
-      const pageJsonPath = join(srcRoot, `${pageId}.json`);
-      const pageJson = await readJsonFile(pageJsonPath);
+      const pageJsonBasePath = join(srcRoot, `${pageId}.json`);
+      const pageJsonPath = await resolveJsonPath(pageJsonBasePath);
+      const pageJson = pageJsonPath ? await readJsonFile(pageJsonPath) : void 0;
       moduleMeta.set(
         normalizePath2(script),
         {
@@ -1380,7 +1402,7 @@ if (import.meta.hot) { import.meta.hot.accept() }
         script,
         id: toPosixId(pageId)
       });
-      const pageComponentTags = pageJson ? await collectComponentTagsFromConfig(pageJson, dirname2(script), pageJsonPath, reportWarning) : await collectComponentTagsFromJson(pageJsonPath, dirname2(script), reportWarning);
+      const pageComponentTags = pageJson && pageJsonPath ? await collectComponentTagsFromConfig(pageJson, dirname2(script), pageJsonPath, reportWarning) : await collectComponentTagsFromJson(pageJsonBasePath, dirname2(script), reportWarning);
       if (template) {
         const mergedTags = mergeComponentTags(appComponentTags, pageComponentTags);
         if (Object.keys(mergedTags).length > 0) {
@@ -1410,6 +1432,9 @@ if (import.meta.hot) { import.meta.hot.accept() }
       const idRelative = relative2(srcRoot, script).replace(new RegExp(`${extname(script)}$`), "");
       const componentIdPosix = toPosixId(idRelative);
       const template = await resolveTemplateFile(script);
+      if (template) {
+        templatePathSet.add(normalizePath2(template));
+      }
       const style = await resolveStyleFile(script);
       moduleMeta.set(
         normalizePath2(script),
@@ -1425,8 +1450,8 @@ if (import.meta.hot) { import.meta.hot.accept() }
         script,
         id: componentIdPosix
       });
-      const componentJsonPath = `${script.replace(new RegExp(`${extname(script)}$`), "")}.json`;
-      const componentTags = await collectComponentTagsFromJson(componentJsonPath, dirname2(script), reportWarning);
+      const componentJsonBasePath = `${script.replace(new RegExp(`${extname(script)}$`), "")}.json`;
+      const componentTags = await collectComponentTagsFromJson(componentJsonBasePath, dirname2(script), reportWarning);
       if (template) {
         const mergedTags = mergeComponentTags(appComponentTags, componentTags);
         if (Object.keys(mergedTags).length > 0) {
@@ -1468,12 +1493,16 @@ if (import.meta.hot) { import.meta.hot.accept() }
       }
       return tags;
     }
-    async function collectComponentTagsFromJson(jsonPath, importerDir, warn2) {
-      const json = await readJsonFile(jsonPath);
+    async function collectComponentTagsFromJson(jsonBasePath, importerDir, warn2) {
+      const resolvedPath = await resolveJsonPath(jsonBasePath);
+      if (!resolvedPath) {
+        return {};
+      }
+      const json = await readJsonFile(resolvedPath);
       if (!json) {
         return {};
       }
-      return collectComponentTagsFromConfig(json, importerDir, jsonPath, warn2);
+      return collectComponentTagsFromConfig(json, importerDir, resolvedPath, warn2);
     }
     function mergeComponentTags(base, overrides) {
       if (!Object.keys(base).length && !Object.keys(overrides).length) {
@@ -1539,14 +1568,44 @@ function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 async function readJsonFile(pathname) {
-  if (!await fs.pathExists(pathname)) {
-    return void 0;
+  const candidates = [pathname];
+  if (pathname.endsWith(".json")) {
+    candidates.push(`${pathname}.ts`, `${pathname}.js`);
   }
-  const json = await fs.readJson(pathname).catch(() => void 0);
-  if (!isRecord(json)) {
-    return void 0;
+  for (const candidate of candidates) {
+    if (!await fs.pathExists(candidate)) {
+      continue;
+    }
+    if (candidate.endsWith(".json")) {
+      const json = await fs.readJson(candidate).catch(() => void 0);
+      if (!isRecord(json)) {
+        return void 0;
+      }
+      return json;
+    }
+    const { mod } = await bundleRequire({
+      filepath: candidate,
+      preserveTemporaryFile: true
+    });
+    const resolved = typeof mod.default === "function" ? await mod.default() : mod.default;
+    if (!isRecord(resolved)) {
+      return void 0;
+    }
+    return resolved;
   }
-  return json;
+  return void 0;
+}
+async function resolveJsonPath(basePath) {
+  const candidates = [basePath];
+  if (basePath.endsWith(".json")) {
+    candidates.push(`${basePath}.ts`, `${basePath}.js`);
+  }
+  for (const candidate of candidates) {
+    if (await fs.pathExists(candidate)) {
+      return candidate;
+    }
+  }
+  return void 0;
 }
 function pickNavigationConfig(source) {
   const config = {};
@@ -1576,6 +1635,16 @@ function mergeNavigationConfig(base, overrides) {
 function normalizePath2(p) {
   return posix.normalize(p.split("\\").join("/"));
 }
+function isInsideDir(filePath, dir) {
+  const rel = relative2(dir, filePath);
+  return rel === "" || !rel.startsWith("..") && !posix.isAbsolute(rel);
+}
+function isHtmlEntry(filePath, root) {
+  if (!filePath.toLowerCase().endsWith(".html")) {
+    return false;
+  }
+  return normalizePath2(filePath) === normalizePath2(resolve(root, "index.html"));
+}
 function resolveImportBase(raw, importer, srcRoot) {
   if (!raw) {
     return void 0;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-vite/web",
   "type": "module",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Experimental web runtime for weapp-vite templates",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -44,15 +44,16 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "dependencies": {
-    "@babel/parser": "^7.28.6",
-    "@babel/traverse": "^7.28.6",
-    "@babel/types": "^7.28.6",
+    "@babel/parser": "^7.29.0",
+    "@babel/traverse": "^7.29.0",
+    "@babel/types": "^7.29.0",
     "domhandler": "^5.0.3",
     "fs-extra": "^11.3.3",
-    "htmlparser2": "^10.0.0",
+    "htmlparser2": "^10.1.0",
     "lit": "^3.3.1",
     "magic-string": "^0.30.21",
-    "pathe": "^2.0.3"
+    "pathe": "^2.0.3",
+    "rolldown-require": "2.0.3"
   },
   "scripts": {
     "dev": "tsup --watch --sourcemap",