@uni-helper/vite-plugin-uni-pages 0.1.1 → 0.1.3

package/dist/index.cjs

@@ -8,7 +8,7 @@ const chokidar = require('chokidar');
 const vite = require('vite');
 const unconfig = require('unconfig');
 const Debug = require('debug');
-const lodashEs = require('lodash-es');
+const lodash = require('lodash');
 const fg = require('fast-glob');
 const fs = require('fs');
 const JSON5 = require('json5');
@@ -52,7 +52,7 @@ function isConfigFile(path) {
   return path.includes("pages.config");
 }
 function mergePageMetaDataArray(pageMetaData) {
-  const pageMetaDataObj = lodashEs.groupBy(pageMetaData, "path");
+  const pageMetaDataObj = lodash.groupBy(pageMetaData, "path");
   const result = [];
   for (const path in pageMetaDataObj) {
     const _pageMetaData = pageMetaDataObj[path];
@@ -154,10 +154,15 @@ async function parseSFC(code) {
 }
 function parseCustomBlock(block, filePath, options) {
   const lang = block.lang ?? options.routeBlockLang;
+  const attr = {
+    type: "page",
+    ...block.attrs
+  };
+  let content;
   debug.routeBlock(`use ${lang} parser`);
   if (lang === "json5") {
     try {
-      return JSON5.parse(block.content);
+      content = JSON5.parse(block.content);
     } catch (err) {
       throw new Error(
         `Invalid JSON5 format of <${block.type}> content in ${filePath}
@@ -166,7 +171,7 @@ ${err.message}`
     }
   } else if (lang === "json") {
     try {
-      return JSON.parse(block.content);
+      content = JSON.parse(block.content);
     } catch (err) {
       throw new Error(
         `Invalid JSON format of <${block.type}> content in ${filePath}
@@ -175,7 +180,7 @@ ${err.message}`
     }
   } else if (lang === "yaml" || lang === "yml") {
     try {
-      return yaml.parse(block.content);
+      content = yaml.parse(block.content);
     } catch (err) {
       throw new Error(
         `Invalid YAML format of <${block.type}> content in ${filePath}
@@ -183,6 +188,12 @@ ${err.message}`
       );
     }
   }
+  if (content) {
+    return {
+      attr,
+      content
+    };
+  }
 }
 async function getRouteBlock(path, options) {
   const content = fs.readFileSync(path, "utf8");
@@ -278,9 +289,9 @@ class PageContext {
     const { relativePath, absolutePath } = page;
     const routeBlock = await getRouteBlock(absolutePath, this.options);
     const relativePathWithFileName = relativePath.replace(path.extname(relativePath), "");
-    const pageMetaDatum = { path: vite.normalizePath(relativePathWithFileName), type: "page" };
+    const pageMetaDatum = { path: vite.normalizePath(relativePathWithFileName), type: routeBlock?.attr.type ?? "page" };
     if (routeBlock)
-      Object.assign(pageMetaDatum, routeBlock);
+      Object.assign(pageMetaDatum, routeBlock.content);
     return pageMetaDatum;
   }
   async mergePageMetaData() {
@@ -296,6 +307,7 @@ class PageContext {
       else
         this.pageMetaData = generatedPageMetaData;
     }
+    this.pageMetaData.sort((page) => page.type === "home" ? -1 : 0);
     debug.pages(generatedPageMetaData);
   }
   async updatePagesJSON() {

package/dist/index.d.ts

@@ -633,7 +633,10 @@ declare class PageContext {
     resolveRoutes(): string;
 }
 
-type CustomBlock = Record<string, any>;
+interface CustomBlock {
+    attr: Record<string, any>;
+    content: Record<string, any>;
+}
 interface Options {
     /**
      * Whether to merge pages in pages.json
@@ -735,7 +738,7 @@ declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): Re
 declare function resolvePageDirs(dir: string, root: string, exclude: string[]): string[];
 
 declare function parseSFC(code: string): Promise<SFCDescriptor>;
-declare function parseCustomBlock(block: SFCBlock, filePath: string, options: ResolvedOptions): any;
+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;

package/dist/index.mjs

@@ -4,7 +4,7 @@ import chokidar from 'chokidar';
 import { normalizePath } from 'vite';
 import { loadConfig } from 'unconfig';
 import Debug from 'debug';
-import { groupBy } from 'lodash-es';
+import { groupBy } from 'lodash';
 import fg from 'fast-glob';
 import fs from 'fs';
 import JSON5 from 'json5';
@@ -150,10 +150,15 @@ async function parseSFC(code) {
 }
 function parseCustomBlock(block, filePath, options) {
   const lang = block.lang ?? options.routeBlockLang;
+  const attr = {
+    type: "page",
+    ...block.attrs
+  };
+  let content;
   debug.routeBlock(`use ${lang} parser`);
   if (lang === "json5") {
     try {
-      return JSON5.parse(block.content);
+      content = JSON5.parse(block.content);
     } catch (err) {
       throw new Error(
         `Invalid JSON5 format of <${block.type}> content in ${filePath}
@@ -162,7 +167,7 @@ ${err.message}`
     }
   } else if (lang === "json") {
     try {
-      return JSON.parse(block.content);
+      content = JSON.parse(block.content);
     } catch (err) {
       throw new Error(
         `Invalid JSON format of <${block.type}> content in ${filePath}
@@ -171,7 +176,7 @@ ${err.message}`
     }
   } else if (lang === "yaml" || lang === "yml") {
     try {
-      return parse$1(block.content);
+      content = parse$1(block.content);
     } catch (err) {
       throw new Error(
         `Invalid YAML format of <${block.type}> content in ${filePath}
@@ -179,6 +184,12 @@ ${err.message}`
       );
     }
   }
+  if (content) {
+    return {
+      attr,
+      content
+    };
+  }
 }
 async function getRouteBlock(path, options) {
   const content = fs.readFileSync(path, "utf8");
@@ -274,9 +285,9 @@ 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: "page" };
+    const pageMetaDatum = { path: normalizePath(relativePathWithFileName), type: routeBlock?.attr.type ?? "page" };
     if (routeBlock)
-      Object.assign(pageMetaDatum, routeBlock);
+      Object.assign(pageMetaDatum, routeBlock.content);
     return pageMetaDatum;
   }
   async mergePageMetaData() {
@@ -292,6 +303,7 @@ class PageContext {
       else
         this.pageMetaData = generatedPageMetaData;
     }
+    this.pageMetaData.sort((page) => page.type === "home" ? -1 : 0);
     debug.pages(generatedPageMetaData);
   }
   async updatePagesJSON() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uni-helper/vite-plugin-uni-pages",
   "type": "module",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "packageManager": "pnpm@7.16.1",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
@@ -18,14 +18,14 @@
     ".": {
       "types": "./dist/index.d.ts",
       "require": "./dist/index.cjs",
-      "import": "./dist/index.js"
+      "import": "./dist/index.mjs"
     },
     "./client": {
       "types": "./client.d.ts"
     }
   },
   "main": "./dist/index.mjs",
-  "module": "./dist/index.js",
+  "module": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
   "files": [
     "dist",
@@ -37,7 +37,7 @@
     "debug": "^4.3.4",
     "fast-glob": "^3.2.12",
     "json5": "^2.2.3",
-    "lodash-es": "^4.17.21",
+    "lodash": "^4.17.21",
     "magic-string": "^0.27.0",
     "unconfig": "^0.3.7",
     "yaml": "^2.2.1"
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@antfu/utils": "^0.7.2",
     "@types/debug": "^4.1.7",
-    "@types/lodash-es": "^4.17.6",
+    "@types/lodash": "^4.14.191",
     "@types/node": "^18.11.18",
     "vite": "^4.0.3"
   },