@uni-helper/vite-plugin-uni-pages 0.1.5 → 0.1.7

package/dist/index.cjs

@@ -2,19 +2,33 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const path = require('path');
+const path$1 = require('path');
+const child_process = require('child_process');
+const vite = require('vite');
 const MagicString = require('magic-string');
 const chokidar = require('chokidar');
-const vite = require('vite');
+const path = require('node:path');
 const unconfig = require('unconfig');
+const uniEnv = require('@uni-helper/uni-env');
 const Debug = require('debug');
-const lodash = require('lodash');
+const lodashUnified = require('lodash-unified');
 const fg = require('fast-glob');
 const fs = require('fs');
 const JSON5 = require('json5');
 const yaml = require('yaml');
 const compilerSfc = require('@vue/compiler-sfc');
 
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
+
+const path__default$1 = /*#__PURE__*/_interopDefaultCompat(path$1);
+const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
+const chokidar__default = /*#__PURE__*/_interopDefaultCompat(chokidar);
+const path__default = /*#__PURE__*/_interopDefaultCompat(path);
+const Debug__default = /*#__PURE__*/_interopDefaultCompat(Debug);
+const fg__default = /*#__PURE__*/_interopDefaultCompat(fg);
+const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
+const JSON5__default = /*#__PURE__*/_interopDefaultCompat(JSON5);
+
 function slash(str) {
   return str.replace(/\\/g, "/");
 }
