@uni-helper/vite-plugin-uni-pages 0.3.14 → 0.3.16

package/dist/index.cjs

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const node_child_process = require('node:child_process');
 const path = require('node:path');
 const process = require('node:process');
 const astKit = require('ast-kit');
@@ -10,13 +9,14 @@ const chokidar = require('chokidar');
 const kolorist = require('kolorist');
 const MagicString = require('magic-string');
 const vite = require('vite');
+const fs = require('node:fs');
 const uniEnv = require('@uni-helper/uni-env');
 const commentJson = require('comment-json');
 const Debug = require('debug');
 const detectIndent = require('detect-indent');
 const detectNewline = require('detect-newline');
+const lockfile = require('proper-lockfile');
 const unconfig = require('unconfig');
-const fs = require('node:fs');
 const promises = require('node:fs/promises');
 const fg = require('fast-glob');
 const node_module = require('node:module');
@@ -47,10 +47,11 @@ const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const process__default = /*#__PURE__*/_interopDefaultCompat(process);
 const chokidar__default = /*#__PURE__*/_interopDefaultCompat(chokidar);
 const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
+const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const Debug__default = /*#__PURE__*/_interopDefaultCompat(Debug);
 const detectIndent__default = /*#__PURE__*/_interopDefaultCompat(detectIndent);
 const detectNewline__default = /*#__PURE__*/_interopDefaultCompat(detectNewline);
-const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
+const lockfile__default = /*#__PURE__*/_interopDefaultCompat(lockfile);
 const fg__default = /*#__PURE__*/_interopDefaultCompat(fg);
 const vm__default = /*#__PURE__*/_interopDefaultCompat(vm);
 const babelGenerator__default = /*#__PURE__*/_interopDefaultCompat(babelGenerator);
@@ -249,23 +250,33 @@ function getPageFiles(path, options) {
   });
   return files;
 }
