@uni-helper/vite-plugin-uni-pages 0.1.7 → 0.1.9

package/dist/index.cjs

@@ -2,28 +2,26 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const path$1 = require('path');
-const child_process = require('child_process');
+const path = require('node:path');
+const node_child_process = require('node:child_process');
 const vite = require('vite');
 const MagicString = require('magic-string');
 const chokidar = require('chokidar');
-const path = require('node:path');
 const unconfig = require('unconfig');
 const uniEnv = require('@uni-helper/uni-env');
 const Debug = require('debug');
 const lodashUnified = require('lodash-unified');
 const fg = require('fast-glob');
-const fs = require('fs');
+const fs = require('node:fs');
 const JSON5 = require('json5');
 const yaml = require('yaml');
 const compilerSfc = require('@vue/compiler-sfc');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
-const path__default$1 = /*#__PURE__*/_interopDefaultCompat(path$1);
+const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
 const chokidar__default = /*#__PURE__*/_interopDefaultCompat(chokidar);
-const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const Debug__default = /*#__PURE__*/_interopDefaultCompat(Debug);
 const fg__default = /*#__PURE__*/_interopDefaultCompat(fg);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
@@ -53,6 +51,7 @@ const debug = {
   routeBlock: Debug__default("vite-plugin-uni-pages:routeBlock"),
   options: Debug__default("vite-plugin-uni-pages:options"),
   pages: Debug__default("vite-plugin-uni-pages:pages"),
+  subPages: Debug__default("vite-plugin-uni-pages:subPages"),
   error: Debug__default("vite-plugin-uni-pages:error")
 };
 function extsToGlob(extensions) {
@@ -79,22 +78,25 @@ function mergePageMetaDataArray(pageMetaData) {
   }
   return result;
 }