@@ -35,11 +49,11 @@ function invalidatePagesModule(server) {
   }
 }
 const debug = {
-  hmr: Debug("vite-plugin-uni-pages:hmr"),
-  routeBlock: Debug("vite-plugin-uni-pages:routeBlock"),
-  options: Debug("vite-plugin-uni-pages:options"),
-  pages: Debug("vite-plugin-uni-pages:pages"),
-  error: Debug("vite-plugin-uni-pages:error")
+  hmr: Debug__default("vite-plugin-uni-pages:hmr"),
+  routeBlock: Debug__default("vite-plugin-uni-pages:routeBlock"),
+  options: Debug__default("vite-plugin-uni-pages:options"),
+  pages: Debug__default("vite-plugin-uni-pages:pages"),
+  error: Debug__default("vite-plugin-uni-pages:error")
 };
 function extsToGlob(extensions) {
   return extensions.length > 1 ? `{${extensions.join(",")}}` : extensions[0] || "";
@@ -52,7 +66,7 @@ function isConfigFile(path) {
   return path.includes("pages.config");
 }
 function mergePageMetaDataArray(pageMetaData) {
-  const pageMetaDataObj = lodash.groupBy(pageMetaData, "path");
+  const pageMetaDataObj = lodashUnified.groupBy(pageMetaData, "path");
   const result = [];
   for (const path in pageMetaDataObj) {
     const _pageMetaData = pageMetaDataObj[path];
@@ -66,7 +80,7 @@ function mergePageMetaDataArray(pageMetaData) {
   return result;
 }
 const getPagesConfigSourcePaths = async () => {
-  return await fg("pages.config.(ts|mts|cts|js|cjs|mjs|json)", {
+  return await fg__default("pages.config.(ts|mts|cts|js|cjs|mjs|json)", {
     deep: 0,
     onlyFiles: true,
     absolute: true
@@ -80,6 +94,7 @@ function resolveOptions(userOptions, viteRoot) {
     outDir = "src",
     exclude = ["node_modules", ".git", "**/__*__/**"],
     routeBlockLang = "json5",
+    minify = false,
     onBeforeLoadUserConfig = () => {
     },
     onAfterLoadUserConfig = () => {
@@ -106,6 +121,7 @@ function resolveOptions(userOptions, viteRoot) {
     exclude,
     routeBlockLang,
     root,
+    minify,
     onBeforeLoadUserConfig,
     onAfterLoadUserConfig,
     onBeforeScanPages,
@@ -118,7 +134,7 @@ function resolveOptions(userOptions, viteRoot) {
   return resolvedOptions;
 }
 function resolvePageDirs(dir, root, exclude) {
-  const dirs = fg.sync(slash(dir), {
+  const dirs = fg__default.sync(slash(dir), {
     ignore: exclude,
     onlyDirectories: true,
     dot: true,
@@ -131,7 +147,7 @@ function resolvePageDirs(dir, root, exclude) {
 function getPageFiles(path, options) {
   const { exclude } = options;
   const ext = extsToGlob(FILE_EXTENSIONS);
-  const files = fg.sync(`**/*.${ext}`, {
+  const files = fg__default.sync(`**/*.${ext}`, {
     ignore: exclude,
     onlyFiles: true,
     cwd: path
@@ -139,11 +155,14 @@ function getPageFiles(path, options) {
   return files;
 }
 function checkPagesJsonFile(path) {
-  if (!fs.existsSync(path))
+  if (!fs__default.existsSync(path)) {
     writeFileSync(path, JSON.stringify({ pages: [{ path: "" }] }, null, 2));
+    return false;
+  }
+  return true;
 }
 function writeFileSync(path, content) {
-  fs.writeFileSync(path, content, { encoding: "utf-8" });
+  fs__default.writeFileSync(path, content, { encoding: "utf-8" });
 }
 
 async function parseSFC(code) {
@@ -169,7 +188,7 @@ function parseCustomBlock(block, filePath, options) {
   debug.routeBlock(`use ${lang} parser`);
   if (lang === "json5") {
     try {
-      content = JSON5.parse(block.content);
+      content = JSON5__default.parse(block.content);
     } catch (err) {
       throw new Error(
         `Invalid JSON5 format of <${block.type}> content in ${filePath}
@@ -203,7 +222,7 @@ ${err.message}`
   }
 }
 async function getRouteBlock(path, options) {
-  const content = fs.readFileSync(path, "utf8");
+  const content = fs__default.readFileSync(path, "utf8");
   const parsedSFC = await parseSFC(content);
   const blockStr = parsedSFC?.customBlocks.find((b) => b.type === "route");
   if (!blockStr)
@@ -221,7 +240,7 @@ class PageContext {
     this.root = slash(viteRoot);
     debug.options("root", this.root);
     this.options = resolveOptions(userOptions, this.root);
-    this.resolvedPagesJSONPath = path.join(this.root, this.options.outDir, OUTPUT_NAME);
+    this.resolvedPagesJSONPath = path__default.join(this.root, this.options.outDir, OUTPUT_NAME);
     debug.options(this.options);
   }
   setLogger(logger) {
@@ -238,13 +257,13 @@ class PageContext {
   }
   async scanPages() {
     const pageDirFiles = this.options.dirs.map((dir) => {
-      const pagesDirPath = slash(path.resolve(this.options.root, dir));
-      const basePath = slash(path.join(this.options.root, this.options.outDir));
+      const pagesDirPath = slash(path__default.resolve(this.options.root, dir));
+      const basePath = slash(path__default.join(this.options.root, this.options.outDir));
       const files = getPageFiles(pagesDirPath, this.options);
       debug.pages(dir, files);
       const pagePaths = files.map((file) => slash(file)).map((file) => ({
-        relativePath: path.relative(basePath, slash(path.resolve(pagesDirPath, file))),
-        absolutePath: slash(path.resolve(pagesDirPath, file))
+        relativePath: path__default.relative(basePath, slash(path__default.resolve(pagesDirPath, file))),
+        absolutePath: slash(path__default.resolve(pagesDirPath, file))
       }));
       return { dir, files: pagePaths };
     });
@@ -258,7 +277,7 @@ class PageContext {
     this.setupWatcher(server.watcher);
   }
   async setupWatcher(watcher) {
-    if (process.env.UNI_PLATFORM !== "h5") {
+    if (!uniEnv.isH5) {
       const configs = await getPagesConfigSourcePaths();
       watcher.add(configs);
     }
@@ -299,7 +318,7 @@ class PageContext {
   async parsePage(page) {
     const { relativePath, absolutePath } = page;
     const routeBlock = await getRouteBlock(absolutePath, this.options);
-    const relativePathWithFileName = relativePath.replace(path.extname(relativePath), "");
+    const relativePathWithFileName = relativePath.replace(path__default.extname(relativePath), "");
     const pageMetaDatum = { path: vite.normalizePath(relativePathWithFileName), type: routeBlock?.attr.type ?? "page" };
     if (routeBlock)
       Object.assign(pageMetaDatum, routeBlock.content);
@@ -335,7 +354,7 @@ class PageContext {
     await this.mergePageMetaData();
     this.options.onAfterMergePageMetaData(this);
     this.options.onBeforeWriteFile(this);
-    const pagesJson = JSON.stringify({ ...this.pagesGlobConfig, pages: this.pageMetaData }, null, 2);
+    const pagesJson = JSON.stringify({ ...this.pagesGlobConfig, pages: this.pageMetaData }, null, this.options.minify ? void 0 : 2);
     writeFileSync(this.resolvedPagesJSONPath, pagesJson);
     this.options.onAfterWriteFile(this);
   }
@@ -351,25 +370,57 @@ function defineUniPages(config) {
   return config;
 }
 
+async function restart() {
+  return new Promise((resolve) => {
+    const build = child_process.spawn(process.argv.shift(), process.argv, {
+      cwd: 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));
+    });
+  });
+}
 const VitePluginUniPages = (userOptions = {}) => {
   let ctx;
-  const resolvedPagesJSONPath = path.join(process.cwd(), userOptions.outDir ?? "src", OUTPUT_NAME);
-  checkPagesJsonFile(resolvedPagesJSONPath);
+  const resolvedPagesJSONPath = path__default$1.join(
+    process.cwd(),
+    userOptions.outDir ?? "src",
+    OUTPUT_NAME
+  );
+  const isValidated = checkPagesJsonFile(resolvedPagesJSONPath);
   return {
     name: "vite-plugin-uni-pages",
     enforce: "pre",
     async configResolved(config) {
       ctx = new PageContext(userOptions, config.root);
-      ctx.setLogger(config.logger);
-      ctx.updatePagesJSON();
-      if (config.build.watch && config.command === "build")
-        ctx.setupWatcher(chokidar.watch(ctx.options.dirs));
+      const logger = vite.createLogger(void 0, {
+        prefix: "[vite-plugin-uni-pages]"
+      });
+      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));
+      }
     },
+    // Applet do not support custom route block, so we need to remove the route block here
     async transform(code, id) {
       if (!/\.vue$/.test(id))
         return null;
-      const s = new MagicString(code.toString());
-      const routeBlockMatches = s.original.matchAll(/<route[^>]*>([\s\S]*?)<\/route>/g);
+      const s = new MagicString__default(code.toString());
+      const routeBlockMatches = s.original.matchAll(
+        /<route[^>]*>([\s\S]*?)<\/route>/g
+      );
       for (const match of routeBlockMatches) {
         const index = match.index;
         const length = match[0].length;

package/dist/index.d.ts

@@ -8,8 +8,11 @@ interface EasyCom {
     custom: Record<string, string>;
 }
 
+type RGBColor = `rgb(${number}, ${number}, ${number})`;
+type RGBAColor = `rgba(${number}, ${number}, ${number}, ${number})`;
 type HEXColor = `#${string}`;
 type ThemeColor = `@${string}`;
+type Color = RGBColor | RGBAColor | HEXColor;
 
 interface AppPlus {
     /**
@@ -414,15 +417,15 @@ interface TabBar {
     /**
      * tab 上的文字默认颜色
      */
-    color?: HEXColor;
+    color?: Color;
     /**
      * tab 上的文字选中时的颜色
      */
-    selectedColor?: HEXColor;
+    selectedColor?: Color;
     /**
      * tab 的背景色
      */
-    backgroundColor?: HEXColor;
+    backgroundColor?: Color;
     /**
      * tabbar 上边框的颜色，可选值 black/white，也支持其他颜色值
      * @default "black"
@@ -686,6 +689,11 @@ interface Options {
      * @default 'json5'
      */
     routeBlockLang: 'json5' | 'json' | 'yaml' | 'yml';
+    /**
+     * minify the `pages.json`
+     * @default false
+     */
+    minify: boolean;
     onBeforeLoadUserConfig: (ctx: PageContext) => void;
     onAfterLoadUserConfig: (ctx: PageContext) => void;
     onBeforeScanPages: (ctx: PageContext) => void;
@@ -756,7 +764,7 @@ declare const getPagesConfigSourcePaths: () => Promise<string[]>;
  * Resolves the files that are valid pages for the given context.
  */
 declare function getPageFiles(path: string, options: ResolvedOptions): string[];
-declare function checkPagesJsonFile(path: string): void;
+declare function checkPagesJsonFile(path: string): boolean;
 declare function writeFileSync(path: string, content: string): void;
 
 declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): ResolvedOptions;

package/dist/index.mjs

@@ -1,10 +1,13 @@
-import path from 'path';
+import path$1 from 'path';
+import { spawn } from 'child_process';
+import { normalizePath, createLogger } from 'vite';
 import MagicString from 'magic-string';
 import chokidar from 'chokidar';
-import { normalizePath } from 'vite';
+import path from 'node:path';
 import { loadConfig } from 'unconfig';
+import { isH5 } from '@uni-helper/uni-env';
 import Debug from 'debug';
-import { groupBy } from 'lodash';
+import { groupBy } from 'lodash-unified';
 import fg from 'fast-glob';
 import fs from 'fs';
 import JSON5 from 'json5';
@@ -76,6 +79,7 @@ function resolveOptions(userOptions, viteRoot) {
     outDir = "src",
     exclude = ["node_modules", ".git", "**/__*__/**"],
     routeBlockLang = "json5",
+    minify = false,
     onBeforeLoadUserConfig = () => {
     },
     onAfterLoadUserConfig = () => {
@@ -102,6 +106,7 @@ function resolveOptions(userOptions, viteRoot) {
     exclude,
     routeBlockLang,
     root,
+    minify,
     onBeforeLoadUserConfig,
     onAfterLoadUserConfig,
     onBeforeScanPages,
@@ -135,8 +140,11 @@ function getPageFiles(path, options) {
   return files;
 }
 function checkPagesJsonFile(path) {
-  if (!fs.existsSync(path))
+  if (!fs.existsSync(path)) {
     writeFileSync(path, JSON.stringify({ pages: [{ path: "" }] }, null, 2));
+    return false;
+  }
+  return true;
 }
 function writeFileSync(path, content) {
   fs.writeFileSync(path, content, { encoding: "utf-8" });
@@ -254,7 +262,7 @@ class PageContext {
     this.setupWatcher(server.watcher);
   }
   async setupWatcher(watcher) {
-    if (process.env.UNI_PLATFORM !== "h5") {
+    if (!isH5) {
       const configs = await getPagesConfigSourcePaths();
       watcher.add(configs);
     }
@@ -331,7 +339,7 @@ class PageContext {
     await this.mergePageMetaData();
     this.options.onAfterMergePageMetaData(this);
     this.options.onBeforeWriteFile(this);
-    const pagesJson = JSON.stringify({ ...this.pagesGlobConfig, pages: this.pageMetaData }, null, 2);
+    const pagesJson = JSON.stringify({ ...this.pagesGlobConfig, pages: this.pageMetaData }, null, this.options.minify ? void 0 : 2);
     writeFileSync(this.resolvedPagesJSONPath, pagesJson);
     this.options.onAfterWriteFile(this);
   }
@@ -347,25 +355,57 @@ function defineUniPages(config) {
   return config;
 }
 
+async function restart() {
+  return new Promise((resolve) => {
+    const build = spawn(process.argv.shift(), process.argv, {
+      cwd: 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));
+    });
+  });
+}
 const VitePluginUniPages = (userOptions = {}) => {
   let ctx;
-  const resolvedPagesJSONPath = path.join(process.cwd(), userOptions.outDir ?? "src", OUTPUT_NAME);
-  checkPagesJsonFile(resolvedPagesJSONPath);
+  const resolvedPagesJSONPath = path$1.join(
+    process.cwd(),
+    userOptions.outDir ?? "src",
+    OUTPUT_NAME
+  );
+  const isValidated = checkPagesJsonFile(resolvedPagesJSONPath);
   return {
     name: "vite-plugin-uni-pages",
     enforce: "pre",
     async configResolved(config) {
       ctx = new PageContext(userOptions, config.root);
-      ctx.setLogger(config.logger);
-      ctx.updatePagesJSON();
-      if (config.build.watch && config.command === "build")
-        ctx.setupWatcher(chokidar.watch(ctx.options.dirs));
+      const logger = createLogger(void 0, {
+        prefix: "[vite-plugin-uni-pages]"
+      });
+      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));
+      }
     },
+    // Applet do not support custom route block, so we need to remove the route block here
     async transform(code, id) {
       if (!/\.vue$/.test(id))
         return null;
       const s = new MagicString(code.toString());
-      const routeBlockMatches = s.original.matchAll(/<route[^>]*>([\s\S]*?)<\/route>/g);
+      const routeBlockMatches = s.original.matchAll(
+        /<route[^>]*>([\s\S]*?)<\/route>/g
+      );
       for (const match of routeBlockMatches) {
         const index = match.index;
         const length = match[0].length;

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@uni-helper/vite-plugin-uni-pages",
   "type": "module",
-  "version": "0.1.5",
-  "packageManager": "pnpm@7.16.1",
+  "version": "0.1.7",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
   "license": "MIT",
@@ -32,22 +31,22 @@
     "client.d.ts"
   ],
   "dependencies": {
-    "@vue/compiler-sfc": "^3.2.45",
+    "@uni-helper/uni-env": "^0.0.2",
+    "@vue/compiler-sfc": "^3.2.47",
     "chokidar": "^3.5.3",
     "debug": "^4.3.4",
     "fast-glob": "^3.2.12",
     "json5": "^2.2.3",
-    "lodash": "^4.17.21",
-    "magic-string": "^0.27.0",
+    "lodash-unified": "^1.0.3",
+    "magic-string": "^0.30.0",
     "unconfig": "^0.3.7",
     "yaml": "^2.2.1"
   },
   "devDependencies": {
     "@antfu/utils": "^0.7.2",
     "@types/debug": "^4.1.7",
-    "@types/lodash": "^4.14.191",
-    "@types/node": "^18.11.18",
-    "vite": "^4.0.3"
+    "@types/node": "^18.15.11",
+    "vite": "^4.2.1"
   },
   "scripts": {
     "build": "unbuild",