-function checkPagesJsonFile(path) {
-  if (!fs__default.existsSync(path)) {
-    writeFileSync(path, commentJson.stringify({ pages: [{ path: "" }] }, null, 2));
-    return false;
-  }
-  return true;
-}
-function readFileSync(path) {
+async function checkPagesJsonFile(path) {
+  const createEmptyFile = (path2) => {
+    return fs__default.promises.writeFile(path2, JSON.stringify({ pages: [{ path: "" }] }, null, 2), { encoding: "utf-8" }).then(() => true).catch(() => false);
+  };
+  const unlink = (path2) => {
+    return fs__default.promises.unlink(path2).then(() => true).catch(() => false);
+  };
   try {
-    return fs__default.readFileSync(path, { encoding: "utf-8" });
+    const stat = await fs__default.promises.stat(path);
+    if (!stat.isFile()) {
+      if (!await unlink(path)) {
+        return false;
+      }
+      return createEmptyFile(path);
+    }
+    const access = await fs__default.promises.access(path, fs__default.constants.W_OK | fs__default.constants.R_OK).then(() => true).catch(() => false);
+    if (!access) {
+      if (!await unlink(path)) {
+        return false;
+      }
+      return createEmptyFile(path);
+    }
+    return true;
   } catch {
-    return "";
+    return createEmptyFile(path);
   }
 }
-function writeFileSync(path, content) {
-  fs__default.writeFileSync(path, content, { encoding: "utf-8" });
-}
 
 function resolveOptions(userOptions, viteRoot = process__default.cwd()) {
   const {
@@ -461,7 +472,7 @@ class Page {
   }
   async readPageMetaFromFile() {
     try {
-      const content = fs.readFileSync(this.path.absolutePath, "utf-8");
+      const content = await fs__default.promises.readFile(this.path.absolutePath, { encoding: "utf-8" });
       const sfc = parseSFC(content, { filename: this.path.absolutePath });
       const meta = await tryPageMetaFromMacro(sfc);
       if (meta) {
@@ -571,9 +582,12 @@ class PageContext {
     __publicField(this, "pageMetaData", []);
     __publicField(this, "subPageMetaData", []);
     __publicField(this, "resolvedPagesJSONPath", "");
-    __publicField(this, "resolvedPagesJSONIndent", "  ");
-    __publicField(this, "resolvedPagesJSONNewline", "\n");
-    __publicField(this, "resolvedPagesJSONEofNewline", true);
+    __publicField(this, "resolvedPagesJSONIndent");
+    // '  '
+    __publicField(this, "resolvedPagesJSONNewline");
+    // '\n'
+    __publicField(this, "resolvedPagesJSONEofNewline");
+    // true
     __publicField(this, "rawOptions");
     __publicField(this, "root");
     __publicField(this, "options");
@@ -590,10 +604,6 @@ class PageContext {
       Debug__default.enable(`${prefix}${suffix}`);
     }
     this.resolvedPagesJSONPath = path__default.join(this.root, this.options.outDir, OUTPUT_NAME);
-    const resolvedPagesJSONContent = readFileSync(this.resolvedPagesJSONPath);
-    this.resolvedPagesJSONIndent = detectIndent__default(resolvedPagesJSONContent).indent || "  ";
-    this.resolvedPagesJSONNewline = detectNewline__default(resolvedPagesJSONContent) || "\n";
-    this.resolvedPagesJSONEofNewline = (resolvedPagesJSONContent.at(-1) ?? "\n") === this.resolvedPagesJSONNewline;
     debug.options(this.options);
   }
   setLogger(logger) {
@@ -761,6 +771,16 @@ class PageContext {
     debug.subPages(this.subPageMetaData);
   }
   async getTabBarMerged() {
+    const tabBarItems = [];
+    for (const [_, page] of this.pages) {
+      const tabbar = await page.getTabBar();
+      if (tabbar) {
+        tabBarItems.push(tabbar);
+      }
+    }
+    if (tabBarItems.length === 0) {
+      return this.pagesGlobConfig?.tabBar;
+    }
     const tabBar = {
       ...this.pagesGlobConfig?.tabBar,
       list: this.pagesGlobConfig?.tabBar?.list || []
@@ -769,13 +789,6 @@ class PageContext {
     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)) {
@@ -806,7 +819,7 @@ class PageContext {
         }
       }
     }
-    checkPagesJsonFile(this.resolvedPagesJSONPath);
+    await checkPagesJsonFile(this.resolvedPagesJSONPath);
     this.options.onBeforeLoadUserConfig(this);
     await this.loadUserPagesConfig();
     this.options.onAfterLoadUserConfig(this);
@@ -837,14 +850,19 @@ class PageContext {
     const pagesJson = commentJson.stringify(
       data,
       null,
-      this.options.minify ? void 0 : this.resolvedPagesJSONIndent
-    ) + (this.resolvedPagesJSONEofNewline ? this.resolvedPagesJSONNewline : "");
+      this.options.minify ? void 0 : await this.getIndent()
+    ) + (await this.getEndOfLine() ? await this.getNewline() : "");
     this.generateDeclaration();
     if (lsatPagesJson === pagesJson) {
       debug.pages("PagesJson Not have change");
       return false;
     }
-    writeFileSync(this.resolvedPagesJSONPath, pagesJson);
+    const relase = await lockfile__default.lock(this.resolvedPagesJSONPath, { realpath: false });
+    try {
+      await fs__default.promises.writeFile(this.resolvedPagesJSONPath, pagesJson, { encoding: "utf-8" });
+    } finally {
+      await relase();
+    }
     lsatPagesJson = pagesJson;
     this.options.onAfterWriteFile(this);
     return true;
@@ -866,6 +884,30 @@ class PageContext {
     debug.declaration("generating");
     return writeDeclaration(this, this.options.dts);
   }
+  async readInfoFromPagesJSON() {
+    const resolvedPagesJSONContent = await fs__default.promises.readFile(this.resolvedPagesJSONPath, { encoding: "utf-8" }).catch(() => "");
+    this.resolvedPagesJSONIndent = detectIndent__default(resolvedPagesJSONContent).indent || "  ";
+    this.resolvedPagesJSONNewline = detectNewline__default(resolvedPagesJSONContent) || "\n";
+    this.resolvedPagesJSONEofNewline = (resolvedPagesJSONContent.at(-1) ?? "\n") === this.resolvedPagesJSONNewline;
+  }
+  async getIndent() {
+    if (!this.resolvedPagesJSONIndent) {
+      await this.readInfoFromPagesJSON();
+    }
+    return this.resolvedPagesJSONIndent;
+  }
+  async getNewline() {
+    if (!this.resolvedPagesJSONNewline) {
+      await this.readInfoFromPagesJSON();
+    }
+    return this.resolvedPagesJSONNewline;
+  }
+  async getEndOfLine() {
+    if (!this.resolvedPagesJSONEofNewline) {
+      await this.readInfoFromPagesJSON();
+    }
+    return this.resolvedPagesJSONEofNewline;
+  }
 }
 function getPagePaths(dir, options) {
   const pagesDirPath = slash(path__default.resolve(options.root, dir));
@@ -883,28 +925,14 @@ function defineUniPages(config) {
   return config;
 }
 
-async function restart() {
-  return new Promise((resolve) => {
-    const build = node_child_process.spawn(process__default.argv.shift(), process__default.argv, {
-      cwd: process__default.env.VITE_ROOT_DIR || process__default.cwd(),
-      detached: true,
-      env: process__default.env
-    });
-    build.stdout?.pipe(process__default.stdout);
-    build.stderr?.pipe(process__default.stderr);
-    build.on("close", (code) => {
-      resolve(process__default.exit(code));
-    });
-  });
-}
-function VitePluginUniPages(userOptions = {}) {
+async function VitePluginUniPages(userOptions = {}) {
   let ctx;
   const resolvedPagesJSONPath = path__default.join(
     process__default.env.VITE_ROOT_DIR || process__default.cwd(),
     userOptions.outDir ?? "src",
     OUTPUT_NAME
   );
-  const isValidated = checkPagesJsonFile(resolvedPagesJSONPath);
+  await checkPagesJsonFile(resolvedPagesJSONPath);
   return {
     name: "vite-plugin-uni-pages",
     enforce: "pre",
@@ -918,12 +946,6 @@ function VitePluginUniPages(userOptions = {}) {
       ctx.setLogger(logger);
       await ctx.updatePagesJSON();
       if (config.command === "build") {
-        if (!isValidated) {
-          ctx.logger?.warn("In build mode, if `pages.json` does not exist, the plugin cannot create the complete `pages.json` before the uni-app, so it restarts the build.", {
-            timestamp: true
-          });
-          await restart();
-        }
         if (config.build.watch)
           ctx.setupWatcher(chokidar__default.watch([...ctx.options.dirs, ...ctx.options.subPackages]));
       }
@@ -1013,9 +1035,7 @@ exports.isTargetFile = isTargetFile;
 exports.mergePageMetaDataArray = mergePageMetaDataArray;
 exports.parseCustomBlock = parseCustomBlock;
 exports.parseSFC = parseSFC;
-exports.readFileSync = readFileSync;
 exports.resolveOptions = resolveOptions;
 exports.resolvePageDirs = resolvePageDirs;
 exports.tryPageMetaFromCustomBlock = tryPageMetaFromCustomBlock;
 exports.tryPageMetaFromMacro = tryPageMetaFromMacro;
-exports.writeFileSync = writeFileSync;

package/dist/index.d.cts

@@ -6,6 +6,7 @@ import { SFCParseOptions, SFCDescriptor, SFCBlock } from '@vue/compiler-sfc';
 import * as t from '@babel/types';
 import babelGenerator from '@babel/generator';
 import Debug from 'debug';
+import fs from 'node:fs';
 
 interface ConditionItem {
     /**
@@ -2955,9 +2956,9 @@ declare class PageContext {
     pageMetaData: PageMetaDatum[];
     subPageMetaData: SubPageMetaDatum[];
     resolvedPagesJSONPath: string;
-    resolvedPagesJSONIndent: string;
-    resolvedPagesJSONNewline: string;
-    resolvedPagesJSONEofNewline: boolean;
+    private resolvedPagesJSONIndent?;
+    private resolvedPagesJSONNewline?;
+    private resolvedPagesJSONEofNewline?;
     rawOptions: UserOptions;
     root: string;
     options: ResolvedOptions;
@@ -2993,6 +2994,10 @@ declare class PageContext {
     resolveRoutes(): string;
     resolveSubRoutes(): string;
     generateDeclaration(): Promise<void> | undefined;
+    private readInfoFromPagesJSON;
+    private getIndent;
+    private getNewline;
+    private getEndOfLine;
 }
 
 declare function invalidatePagesModule(server: ViteDevServer): void;
@@ -3189,9 +3194,12 @@ declare function getRouteBlock(path: string, blockStr: SFCBlock | undefined, rou
  * Resolves the files that are valid pages for the given context.
  */
 declare function getPageFiles(path: string, options: ResolvedOptions): string[];
-declare function checkPagesJsonFile(path: string): boolean;
-declare function readFileSync(path: string): string;
-declare function writeFileSync(path: string, content: string): void;
+/**
+ * 检查指定路径的pages.json文件，如果文件不存在或不是有效文件则创建一个空的pages.json文件
+ * @param path - 要检查的文件路径
+ * @returns Promise<void> - 无返回值的异步函数
+ */
+declare function checkPagesJsonFile(path: fs.PathLike): Promise<boolean>;
 
 declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): ResolvedOptions;
 /**
@@ -3199,7 +3207,7 @@ declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): Re
  */
 declare function resolvePageDirs(dir: string, root: string, exclude: string[]): string[];
 
-declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
+declare function VitePluginUniPages(userOptions?: UserOptions): Promise<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 { 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, resolveOptions, resolvePageDirs, tryPageMetaFromCustomBlock, tryPageMetaFromMacro };
 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

@@ -6,6 +6,7 @@ import { SFCParseOptions, SFCDescriptor, SFCBlock } from '@vue/compiler-sfc';
 import * as t from '@babel/types';
 import babelGenerator from '@babel/generator';
 import Debug from 'debug';
+import fs from 'node:fs';
 
 interface ConditionItem {
     /**
@@ -2955,9 +2956,9 @@ declare class PageContext {
     pageMetaData: PageMetaDatum[];
     subPageMetaData: SubPageMetaDatum[];
     resolvedPagesJSONPath: string;
-    resolvedPagesJSONIndent: string;
-    resolvedPagesJSONNewline: string;
-    resolvedPagesJSONEofNewline: boolean;
+    private resolvedPagesJSONIndent?;
+    private resolvedPagesJSONNewline?;
+    private resolvedPagesJSONEofNewline?;
     rawOptions: UserOptions;
     root: string;
     options: ResolvedOptions;
@@ -2993,6 +2994,10 @@ declare class PageContext {
     resolveRoutes(): string;
     resolveSubRoutes(): string;
     generateDeclaration(): Promise<void> | undefined;
+    private readInfoFromPagesJSON;
+    private getIndent;
+    private getNewline;
+    private getEndOfLine;
 }
 
 declare function invalidatePagesModule(server: ViteDevServer): void;
@@ -3189,9 +3194,12 @@ declare function getRouteBlock(path: string, blockStr: SFCBlock | undefined, rou
  * Resolves the files that are valid pages for the given context.
  */
 declare function getPageFiles(path: string, options: ResolvedOptions): string[];
-declare function checkPagesJsonFile(path: string): boolean;
-declare function readFileSync(path: string): string;
-declare function writeFileSync(path: string, content: string): void;
+/**
+ * 检查指定路径的pages.json文件，如果文件不存在或不是有效文件则创建一个空的pages.json文件
+ * @param path - 要检查的文件路径
+ * @returns Promise<void> - 无返回值的异步函数
+ */
+declare function checkPagesJsonFile(path: fs.PathLike): Promise<boolean>;
 
 declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): ResolvedOptions;
 /**
@@ -3199,7 +3207,7 @@ declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): Re
  */
 declare function resolvePageDirs(dir: string, root: string, exclude: string[]): string[];
 
-declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
+declare function VitePluginUniPages(userOptions?: UserOptions): Promise<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 { 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, resolveOptions, resolvePageDirs, tryPageMetaFromCustomBlock, tryPageMetaFromMacro };
 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

@@ -6,6 +6,7 @@ import { SFCParseOptions, SFCDescriptor, SFCBlock } from '@vue/compiler-sfc';
 import * as t from '@babel/types';
 import babelGenerator from '@babel/generator';
 import Debug from 'debug';
+import fs from 'node:fs';
 
 interface ConditionItem {
     /**
@@ -2955,9 +2956,9 @@ declare class PageContext {
     pageMetaData: PageMetaDatum[];
     subPageMetaData: SubPageMetaDatum[];
     resolvedPagesJSONPath: string;
-    resolvedPagesJSONIndent: string;
-    resolvedPagesJSONNewline: string;
-    resolvedPagesJSONEofNewline: boolean;
+    private resolvedPagesJSONIndent?;
+    private resolvedPagesJSONNewline?;
+    private resolvedPagesJSONEofNewline?;
     rawOptions: UserOptions;
     root: string;
     options: ResolvedOptions;
@@ -2993,6 +2994,10 @@ declare class PageContext {
     resolveRoutes(): string;
     resolveSubRoutes(): string;
     generateDeclaration(): Promise<void> | undefined;
+    private readInfoFromPagesJSON;
+    private getIndent;
+    private getNewline;
+    private getEndOfLine;
 }
 
 declare function invalidatePagesModule(server: ViteDevServer): void;
@@ -3189,9 +3194,12 @@ declare function getRouteBlock(path: string, blockStr: SFCBlock | undefined, rou
  * Resolves the files that are valid pages for the given context.
  */
 declare function getPageFiles(path: string, options: ResolvedOptions): string[];
-declare function checkPagesJsonFile(path: string): boolean;
-declare function readFileSync(path: string): string;
-declare function writeFileSync(path: string, content: string): void;
+/**
+ * 检查指定路径的pages.json文件，如果文件不存在或不是有效文件则创建一个空的pages.json文件
+ * @param path - 要检查的文件路径
+ * @returns Promise<void> - 无返回值的异步函数
+ */
+declare function checkPagesJsonFile(path: fs.PathLike): Promise<boolean>;
 
 declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): ResolvedOptions;
 /**
@@ -3199,7 +3207,7 @@ declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): Re
  */
 declare function resolvePageDirs(dir: string, root: string, exclude: string[]): string[];
 
-declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
+declare function VitePluginUniPages(userOptions?: UserOptions): Promise<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 { 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, resolveOptions, resolvePageDirs, tryPageMetaFromCustomBlock, tryPageMetaFromMacro };
 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

@@ -1,4 +1,3 @@
-import { spawn } from 'node:child_process';
 import path, { join, dirname, resolve, extname } from 'node:path';
 import process from 'node:process';
 import { babelParse, isCallOf } from 'ast-kit';
@@ -6,13 +5,14 @@ import chokidar from 'chokidar';
 import { lightYellow, bold, link, dim } from 'kolorist';
 import MagicString from 'magic-string';
 import { normalizePath, createLogger } from 'vite';
+import fs, { existsSync } from 'node:fs';
 import { platform } from '@uni-helper/uni-env';
-import { stringify, parse, assign } from 'comment-json';
+import { parse, assign, stringify } from 'comment-json';
 import Debug from 'debug';
 import detectIndent from 'detect-indent';
 import detectNewline from 'detect-newline';
+import lockfile from 'proper-lockfile';
 import { loadConfig } from 'unconfig';
-import fs, { existsSync, readFileSync as readFileSync$1 } from 'node:fs';
 import { readFile, mkdir, writeFile as writeFile$1 } from 'node:fs/promises';
 import fg from 'fast-glob';
 import { createRequire } from 'node:module';
@@ -215,23 +215,33 @@ function getPageFiles(path, options) {
   });
   return files;
 }
-function checkPagesJsonFile(path) {
-  if (!fs.existsSync(path)) {
-    writeFileSync(path, stringify({ pages: [{ path: "" }] }, null, 2));
-    return false;
-  }
-  return true;
-}
-function readFileSync(path) {
+async function checkPagesJsonFile(path) {
+  const createEmptyFile = (path2) => {
+    return fs.promises.writeFile(path2, JSON.stringify({ pages: [{ path: "" }] }, null, 2), { encoding: "utf-8" }).then(() => true).catch(() => false);
+  };
+  const unlink = (path2) => {
+    return fs.promises.unlink(path2).then(() => true).catch(() => false);
+  };
   try {
-    return fs.readFileSync(path, { encoding: "utf-8" });
+    const stat = await fs.promises.stat(path);
+    if (!stat.isFile()) {
+      if (!await unlink(path)) {
+        return false;
+      }
+      return createEmptyFile(path);
+    }
+    const access = await fs.promises.access(path, fs.constants.W_OK | fs.constants.R_OK).then(() => true).catch(() => false);
+    if (!access) {
+      if (!await unlink(path)) {
+        return false;
+      }
+      return createEmptyFile(path);
+    }
+    return true;
   } catch {
-    return "";
+    return createEmptyFile(path);
   }
 }
-function writeFileSync(path, content) {
-  fs.writeFileSync(path, content, { encoding: "utf-8" });
-}
 
 function resolveOptions(userOptions, viteRoot = process.cwd()) {
   const {
@@ -427,7 +437,7 @@ class Page {
   }
   async readPageMetaFromFile() {
     try {
-      const content = readFileSync$1(this.path.absolutePath, "utf-8");
+      const content = await fs.promises.readFile(this.path.absolutePath, { encoding: "utf-8" });
       const sfc = parseSFC(content, { filename: this.path.absolutePath });
       const meta = await tryPageMetaFromMacro(sfc);
       if (meta) {
@@ -537,9 +547,12 @@ class PageContext {
     __publicField(this, "pageMetaData", []);
     __publicField(this, "subPageMetaData", []);
     __publicField(this, "resolvedPagesJSONPath", "");
-    __publicField(this, "resolvedPagesJSONIndent", "  ");
-    __publicField(this, "resolvedPagesJSONNewline", "\n");
-    __publicField(this, "resolvedPagesJSONEofNewline", true);
+    __publicField(this, "resolvedPagesJSONIndent");
+    // '  '
+    __publicField(this, "resolvedPagesJSONNewline");
+    // '\n'
+    __publicField(this, "resolvedPagesJSONEofNewline");
+    // true
     __publicField(this, "rawOptions");
     __publicField(this, "root");
     __publicField(this, "options");
@@ -556,10 +569,6 @@ class PageContext {
       Debug.enable(`${prefix}${suffix}`);
     }
     this.resolvedPagesJSONPath = path.join(this.root, this.options.outDir, OUTPUT_NAME);
-    const resolvedPagesJSONContent = readFileSync(this.resolvedPagesJSONPath);
-    this.resolvedPagesJSONIndent = detectIndent(resolvedPagesJSONContent).indent || "  ";
-    this.resolvedPagesJSONNewline = detectNewline(resolvedPagesJSONContent) || "\n";
-    this.resolvedPagesJSONEofNewline = (resolvedPagesJSONContent.at(-1) ?? "\n") === this.resolvedPagesJSONNewline;
     debug.options(this.options);
   }
   setLogger(logger) {
@@ -727,6 +736,16 @@ class PageContext {
     debug.subPages(this.subPageMetaData);
   }
   async getTabBarMerged() {
+    const tabBarItems = [];
+    for (const [_, page] of this.pages) {
+      const tabbar = await page.getTabBar();
+      if (tabbar) {
+        tabBarItems.push(tabbar);
+      }
+    }
+    if (tabBarItems.length === 0) {
+      return this.pagesGlobConfig?.tabBar;
+    }
     const tabBar = {
       ...this.pagesGlobConfig?.tabBar,
       list: this.pagesGlobConfig?.tabBar?.list || []
@@ -735,13 +754,6 @@ class PageContext {
     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)) {
@@ -772,7 +784,7 @@ class PageContext {
         }
       }
     }
-    checkPagesJsonFile(this.resolvedPagesJSONPath);
+    await checkPagesJsonFile(this.resolvedPagesJSONPath);
     this.options.onBeforeLoadUserConfig(this);
     await this.loadUserPagesConfig();
     this.options.onAfterLoadUserConfig(this);
@@ -803,14 +815,19 @@ class PageContext {
     const pagesJson = stringify(
       data,
       null,
-      this.options.minify ? void 0 : this.resolvedPagesJSONIndent
-    ) + (this.resolvedPagesJSONEofNewline ? this.resolvedPagesJSONNewline : "");
+      this.options.minify ? void 0 : await this.getIndent()
+    ) + (await this.getEndOfLine() ? await this.getNewline() : "");
     this.generateDeclaration();
     if (lsatPagesJson === pagesJson) {
       debug.pages("PagesJson Not have change");
       return false;
     }
-    writeFileSync(this.resolvedPagesJSONPath, pagesJson);
+    const relase = await lockfile.lock(this.resolvedPagesJSONPath, { realpath: false });
+    try {
+      await fs.promises.writeFile(this.resolvedPagesJSONPath, pagesJson, { encoding: "utf-8" });
+    } finally {
+      await relase();
+    }
     lsatPagesJson = pagesJson;
     this.options.onAfterWriteFile(this);
     return true;
@@ -832,6 +849,30 @@ class PageContext {
     debug.declaration("generating");
     return writeDeclaration(this, this.options.dts);
   }
+  async readInfoFromPagesJSON() {
+    const resolvedPagesJSONContent = await fs.promises.readFile(this.resolvedPagesJSONPath, { encoding: "utf-8" }).catch(() => "");
+    this.resolvedPagesJSONIndent = detectIndent(resolvedPagesJSONContent).indent || "  ";
+    this.resolvedPagesJSONNewline = detectNewline(resolvedPagesJSONContent) || "\n";
+    this.resolvedPagesJSONEofNewline = (resolvedPagesJSONContent.at(-1) ?? "\n") === this.resolvedPagesJSONNewline;
+  }
+  async getIndent() {
+    if (!this.resolvedPagesJSONIndent) {
+      await this.readInfoFromPagesJSON();
+    }
+    return this.resolvedPagesJSONIndent;
+  }
+  async getNewline() {
+    if (!this.resolvedPagesJSONNewline) {
+      await this.readInfoFromPagesJSON();
+    }
+    return this.resolvedPagesJSONNewline;
+  }
+  async getEndOfLine() {
+    if (!this.resolvedPagesJSONEofNewline) {
+      await this.readInfoFromPagesJSON();
+    }
+    return this.resolvedPagesJSONEofNewline;
+  }
 }
 function getPagePaths(dir, options) {
   const pagesDirPath = slash(path.resolve(options.root, dir));
@@ -849,28 +890,14 @@ function defineUniPages(config) {
   return config;
 }
 
-async function restart() {
-  return new Promise((resolve) => {
-    const build = spawn(process.argv.shift(), process.argv, {
-      cwd: process.env.VITE_ROOT_DIR || process.cwd(),
-      detached: true,
-      env: process.env
-    });
-    build.stdout?.pipe(process.stdout);
-    build.stderr?.pipe(process.stderr);
-    build.on("close", (code) => {
-      resolve(process.exit(code));
-    });
-  });
-}
-function VitePluginUniPages(userOptions = {}) {
+async function VitePluginUniPages(userOptions = {}) {
   let ctx;
   const resolvedPagesJSONPath = path.join(
     process.env.VITE_ROOT_DIR || process.cwd(),
     userOptions.outDir ?? "src",
     OUTPUT_NAME
   );
-  const isValidated = checkPagesJsonFile(resolvedPagesJSONPath);
+  await checkPagesJsonFile(resolvedPagesJSONPath);
   return {
     name: "vite-plugin-uni-pages",
     enforce: "pre",
@@ -884,12 +911,6 @@ function VitePluginUniPages(userOptions = {}) {
       ctx.setLogger(logger);
       await ctx.updatePagesJSON();
       if (config.command === "build") {
-        if (!isValidated) {
-          ctx.logger?.warn("In build mode, if `pages.json` does not exist, the plugin cannot create the complete `pages.json` before the uni-app, so it restarts the build.", {
-            timestamp: true
-          });
-          await restart();
-        }
         if (config.build.watch)
           ctx.setupWatcher(chokidar.watch([...ctx.options.dirs, ...ctx.options.subPackages]));
       }
@@ -955,4 +976,4 @@ function VitePluginUniPages(userOptions = {}) {
   };
 }
 
-export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFile, debug, VitePluginUniPages as default, defineUniPages, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, readFileSync, resolveOptions, resolvePageDirs, tryPageMetaFromCustomBlock, tryPageMetaFromMacro, writeFileSync };
+export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFile, debug, VitePluginUniPages as default, defineUniPages, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, tryPageMetaFromCustomBlock, tryPageMetaFromMacro };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uni-helper/vite-plugin-uni-pages",
   "type": "module",
-  "version": "0.3.14",
+  "version": "0.3.16",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
   "maintainers": [
@@ -53,6 +53,7 @@
   "dependencies": {
     "@babel/generator": "^7.28.3",
     "@babel/types": "^7.28.2",
+    "@types/proper-lockfile": "^4.1.4",
     "@uni-helper/uni-env": "^0.1.4",
     "@vue/compiler-sfc": "3.4.21",
     "ast-kit": "1.4.3",
@@ -66,6 +67,7 @@
     "kolorist": "^1.8.0",
     "lodash.groupby": "^4.6.0",
     "magic-string": "^0.30.11",
+    "proper-lockfile": "^4.1.2",
     "typescript": "5.9.2",
     "unconfig": "^7.3.2",
     "yaml": "^2.5.0"