@uni-helper/vite-plugin-uni-pages 0.2.5 → 0.2.7

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { Logger, ViteDevServer, Plugin } from 'vite';
+import { LoadConfigSource } from 'unconfig';
 import { FSWatcher } from 'chokidar';
 import Debug from 'debug';
 import { SFCBlock, SFCDescriptor } from '@vue/compiler-sfc';
@@ -417,21 +418,21 @@ interface TabBar {
     /**
      * tab 上的文字默认颜色
      */
-    color?: Color;
+    color?: Color | ThemeColor;
     /**
      * tab 上的文字选中时的颜色
      */
-    selectedColor?: Color;
+    selectedColor?: Color | ThemeColor;
     /**
      * tab 的背景色
      */
-    backgroundColor?: Color;
+    backgroundColor?: Color | ThemeColor;
     /**
      * tabbar 上边框的颜色，可选值 black/white，也支持其他颜色值
      * @default "black"
      * @desc App 2.3.4+ 、H5 3.0.0+
      */
-    borderStyle?: string;
+    borderStyle?: string | ThemeColor;
     /**
      * iOS 高斯模糊效果，可选值 dark/extralight/light/none（参考?:使用说明）
      * @default "none"
@@ -685,7 +686,7 @@ declare function isConfigFile(path: string): boolean;
  * TODO: support merge middleware
  */
 declare function mergePageMetaDataArray(pageMetaData: PageMetaDatum[]): PageMetaDatum[];
-declare function getPagesConfigSourcePaths(): Promise<string[]>;
+declare function getPagesConfigSourcePaths(configSource: LoadConfigSource<PagesConfig>[]): Promise<string[]>;
 declare function useCachedPages(): {
     setCache: (filePath: string, routeBlock?: SFCBlock) => void;
     hasChanged: (filePath: string, routeBlock?: SFCBlock) => Promise<boolean>;
@@ -696,7 +697,14 @@ interface CustomBlock {
     content: Record<string, any>;
 }
 type debugType = keyof typeof debug;
+type ConfigSource = string | LoadConfigSource<PagesConfig> | LoadConfigSource<PagesConfig>[];
 interface Options {
+    /**
+     * Load from configs files
+     *
+     * @default 'pages.config.(ts|mts|cts|js|cjs|mjs|json)',
+     */
+    configSource: ConfigSource;
     /**
      * The default application entry page is the home page
      * @default 'pages/index' or 'pages/index/index'
@@ -751,7 +759,7 @@ interface Options {
     onAfterWriteFile: (ctx: PageContext) => void;
 }
 type UserOptions = Partial<Options>;
-interface ResolvedOptions extends Omit<Options, 'dir' | 'homePage'> {
+interface ResolvedOptions extends Omit<Options, 'dir' | 'homePage' | 'configSource'> {
     /**
      * Resolves to the `root` value from Vite config.
      * @default config.root
@@ -765,6 +773,7 @@ interface ResolvedOptions extends Omit<Options, 'dir' | 'homePage'> {
      * Resolved entry page
      */
     homePage: string[];
+    configSource: LoadConfigSource<PagesConfig>[];
 }
 interface PagePath {
     relativePath: string;
@@ -816,4 +825,4 @@ declare function getRouteBlock(path: string, blockStr: SFCBlock | undefined, opt
 
 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, SubPageMetaDatum, TabBar, TabBarItem, TheWindow, UniIdRouter, UserOptions, UserPagesConfig, VitePluginUniPages, checkPagesJsonFile, debug, debugType, VitePluginUniPages as default, defineUniPages, extsToGlob, getPageFiles, getPagesConfigSourcePaths, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isConfigFile, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, useCachedPages, writeFileSync };
+export { type Condition, type ConditionItem, type ConfigSource, type CustomBlock, type EasyCom, FILE_EXTENSIONS, type GlobalStyle, type IconFont, MODULE_ID_VIRTUAL, type MidButton, OUTPUT_NAME, type Options, PageContext, type PageMetaDatum, type PagePath, type PagesConfig, type PreloadRule, RESOLVED_MODULE_ID_VIRTUAL, type ResolvedOptions, type SubPackage, type SubPageMetaDatum, type TabBar, type TabBarItem, type TheWindow, type UniIdRouter, type UserOptions, type UserPagesConfig, VitePluginUniPages, checkPagesJsonFile, debug, type debugType, VitePluginUniPages as default, defineUniPages, extsToGlob, getPageFiles, getPagesConfigSourcePaths, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isConfigFile, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, useCachedPages, writeFileSync };

package/dist/index.mjs

@@ -132,8 +132,8 @@ function mergePageMetaDataArray(pageMetaData) {
   }
   return result;
 }
-async function getPagesConfigSourcePaths() {
-  return await fg("pages.config.(ts|mts|cts|js|cjs|mjs|json)", {
+async function getPagesConfigSourcePaths(configSource) {
+  return await fg(configSource.map((v) => v.files).flat(), {
     deep: 0,
     onlyFiles: true,
     absolute: true
@@ -163,6 +163,7 @@ function useCachedPages() {
 
 function resolveOptions(userOptions, viteRoot) {
   const {
+    configSource = "pages.config.(ts|mts|cts|js|cjs|mjs|json)",
     homePage = ["pages/index", "pages/index/index"],
     mergePages = true,
     dir = "src/pages",
@@ -192,9 +193,11 @@ function resolveOptions(userOptions, viteRoot) {
   const root = viteRoot || slash(process$1.cwd());
   const resolvedDirs = resolvePageDirs(dir, root, exclude);
   const resolvedSubDirs = subPackages.map((dir2) => slash(dir2));
-  const ResolvedHomePage = typeof homePage === "string" ? [homePage] : homePage;
+  const resolvedHomePage = typeof homePage === "string" ? [homePage] : homePage;
+  const resolvedConfigSource = typeof configSource === "string" ? [{ files: configSource }] : configSource;
   const resolvedOptions = {
-    homePage: ResolvedHomePage,
+    configSource: Array.isArray(resolvedConfigSource) ? resolvedConfigSource : [resolvedConfigSource],
+    homePage: resolvedHomePage,
     mergePages,
     dirs: resolvedDirs,
     subPackages: resolvedSubDirs,
@@ -247,15 +250,27 @@ function writeFileSync(path, content) {
   fs.writeFileSync(path, content, { encoding: "utf-8" });
 }
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 let lsatPagesJson = "";
 const { setCache, hasChanged } = useCachedPages();
 class PageContext {
   constructor(userOptions, viteRoot = process$1.cwd()) {
-    this.pagesPath = [];
-    this.subPagesPath = {};
-    this.pageMetaData = [];
-    this.subPageMetaData = [];
-    this.resolvedPagesJSONPath = "";
+    __publicField(this, "_server");
+    __publicField(this, "pagesGlobConfig");
+    __publicField(this, "pagesPath", []);
+    __publicField(this, "subPagesPath", {});
+    __publicField(this, "pageMetaData", []);
+    __publicField(this, "subPageMetaData", []);
+    __publicField(this, "resolvedPagesJSONPath", "");
+    __publicField(this, "rawOptions");
+    __publicField(this, "root");
+    __publicField(this, "options");
+    __publicField(this, "logger");
     this.rawOptions = userOptions;
     this.root = slash(viteRoot);
     debug.options("root", this.root);
@@ -273,11 +288,8 @@ class PageContext {
     this.logger = logger;
   }
   async loadUserPagesConfig() {
-    const { config } = await loadConfig({ cwd: this.root, sources: [{ files: "pages.config" }] });
-    if (!config) {
-      this.logger?.warn("Can't found pages.config, please create pages.config.(ts|mts|cts|js|cjs|mjs|json)");
-      process$1.exit(-1);
-    }
+    const sources = this.options.configSource;
+    const { config } = await loadConfig({ cwd: this.root, sources, defaults: {} });
     this.pagesGlobConfig = config;
     debug.options(config);
   }
@@ -305,7 +317,7 @@ class PageContext {
   }
   async setupWatcher(watcher) {
     if (!isH5) {
-      const configs = await getPagesConfigSourcePaths();
+      const configs = await getPagesConfigSourcePaths(this.options.configSource);
       watcher.add(configs);
     }
     const targetDirs = [...this.options.dirs, ...this.options.subPackages].map((v) => slash(path.resolve(this.root, v)));
@@ -546,9 +558,9 @@ function VitePluginUniPages(userOptions = {}) {
         return {
           code: s.toString(),
           map: s.generateMap({
-            source: code,
+            source: id,
             includeContent: true,
-            file: id
+            file: `${id}.map`
           })
         };
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uni-helper/vite-plugin-uni-pages",
   "type": "module",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
   "license": "MIT",
@@ -15,16 +15,21 @@
   "sideEffects": false,
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "require": "./dist/index.cjs",
-      "import": "./dist/index.mjs"
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      },
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      }
     },
     "./client": {
       "types": "./client.d.ts"
     }
   },
-  "main": "./dist/index.mjs",
-  "module": "./dist/index.cjs",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
     "dist",
@@ -38,14 +43,14 @@
     "fast-glob": "^3.3.1",
     "json5": "^2.2.3",
     "lodash-unified": "^1.0.3",
-    "magic-string": "^0.30.2",
+    "magic-string": "^0.30.3",
     "unconfig": "^0.3.10",
     "yaml": "^2.3.1"
   },
   "devDependencies": {
-    "@antfu/utils": "^0.7.5",
+    "@antfu/utils": "^0.7.6",
     "@types/debug": "^4.1.8",
-    "@types/node": "^18.17.1"
+    "@types/node": "^18.17.9"
   },
   "scripts": {
     "build": "unbuild",