@uni-helper/vite-plugin-uni-pages 0.3.20 → 0.3.22

package/client.d.ts

@@ -1,3 +1,5 @@
+/// <reference path="./global.d.ts" />
+
 declare module 'virtual:uni-pages' {
   import type { SubPackage } from './src/config/types/index'
   import type { PageMetaDatum } from './src/types'
@@ -5,9 +7,3 @@ declare module 'virtual:uni-pages' {
   export const pages: PageMetaDatum[]
   export const subPackages: SubPackage[]
 }
-
-declare global {
-  const definePage: import('.').DefinePage
-}
-
-export {}

package/dist/index.cjs

@@ -319,18 +319,18 @@ async function writeFileWithLock(path, content, retry = 3) {
     debug.error(`${path} \u83B7\u53D6\u6587\u4EF6\u9501\u5931\u8D25\uFF0C\u5199\u5165\u5931\u8D25`);
     return;
   }
-  let relase;
+  let release;
   try {
     try {
-      relase = await lockfile__default.lock(path, { realpath: false });
+      release = await lockfile__default.lock(path, { realpath: false });
     } catch {
       await sleep(500);
       return writeFileWithLock(path, content, retry - 1);
     }
     await fs__default.promises.writeFile(path, content, { encoding: "utf-8" });
   } finally {
-    if (relase) {
-      await relase();
+    if (release) {
+      await release();
     }
   }
 }
@@ -809,6 +809,9 @@ class PageContext {
     return result;
   }
   async mergePageMetaData() {
+    const subPageAbsolutePaths = Array.from(this.subPages.values()).flatMap((v) => Array.from(v.keys()));
+    for (const subPageAbsolutePath of subPageAbsolutePaths)
+      this.pages.delete(subPageAbsolutePath);
     const pageMetaData = await this.parsePages(this.pages, "main", this.pagesGlobConfig?.pages);
     this.pageMetaData = pageMetaData;
     debug.pages(this.pageMetaData);
@@ -1062,6 +1065,7 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
     const equalObj = existing.find((val) => val.itemStr === newItemStr);
     if (equalObj) {
       equalObj.platforms.push(currentPlatform);
+      equalObj.platforms.sort();
       equalObj.platformStr = equalObj.platforms.join(" || ");
     } else {
       existing.push({

package/dist/index.mjs

@@ -284,18 +284,18 @@ async function writeFileWithLock(path, content, retry = 3) {
     debug.error(`${path} \u83B7\u53D6\u6587\u4EF6\u9501\u5931\u8D25\uFF0C\u5199\u5165\u5931\u8D25`);
     return;
   }
-  let relase;
+  let release;
   try {
     try {
-      relase = await lockfile.lock(path, { realpath: false });
+      release = await lockfile.lock(path, { realpath: false });
     } catch {
       await sleep(500);
       return writeFileWithLock(path, content, retry - 1);
     }
     await fs.promises.writeFile(path, content, { encoding: "utf-8" });
   } finally {
-    if (relase) {
-      await relase();
+    if (release) {
+      await release();
     }
   }
 }
@@ -774,6 +774,9 @@ class PageContext {
     return result;
   }
   async mergePageMetaData() {
+    const subPageAbsolutePaths = Array.from(this.subPages.values()).flatMap((v) => Array.from(v.keys()));
+    for (const subPageAbsolutePath of subPageAbsolutePaths)
+      this.pages.delete(subPageAbsolutePath);
     const pageMetaData = await this.parsePages(this.pages, "main", this.pagesGlobConfig?.pages);
     this.pageMetaData = pageMetaData;
     debug.pages(this.pageMetaData);
@@ -1027,6 +1030,7 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
     const equalObj = existing.find((val) => val.itemStr === newItemStr);
     if (equalObj) {
       equalObj.platforms.push(currentPlatform);
+      equalObj.platforms.sort();
       equalObj.platformStr = equalObj.platforms.join(" || ");
     } else {
       existing.push({

package/global.d.ts

@@ -0,0 +1,5 @@
+declare global {
+  const definePage: import('.').DefinePage
+}
+
+export {}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uni-helper/vite-plugin-uni-pages",
   "type": "module",
-  "version": "0.3.20",
+  "version": "0.3.22",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
   "maintainers": [
@@ -45,6 +45,7 @@
   "files": [
     "client.d.ts",
     "dist",
+    "global.d.ts",
     "index.d.ts"
   ],
   "peerDependencies": {