@uni-helper/vite-plugin-uni-pages 0.2.23 → 0.2.25

package/dist/index.cjs

@@ -11,6 +11,8 @@ const chokidar = require('chokidar');
 const unconfig = require('unconfig');
 const Debug = require('debug');
 const uniEnv = require('@uni-helper/uni-env');
+const detectIndent = require('detect-indent');
+const detectNewline = require('detect-newline');
 const fs = require('node:fs');
 const promises = require('node:fs/promises');
 const lodashUnified = require('lodash-unified');
@@ -26,6 +28,8 @@ const process__default = /*#__PURE__*/_interopDefaultCompat(process);
 const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
 const chokidar__default = /*#__PURE__*/_interopDefaultCompat(chokidar);
 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 JSON5__default = /*#__PURE__*/_interopDefaultCompat(JSON5);
 const fg__default = /*#__PURE__*/_interopDefaultCompat(fg);
@@ -302,6 +306,13 @@ function checkPagesJsonFile(path) {
   }
   return true;
 }
+function readFileSync(path) {
+  try {
+    return fs__default.readFileSync(path, { encoding: "utf-8" });
+  } catch {
+    return "";
+  }
+}
 function writeFileSync(path, content) {
   fs__default.writeFileSync(path, content, { encoding: "utf-8" });
 }
@@ -324,6 +335,9 @@ class PageContext {
     __publicField(this, "pageMetaData", []);
     __publicField(this, "subPageMetaData", []);
     __publicField(this, "resolvedPagesJSONPath", "");
+    __publicField(this, "resolvedPagesJSONIndent", "  ");
+    __publicField(this, "resolvedPagesJSONNewline", "\n");
+    __publicField(this, "resolvedPagesJSONEofNewline", true);
     __publicField(this, "rawOptions");
     __publicField(this, "root");
     __publicField(this, "options");
@@ -340,6 +354,10 @@ 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) {
@@ -452,7 +470,10 @@ class PageContext {
     const generatedPageMetaData = await Promise.all(pages.map(async (page) => await this.parsePage(page)));
     const customPageMetaData = overrides || [];
     const result = customPageMetaData.length ? mergePageMetaDataArray(generatedPageMetaData.concat(customPageMetaData)) : generatedPageMetaData;
-    return type === "main" ? this.setHomePage(result) : result;
+    const parseMeta = result.filter(
+      (page, index, self) => self.findLastIndex((item) => page.path === item.path) === index
+    );
+    return type === "main" ? this.setHomePage(parseMeta) : parseMeta;
   }
   /**
    * set home page
@@ -531,7 +552,11 @@ class PageContext {
       pages: this.pageMetaData,
       subPackages: this.subPageMetaData
     };
-    const pagesJson = JSON.stringify(data, null, this.options.minify ? void 0 : 2);
+    const pagesJson = JSON.stringify(
+      data,
+      null,
+      this.options.minify ? void 0 : this.resolvedPagesJSONIndent
+    ) + (this.resolvedPagesJSONEofNewline ? this.resolvedPagesJSONNewline : "");
     this.generateDeclaration();
     if (lsatPagesJson === pagesJson) {
       debug.pages("PagesJson Not have change");
@@ -678,6 +703,7 @@ exports.isTargetFile = isTargetFile;
 exports.mergePageMetaDataArray = mergePageMetaDataArray;
 exports.parseCustomBlock = parseCustomBlock;
 exports.parseSFC = parseSFC;
+exports.readFileSync = readFileSync;
 exports.resolveOptions = resolveOptions;
 exports.resolvePageDirs = resolvePageDirs;
 exports.useCachedPages = useCachedPages;

package/dist/index.d.cts

@@ -2919,6 +2919,9 @@ declare class PageContext {
     pageMetaData: PageMetaDatum[];
     subPageMetaData: SubPageMetaDatum[];
     resolvedPagesJSONPath: string;
+    resolvedPagesJSONIndent: string;
+    resolvedPagesJSONNewline: string;
+    resolvedPagesJSONEofNewline: boolean;
     rawOptions: UserOptions;
     root: string;
     options: ResolvedOptions;
@@ -3107,6 +3110,7 @@ declare const FILE_EXTENSIONS: string[];
  */
 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;
 
 declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): ResolvedOptions;
