@uni-helper/vite-plugin-uni-pages 0.3.11 → 0.3.13

package/dist/index.cjs

@@ -404,68 +404,84 @@ var __publicField$1 = (obj, key, value) => {
   return value;
 };
 class Page {
-  constructor(ctx, path) {
+  constructor(ctx, path$1) {
     __publicField$1(this, "ctx");
     __publicField$1(this, "path");
-    __publicField$1(this, "rawOptions", "");
-    __publicField$1(this, "options");
+    __publicField$1(this, "uri");
+    __publicField$1(this, "changed", true);
+    __publicField$1(this, "raw", "");
+    __publicField$1(this, "meta");
     this.ctx = ctx;
-    this.path = path;
+    this.path = path$1;
+    this.uri = vite.normalizePath(path$1.relativePath.replace(path.extname(path$1.relativePath), ""));
   }
   async getPageMeta(forceUpdate = false) {
-    if (forceUpdate || !this.options) {
-      await this.readPageMeta();
+    if (forceUpdate || !this.meta) {
+      await this.read();
     }
-    return this.options;
+    const { path, tabBar: _, ...others } = this.meta;
+    return {
+      path: path ?? this.uri,
+      ...others
+    };
   }
-  async hasChanged() {
-    const { hasChanged } = await this.readPageMeta();
-    return hasChanged;
+  async getTabBar(forceUpdate = false) {
+    if (forceUpdate || !this.meta) {
+      await this.read();
+    }
+    const { tabBar } = this.meta;
+    if (tabBar === void 0) {
+      return void 0;
+    }
+    return {
+      ...tabBar,
+      pagePath: tabBar.pagePath || this.uri,
+      index: tabBar.index || 0
+    };
+  }
+  hasChanged() {
+    return this.changed;
   }
-  async readPageMeta() {
+  async read() {
+    let meta;
     try {
-      const { relativePath } = this.path;
-      const { path: path$1, ...others } = await this.readPageMetaFromFile();
-      this.options = {
-        path: path$1 ?? vite.normalizePath(relativePath.replace(path.extname(relativePath), "")),
-        ...others
-      };
-      const raw = this.options ? JSON.stringify(this.options) : "";
-      const hasChanged = this.rawOptions !== raw;
-      this.rawOptions = raw;
-      return {
-        options: this.options,
-        hasChanged
-      };
+      meta = await this.readPageMetaFromFile();
     } catch (err) {
-      throw new Error(`Read page options fail in ${this.path.relativePath}
-${err.message}`);
+      debug.error(err);
+      return;
     }
+    let raw = "";
+    try {
+      raw = JSON.stringify(meta);
+    } catch {
+    }
+    this.changed = this.raw !== raw;
+    this.meta = meta;
+    this.raw = raw;
   }
   async readPageMetaFromFile() {
-    const content = fs.readFileSync(this.path.absolutePath, "utf-8");
-    const sfc = parseSFC(content, { filename: this.path.absolutePath });
-    const meta = await tryPageMetaFromMacro(sfc);
-    if (meta) {
-      return meta;
+    try {
+      const content = fs.readFileSync(this.path.absolutePath, "utf-8");
+      const sfc = parseSFC(content, { filename: this.path.absolutePath });
+      const meta = await tryPageMetaFromMacro(sfc);
+      if (meta) {
+        return meta;
+      }
+      return tryPageMetaFromCustomBlock(sfc, this.ctx.options.routeBlockLang);
+    } catch (err) {
+      throw new Error(`Read page meta fail in ${this.path.relativePath}
+${err.message}`);
     }
-    return tryPageMetaFromCustomBlock(sfc, this.ctx.options.routeBlockLang);
   }
 }
 function parseSFC(code, options) {
-  try {
-    return compilerSfc.parse(code, {
-      pad: "space",
-      ...options
-    }).descriptor || compilerSfc.parse({
-      source: code,
-      ...options
-    });
-  } catch (error) {
-    throw new Error(`[vite-plugin-uni-pages] Vue3's "@vue/compiler-sfc" is required. 
-Original error: 
-${error}`);
-  }
+  return compilerSfc.parse(code, {
+    pad: "space",
+    ...options
+  }).descriptor || compilerSfc.parse({
+    source: code,
+    ...options
+  });
 }
 async function tryPageMetaFromMacro(sfc) {
   const sfcScript = sfc.scriptSetup || sfc.script;
@@ -477,7 +493,7 @@ async function tryPageMetaFromMacro(sfc) {
   });
   const macro = findMacro(ast.body, sfc.filename);
   if (macro) {
-    const imports = findImports(ast.body).map((imp) => babelGenerate(imp).code);
+    const imports = findImports(ast.body).filter((imp) => !!imp.specifiers.length).map((imp) => babelGenerate(imp).code);
     const [macroOption] = macro.arguments;
     const code = babelGenerate(macroOption).code;
     const result = await execScript({
@@ -499,7 +515,10 @@ async function tryPageMetaFromCustomBlock(sfc, routeBlockLang) {
     type: routeBlock?.attr.type ?? "page"
   };
   if (routeBlock) {
-    commentJson.assign(pageMeta, routeBlock.content);
+    try {
+      commentJson.assign(pageMeta, routeBlock.content);
+    } catch {
+    }
   }
   return pageMeta;
 }
@@ -524,7 +543,13 @@ function findMacro(stmts, filename) {
   return macro;
 }
 function findImports(stmts) {
-  return stmts.map((node) => node.type === "ImportDeclaration" ? node : void 0).filter((node) => !!node);
+  const imports = [];
+  for (const stmt of stmts) {
+    if (t__namespace.isImportDeclaration(stmt)) {
+      imports.push(stmt);
+    }
+  }
+  return imports;
 }
 
 var __defProp = Object.defineProperty;
@@ -735,6 +760,31 @@ class PageContext {
     this.subPageMetaData = subPageMetaData;
     debug.subPages(this.subPageMetaData);
   }
+  async getTabBarMerged() {
+    const tabBar = {
+      ...this.pagesGlobConfig?.tabBar,
+      list: this.pagesGlobConfig?.tabBar?.list || []
+    };
+    const pagePaths = /* @__PURE__ */ new Map();
+    for (const item of tabBar.list) {
+      pagePaths.set(item.pagePath, true);
+    }
+    const tabBarItems = [];
+    for (const [_, page] of this.pages) {
+      const tabbar = await page.getTabBar();
+      if (tabbar) {
+        tabBarItems.push(tabbar);
+      }
+    }
+    tabBarItems.sort((a, b) => a.index - b.index);
+    for (const item of tabBarItems) {
+      if (!pagePaths.has(item.pagePath)) {
+        const { index: _, ...tabbar } = item;
+        tabBar.list.push(tabbar);
+      }
+    }
+    return tabBar;
+  }
   async updatePagesJSON(filepath) {
     if (filepath) {
       let page = this.pages.get(filepath);
@@ -748,9 +798,12 @@ class PageContext {
         }
         page = subPage;
       }
-      if (page && !await page.hasChanged()) {
-        debug.cache(`The route block on page ${filepath} did not send any changes, skipping`);
-        return false;
+      if (page) {
+        await page.read();
+        if (!page.hasChanged()) {
+          debug.cache(`The route block on page ${filepath} did not send any changes, skipping`);
+          return false;
+        }
       }
     }
     checkPagesJsonFile(this.resolvedPagesJSONPath);
@@ -778,7 +831,8 @@ class PageContext {
     const data = {
       ...this.pagesGlobConfig,
       pages: this.pageMetaData,
-      subPackages: this.subPageMetaData
+      subPackages: this.subPageMetaData,
+      tabBar: await this.getTabBarMerged()
     };
     const pagesJson = commentJson.stringify(
       data,

package/dist/index.d.cts

@@ -2533,6 +2533,7 @@ interface SubPackage {
         [pluginName: string]: {
             version: string;
             provider: string;
+            export?: string;
             [key: string]: any;
         };
     };
@@ -2926,15 +2927,17 @@ declare function defineUniPages(config: UserPagesConfig): UserPagesConfig;
 declare class Page {
     ctx: PageContext;
     path: PagePath;
-    private rawOptions;
-    private options;
+    uri: string;
+    changed: boolean;
+    private raw;
+    private meta;
     constructor(ctx: PageContext, path: PagePath);
     getPageMeta(forceUpdate?: boolean): Promise<PageMetaDatum>;
-    hasChanged(): Promise<boolean>;
-    readPageMeta(): Promise<{
-        options: PageMetaDatum;
-        hasChanged: boolean;
-    }>;
+    getTabBar(forceUpdate?: boolean): Promise<TabBarItem & {
+        index: number;
+    } | undefined>;
+    hasChanged(): boolean;
+    read(): Promise<void>;
     private readPageMetaFromFile;
 }
 declare function parseSFC(code: string, options?: SFCParseOptions): SFCDescriptor;
@@ -2984,6 +2987,7 @@ declare class PageContext {
     setHomePage(result: PageMetaDatum[]): PageMetaDatum[];
     mergePageMetaData(): Promise<void>;
     mergeSubPageMetaData(): Promise<void>;
+    private getTabBarMerged;
     updatePagesJSON(filepath?: string): Promise<boolean>;
     virtualModule(): string;
     resolveRoutes(): string;
@@ -3144,12 +3148,27 @@ interface SubPageMetaDatum {
     root: string;
     pages: PageMetaDatum[];
 }
+interface UserTabBarItem extends Partial<TabBarItem> {
+    /**
+     * 配置页面路径
+     * @deprecated 可选，将会根据文件路径自动生成
+     */
+    pagePath?: string;
+    /**
+     * 排序，数字越小越靠前
+     */
+    index?: number;
+}
 interface UserPageMeta extends Partial<PageMetaDatum> {
     /**
      * 配置页面路径
      * @deprecated 可选，将会根据文件路径自动生成
      */
     path?: string;
+    /**
+     * 底部 tabBar 的子项 [tabBar](https://uniapp.dcloud.net.cn/collocation/pages#tabBar)
+     */
+    tabBar?: UserTabBarItem;
 }
 type MaybePromise<T> = T | Promise<T>;
 type MaybeCallable<T> = T | (() => T);
@@ -3183,4 +3202,4 @@ declare function resolvePageDirs(dir: string, root: string, exclude: string[]):
 declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
 
 export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFile, debug, VitePluginUniPages as default, definePage, defineUniPages, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, readFileSync, resolveOptions, resolvePageDirs, tryPageMetaFromCustomBlock, tryPageMetaFromMacro, writeFileSync };
-export type { Condition, ConditionItem, ConfigSource, CustomBlock, DefinePage, EasyCom, GlobalStyle, MaybeCallable, MaybePromise, MaybePromiseCallable, Options, PageMetaDatum, PagePath, PagesConfig, ResolvedOptions, RouteBlockLang, SubPackage, SubPackages, SubPageMetaDatum, TabBar, TabBarIconFont, TabBarItem, TabBarMidButton, TheWindow, UniIdRouter, UserOptions, UserPageMeta, UserPagesConfig, debugType };
+export type { Condition, ConditionItem, ConfigSource, CustomBlock, DefinePage, EasyCom, GlobalStyle, MaybeCallable, MaybePromise, MaybePromiseCallable, Options, PageMetaDatum, PagePath, PagesConfig, ResolvedOptions, RouteBlockLang, SubPackage, SubPackages, SubPageMetaDatum, TabBar, TabBarIconFont, TabBarItem, TabBarMidButton, TheWindow, UniIdRouter, UserOptions, UserPageMeta, UserPagesConfig, UserTabBarItem, debugType };

package/dist/index.d.mts

@@ -2533,6 +2533,7 @@ interface SubPackage {
         [pluginName: string]: {
             version: string;
             provider: string;
+            export?: string;
             [key: string]: any;
         };
     };
@@ -2926,15 +2927,17 @@ declare function defineUniPages(config: UserPagesConfig): UserPagesConfig;
 declare class Page {
     ctx: PageContext;
     path: PagePath;
-    private rawOptions;
-    private options;
+    uri: string;
+    changed: boolean;
+    private raw;
+    private meta;
     constructor(ctx: PageContext, path: PagePath);
     getPageMeta(forceUpdate?: boolean): Promise<PageMetaDatum>;
-    hasChanged(): Promise<boolean>;
-    readPageMeta(): Promise<{
-        options: PageMetaDatum;
-        hasChanged: boolean;
-    }>;
+    getTabBar(forceUpdate?: boolean): Promise<TabBarItem & {
+        index: number;
+    } | undefined>;
+    hasChanged(): boolean;
+    read(): Promise<void>;
     private readPageMetaFromFile;
 }
 declare function parseSFC(code: string, options?: SFCParseOptions): SFCDescriptor;
@@ -2984,6 +2987,7 @@ declare class PageContext {
     setHomePage(result: PageMetaDatum[]): PageMetaDatum[];
     mergePageMetaData(): Promise<void>;
     mergeSubPageMetaData(): Promise<void>;
+    private getTabBarMerged;
     updatePagesJSON(filepath?: string): Promise<boolean>;
     virtualModule(): string;
     resolveRoutes(): string;
@@ -3144,12 +3148,27 @@ interface SubPageMetaDatum {
     root: string;
     pages: PageMetaDatum[];
 }
+interface UserTabBarItem extends Partial<TabBarItem> {
+    /**
+     * 配置页面路径
+     * @deprecated 可选，将会根据文件路径自动生成
+     */
+    pagePath?: string;
+    /**
+     * 排序，数字越小越靠前
+     */
+    index?: number;
+}
 interface UserPageMeta extends Partial<PageMetaDatum> {
     /**
      * 配置页面路径
      * @deprecated 可选，将会根据文件路径自动生成
      */
     path?: string;
+    /**
+     * 底部 tabBar 的子项 [tabBar](https://uniapp.dcloud.net.cn/collocation/pages#tabBar)
+     */
+    tabBar?: UserTabBarItem;
 }
 type MaybePromise<T> = T | Promise<T>;
 type MaybeCallable<T> = T | (() => T);
@@ -3183,4 +3202,4 @@ declare function resolvePageDirs(dir: string, root: string, exclude: string[]):
 declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
 
 export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFile, debug, VitePluginUniPages as default, definePage, defineUniPages, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, readFileSync, resolveOptions, resolvePageDirs, tryPageMetaFromCustomBlock, tryPageMetaFromMacro, writeFileSync };
-export type { Condition, ConditionItem, ConfigSource, CustomBlock, DefinePage, EasyCom, GlobalStyle, MaybeCallable, MaybePromise, MaybePromiseCallable, Options, PageMetaDatum, PagePath, PagesConfig, ResolvedOptions, RouteBlockLang, SubPackage, SubPackages, SubPageMetaDatum, TabBar, TabBarIconFont, TabBarItem, TabBarMidButton, TheWindow, UniIdRouter, UserOptions, UserPageMeta, UserPagesConfig, debugType };
+export type { Condition, ConditionItem, ConfigSource, CustomBlock, DefinePage, EasyCom, GlobalStyle, MaybeCallable, MaybePromise, MaybePromiseCallable, Options, PageMetaDatum, PagePath, PagesConfig, ResolvedOptions, RouteBlockLang, SubPackage, SubPackages, SubPageMetaDatum, TabBar, TabBarIconFont, TabBarItem, TabBarMidButton, TheWindow, UniIdRouter, UserOptions, UserPageMeta, UserPagesConfig, UserTabBarItem, debugType };

package/dist/index.d.ts

@@ -2533,6 +2533,7 @@ interface SubPackage {
         [pluginName: string]: {
             version: string;
             provider: string;
+            export?: string;
             [key: string]: any;
         };
     };
@@ -2926,15 +2927,17 @@ declare function defineUniPages(config: UserPagesConfig): UserPagesConfig;
 declare class Page {
     ctx: PageContext;
     path: PagePath;
-    private rawOptions;
-    private options;
+    uri: string;
+    changed: boolean;
+    private raw;
+    private meta;
     constructor(ctx: PageContext, path: PagePath);
     getPageMeta(forceUpdate?: boolean): Promise<PageMetaDatum>;
-    hasChanged(): Promise<boolean>;
-    readPageMeta(): Promise<{
-        options: PageMetaDatum;
-        hasChanged: boolean;
-    }>;
+    getTabBar(forceUpdate?: boolean): Promise<TabBarItem & {
+        index: number;
+    } | undefined>;
+    hasChanged(): boolean;
+    read(): Promise<void>;
     private readPageMetaFromFile;
 }
 declare function parseSFC(code: string, options?: SFCParseOptions): SFCDescriptor;
@@ -2984,6 +2987,7 @@ declare class PageContext {
     setHomePage(result: PageMetaDatum[]): PageMetaDatum[];
     mergePageMetaData(): Promise<void>;
     mergeSubPageMetaData(): Promise<void>;
+    private getTabBarMerged;
     updatePagesJSON(filepath?: string): Promise<boolean>;
     virtualModule(): string;
     resolveRoutes(): string;
@@ -3144,12 +3148,27 @@ interface SubPageMetaDatum {
     root: string;
     pages: PageMetaDatum[];
 }
+interface UserTabBarItem extends Partial<TabBarItem> {
+    /**
+     * 配置页面路径
+     * @deprecated 可选，将会根据文件路径自动生成
+     */
+    pagePath?: string;
+    /**
+     * 排序，数字越小越靠前
+     */
+    index?: number;
+}
 interface UserPageMeta extends Partial<PageMetaDatum> {
     /**
      * 配置页面路径
      * @deprecated 可选，将会根据文件路径自动生成
      */
     path?: string;
+    /**
+     * 底部 tabBar 的子项 [tabBar](https://uniapp.dcloud.net.cn/collocation/pages#tabBar)
+     */
+    tabBar?: UserTabBarItem;
 }
 type MaybePromise<T> = T | Promise<T>;
 type MaybeCallable<T> = T | (() => T);
@@ -3183,4 +3202,4 @@ declare function resolvePageDirs(dir: string, root: string, exclude: string[]):
 declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
 
 export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFile, debug, VitePluginUniPages as default, definePage, defineUniPages, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, readFileSync, resolveOptions, resolvePageDirs, tryPageMetaFromCustomBlock, tryPageMetaFromMacro, writeFileSync };
-export type { Condition, ConditionItem, ConfigSource, CustomBlock, DefinePage, EasyCom, GlobalStyle, MaybeCallable, MaybePromise, MaybePromiseCallable, Options, PageMetaDatum, PagePath, PagesConfig, ResolvedOptions, RouteBlockLang, SubPackage, SubPackages, SubPageMetaDatum, TabBar, TabBarIconFont, TabBarItem, TabBarMidButton, TheWindow, UniIdRouter, UserOptions, UserPageMeta, UserPagesConfig, debugType };
+export type { Condition, ConditionItem, ConfigSource, CustomBlock, DefinePage, EasyCom, GlobalStyle, MaybeCallable, MaybePromise, MaybePromiseCallable, Options, PageMetaDatum, PagePath, PagesConfig, ResolvedOptions, RouteBlockLang, SubPackage, SubPackages, SubPageMetaDatum, TabBar, TabBarIconFont, TabBarItem, TabBarMidButton, TheWindow, UniIdRouter, UserOptions, UserPageMeta, UserPagesConfig, UserTabBarItem, debugType };

package/dist/index.mjs

@@ -373,65 +373,81 @@ class Page {
   constructor(ctx, path) {
     __publicField$1(this, "ctx");
     __publicField$1(this, "path");
-    __publicField$1(this, "rawOptions", "");
-    __publicField$1(this, "options");
+    __publicField$1(this, "uri");
+    __publicField$1(this, "changed", true);
+    __publicField$1(this, "raw", "");
+    __publicField$1(this, "meta");
     this.ctx = ctx;
     this.path = path;
+    this.uri = normalizePath(path.relativePath.replace(extname(path.relativePath), ""));
   }
   async getPageMeta(forceUpdate = false) {
-    if (forceUpdate || !this.options) {
-      await this.readPageMeta();
+    if (forceUpdate || !this.meta) {
+      await this.read();
     }
-    return this.options;
+    const { path, tabBar: _, ...others } = this.meta;
+    return {
+      path: path ?? this.uri,
+      ...others
+    };
   }
-  async hasChanged() {
-    const { hasChanged } = await this.readPageMeta();
-    return hasChanged;
+  async getTabBar(forceUpdate = false) {
+    if (forceUpdate || !this.meta) {
+      await this.read();
+    }
+    const { tabBar } = this.meta;
+    if (tabBar === void 0) {
+      return void 0;
+    }
+    return {
+      ...tabBar,
+      pagePath: tabBar.pagePath || this.uri,
+      index: tabBar.index || 0
+    };
+  }
+  hasChanged() {
+    return this.changed;
   }
-  async readPageMeta() {
+  async read() {
+    let meta;
     try {
-      const { relativePath } = this.path;
-      const { path, ...others } = await this.readPageMetaFromFile();
-      this.options = {
-        path: path ?? normalizePath(relativePath.replace(extname(relativePath), "")),
-        ...others
-      };
-      const raw = this.options ? JSON.stringify(this.options) : "";
-      const hasChanged = this.rawOptions !== raw;
-      this.rawOptions = raw;
-      return {
-        options: this.options,
-        hasChanged
-      };
+      meta = await this.readPageMetaFromFile();
     } catch (err) {
-      throw new Error(`Read page options fail in ${this.path.relativePath}
-${err.message}`);
+      debug.error(err);
+      return;
     }
+    let raw = "";
+    try {
+      raw = JSON.stringify(meta);
+    } catch {
+    }
+    this.changed = this.raw !== raw;
+    this.meta = meta;
+    this.raw = raw;
   }
   async readPageMetaFromFile() {
-    const content = readFileSync$1(this.path.absolutePath, "utf-8");
-    const sfc = parseSFC(content, { filename: this.path.absolutePath });
-    const meta = await tryPageMetaFromMacro(sfc);
-    if (meta) {
-      return meta;
+    try {
+      const content = readFileSync$1(this.path.absolutePath, "utf-8");
+      const sfc = parseSFC(content, { filename: this.path.absolutePath });
+      const meta = await tryPageMetaFromMacro(sfc);
+      if (meta) {
+        return meta;
+      }
+      return tryPageMetaFromCustomBlock(sfc, this.ctx.options.routeBlockLang);
+    } catch (err) {
+      throw new Error(`Read page meta fail in ${this.path.relativePath}
+${err.message}`);
     }
-    return tryPageMetaFromCustomBlock(sfc, this.ctx.options.routeBlockLang);
   }
 }
 function parseSFC(code, options) {
-  try {
-    return parse$2(code, {
-      pad: "space",
-      ...options
-    }).descriptor || parse$2({
-      source: code,
-      ...options
-    });
-  } catch (error) {
-    throw new Error(`[vite-plugin-uni-pages] Vue3's "@vue/compiler-sfc" is required. 
-Original error: 
-${error}`);
-  }
+  return parse$2(code, {
+    pad: "space",
+    ...options
+  }).descriptor || parse$2({
+    source: code,
+    ...options
+  });
 }
 async function tryPageMetaFromMacro(sfc) {
   const sfcScript = sfc.scriptSetup || sfc.script;
@@ -443,7 +459,7 @@ async function tryPageMetaFromMacro(sfc) {
   });
   const macro = findMacro(ast.body, sfc.filename);
   if (macro) {
-    const imports = findImports(ast.body).map((imp) => babelGenerate(imp).code);
+    const imports = findImports(ast.body).filter((imp) => !!imp.specifiers.length).map((imp) => babelGenerate(imp).code);
     const [macroOption] = macro.arguments;
     const code = babelGenerate(macroOption).code;
     const result = await execScript({
@@ -465,7 +481,10 @@ async function tryPageMetaFromCustomBlock(sfc, routeBlockLang) {
     type: routeBlock?.attr.type ?? "page"
   };
   if (routeBlock) {
-    assign(pageMeta, routeBlock.content);
+    try {
+      assign(pageMeta, routeBlock.content);
+    } catch {
+    }
   }
   return pageMeta;
 }
@@ -490,7 +509,13 @@ function findMacro(stmts, filename) {
   return macro;
 }
 function findImports(stmts) {
-  return stmts.map((node) => node.type === "ImportDeclaration" ? node : void 0).filter((node) => !!node);
+  const imports = [];
+  for (const stmt of stmts) {
+    if (t.isImportDeclaration(stmt)) {
+      imports.push(stmt);
+    }
+  }
+  return imports;
 }
 
 var __defProp = Object.defineProperty;
@@ -701,6 +726,31 @@ class PageContext {
     this.subPageMetaData = subPageMetaData;
     debug.subPages(this.subPageMetaData);
   }
+  async getTabBarMerged() {
+    const tabBar = {
+      ...this.pagesGlobConfig?.tabBar,
+      list: this.pagesGlobConfig?.tabBar?.list || []
+    };
+    const pagePaths = /* @__PURE__ */ new Map();
+    for (const item of tabBar.list) {
+      pagePaths.set(item.pagePath, true);
+    }
+    const tabBarItems = [];
+    for (const [_, page] of this.pages) {
+      const tabbar = await page.getTabBar();
+      if (tabbar) {
+        tabBarItems.push(tabbar);
+      }
+    }
+    tabBarItems.sort((a, b) => a.index - b.index);
+    for (const item of tabBarItems) {
+      if (!pagePaths.has(item.pagePath)) {
+        const { index: _, ...tabbar } = item;
+        tabBar.list.push(tabbar);
+      }
+    }
+    return tabBar;
+  }
   async updatePagesJSON(filepath) {
     if (filepath) {
       let page = this.pages.get(filepath);
@@ -714,9 +764,12 @@ class PageContext {
         }
         page = subPage;
       }
-      if (page && !await page.hasChanged()) {
-        debug.cache(`The route block on page ${filepath} did not send any changes, skipping`);
-        return false;
+      if (page) {
+        await page.read();
+        if (!page.hasChanged()) {
+          debug.cache(`The route block on page ${filepath} did not send any changes, skipping`);
+          return false;
+        }
       }
     }
     checkPagesJsonFile(this.resolvedPagesJSONPath);
@@ -744,7 +797,8 @@ class PageContext {
     const data = {
       ...this.pagesGlobConfig,
       pages: this.pageMetaData,
-      subPackages: this.subPageMetaData
+      subPackages: this.subPageMetaData,
+      tabBar: await this.getTabBarMerged()
     };
     const pagesJson = stringify(
       data,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uni-helper/vite-plugin-uni-pages",
   "type": "module",
-  "version": "0.3.11",
+  "version": "0.3.13",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
   "maintainers": [