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

package/dist/index.cjs

@@ -10,6 +10,7 @@ const MagicString = require('magic-string');
 const chokidar = require('chokidar');
 const unconfig = require('unconfig');
 const Debug = require('debug');
+const uniEnv = require('@uni-helper/uni-env');
 const fs = require('node:fs');
 const promises = require('node:fs/promises');
 const lodashUnified = require('lodash-unified');
@@ -327,6 +328,7 @@ class PageContext {
     __publicField(this, "root");
     __publicField(this, "options");
     __publicField(this, "logger");
+    __publicField(this, "withUniPlatform", false);
     this.rawOptions = userOptions;
     this.root = slash(viteRoot);
     debug.options("root", this.root);
@@ -459,7 +461,7 @@ class PageContext {
     if (hasHome)
       return true;
     const isFoundHome = result.some((item) => {
-      if (this.options.homePage.includes(item.path)) {
+      if (this.options.homePage.some((v) => v.startsWith(item.path))) {
         item.type = "home";
         return true;
       } else {
@@ -515,6 +517,12 @@ class PageContext {
     await this.mergePageMetaData();
     await this.mergeSubPageMetaData();
     this.options.onAfterMergePageMetaData(this);
+    if (this.withUniPlatform) {
+      const pagesMap = /* @__PURE__ */ new Map();
+      const pages = this.pageMetaData.filter((v) => !/\..*$/.test(v.path) || v.path.includes(uniEnv.platform)).map((v) => ({ ...v, path: v.path.replace(/\..*$/, "") }));
+      pages.forEach((v) => pagesMap.set(v.path, v));
+      this.pageMetaData = [...pagesMap.values()];
+    }
     this.options.onBeforeWriteFile(this);
     const data = {
       ...this.pagesGlobConfig,
@@ -593,6 +601,8 @@ function VitePluginUniPages(userOptions = {}) {
     enforce: "pre",
     async configResolved(config) {
       ctx = new PageContext(userOptions, config.root);
+      if (config.plugins.some((v) => v.name === "vite-plugin-uni-platform"))
+        ctx.withUniPlatform = true;
       const logger = vite.createLogger(void 0, {
         prefix: "[vite-plugin-uni-pages]"
       });
@@ -606,7 +616,7 @@ function VitePluginUniPages(userOptions = {}) {
           await restart();
         }
         if (config.build.watch)
-          ctx.setupWatcher(chokidar__default.watch(ctx.options.dirs));
+          ctx.setupWatcher(chokidar__default.watch([...ctx.options.dirs, ...ctx.options.subPackages]));
       }
     },
     // Applet do not support custom route block, so we need to remove the route block here

package/dist/index.d.cts

@@ -5,8 +5,8 @@ import Debug from 'debug';
 import { SFCBlock, SFCDescriptor } from '@vue/compiler-sfc';
 
 interface EasyCom {
-    autoscan: boolean;
-    custom: Record<string, string>;
+    autoscan?: boolean;
+    custom?: Record<string, string>;
 }
 
 type RGBColor = `rgb(${number}, ${number}, ${number})`;
@@ -649,6 +649,7 @@ declare class PageContext {
     root: string;
     options: ResolvedOptions;
     logger?: Logger;
+    withUniPlatform: boolean;
     constructor(userOptions: UserOptions, viteRoot?: string);
     setLogger(logger: Logger): void;
     loadUserPagesConfig(): Promise<void>;

package/dist/index.d.mts

@@ -5,8 +5,8 @@ import Debug from 'debug';
 import { SFCBlock, SFCDescriptor } from '@vue/compiler-sfc';
 
 interface EasyCom {
-    autoscan: boolean;
-    custom: Record<string, string>;
+    autoscan?: boolean;
+    custom?: Record<string, string>;
 }
 
 type RGBColor = `rgb(${number}, ${number}, ${number})`;
@@ -649,6 +649,7 @@ declare class PageContext {
     root: string;
     options: ResolvedOptions;
     logger?: Logger;
+    withUniPlatform: boolean;
     constructor(userOptions: UserOptions, viteRoot?: string);
     setLogger(logger: Logger): void;
     loadUserPagesConfig(): Promise<void>;

package/dist/index.d.ts

@@ -5,8 +5,8 @@ import Debug from 'debug';
 import { SFCBlock, SFCDescriptor } from '@vue/compiler-sfc';
 
 interface EasyCom {
-    autoscan: boolean;
-    custom: Record<string, string>;
+    autoscan?: boolean;
+    custom?: Record<string, string>;
 }
 
 type RGBColor = `rgb(${number}, ${number}, ${number})`;
@@ -649,6 +649,7 @@ declare class PageContext {
     root: string;
     options: ResolvedOptions;
     logger?: Logger;
+    withUniPlatform: boolean;
     constructor(userOptions: UserOptions, viteRoot?: string);
     setLogger(logger: Logger): void;
     loadUserPagesConfig(): Promise<void>;

package/dist/index.mjs

@@ -6,6 +6,7 @@ import MagicString from 'magic-string';
 import chokidar from 'chokidar';
 import { loadConfig } from 'unconfig';
 import Debug from 'debug';
+import { platform } from '@uni-helper/uni-env';
 import fs, { existsSync } from 'node:fs';
 import { readFile, mkdir, writeFile as writeFile$1 } from 'node:fs/promises';
 import { groupBy } from 'lodash-unified';
@@ -312,6 +313,7 @@ class PageContext {
     __publicField(this, "root");
     __publicField(this, "options");
     __publicField(this, "logger");
+    __publicField(this, "withUniPlatform", false);
     this.rawOptions = userOptions;
     this.root = slash(viteRoot);
     debug.options("root", this.root);
@@ -444,7 +446,7 @@ class PageContext {
     if (hasHome)
       return true;
     const isFoundHome = result.some((item) => {
-      if (this.options.homePage.includes(item.path)) {
+      if (this.options.homePage.some((v) => v.startsWith(item.path))) {
         item.type = "home";
         return true;
       } else {
@@ -500,6 +502,12 @@ class PageContext {
     await this.mergePageMetaData();
     await this.mergeSubPageMetaData();
     this.options.onAfterMergePageMetaData(this);
+    if (this.withUniPlatform) {
+      const pagesMap = /* @__PURE__ */ new Map();
+      const pages = this.pageMetaData.filter((v) => !/\..*$/.test(v.path) || v.path.includes(platform)).map((v) => ({ ...v, path: v.path.replace(/\..*$/, "") }));
+      pages.forEach((v) => pagesMap.set(v.path, v));
+      this.pageMetaData = [...pagesMap.values()];
+    }
     this.options.onBeforeWriteFile(this);
     const data = {
       ...this.pagesGlobConfig,
@@ -578,6 +586,8 @@ function VitePluginUniPages(userOptions = {}) {
     enforce: "pre",
     async configResolved(config) {
       ctx = new PageContext(userOptions, config.root);
+      if (config.plugins.some((v) => v.name === "vite-plugin-uni-platform"))
+        ctx.withUniPlatform = true;
       const logger = createLogger(void 0, {
         prefix: "[vite-plugin-uni-pages]"
       });
@@ -591,7 +601,7 @@ function VitePluginUniPages(userOptions = {}) {
           await restart();
         }
         if (config.build.watch)
-          ctx.setupWatcher(chokidar.watch(ctx.options.dirs));
+          ctx.setupWatcher(chokidar.watch([...ctx.options.dirs, ...ctx.options.subPackages]));
       }
     },
     // Applet do not support custom route block, so we need to remove the route block here

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uni-helper/vite-plugin-uni-pages",
   "type": "module",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
   "license": "MIT",
@@ -32,8 +32,8 @@
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
-    "dist",
-    "client.d.ts"
+    "client.d.ts",
+    "dist"
   ],
   "dependencies": {
     "@uni-helper/uni-env": "^0.0.3",
@@ -43,14 +43,14 @@
     "fast-glob": "^3.3.1",
     "json5": "^2.2.3",
     "lodash-unified": "^1.0.3",
-    "magic-string": "^0.30.3",
-    "unconfig": "^0.3.10",
+    "magic-string": "^0.30.4",
+    "unconfig": "^0.3.11",
     "yaml": "^2.3.2"
   },
   "devDependencies": {
     "@antfu/utils": "^0.7.6",
-    "@types/debug": "^4.1.8",
-    "@types/node": "^18.17.18"
+    "@types/debug": "^4.1.9",
+    "@types/node": "^20.8.3"
   },
   "scripts": {
     "build": "unbuild",