@@ -3122,4 +3126,4 @@ declare function getRouteBlock(path: string, blockStr: SFCBlock | undefined, opt
 
 declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
 
-export { type Condition, type ConditionItem, type ConfigSource, type CustomBlock, type EasyCom, FILE_EXTENSIONS, type GlobalStyle, MODULE_ID_VIRTUAL, OUTPUT_NAME, type Options, PageContext, type PageMetaDatum, type PagePath, type PagesConfig, RESOLVED_MODULE_ID_VIRTUAL, type ResolvedOptions, type SubPackage, type SubPackages, type SubPageMetaDatum, type TabBar, type TabBarIconFont, type TabBarItem, type TabBarMidButton, type TheWindow, type UniIdRouter, type UserOptions, type UserPagesConfig, VitePluginUniPages, checkPagesJsonFile, debug, type debugType, VitePluginUniPages as default, defineUniPages, extsToGlob, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, useCachedPages, writeFileSync };
+export { type Condition, type ConditionItem, type ConfigSource, type CustomBlock, type EasyCom, FILE_EXTENSIONS, type GlobalStyle, MODULE_ID_VIRTUAL, OUTPUT_NAME, type Options, PageContext, type PageMetaDatum, type PagePath, type PagesConfig, RESOLVED_MODULE_ID_VIRTUAL, type ResolvedOptions, type SubPackage, type SubPackages, type SubPageMetaDatum, type TabBar, type TabBarIconFont, type TabBarItem, type TabBarMidButton, type TheWindow, type UniIdRouter, type UserOptions, type UserPagesConfig, VitePluginUniPages, checkPagesJsonFile, debug, type debugType, VitePluginUniPages as default, defineUniPages, extsToGlob, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, readFileSync, resolveOptions, resolvePageDirs, useCachedPages, writeFileSync };

package/dist/index.d.mts

@@ -2919,6 +2919,9 @@ declare class PageContext {
     pageMetaData: PageMetaDatum[];
     subPageMetaData: SubPageMetaDatum[];
     resolvedPagesJSONPath: string;
+    resolvedPagesJSONIndent: string;
+    resolvedPagesJSONNewline: string;
+    resolvedPagesJSONEofNewline: boolean;
     rawOptions: UserOptions;
     root: string;
     options: ResolvedOptions;
@@ -3107,6 +3110,7 @@ declare const FILE_EXTENSIONS: string[];
  */
 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;
 
 declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): ResolvedOptions;
@@ -3122,4 +3126,4 @@ declare function getRouteBlock(path: string, blockStr: SFCBlock | undefined, opt
 
 declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
 
-export { type Condition, type ConditionItem, type ConfigSource, type CustomBlock, type EasyCom, FILE_EXTENSIONS, type GlobalStyle, MODULE_ID_VIRTUAL, OUTPUT_NAME, type Options, PageContext, type PageMetaDatum, type PagePath, type PagesConfig, RESOLVED_MODULE_ID_VIRTUAL, type ResolvedOptions, type SubPackage, type SubPackages, type SubPageMetaDatum, type TabBar, type TabBarIconFont, type TabBarItem, type TabBarMidButton, type TheWindow, type UniIdRouter, type UserOptions, type UserPagesConfig, VitePluginUniPages, checkPagesJsonFile, debug, type debugType, VitePluginUniPages as default, defineUniPages, extsToGlob, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, useCachedPages, writeFileSync };
+export { type Condition, type ConditionItem, type ConfigSource, type CustomBlock, type EasyCom, FILE_EXTENSIONS, type GlobalStyle, MODULE_ID_VIRTUAL, OUTPUT_NAME, type Options, PageContext, type PageMetaDatum, type PagePath, type PagesConfig, RESOLVED_MODULE_ID_VIRTUAL, type ResolvedOptions, type SubPackage, type SubPackages, type SubPageMetaDatum, type TabBar, type TabBarIconFont, type TabBarItem, type TabBarMidButton, type TheWindow, type UniIdRouter, type UserOptions, type UserPagesConfig, VitePluginUniPages, checkPagesJsonFile, debug, type debugType, VitePluginUniPages as default, defineUniPages, extsToGlob, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, readFileSync, resolveOptions, resolvePageDirs, useCachedPages, writeFileSync };

package/dist/index.d.ts

@@ -2919,6 +2919,9 @@ declare class PageContext {
     pageMetaData: PageMetaDatum[];
     subPageMetaData: SubPageMetaDatum[];
     resolvedPagesJSONPath: string;
+    resolvedPagesJSONIndent: string;
+    resolvedPagesJSONNewline: string;
+    resolvedPagesJSONEofNewline: boolean;
     rawOptions: UserOptions;
     root: string;
     options: ResolvedOptions;
@@ -3107,6 +3110,7 @@ declare const FILE_EXTENSIONS: string[];
  */
 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;
 
 declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): ResolvedOptions;
@@ -3122,4 +3126,4 @@ declare function getRouteBlock(path: string, blockStr: SFCBlock | undefined, opt
 
 declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
 
-export { type Condition, type ConditionItem, type ConfigSource, type CustomBlock, type EasyCom, FILE_EXTENSIONS, type GlobalStyle, MODULE_ID_VIRTUAL, OUTPUT_NAME, type Options, PageContext, type PageMetaDatum, type PagePath, type PagesConfig, RESOLVED_MODULE_ID_VIRTUAL, type ResolvedOptions, type SubPackage, type SubPackages, type SubPageMetaDatum, type TabBar, type TabBarIconFont, type TabBarItem, type TabBarMidButton, type TheWindow, type UniIdRouter, type UserOptions, type UserPagesConfig, VitePluginUniPages, checkPagesJsonFile, debug, type debugType, VitePluginUniPages as default, defineUniPages, extsToGlob, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, useCachedPages, writeFileSync };
+export { type Condition, type ConditionItem, type ConfigSource, type CustomBlock, type EasyCom, FILE_EXTENSIONS, type GlobalStyle, MODULE_ID_VIRTUAL, OUTPUT_NAME, type Options, PageContext, type PageMetaDatum, type PagePath, type PagesConfig, RESOLVED_MODULE_ID_VIRTUAL, type ResolvedOptions, type SubPackage, type SubPackages, type SubPageMetaDatum, type TabBar, type TabBarIconFont, type TabBarItem, type TabBarMidButton, type TheWindow, type UniIdRouter, type UserOptions, type UserPagesConfig, VitePluginUniPages, checkPagesJsonFile, debug, type debugType, VitePluginUniPages as default, defineUniPages, extsToGlob, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, readFileSync, resolveOptions, resolvePageDirs, useCachedPages, writeFileSync };

package/dist/index.mjs

@@ -7,6 +7,8 @@ import chokidar from 'chokidar';
 import { loadConfig } from 'unconfig';
 import Debug from 'debug';
 import { platform } from '@uni-helper/uni-env';
+import detectIndent from 'detect-indent';
+import detectNewline from 'detect-newline';
 import fs, { existsSync } from 'node:fs';
 import { readFile, mkdir, writeFile as writeFile$1 } from 'node:fs/promises';
 import { groupBy } from 'lodash-unified';
@@ -287,6 +289,13 @@ function checkPagesJsonFile(path) {
   }
   return true;
 }
+function readFileSync(path) {
+  try {
+    return fs.readFileSync(path, { encoding: "utf-8" });
+  } catch {
+    return "";
+  }
+}
 function writeFileSync(path, content) {
   fs.writeFileSync(path, content, { encoding: "utf-8" });
 }
@@ -309,6 +318,9 @@ class PageContext {
     __publicField(this, "pageMetaData", []);
     __publicField(this, "subPageMetaData", []);
     __publicField(this, "resolvedPagesJSONPath", "");
+    __publicField(this, "resolvedPagesJSONIndent", "  ");
+    __publicField(this, "resolvedPagesJSONNewline", "\n");
+    __publicField(this, "resolvedPagesJSONEofNewline", true);
     __publicField(this, "rawOptions");
     __publicField(this, "root");
     __publicField(this, "options");
@@ -325,6 +337,10 @@ 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) {
@@ -437,7 +453,10 @@ class PageContext {
     const generatedPageMetaData = await Promise.all(pages.map(async (page) => await this.parsePage(page)));
     const customPageMetaData = overrides || [];
     const result = customPageMetaData.length ? mergePageMetaDataArray(generatedPageMetaData.concat(customPageMetaData)) : generatedPageMetaData;
-    return type === "main" ? this.setHomePage(result) : result;
+    const parseMeta = result.filter(
+      (page, index, self) => self.findLastIndex((item) => page.path === item.path) === index
+    );
+    return type === "main" ? this.setHomePage(parseMeta) : parseMeta;
   }
   /**
    * set home page
@@ -516,7 +535,11 @@ class PageContext {
       pages: this.pageMetaData,
       subPackages: this.subPageMetaData
     };
-    const pagesJson = JSON.stringify(data, null, this.options.minify ? void 0 : 2);
+    const pagesJson = JSON.stringify(
+      data,
+      null,
+      this.options.minify ? void 0 : this.resolvedPagesJSONIndent
+    ) + (this.resolvedPagesJSONEofNewline ? this.resolvedPagesJSONNewline : "");
     this.generateDeclaration();
     if (lsatPagesJson === pagesJson) {
       debug.pages("PagesJson Not have change");
@@ -644,4 +667,4 @@ function VitePluginUniPages(userOptions = {}) {
   };
 }
 
-export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, checkPagesJsonFile, debug, VitePluginUniPages as default, defineUniPages, extsToGlob, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, useCachedPages, writeFileSync };
+export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, checkPagesJsonFile, debug, VitePluginUniPages as default, defineUniPages, extsToGlob, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, readFileSync, resolveOptions, resolvePageDirs, useCachedPages, writeFileSync };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uni-helper/vite-plugin-uni-pages",
   "type": "module",
-  "version": "0.2.23",
+  "version": "0.2.25",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
   "license": "MIT",
@@ -36,21 +36,23 @@
     "dist"
   ],
   "dependencies": {
-    "@uni-helper/uni-env": "^0.1.1",
-    "@vue/compiler-sfc": "^3.4.27",
+    "@uni-helper/uni-env": "^0.1.3",
+    "@vue/compiler-sfc": "^3.4.31",
     "chokidar": "^3.6.0",
-    "debug": "^4.3.4",
+    "debug": "^4.3.5",
+    "detect-indent": "^6.1.0",
+    "detect-newline": "^3.1.0",
     "fast-glob": "^3.3.2",
     "json5": "^2.2.3",
     "lodash-unified": "^1.0.3",
     "magic-string": "^0.30.10",
-    "unconfig": "^0.3.13",
-    "yaml": "^2.4.2"
+    "unconfig": "^0.4.5",
+    "yaml": "^2.4.5"
   },
   "devDependencies": {
-    "@antfu/utils": "^0.7.8",
+    "@antfu/utils": "^0.7.10",
     "@types/debug": "^4.1.12",
-    "@types/node": "^20.12.11"
+    "@types/node": "^20.14.10"
   },
   "scripts": {
     "build": "unbuild",