@uni-helper/vite-plugin-uni-pages 0.4.4 → 0.4.7

package/README.md

@@ -253,7 +253,8 @@ export default defineConfig({
 本插件默认会：
 
 - 通过文件锁串行化对 `pages.json` 的「读取已有内容 → 合并当前平台配置 → 写回」整个流程，避免并发写入互相覆盖；
-- 保留其他平台已经写入的条件编译块（`#ifdef H5` / `#ifndef MP-WEIXIN` 等），只更新当前平台对应的条目。
+- 保留其他平台已经写入的条件编译块（`#ifdef H5` / `#ifndef MP-WEIXIN` 等），只更新当前平台对应的条目；
+- 对同一 `path`（或 tabBar 的 `pagePath`）的条目按内容去重：内容相同的条目会合并为一条并叠加平台标识（如 `H5 || MP-WEIXIN`），不会因为先后跑过多个平台而产生重复路由。
 
 这样每个终端都能保留各自的平台配置。条件编译注释基于 `comment-json` 写入，最终 `pages.json` 同时包含所有平台的分支。
 

package/dist/index.cjs

@@ -1207,6 +1207,13 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
 		});
 		tmpMap.set(uniqueKey, existing);
 	}
+	const stringifyForCompare = (val) => {
+		if (val && typeof val === "object" && "type" in val) {
+			const { type: _type, ...rest } = val;
+			return JSON.stringify(rest);
+		}
+		return JSON.stringify(val);
+	};
 	for (const item of items) {
 		const newItem = item;
 		const uniqueKey = item[uniqueKeyName];
@@ -1214,14 +1221,14 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
 		if (!tmpMap.has(uniqueKey)) {
 			tmpMap.set(uniqueKey, [{
 				item: newItem,
-				itemStr: JSON.stringify(newItem),
+				itemStr: stringifyForCompare(newItem),
 				platforms: [currentPlatform],
 				platformStr: currentPlatform
 			}]);
 			continue;
 		}
 		const existing = tmpMap.get(uniqueKey);
-		const newItemStr = JSON.stringify(newItem);
+		const newItemStr = stringifyForCompare(newItem);
 		const equalObj = existing.find((val) => val.itemStr === newItemStr);
 		if (equalObj) {
 			equalObj.platforms.push(currentPlatform);
@@ -1229,7 +1236,7 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
 			equalObj.platformStr = equalObj.platforms.join(" || ");
 		} else existing.push({
 			item: newItem,
-			itemStr: newItemStr,
+			itemStr: stringifyForCompare(newItem),
 			platforms: [currentPlatform],
 			platformStr: currentPlatform
 		});

package/dist/index.d.mts

@@ -2,7 +2,7 @@ import { createRequire } from "node:module";
 import { FSWatcher } from "chokidar";
 import { Logger, Plugin, ViteDevServer } from "vite";
 import fs from "node:fs";
-import dbg from "debug";
+import Debug from "debug";
 import { LoadConfigSource } from "unconfig";
 import babelGenerator from "@babel/generator";
 import * as t from "@babel/types";
@@ -286,14 +286,14 @@ declare function invalidatePagesModule(server: ViteDevServer): void;
  * Enable via environment variable DEBUG=vite-plugin-uni-pages:*
  */
 declare const debug: {
-  /** HMR related logs */hmr: dbg.Debugger; /** Configuration options related logs */
-  options: dbg.Debugger; /** Main package page scanning logs */
-  pages: dbg.Debugger; /** Sub-package page scanning logs */
-  subPages: dbg.Debugger; /** Error logs */
-  error: dbg.Debugger; /** Cache related logs */
-  cache: dbg.Debugger; /** Declaration file generation logs */
-  declaration: dbg.Debugger; /** definePage macro parsing logs */
-  definePage: dbg.Debugger;
+  /** HMR related logs */hmr: Debug.Debugger; /** Configuration options related logs */
+  options: Debug.Debugger; /** Main package page scanning logs */
+  pages: Debug.Debugger; /** Sub-package page scanning logs */
+  subPages: Debug.Debugger; /** Error logs */
+  error: Debug.Debugger; /** Cache related logs */
+  cache: Debug.Debugger; /** Declaration file generation logs */
+  declaration: Debug.Debugger; /** definePage macro parsing logs */
+  definePage: Debug.Debugger;
 };
 /**
  * Convert file extensions array to glob pattern

package/dist/index.mjs

@@ -8,7 +8,7 @@ import { createLogger, normalizePath } from "vite";
 import fs, { existsSync } from "node:fs";
 import { platform } from "@uni-helper/uni-env";
 import { CommentArray, parse, stringify } from "comment-json";
-import dbg from "debug";
+import Debug from "debug";
 import detectIndent from "detect-indent";
 import detectNewline from "detect-newline";
 import { loadConfig } from "unconfig";
@@ -135,21 +135,21 @@ function invalidatePagesModule(server) {
 */
 const debug = {
 	/** HMR related logs */
-	hmr: dbg("vite-plugin-uni-pages:hmr"),
+	hmr: Debug("vite-plugin-uni-pages:hmr"),
 	/** Configuration options related logs */
-	options: dbg("vite-plugin-uni-pages:options"),
+	options: Debug("vite-plugin-uni-pages:options"),
 	/** Main package page scanning logs */
-	pages: dbg("vite-plugin-uni-pages:pages"),
+	pages: Debug("vite-plugin-uni-pages:pages"),
 	/** Sub-package page scanning logs */
-	subPages: dbg("vite-plugin-uni-pages:subPages"),
+	subPages: Debug("vite-plugin-uni-pages:subPages"),
 	/** Error logs */
-	error: dbg("vite-plugin-uni-pages:error"),
+	error: Debug("vite-plugin-uni-pages:error"),
 	/** Cache related logs */
-	cache: dbg("vite-plugin-uni-pages:cache"),
+	cache: Debug("vite-plugin-uni-pages:cache"),
 	/** Declaration file generation logs */
-	declaration: dbg("vite-plugin-uni-pages:declaration"),
+	declaration: Debug("vite-plugin-uni-pages:declaration"),
 	/** definePage macro parsing logs */
-	definePage: dbg("vite-plugin-uni-pages:definePage")
+	definePage: Debug("vite-plugin-uni-pages:definePage")
 };
 /**
 * Convert file extensions array to glob pattern
@@ -712,7 +712,7 @@ var PageContext = class {
 		if (debugOption) {
 			const prefix = "vite-plugin-uni-pages:";
 			const suffix = typeof debugOption === "boolean" ? "*" : debugOption;
-			dbg.enable(`${prefix}${suffix}`);
+			Debug.enable(`${prefix}${suffix}`);
 		}
 		this.resolvedPagesJSONPath = path.join(this.root, this.options.outDir, OUTPUT_NAME);
 		debug.options(this.options);
@@ -1166,6 +1166,13 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
 		});
 		tmpMap.set(uniqueKey, existing);
 	}
+	const stringifyForCompare = (val) => {
+		if (val && typeof val === "object" && "type" in val) {
+			const { type: _type, ...rest } = val;
+			return JSON.stringify(rest);
+		}
+		return JSON.stringify(val);
+	};
 	for (const item of items) {
 		const newItem = item;
 		const uniqueKey = item[uniqueKeyName];
@@ -1173,14 +1180,14 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
 		if (!tmpMap.has(uniqueKey)) {
 			tmpMap.set(uniqueKey, [{
 				item: newItem,
-				itemStr: JSON.stringify(newItem),
+				itemStr: stringifyForCompare(newItem),
 				platforms: [currentPlatform],
 				platformStr: currentPlatform
 			}]);
 			continue;
 		}
 		const existing = tmpMap.get(uniqueKey);
-		const newItemStr = JSON.stringify(newItem);
+		const newItemStr = stringifyForCompare(newItem);
 		const equalObj = existing.find((val) => val.itemStr === newItemStr);
 		if (equalObj) {
 			equalObj.platforms.push(currentPlatform);
@@ -1188,7 +1195,7 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
 			equalObj.platformStr = equalObj.platforms.join(" || ");
 		} else existing.push({
 			item: newItem,
-			itemStr: newItemStr,
+			itemStr: stringifyForCompare(newItem),
 			platforms: [currentPlatform],
 			platformStr: currentPlatform
 		});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uni-helper/vite-plugin-uni-pages",
   "type": "module",
-  "version": "0.4.4",
+  "version": "0.4.7",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
   "maintainers": [
@@ -55,7 +55,7 @@
     "@babel/generator": "^7.29.7",
     "@babel/types": "^7.29.7",
     "@types/proper-lockfile": "^4.1.4",
-    "@uni-helper/uni-env": "^0.2.2",
+    "@uni-helper/uni-env": "^0.3.1",
     "@vue/compiler-sfc": "~3.4.38",
     "ast-kit": "^1.4.3",
     "chokidar": "^3.6.0",
@@ -72,7 +72,7 @@
     "unconfig": "^7.5.0",
     "write-file-atomic": "^7.0.1",
     "yaml": "^2.9.0",
-    "@uni-helper/uni-pages-types": "0.4.4"
+    "@uni-helper/uni-pages-types": "0.4.7"
   },
   "devDependencies": {
     "@antfu/utils": "^9.3.0",