@uni-helper/vite-plugin-uni-pages 0.2.13 → 0.2.15

package/dist/index.cjs

@@ -36,12 +36,12 @@ function slash(str) {
 
 function getDeclaration(ctx) {
   const subPagesPath = ctx.subPageMetaData.map((sub) => {
-    return sub.pages.map((v) => `"${vite.normalizePath(path.join(sub.root, v.path))}"`);
+    return sub.pages.map((v) => `"/${vite.normalizePath(path.join(sub.root, v.path))}"`);
   }).flat();
   const tabsPagesPath = ctx.pagesGlobConfig?.tabBar?.list?.map((v) => {
-    return `"${v.pagePath}"`;
+    return `"/${v.pagePath}"`;
   }) ?? [];
-  const allPagesPath = [...ctx.pageMetaData.filter((page) => !tabsPagesPath.includes(page.path)).map((v) => `"${v.path}"`), ...subPagesPath];
+  const allPagesPath = [...ctx.pageMetaData.filter((page) => !tabsPagesPath.includes(page.path)).map((v) => `"/${v.path}"`), ...subPagesPath];
   const code = `/* eslint-disable */
 /* prettier-ignore */
 // @ts-nocheck
@@ -92,10 +92,10 @@ async function parseSFC(code) {
     }).descriptor || compilerSfc.parse({
       source: code
     });
-  } catch {
-    throw new Error(
-      `[vite-plugin-uni-pages] Vue3's "@vue/compiler-sfc" is required.`
-    );
+  } catch (error) {
+    throw new Error(`[vite-plugin-uni-pages] Vue3's "@vue/compiler-sfc" is required. 
+Original error: 
+${error}`);
   }
 }
 function parseCustomBlock(block, filePath, options) {
@@ -441,41 +441,44 @@ class PageContext {
       Object.assign(pageMetaDatum, routeBlock.content);
     return pageMetaDatum;
   }
-  async parsePages(pages, overrides) {
+  /**
+   * parse pages rules && set page type
+   * @param pages page path array
+   * @param type  page type
+   * @param overrides custom page config
+   * @returns pages rules
+   */
+  async parsePages(pages, type, overrides) {
     const generatedPageMetaData = await Promise.all(pages.map(async (page) => await this.parsePage(page)));
     const customPageMetaData = overrides || [];
     const result = customPageMetaData.length ? mergePageMetaDataArray(generatedPageMetaData.concat(customPageMetaData)) : generatedPageMetaData;
-    this.setHomePage(result);
-    result.sort((page) => page.type === "home" ? -1 : 0);
-    return result;
+    return type === "main" ? this.setHomePage(result) : result;
   }
+  /**
+   * set home page
+   * @param result pages rules array
+   * @returns pages rules
+   */
   setHomePage(result) {
-    const hasHome = result.some((page) => {
-      if (page.type === "home")
-        return true;
-      const base = page.path.split("/")[0];
-      if (this.options.subPackages.includes(`src/${base}`))
-        return true;
-      return false;
-    });
-    if (hasHome)
-      return true;
-    const isFoundHome = result.some((item) => {
-      if (this.options.homePage.some((v) => v.startsWith(item.path))) {
-        item.type = "home";
-        return true;
-      } else {
-        return false;
+    const hasHome = result.some(({ type }) => type === "home");
+    if (!hasHome) {
+      const isFoundHome = result.some((item) => {
+        const isFound = this.options.homePage.find((v) => v === item.path);
+        if (isFound)
+          item.type = "home";
+        return isFound;
+      });
+      if (!isFoundHome) {
+        this.logger?.warn('No home page found, check the configuration of pages.config.ts, or add the `homePage` option to UniPages in vite.config.js, or add `type="home"` to the routeBlock of your vue page.', {
+          timestamp: true
+        });
       }
-    });
-    if (isFoundHome)
-      return true;
-    this.logger?.warn('No home page found, check the configuration of pages.config.ts, or add the `homePage` option to UniPages in vite.config.js, or add `type="home"` to the routeBlock of your vue page.', {
-      timestamp: true
-    });
+    }
+    result.sort((page) => page.type === "home" ? -1 : 0);
+    return result;
   }
   async mergePageMetaData() {
-    const pageMetaData = await this.parsePages(this.pagesPath, this.pagesGlobConfig?.pages);
+    const pageMetaData = await this.parsePages(this.pagesPath, "main", this.pagesGlobConfig?.pages);
     this.pageMetaData = pageMetaData;
     debug.pages(this.pageMetaData);
   }
@@ -485,7 +488,7 @@ class PageContext {
     for (const [dir, pages] of Object.entries(this.subPagesPath)) {
       const root = path__default.basename(dir);
       const globPackage = subPackages?.find((v) => v.root === root);
-      subPageMaps[root] = await this.parsePages(pages, globPackage?.pages);
+      subPageMaps[root] = await this.parsePages(pages, "sub", globPackage?.pages);
       subPageMaps[root] = subPageMaps[root].map((page) => ({ ...page, path: slash(path__default.relative(root, page.path)) }));
     }
     for (const { root, pages } of subPackages) {
@@ -517,12 +520,10 @@ class PageContext {
     await this.mergePageMetaData();
     await this.mergeSubPageMetaData();
     this.options.onAfterMergePageMetaData(this);
-    if (this.withUniPlatform) {
-      const pagesMap = /* @__PURE__ */ new Map();
-      const pages = this.pageMetaData.filter((v) => !/\..*$/.test(v.path) || v.path.includes(uniEnv.platform)).map((v) => ({ ...v, path: v.path.replace(/\..*$/, "") }));
-      pages.forEach((v) => pagesMap.set(v.path, v));
-      this.pageMetaData = [...pagesMap.values()];
-    }
+    const pagesMap = /* @__PURE__ */ new Map();
+    const pages = this.withUniPlatform ? this.pageMetaData.filter((v) => !/\..*$/.test(v.path) || v.path.includes(uniEnv.platform)).map((v) => ({ ...v, path: v.path.replace(/\..*$/, "") })) : this.pageMetaData;
+    pages.forEach((v) => pagesMap.set(v.path, v));
+    this.pageMetaData = [...pagesMap.values()];
     this.options.onBeforeWriteFile(this);
     const data = {
       ...this.pagesGlobConfig,

package/dist/index.d.cts

@@ -659,8 +659,20 @@ declare class PageContext {
     setupWatcher(watcher: FSWatcher): Promise<void>;
     onUpdate(): void;
     parsePage(page: PagePath): Promise<PageMetaDatum>;
-    parsePages(pages: PagePath[], overrides?: PageMetaDatum[]): Promise<PageMetaDatum[]>;
-    setHomePage(result: PageMetaDatum[]): true | undefined;
+    /**
+     * parse pages rules && set page type
+     * @param pages page path array
+     * @param type  page type
+     * @param overrides custom page config
+     * @returns pages rules
+     */
+    parsePages(pages: PagePath[], type: 'main' | 'sub', overrides?: PageMetaDatum[]): Promise<PageMetaDatum[]>;
+    /**
+     * set home page
+     * @param result pages rules array
+     * @returns pages rules
+     */
+    setHomePage(result: PageMetaDatum[]): PageMetaDatum[];
     mergePageMetaData(): Promise<void>;
     mergeSubPageMetaData(): Promise<void>;
     updatePagesJSON(filepath?: string): Promise<boolean>;

package/dist/index.d.mts

@@ -659,8 +659,20 @@ declare class PageContext {
     setupWatcher(watcher: FSWatcher): Promise<void>;
     onUpdate(): void;
     parsePage(page: PagePath): Promise<PageMetaDatum>;
-    parsePages(pages: PagePath[], overrides?: PageMetaDatum[]): Promise<PageMetaDatum[]>;
-    setHomePage(result: PageMetaDatum[]): true | undefined;
+    /**
+     * parse pages rules && set page type
+     * @param pages page path array
+     * @param type  page type
+     * @param overrides custom page config
+     * @returns pages rules
+     */
+    parsePages(pages: PagePath[], type: 'main' | 'sub', overrides?: PageMetaDatum[]): Promise<PageMetaDatum[]>;
+    /**
+     * set home page
+     * @param result pages rules array
+     * @returns pages rules
+     */
+    setHomePage(result: PageMetaDatum[]): PageMetaDatum[];
     mergePageMetaData(): Promise<void>;
     mergeSubPageMetaData(): Promise<void>;
     updatePagesJSON(filepath?: string): Promise<boolean>;

package/dist/index.d.ts

@@ -659,8 +659,20 @@ declare class PageContext {
     setupWatcher(watcher: FSWatcher): Promise<void>;
     onUpdate(): void;
     parsePage(page: PagePath): Promise<PageMetaDatum>;
-    parsePages(pages: PagePath[], overrides?: PageMetaDatum[]): Promise<PageMetaDatum[]>;
-    setHomePage(result: PageMetaDatum[]): true | undefined;
+    /**
+     * parse pages rules && set page type
+     * @param pages page path array
+     * @param type  page type
+     * @param overrides custom page config
+     * @returns pages rules
+     */
+    parsePages(pages: PagePath[], type: 'main' | 'sub', overrides?: PageMetaDatum[]): Promise<PageMetaDatum[]>;
+    /**
+     * set home page
+     * @param result pages rules array
+     * @returns pages rules
+     */
+    setHomePage(result: PageMetaDatum[]): PageMetaDatum[];
     mergePageMetaData(): Promise<void>;
     mergeSubPageMetaData(): Promise<void>;
     updatePagesJSON(filepath?: string): Promise<boolean>;

package/dist/index.mjs

@@ -21,12 +21,12 @@ function slash(str) {
 
 function getDeclaration(ctx) {
   const subPagesPath = ctx.subPageMetaData.map((sub) => {
-    return sub.pages.map((v) => `"${normalizePath(join(sub.root, v.path))}"`);
+    return sub.pages.map((v) => `"/${normalizePath(join(sub.root, v.path))}"`);
   }).flat();
   const tabsPagesPath = ctx.pagesGlobConfig?.tabBar?.list?.map((v) => {
-    return `"${v.pagePath}"`;
+    return `"/${v.pagePath}"`;
   }) ?? [];
-  const allPagesPath = [...ctx.pageMetaData.filter((page) => !tabsPagesPath.includes(page.path)).map((v) => `"${v.path}"`), ...subPagesPath];
+  const allPagesPath = [...ctx.pageMetaData.filter((page) => !tabsPagesPath.includes(page.path)).map((v) => `"/${v.path}"`), ...subPagesPath];
   const code = `/* eslint-disable */
 /* prettier-ignore */
 // @ts-nocheck
@@ -77,10 +77,10 @@ async function parseSFC(code) {
     }).descriptor || parse({
       source: code
     });
-  } catch {
-    throw new Error(
-      `[vite-plugin-uni-pages] Vue3's "@vue/compiler-sfc" is required.`
-    );
+  } catch (error) {
+    throw new Error(`[vite-plugin-uni-pages] Vue3's "@vue/compiler-sfc" is required. 
+Original error: 
+${error}`);
   }
 }
 function parseCustomBlock(block, filePath, options) {
@@ -426,41 +426,44 @@ class PageContext {
       Object.assign(pageMetaDatum, routeBlock.content);
     return pageMetaDatum;
   }
-  async parsePages(pages, overrides) {
+  /**
+   * parse pages rules && set page type
+   * @param pages page path array
+   * @param type  page type
+   * @param overrides custom page config
+   * @returns pages rules
+   */
+  async parsePages(pages, type, overrides) {
     const generatedPageMetaData = await Promise.all(pages.map(async (page) => await this.parsePage(page)));
     const customPageMetaData = overrides || [];
     const result = customPageMetaData.length ? mergePageMetaDataArray(generatedPageMetaData.concat(customPageMetaData)) : generatedPageMetaData;
-    this.setHomePage(result);
-    result.sort((page) => page.type === "home" ? -1 : 0);
-    return result;
+    return type === "main" ? this.setHomePage(result) : result;
   }
+  /**
+   * set home page
+   * @param result pages rules array
+   * @returns pages rules
+   */
   setHomePage(result) {
-    const hasHome = result.some((page) => {
-      if (page.type === "home")
-        return true;
-      const base = page.path.split("/")[0];
-      if (this.options.subPackages.includes(`src/${base}`))
-        return true;
-      return false;
-    });
-    if (hasHome)
-      return true;
-    const isFoundHome = result.some((item) => {
-      if (this.options.homePage.some((v) => v.startsWith(item.path))) {
-        item.type = "home";
-        return true;
-      } else {
-        return false;
+    const hasHome = result.some(({ type }) => type === "home");
+    if (!hasHome) {
+      const isFoundHome = result.some((item) => {
+        const isFound = this.options.homePage.find((v) => v === item.path);
+        if (isFound)
+          item.type = "home";
+        return isFound;
+      });
+      if (!isFoundHome) {
+        this.logger?.warn('No home page found, check the configuration of pages.config.ts, or add the `homePage` option to UniPages in vite.config.js, or add `type="home"` to the routeBlock of your vue page.', {
+          timestamp: true
+        });
       }
-    });
-    if (isFoundHome)
-      return true;
-    this.logger?.warn('No home page found, check the configuration of pages.config.ts, or add the `homePage` option to UniPages in vite.config.js, or add `type="home"` to the routeBlock of your vue page.', {
-      timestamp: true
-    });
+    }
+    result.sort((page) => page.type === "home" ? -1 : 0);
+    return result;
   }
   async mergePageMetaData() {
-    const pageMetaData = await this.parsePages(this.pagesPath, this.pagesGlobConfig?.pages);
+    const pageMetaData = await this.parsePages(this.pagesPath, "main", this.pagesGlobConfig?.pages);
     this.pageMetaData = pageMetaData;
     debug.pages(this.pageMetaData);
   }
@@ -470,7 +473,7 @@ class PageContext {
     for (const [dir, pages] of Object.entries(this.subPagesPath)) {
       const root = path.basename(dir);
       const globPackage = subPackages?.find((v) => v.root === root);
-      subPageMaps[root] = await this.parsePages(pages, globPackage?.pages);
+      subPageMaps[root] = await this.parsePages(pages, "sub", globPackage?.pages);
       subPageMaps[root] = subPageMaps[root].map((page) => ({ ...page, path: slash(path.relative(root, page.path)) }));
     }
     for (const { root, pages } of subPackages) {
@@ -502,12 +505,10 @@ class PageContext {
     await this.mergePageMetaData();
     await this.mergeSubPageMetaData();
     this.options.onAfterMergePageMetaData(this);
-    if (this.withUniPlatform) {
-      const pagesMap = /* @__PURE__ */ new Map();
-      const pages = this.pageMetaData.filter((v) => !/\..*$/.test(v.path) || v.path.includes(platform)).map((v) => ({ ...v, path: v.path.replace(/\..*$/, "") }));
-      pages.forEach((v) => pagesMap.set(v.path, v));
-      this.pageMetaData = [...pagesMap.values()];
-    }
+    const pagesMap = /* @__PURE__ */ new Map();
+    const pages = this.withUniPlatform ? this.pageMetaData.filter((v) => !/\..*$/.test(v.path) || v.path.includes(platform)).map((v) => ({ ...v, path: v.path.replace(/\..*$/, "") })) : this.pageMetaData;
+    pages.forEach((v) => pagesMap.set(v.path, v));
+    this.pageMetaData = [...pagesMap.values()];
     this.options.onBeforeWriteFile(this);
     const data = {
       ...this.pagesGlobConfig,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uni-helper/vite-plugin-uni-pages",
   "type": "module",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
   "license": "MIT",
@@ -36,21 +36,21 @@
     "dist"
   ],
   "dependencies": {
-    "@uni-helper/uni-env": "^0.0.3",
-    "@vue/compiler-sfc": "^3.3.4",
-    "chokidar": "^3.5.3",
+    "@uni-helper/uni-env": "^0.1.1",
+    "@vue/compiler-sfc": "^3.4.21",
+    "chokidar": "^3.6.0",
     "debug": "^4.3.4",
-    "fast-glob": "^3.3.1",
+    "fast-glob": "^3.3.2",
     "json5": "^2.2.3",
     "lodash-unified": "^1.0.3",
-    "magic-string": "^0.30.4",
+    "magic-string": "^0.30.8",
     "unconfig": "^0.3.11",
-    "yaml": "^2.3.2"
+    "yaml": "^2.4.0"
   },
   "devDependencies": {
-    "@antfu/utils": "^0.7.6",
-    "@types/debug": "^4.1.9",
-    "@types/node": "^20.8.3"
+    "@antfu/utils": "^0.7.7",
+    "@types/debug": "^4.1.12",
+    "@types/node": "^20.11.24"
   },
   "scripts": {
     "build": "unbuild",