-const getPagesConfigSourcePaths = async () => {
+async function getPagesConfigSourcePaths() {
   return await fg__default("pages.config.(ts|mts|cts|js|cjs|mjs|json)", {
     deep: 0,
     onlyFiles: true,
     absolute: true
   });
-};
+}
 
 function resolveOptions(userOptions, viteRoot) {
   const {
+    homePage = ["pages/index", "pages/index/index"],
     mergePages = true,
     dir = "src/pages",
+    subPackages = [],
     outDir = "src",
     exclude = ["node_modules", ".git", "**/__*__/**"],
     routeBlockLang = "json5",
     minify = false,
+    debug = false,
     onBeforeLoadUserConfig = () => {
     },
     onAfterLoadUserConfig = () => {
@@ -114,14 +116,19 @@ function resolveOptions(userOptions, viteRoot) {
   } = userOptions;
   const root = viteRoot || slash(process.cwd());
   const resolvedDirs = resolvePageDirs(dir, root, exclude);
+  const resolvedSubDirs = subPackages.map((dir2) => slash(dir2));
+  const ResolvedHomePage = typeof homePage === "string" ? [homePage] : homePage;
   const resolvedOptions = {
+    homePage: ResolvedHomePage,
     mergePages,
     dirs: resolvedDirs,
+    subPackages: resolvedSubDirs,
     outDir,
     exclude,
     routeBlockLang,
     root,
     minify,
+    debug,
     onBeforeLoadUserConfig,
     onAfterLoadUserConfig,
     onBeforeScanPages,
@@ -186,7 +193,7 @@ function parseCustomBlock(block, filePath, options) {
   };
   let content;
   debug.routeBlock(`use ${lang} parser`);
-  if (lang === "json5") {
+  if (lang === "json5" || lang === "jsonc") {
     try {
       content = JSON5__default.parse(block.content);
     } catch (err) {
@@ -234,12 +241,20 @@ async function getRouteBlock(path, options) {
 class PageContext {
   constructor(userOptions, viteRoot = process.cwd()) {
     this.pagesPath = [];
+    this.subPagesPath = {};
     this.pageMetaData = [];
+    this.subPageMetaData = [];
     this.resolvedPagesJSONPath = "";
     this.rawOptions = userOptions;
     this.root = slash(viteRoot);
     debug.options("root", this.root);
     this.options = resolveOptions(userOptions, this.root);
+    const debugOption = this.options.debug;
+    if (debugOption) {
+      const prefix = "vite-plugin-uni-pages:";
+      const suffix = typeof debugOption === "boolean" ? "*" : debugOption;
+      Debug__default.enable(`${prefix}${suffix}`);
+    }
     this.resolvedPagesJSONPath = path__default.join(this.root, this.options.outDir, OUTPUT_NAME);
     debug.options(this.options);
   }
@@ -257,19 +272,20 @@ class PageContext {
   }
   async scanPages() {
     const pageDirFiles = this.options.dirs.map((dir) => {
-      const pagesDirPath = slash(path__default.resolve(this.options.root, dir));
-      const basePath = slash(path__default.join(this.options.root, this.options.outDir));
-      const files = getPageFiles(pagesDirPath, this.options);
-      debug.pages(dir, files);
-      const pagePaths = files.map((file) => slash(file)).map((file) => ({
-        relativePath: path__default.relative(basePath, slash(path__default.resolve(pagesDirPath, file))),
-        absolutePath: slash(path__default.resolve(pagesDirPath, file))
-      }));
-      return { dir, files: pagePaths };
+      return { dir, files: getPagePaths(dir, this.options) };
     });
     this.pagesPath = pageDirFiles.map((page) => page.files).flat();
     debug.pages(this.pagesPath);
   }
+  async scanSubPages() {
+    const subPagesPath = {};
+    for (const dir of this.options.subPackages) {
+      const pagePaths = getPagePaths(dir, this.options);
+      subPagesPath[dir] = pagePaths;
+    }
+    this.subPagesPath = subPagesPath;
+    debug.subPages(this.subPagesPath);
+  }
   setupViteServer(server) {
     if (this._server === server)
       return;
@@ -319,26 +335,70 @@ class PageContext {
     const { relativePath, absolutePath } = page;
     const routeBlock = await getRouteBlock(absolutePath, this.options);
     const relativePathWithFileName = relativePath.replace(path__default.extname(relativePath), "");
-    const pageMetaDatum = { path: vite.normalizePath(relativePathWithFileName), type: routeBlock?.attr.type ?? "page" };
+    const pageMetaDatum = {
+      path: vite.normalizePath(relativePathWithFileName),
+      type: routeBlock?.attr.type ?? "page"
+    };
     if (routeBlock)
       Object.assign(pageMetaDatum, routeBlock.content);
     return pageMetaDatum;
   }
-  async mergePageMetaData() {
-    const generatedPageMetaData = await Promise.all(
-      this.pagesPath.map(async (page) => await this.parsePage(page))
-    );
-    const customPageMetaData = this.pagesGlobConfig?.pages || [];
-    if (!this.options.mergePages) {
-      this.pageMetaData = customPageMetaData;
+  async parsePages(pages, 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;
+  }
+  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.includes(item.path)) {
+        item.type = "home";
+        return true;
+      } else {
+        return false;
+      }
+    });
+    if (isFoundHome) {
+      return true;
     } else {
-      if (this.pagesGlobConfig?.pages)
-        this.pageMetaData = mergePageMetaDataArray(generatedPageMetaData.concat(customPageMetaData));
-      else
-        this.pageMetaData = generatedPageMetaData;
+      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
+      });
     }
-    this.pageMetaData.sort((page) => page.type === "home" ? -1 : 0);
-    debug.pages(generatedPageMetaData);
+  }
+  async mergePageMetaData() {
+    const pageMetaData = await this.parsePages(this.pagesPath, this.pagesGlobConfig?.pages);
+    this.pageMetaData = pageMetaData;
+    debug.pages(this.pageMetaData);
+  }
+  async mergeSubPageMetaData() {
+    const subPageMaps = {};
+    const subPackages = this.pagesGlobConfig?.subPackages || [];
+    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] = subPageMaps[root].map((page) => ({ ...page, path: slash(path__default.relative(root, page.path)) }));
+    }
+    for (const { root, pages } of subPackages) {
+      if (root && !subPageMaps[root])
+        subPageMaps[root] = pages || [];
+    }
+    const subPageMetaData = Object.keys(subPageMaps).map((root) => ({ root, pages: subPageMaps[root] }));
+    this.subPageMetaData = subPageMetaData;
+    debug.subPages(this.subPageMetaData);
   }
   async updatePagesJSON() {
     checkPagesJsonFile(this.resolvedPagesJSONPath);
@@ -348,13 +408,20 @@ class PageContext {
     if (this.options.mergePages) {
       this.options.onBeforeScanPages(this);
       await this.scanPages();
+      await this.scanSubPages();
       this.options.onAfterScanPages(this);
     }
     this.options.onBeforeMergePageMetaData(this);
     await this.mergePageMetaData();
+    await this.mergeSubPageMetaData();
     this.options.onAfterMergePageMetaData(this);
     this.options.onBeforeWriteFile(this);
-    const pagesJson = JSON.stringify({ ...this.pagesGlobConfig, pages: this.pageMetaData }, null, this.options.minify ? void 0 : 2);
+    const data = {
+      ...this.pagesGlobConfig,
+      pages: this.pageMetaData,
+      subPackages: this.subPageMetaData
+    };
+    const pagesJson = JSON.stringify(data, null, this.options.minify ? void 0 : 2);
     writeFileSync(this.resolvedPagesJSONPath, pagesJson);
     this.options.onAfterWriteFile(this);
   }
@@ -365,6 +432,17 @@ class PageContext {
     return JSON.stringify(this.pageMetaData, null, 2);
   }
 }
+function getPagePaths(dir, options) {
+  const pagesDirPath = slash(path__default.resolve(options.root, dir));
+  const basePath = slash(path__default.join(options.root, options.outDir));
+  const files = getPageFiles(pagesDirPath, options);
+  debug.pages(dir, files);
+  const pagePaths = files.map((file) => slash(file)).map((file) => ({
+    relativePath: path__default.relative(basePath, slash(path__default.resolve(pagesDirPath, file))),
+    absolutePath: slash(path__default.resolve(pagesDirPath, file))
+  }));
+  return pagePaths;
+}
 
 function defineUniPages(config) {
   return config;
@@ -372,7 +450,7 @@ function defineUniPages(config) {
 
 async function restart() {
   return new Promise((resolve) => {
-    const build = child_process.spawn(process.argv.shift(), process.argv, {
+    const build = node_child_process.spawn(process.argv.shift(), process.argv, {
       cwd: process.cwd(),
       detached: true,
       env: process.env
@@ -384,9 +462,9 @@ async function restart() {
     });
   });
 }
-const VitePluginUniPages = (userOptions = {}) => {
+function VitePluginUniPages(userOptions = {}) {
   let ctx;
-  const resolvedPagesJSONPath = path__default$1.join(
+  const resolvedPagesJSONPath = path__default.join(
     process.cwd(),
     userOptions.outDir ?? "src",
     OUTPUT_NAME
@@ -440,7 +518,7 @@ const VitePluginUniPages = (userOptions = {}) => {
         return ctx.virtualModule();
     }
   };
-};
+}
 
 exports.FILE_EXTENSIONS = FILE_EXTENSIONS;
 exports.MODULE_ID_VIRTUAL = MODULE_ID_VIRTUAL;

package/dist/index.d.ts

@@ -22,10 +22,10 @@ interface AppPlus {
      */
     background?: HEXColor;
     /**
-     * 导航栏 ，详见?:导航栏
+     * 导航栏 ，详见?:导航栏; 设置为 false 不显示默认导航栏
      * @desc App、H5
      */
-    titleNView?: object;
+    titleNView?: object | false;
     /**
      * 原生子窗体，详见?:原生子窗体
      * @desc App 1.9.10+
@@ -639,7 +639,9 @@ declare class PageContext {
     private _server;
     pagesGlobConfig: PagesConfig | undefined;
     pagesPath: PagePath[];
+    subPagesPath: Record<string, PagePath[]>;
     pageMetaData: PageMetaDatum[];
+    subPageMetaData: SubPageMetaDatum[];
     resolvedPagesJSONPath: string;
     rawOptions: UserOptions;
     root: string;
@@ -649,21 +651,51 @@ declare class PageContext {
     setLogger(logger: Logger): void;
     loadUserPagesConfig(): Promise<void>;
     scanPages(): Promise<void>;
+    scanSubPages(): Promise<void>;
     setupViteServer(server: ViteDevServer): void;
     setupWatcher(watcher: FSWatcher): Promise<void>;
     onUpdate(): void;
     parsePage(page: PagePath): Promise<PageMetaDatum>;
+    parsePages(pages: PagePath[], overrides?: PageMetaDatum[]): Promise<PageMetaDatum[]>;
+    setHomePage(result: PageMetaDatum[]): true | undefined;
     mergePageMetaData(): Promise<void>;
+    mergeSubPageMetaData(): Promise<void>;
     updatePagesJSON(): Promise<void>;
     virtualModule(): Promise<string>;
     resolveRoutes(): string;
 }
 
+declare function invalidatePagesModule(server: ViteDevServer): void;
+declare const debug: {
+    hmr: Debug.Debugger;
+    routeBlock: Debug.Debugger;
+    options: Debug.Debugger;
+    pages: Debug.Debugger;
+    subPages: Debug.Debugger;
+    error: Debug.Debugger;
+};
+declare function extsToGlob(extensions: string[]): string;
+declare function isTargetFile(path: string): boolean;
+declare function isConfigFile(path: string): boolean;
+/**
+ * merge page meta data array by path and assign style
+ * @param pageMetaData  page meta data array
+ * TODO: support merge middleware
+ */
+declare function mergePageMetaDataArray(pageMetaData: PageMetaDatum[]): PageMetaDatum[];
+declare function getPagesConfigSourcePaths(): Promise<string[]>;
+
 interface CustomBlock {
     attr: Record<string, any>;
     content: Record<string, any>;
 }
+type debugType = keyof typeof debug;
 interface Options {
+    /**
+     * The default application entry page is the home page
+     * @default 'pages/index' or 'pages/index/index'
+     */
+    homePage: string;
     /**
      * Whether to merge pages in pages.json
      * @default true
@@ -674,6 +706,11 @@ interface Options {
      * @default 'src/pages'
      */
     dir: string;
+    /**
+     * all root directories loaded by subPackages
+     * @default []
+     */
+    subPackages: string[];
     /**
      * pages.json dir
      * @default "src"
@@ -694,6 +731,10 @@ interface Options {
      * @default false
      */
     minify: boolean;
+    /**
+     * enable debug log
+     */
+    debug: boolean | debugType;
     onBeforeLoadUserConfig: (ctx: PageContext) => void;
     onAfterLoadUserConfig: (ctx: PageContext) => void;
     onBeforeScanPages: (ctx: PageContext) => void;
@@ -704,7 +745,7 @@ interface Options {
     onAfterWriteFile: (ctx: PageContext) => void;
 }
 type UserOptions = Partial<Options>;
-interface ResolvedOptions extends Omit<Options, 'dir'> {
+interface ResolvedOptions extends Omit<Options, 'dir' | 'homePage'> {
     /**
      * Resolves to the `root` value from Vite config.
      * @default config.root
@@ -714,6 +755,10 @@ interface ResolvedOptions extends Omit<Options, 'dir'> {
      * Resolved page dirs
      */
     dirs: string[];
+    /**
+     * Resolved entry page
+     */
+    homePage: string[];
 }
 interface PagePath {
     relativePath: string;
@@ -735,31 +780,16 @@ interface PageMetaDatum {
     needLogin?: boolean;
     [x: string]: any;
 }
+interface SubPageMetaDatum {
+    root: string;
+    pages: PageMetaDatum[];
+}
 
 declare const MODULE_ID_VIRTUAL = "virtual:uni-pages";
 declare const RESOLVED_MODULE_ID_VIRTUAL: string;
 declare const OUTPUT_NAME = "pages.json";
 declare const FILE_EXTENSIONS: string[];
 
-declare function invalidatePagesModule(server: ViteDevServer): void;
-declare const debug: {
-    hmr: Debug.Debugger;
-    routeBlock: Debug.Debugger;
-    options: Debug.Debugger;
-    pages: Debug.Debugger;
-    error: Debug.Debugger;
-};
-declare function extsToGlob(extensions: string[]): string;
-declare function isTargetFile(path: string): boolean;
-declare function isConfigFile(path: string): boolean;
-/**
- * merge page meta data array by path and assign style
- * @param pageMetaData  page meta data array
- * TODO: support merge middleware
- */
-declare function mergePageMetaDataArray(pageMetaData: PageMetaDatum[]): PageMetaDatum[];
-declare const getPagesConfigSourcePaths: () => Promise<string[]>;
-
 /**
  * Resolves the files that are valid pages for the given context.
  */
@@ -777,6 +807,6 @@ declare function parseSFC(code: string): Promise<SFCDescriptor>;
 declare function parseCustomBlock(block: SFCBlock, filePath: string, options: ResolvedOptions): CustomBlock | undefined;
 declare function getRouteBlock(path: string, options: ResolvedOptions): Promise<CustomBlock | undefined>;
 
-declare const VitePluginUniPages: (userOptions?: UserOptions) => Plugin;
+declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
 
-export { Condition, ConditionItem, CustomBlock, EasyCom, FILE_EXTENSIONS, GlobalStyle, IconFont, MODULE_ID_VIRTUAL, MidButton, OUTPUT_NAME, Options, PageContext, PageMetaDatum, PagePath, PagesConfig, PreloadRule, RESOLVED_MODULE_ID_VIRTUAL, ResolvedOptions, SubPackage, TabBar, TabBarItem, TheWindow, UniIdRouter, UserOptions, UserPagesConfig, VitePluginUniPages, checkPagesJsonFile, debug, VitePluginUniPages as default, defineUniPages, extsToGlob, getPageFiles, getPagesConfigSourcePaths, getRouteBlock, invalidatePagesModule, isConfigFile, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, writeFileSync };
+export { Condition, ConditionItem, CustomBlock, EasyCom, FILE_EXTENSIONS, GlobalStyle, IconFont, MODULE_ID_VIRTUAL, MidButton, OUTPUT_NAME, Options, PageContext, PageMetaDatum, PagePath, PagesConfig, PreloadRule, RESOLVED_MODULE_ID_VIRTUAL, ResolvedOptions, SubPackage, SubPageMetaDatum, TabBar, TabBarItem, TheWindow, UniIdRouter, UserOptions, UserPagesConfig, VitePluginUniPages, checkPagesJsonFile, debug, debugType, VitePluginUniPages as default, defineUniPages, extsToGlob, getPageFiles, getPagesConfigSourcePaths, getRouteBlock, invalidatePagesModule, isConfigFile, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, writeFileSync };

package/dist/index.mjs

@@ -1,15 +1,14 @@
-import path$1 from 'path';
-import { spawn } from 'child_process';
+import path from 'node:path';
+import { spawn } from 'node:child_process';
 import { normalizePath, createLogger } from 'vite';
 import MagicString from 'magic-string';
 import chokidar from 'chokidar';
-import path from 'node:path';
 import { loadConfig } from 'unconfig';
 import { isH5 } from '@uni-helper/uni-env';
 import Debug from 'debug';
 import { groupBy } from 'lodash-unified';
 import fg from 'fast-glob';
-import fs from 'fs';
+import fs from 'node:fs';
 import JSON5 from 'json5';
 import { parse as parse$1 } from 'yaml';
 import { parse } from '@vue/compiler-sfc';
@@ -38,6 +37,7 @@ const debug = {
   routeBlock: Debug("vite-plugin-uni-pages:routeBlock"),
   options: Debug("vite-plugin-uni-pages:options"),
   pages: Debug("vite-plugin-uni-pages:pages"),
+  subPages: Debug("vite-plugin-uni-pages:subPages"),
   error: Debug("vite-plugin-uni-pages:error")
 };
 function extsToGlob(extensions) {
@@ -64,22 +64,25 @@ function mergePageMetaDataArray(pageMetaData) {
   }
   return result;
 }
-const getPagesConfigSourcePaths = async () => {
+async function getPagesConfigSourcePaths() {
   return await fg("pages.config.(ts|mts|cts|js|cjs|mjs|json)", {
     deep: 0,
     onlyFiles: true,
     absolute: true
   });
-};
+}
 
 function resolveOptions(userOptions, viteRoot) {
   const {
+    homePage = ["pages/index", "pages/index/index"],
     mergePages = true,
     dir = "src/pages",
+    subPackages = [],
     outDir = "src",
     exclude = ["node_modules", ".git", "**/__*__/**"],
     routeBlockLang = "json5",
     minify = false,
+    debug = false,
     onBeforeLoadUserConfig = () => {
     },
     onAfterLoadUserConfig = () => {
@@ -99,14 +102,19 @@ function resolveOptions(userOptions, viteRoot) {
   } = userOptions;
   const root = viteRoot || slash(process.cwd());
   const resolvedDirs = resolvePageDirs(dir, root, exclude);
+  const resolvedSubDirs = subPackages.map((dir2) => slash(dir2));
+  const ResolvedHomePage = typeof homePage === "string" ? [homePage] : homePage;
   const resolvedOptions = {
+    homePage: ResolvedHomePage,
     mergePages,
     dirs: resolvedDirs,
+    subPackages: resolvedSubDirs,
     outDir,
     exclude,
     routeBlockLang,
     root,
     minify,
+    debug,
     onBeforeLoadUserConfig,
     onAfterLoadUserConfig,
     onBeforeScanPages,
@@ -171,7 +179,7 @@ function parseCustomBlock(block, filePath, options) {
   };
   let content;
   debug.routeBlock(`use ${lang} parser`);
-  if (lang === "json5") {
+  if (lang === "json5" || lang === "jsonc") {
     try {
       content = JSON5.parse(block.content);
     } catch (err) {
@@ -219,12 +227,20 @@ async function getRouteBlock(path, options) {
 class PageContext {
   constructor(userOptions, viteRoot = process.cwd()) {
     this.pagesPath = [];
+    this.subPagesPath = {};
     this.pageMetaData = [];
+    this.subPageMetaData = [];
     this.resolvedPagesJSONPath = "";
     this.rawOptions = userOptions;
     this.root = slash(viteRoot);
     debug.options("root", this.root);
     this.options = resolveOptions(userOptions, this.root);
+    const debugOption = this.options.debug;
+    if (debugOption) {
+      const prefix = "vite-plugin-uni-pages:";
+      const suffix = typeof debugOption === "boolean" ? "*" : debugOption;
+      Debug.enable(`${prefix}${suffix}`);
+    }
     this.resolvedPagesJSONPath = path.join(this.root, this.options.outDir, OUTPUT_NAME);
     debug.options(this.options);
   }
@@ -242,19 +258,20 @@ class PageContext {
   }
   async scanPages() {
     const pageDirFiles = this.options.dirs.map((dir) => {
-      const pagesDirPath = slash(path.resolve(this.options.root, dir));
-      const basePath = slash(path.join(this.options.root, this.options.outDir));
-      const files = getPageFiles(pagesDirPath, this.options);
-      debug.pages(dir, files);
-      const pagePaths = files.map((file) => slash(file)).map((file) => ({
-        relativePath: path.relative(basePath, slash(path.resolve(pagesDirPath, file))),
-        absolutePath: slash(path.resolve(pagesDirPath, file))
-      }));
-      return { dir, files: pagePaths };
+      return { dir, files: getPagePaths(dir, this.options) };
     });
     this.pagesPath = pageDirFiles.map((page) => page.files).flat();
     debug.pages(this.pagesPath);
   }
+  async scanSubPages() {
+    const subPagesPath = {};
+    for (const dir of this.options.subPackages) {
+      const pagePaths = getPagePaths(dir, this.options);
+      subPagesPath[dir] = pagePaths;
+    }
+    this.subPagesPath = subPagesPath;
+    debug.subPages(this.subPagesPath);
+  }
   setupViteServer(server) {
     if (this._server === server)
       return;
@@ -304,26 +321,70 @@ class PageContext {
     const { relativePath, absolutePath } = page;
     const routeBlock = await getRouteBlock(absolutePath, this.options);
     const relativePathWithFileName = relativePath.replace(path.extname(relativePath), "");
-    const pageMetaDatum = { path: normalizePath(relativePathWithFileName), type: routeBlock?.attr.type ?? "page" };
+    const pageMetaDatum = {
+      path: normalizePath(relativePathWithFileName),
+      type: routeBlock?.attr.type ?? "page"
+    };
     if (routeBlock)
       Object.assign(pageMetaDatum, routeBlock.content);
     return pageMetaDatum;
   }
-  async mergePageMetaData() {
-    const generatedPageMetaData = await Promise.all(
-      this.pagesPath.map(async (page) => await this.parsePage(page))
-    );
-    const customPageMetaData = this.pagesGlobConfig?.pages || [];
-    if (!this.options.mergePages) {
-      this.pageMetaData = customPageMetaData;
+  async parsePages(pages, 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;
+  }
+  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.includes(item.path)) {
+        item.type = "home";
+        return true;
+      } else {
+        return false;
+      }
+    });
+    if (isFoundHome) {
+      return true;
     } else {
-      if (this.pagesGlobConfig?.pages)
-        this.pageMetaData = mergePageMetaDataArray(generatedPageMetaData.concat(customPageMetaData));
-      else
-        this.pageMetaData = generatedPageMetaData;
+      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
+      });
+    }
+  }
+  async mergePageMetaData() {
+    const pageMetaData = await this.parsePages(this.pagesPath, this.pagesGlobConfig?.pages);
+    this.pageMetaData = pageMetaData;
+    debug.pages(this.pageMetaData);
+  }
+  async mergeSubPageMetaData() {
+    const subPageMaps = {};
+    const subPackages = this.pagesGlobConfig?.subPackages || [];
+    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] = subPageMaps[root].map((page) => ({ ...page, path: slash(path.relative(root, page.path)) }));
+    }
+    for (const { root, pages } of subPackages) {
+      if (root && !subPageMaps[root])
+        subPageMaps[root] = pages || [];
     }
-    this.pageMetaData.sort((page) => page.type === "home" ? -1 : 0);
-    debug.pages(generatedPageMetaData);
+    const subPageMetaData = Object.keys(subPageMaps).map((root) => ({ root, pages: subPageMaps[root] }));
+    this.subPageMetaData = subPageMetaData;
+    debug.subPages(this.subPageMetaData);
   }
   async updatePagesJSON() {
     checkPagesJsonFile(this.resolvedPagesJSONPath);
@@ -333,13 +394,20 @@ class PageContext {
     if (this.options.mergePages) {
       this.options.onBeforeScanPages(this);
       await this.scanPages();
+      await this.scanSubPages();
       this.options.onAfterScanPages(this);
     }
     this.options.onBeforeMergePageMetaData(this);
     await this.mergePageMetaData();
+    await this.mergeSubPageMetaData();
     this.options.onAfterMergePageMetaData(this);
     this.options.onBeforeWriteFile(this);
-    const pagesJson = JSON.stringify({ ...this.pagesGlobConfig, pages: this.pageMetaData }, null, this.options.minify ? void 0 : 2);
+    const data = {
+      ...this.pagesGlobConfig,
+      pages: this.pageMetaData,
+      subPackages: this.subPageMetaData
+    };
+    const pagesJson = JSON.stringify(data, null, this.options.minify ? void 0 : 2);
     writeFileSync(this.resolvedPagesJSONPath, pagesJson);
     this.options.onAfterWriteFile(this);
   }
@@ -350,6 +418,17 @@ class PageContext {
     return JSON.stringify(this.pageMetaData, null, 2);
   }
 }
+function getPagePaths(dir, options) {
+  const pagesDirPath = slash(path.resolve(options.root, dir));
+  const basePath = slash(path.join(options.root, options.outDir));
+  const files = getPageFiles(pagesDirPath, options);
+  debug.pages(dir, files);
+  const pagePaths = files.map((file) => slash(file)).map((file) => ({
+    relativePath: path.relative(basePath, slash(path.resolve(pagesDirPath, file))),
+    absolutePath: slash(path.resolve(pagesDirPath, file))
+  }));
+  return pagePaths;
+}
 
 function defineUniPages(config) {
   return config;
@@ -369,9 +448,9 @@ async function restart() {
     });
   });
 }
-const VitePluginUniPages = (userOptions = {}) => {
+function VitePluginUniPages(userOptions = {}) {
   let ctx;
-  const resolvedPagesJSONPath = path$1.join(
+  const resolvedPagesJSONPath = path.join(
     process.cwd(),
     userOptions.outDir ?? "src",
     OUTPUT_NAME
@@ -425,6 +504,6 @@ const VitePluginUniPages = (userOptions = {}) => {
         return ctx.virtualModule();
     }
   };
-};
+}
 
 export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, checkPagesJsonFile, debug, VitePluginUniPages as default, defineUniPages, extsToGlob, getPageFiles, getPagesConfigSourcePaths, getRouteBlock, invalidatePagesModule, isConfigFile, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, writeFileSync };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uni-helper/vite-plugin-uni-pages",
   "type": "module",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
   "license": "MIT",
@@ -31,8 +31,8 @@
     "client.d.ts"
   ],
   "dependencies": {
-    "@uni-helper/uni-env": "^0.0.2",
-    "@vue/compiler-sfc": "^3.2.47",
+    "@uni-helper/uni-env": "^0.0.3",
+    "@vue/compiler-sfc": "^3.3.1",
     "chokidar": "^3.5.3",
     "debug": "^4.3.4",
     "fast-glob": "^3.2.12",
@@ -40,13 +40,12 @@
     "lodash-unified": "^1.0.3",
     "magic-string": "^0.30.0",
     "unconfig": "^0.3.7",
-    "yaml": "^2.2.1"
+    "yaml": "^2.2.2"
   },
   "devDependencies": {
     "@antfu/utils": "^0.7.2",
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.15.11",
-    "vite": "^4.2.1"
+    "@types/node": "^18.16.7"
   },
   "scripts": {
     "build": "unbuild",