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

package/dist/index.cjs

@@ -7,6 +7,7 @@ const node_child_process = require('node:child_process');
 const vite = require('vite');
 const MagicString = require('magic-string');
 const chokidar = require('chokidar');
+const process$1 = require('node:process');
 const unconfig = require('unconfig');
 const uniEnv = require('@uni-helper/uni-env');
 const Debug = require('debug');
@@ -22,6 +23,7 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
 const chokidar__default = /*#__PURE__*/_interopDefaultCompat(chokidar);
+const process__default = /*#__PURE__*/_interopDefaultCompat(process$1);
 const Debug__default = /*#__PURE__*/_interopDefaultCompat(Debug);
 const fg__default = /*#__PURE__*/_interopDefaultCompat(fg);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
@@ -202,7 +204,7 @@ function resolveOptions(userOptions, viteRoot) {
     onAfterWriteFile = () => {
     }
   } = userOptions;
-  const root = viteRoot || slash(process.cwd());
+  const root = viteRoot || slash(process__default.cwd());
   const resolvedDirs = resolvePageDirs(dir, root, exclude);
   const resolvedSubDirs = subPackages.map((dir2) => slash(dir2));
   const ResolvedHomePage = typeof homePage === "string" ? [homePage] : homePage;
@@ -263,7 +265,7 @@ function writeFileSync(path, content) {
 let lsatPagesJson = "";
 const { setCache, hasChanged } = useCachedPages();
 class PageContext {
-  constructor(userOptions, viteRoot = process.cwd()) {
+  constructor(userOptions, viteRoot = process__default.cwd()) {
     this.pagesPath = [];
     this.subPagesPath = {};
     this.pageMetaData = [];
@@ -286,10 +288,10 @@ class PageContext {
     this.logger = logger;
   }
   async loadUserPagesConfig() {
-    const { config } = await unconfig.loadConfig({ sources: [{ files: "pages.config" }] });
+    const { config } = await unconfig.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.exit(-1);
+      process__default.exit(-1);
     }
     this.pagesGlobConfig = config;
     debug.options(config);
@@ -321,10 +323,14 @@ class PageContext {
       const configs = await getPagesConfigSourcePaths();
       watcher.add(configs);
     }
+    const targetDirs = [...this.options.dirs, ...this.options.subPackages].map((v) => slash(path__default.resolve(this.root, v)));
+    const isInTargetDirs = (path2) => targetDirs.some((v) => path2.startsWith(v));
     watcher.on("add", async (path2) => {
       path2 = slash(path2);
       if (!isTargetFile(path2))
         return;
+      if (!isInTargetDirs(path2))
+        return;
       debug.pages(`File added: ${path2}`);
       if (await this.updatePagesJSON())
         this.onUpdate();
@@ -333,7 +339,11 @@ class PageContext {
       path2 = slash(path2);
       if (!isTargetFile(path2) && !isConfigFile(path2))
         return;
+      if (!isInTargetDirs(path2))
+        return;
       debug.pages(`File changed: ${path2}`);
+      debug.pages(targetDirs);
+      debug.pages(isInTargetDirs(path2));
       if (await this.updatePagesJSON(path2))
         this.onUpdate();
     });
@@ -341,6 +351,8 @@ class PageContext {
       path2 = slash(path2);
       if (!isTargetFile(path2))
         return;
+      if (!isInTargetDirs(path2))
+        return;
       debug.pages(`File removed: ${path2}`);
       if (await this.updatePagesJSON())
         this.onUpdate();
@@ -534,11 +546,9 @@ function VitePluginUniPages(userOptions = {}) {
     },
     // Applet do not support custom route block, so we need to remove the route block here
     async transform(code, id) {
-      if (!/\.vue$/.test(id))
+      if (!/\.n?vue$/.test(id) && !code.includes("</route>"))
         return null;
-      const s = new MagicString__default(code.toString(), {
-        filename: id
-      });
+      const s = new MagicString__default(code);
       const routeBlockMatches = s.original.matchAll(
         /<route[^>]*>([\s\S]*?)<\/route>/g
       );
@@ -547,12 +557,16 @@ function VitePluginUniPages(userOptions = {}) {
         const length = match[0].length;
         s.remove(index, index + length);
       }
-      return {
-        code: s.toString(),
-        map: s.generateMap({
-          source: code
-        })
-      };
+      if (s.hasChanged()) {
+        return {
+          code: s.toString(),
+          map: s.generateMap({
+            source: code,
+            includeContent: true,
+            file: id
+          })
+        };
+      }
     },
     configureServer(server) {
       ctx.setupViteServer(server);

package/dist/index.mjs

@@ -3,6 +3,7 @@ import { spawn } from 'node:child_process';
 import { normalizePath, createLogger } from 'vite';
 import MagicString from 'magic-string';
 import chokidar from 'chokidar';
+import process$1 from 'node:process';
 import { loadConfig } from 'unconfig';
 import { isH5 } from '@uni-helper/uni-env';
 import Debug from 'debug';
@@ -188,7 +189,7 @@ function resolveOptions(userOptions, viteRoot) {
     onAfterWriteFile = () => {
     }
   } = userOptions;
-  const root = viteRoot || slash(process.cwd());
+  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;
@@ -249,7 +250,7 @@ function writeFileSync(path, content) {
 let lsatPagesJson = "";
 const { setCache, hasChanged } = useCachedPages();
 class PageContext {
-  constructor(userOptions, viteRoot = process.cwd()) {
+  constructor(userOptions, viteRoot = process$1.cwd()) {
     this.pagesPath = [];
     this.subPagesPath = {};
     this.pageMetaData = [];
@@ -272,10 +273,10 @@ class PageContext {
     this.logger = logger;
   }
   async loadUserPagesConfig() {
-    const { config } = await loadConfig({ sources: [{ files: "pages.config" }] });
+    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.exit(-1);
+      process$1.exit(-1);
     }
     this.pagesGlobConfig = config;
     debug.options(config);
@@ -307,10 +308,14 @@ class PageContext {
       const configs = await getPagesConfigSourcePaths();
       watcher.add(configs);
     }
+    const targetDirs = [...this.options.dirs, ...this.options.subPackages].map((v) => slash(path.resolve(this.root, v)));
+    const isInTargetDirs = (path2) => targetDirs.some((v) => path2.startsWith(v));
     watcher.on("add", async (path2) => {
       path2 = slash(path2);
       if (!isTargetFile(path2))
         return;
+      if (!isInTargetDirs(path2))
+        return;
       debug.pages(`File added: ${path2}`);
       if (await this.updatePagesJSON())
         this.onUpdate();
@@ -319,7 +324,11 @@ class PageContext {
       path2 = slash(path2);
       if (!isTargetFile(path2) && !isConfigFile(path2))
         return;
+      if (!isInTargetDirs(path2))
+        return;
       debug.pages(`File changed: ${path2}`);
+      debug.pages(targetDirs);
+      debug.pages(isInTargetDirs(path2));
       if (await this.updatePagesJSON(path2))
         this.onUpdate();
     });
@@ -327,6 +336,8 @@ class PageContext {
       path2 = slash(path2);
       if (!isTargetFile(path2))
         return;
+      if (!isInTargetDirs(path2))
+        return;
       debug.pages(`File removed: ${path2}`);
       if (await this.updatePagesJSON())
         this.onUpdate();
@@ -520,11 +531,9 @@ function VitePluginUniPages(userOptions = {}) {
     },
     // Applet do not support custom route block, so we need to remove the route block here
     async transform(code, id) {
-      if (!/\.vue$/.test(id))
+      if (!/\.n?vue$/.test(id) && !code.includes("</route>"))
         return null;
-      const s = new MagicString(code.toString(), {
-        filename: id
-      });
+      const s = new MagicString(code);
       const routeBlockMatches = s.original.matchAll(
         /<route[^>]*>([\s\S]*?)<\/route>/g
       );
@@ -533,12 +542,16 @@ function VitePluginUniPages(userOptions = {}) {
         const length = match[0].length;
         s.remove(index, index + length);
       }
-      return {
-        code: s.toString(),
-        map: s.generateMap({
-          source: code
-        })
-      };
+      if (s.hasChanged()) {
+        return {
+          code: s.toString(),
+          map: s.generateMap({
+            source: code,
+            includeContent: true,
+            file: id
+          })
+        };
+      }
     },
     configureServer(server) {
       ctx.setupViteServer(server);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uni-helper/vite-plugin-uni-pages",
   "type": "module",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
   "license": "MIT",
@@ -32,20 +32,20 @@
   ],
   "dependencies": {
     "@uni-helper/uni-env": "^0.0.3",
-    "@vue/compiler-sfc": "^3.3.1",
+    "@vue/compiler-sfc": "^3.3.4",
     "chokidar": "^3.5.3",
     "debug": "^4.3.4",
-    "fast-glob": "^3.2.12",
+    "fast-glob": "^3.3.1",
     "json5": "^2.2.3",
     "lodash-unified": "^1.0.3",
-    "magic-string": "^0.30.0",
-    "unconfig": "^0.3.7",
-    "yaml": "^2.2.2"
+    "magic-string": "^0.30.2",
+    "unconfig": "^0.3.10",
+    "yaml": "^2.3.1"
   },
   "devDependencies": {
-    "@antfu/utils": "^0.7.2",
-    "@types/debug": "^4.1.7",
-    "@types/node": "^18.16.8"
+    "@antfu/utils": "^0.7.5",
+    "@types/debug": "^4.1.8",
+    "@types/node": "^18.17.1"
   },
   "scripts": {
     "build": "unbuild",