vite-plugin-mock-dev-server 1.4.1 → 1.4.2

package/README.md

@@ -232,6 +232,11 @@ export default defineConfig({
      * @default 'mockServer'
      */
     dist?: string
+    /**
+     * log level
+     * @default 'error'
+     */
+    log?: LogLevel
   }
   ```
 

package/README.zh-CN.md

@@ -227,6 +227,12 @@ export default defineConfig({
      * @default 'mockServer'
      */
     dist?: string
+
+    /**
+     * 日志级别
+     * @default 'error'
+     */
+    log?: LogLevel
   }
   ```
 

package/dist/index.cjs

@@ -59,11 +59,11 @@ var import_node_process2 = __toESM(require("process"), 1);
 var import_utils3 = require("@pengzhanbo/utils");
 var import_fast_glob = __toESM(require("fast-glob"), 1);
 var import_is_core_module = __toESM(require("is-core-module"), 1);
-var import_vite = require("vite");
+var import_pluginutils = require("@rollup/pluginutils");
 
 // package.json
 var name = "vite-plugin-mock-dev-server";
-var version = "1.4.1";
+var version = "1.4.2";
 
 // src/compiler.ts
 var import_node_fs2 = __toESM(require("fs"), 1);
@@ -78,6 +78,7 @@ var import_node_fs = __toESM(require("fs"), 1);
 var import_node_path = __toESM(require("path"), 1);
 var import_node_querystring = require("querystring");
 var import_node_url = require("url");
+var import_node_os = __toESM(require("os"), 1);
 var import_debug = __toESM(require("debug"), 1);
 var import_path_to_regexp = require("path-to-regexp");
 function isStream(stream) {
@@ -131,6 +132,14 @@ function urlParse(input) {
   const query = (0, import_node_querystring.parse)(url.search.replace(/^\?/, ""));
   return { pathname, query };
 }
+var windowsSlashRE = /\\/g;
+var isWindows = import_node_os.default.platform() === "win32";
+function slash(p) {
+  return p.replace(windowsSlashRE, "/");
+}
+function normalizePath(id) {
+  return import_node_path.default.posix.normalize(isWindows ? slash(id) : id);
+}
 
 // src/compiler.ts
 var externalizeDeps = {
@@ -401,7 +410,7 @@ async function generateMockServer(ctx, config, options) {
         wsProxies,
         options.cookiesOptions,
         options.priority,
-        options.build.serverPort
+        options.build
       )
     },
     {
@@ -411,7 +420,8 @@ async function generateMockServer(ctx, config, options) {
   ];
   try {
     if (import_node_path3.default.isAbsolute(outputDir)) {
-      await import_promises.default.rm(outputDir, { recursive: true });
+      for (const { filename } of outputList)
+        await import_promises.default.rm(filename);
       import_node_fs3.default.mkdirSync(outputDir, { recursive: true });
       for (const { filename, source } of outputList)
         await import_promises.default.writeFile(filename, source, "utf-8");
@@ -461,7 +471,8 @@ function generatePackageJson(pkg, mockDeps) {
   });
   return JSON.stringify(mockPkg, null, 2);
 }
-function generatorServerEntryCode(httpProxies, wsProxies, cookiesOptions = {}, priority = {}, port = 8080) {
+function generatorServerEntryCode(httpProxies, wsProxies, cookiesOptions = {}, priority = {}, build2) {
+  const { serverPort, log } = build2;
   return `import { createServer } from 'node:http';
 import connect from 'connect';
 import corsMiddleware from 'cors';
@@ -470,7 +481,7 @@ import mockData from './mock-data.js';
 
 const app = connect();
 const server = createServer(app);
-const logger = createLogger('mock-server', 'error');
+const logger = createLogger('mock-server', '${log}');
 const httpProxies = ${JSON.stringify(httpProxies)};
 const wsProxies = ${JSON.stringify(wsProxies)};
 const cookiesOptions = ${JSON.stringify(cookiesOptions)};
@@ -493,21 +504,21 @@ app.use(baseMiddleware({ mockData }, {
   logger,
 }));
 
-server.listen(${port});
+server.listen(${serverPort});
 
-console.log('listen: http://localhost:${port}');
+console.log('listen: http://localhost:${serverPort}');
 `;
 }
 async function generateMockEntryCode(cwd, include, exclude) {
   const includePaths = await (0, import_fast_glob.default)(include, { cwd });
-  const includeFilter = (0, import_vite.createFilter)(include, exclude, {
+  const includeFilter = (0, import_pluginutils.createFilter)(include, exclude, {
     resolve: false
   });
   const mockFiles = includePaths.filter(includeFilter);
   let importers = "";
   let exporters = "";
   mockFiles.forEach((filepath, index) => {
-    const file = (0, import_vite.normalizePath)(import_node_path3.default.join(cwd, filepath));
+    const file = normalizePath(import_node_path3.default.join(cwd, filepath));
     importers += `import * as m${index} from '${file}';
 `;
     exporters += `m${index}, `;
@@ -968,7 +979,7 @@ async function provideHeaders(req, res, mock, logger) {
   contentType2 && res.setHeader("Content-Type", contentType2);
   res.setHeader("Cache-Control", "no-cache,max-age=0");
   res.setHeader("X-Mock-Power-By", "vite-plugin-mock-dev-server");
-  res.setHeader("X-File-Path", filepath);
+  filepath && res.setHeader("X-File-Path", filepath);
   if (!headers)
     return;
   try {
@@ -1061,7 +1072,7 @@ var import_node_process3 = __toESM(require("process"), 1);
 var import_utils11 = require("@pengzhanbo/utils");
 var import_chokidar = __toESM(require("chokidar"), 1);
 var import_fast_glob2 = __toESM(require("fast-glob"), 1);
-var import_vite2 = require("vite");
+var import_pluginutils2 = require("@rollup/pluginutils");
 
 // src/transform.ts
 var import_utils9 = require("@pengzhanbo/utils");
@@ -1144,7 +1155,7 @@ var MockLoader = class extends import_node_events.default {
   }
   load() {
     const { include, exclude } = this.options;
-    const includeFilter = (0, import_vite2.createFilter)(include, exclude, {
+    const includeFilter = (0, import_pluginutils2.createFilter)(include, exclude, {
       resolve: false
     });
     (0, import_fast_glob2.default)(include, { cwd: this.cwd }).then(
@@ -1181,17 +1192,17 @@ var MockLoader = class extends import_node_events.default {
     });
     otherGlob.length > 0 && otherGlob.forEach((glob) => watcher.add(glob));
     watcher.on("add", async (filepath) => {
-      filepath = (0, import_vite2.normalizePath)(filepath);
+      filepath = normalizePath(filepath);
       this.emit("mock:update", filepath);
       debug("watcher:add", filepath);
     });
     watcher.on("change", async (filepath) => {
-      filepath = (0, import_vite2.normalizePath)(filepath);
+      filepath = normalizePath(filepath);
       this.emit("mock:update", filepath);
       debug("watcher:change", filepath);
     });
     watcher.on("unlink", async (filepath) => {
-      filepath = (0, import_vite2.normalizePath)(filepath);
+      filepath = normalizePath(filepath);
       this.emit("mock:unlink", filepath);
       debug("watcher:unlink", filepath);
     });
@@ -1207,14 +1218,14 @@ var MockLoader = class extends import_node_events.default {
       cwd: this.cwd
     });
     this.depsWatcher.on("change", (filepath) => {
-      filepath = (0, import_vite2.normalizePath)(filepath);
+      filepath = normalizePath(filepath);
       const mockFiles = this.moduleDeps.get(filepath);
       mockFiles && mockFiles.forEach((file) => {
         this.emit("mock:update", file);
       });
     });
     this.depsWatcher.on("unlink", (filepath) => {
-      filepath = (0, import_vite2.normalizePath)(filepath);
+      filepath = normalizePath(filepath);
       this.moduleDeps.delete(filepath);
     });
     this.on("update:deps", () => {
@@ -1562,7 +1573,8 @@ function mockDevServerPlugin({
     build: build2 ? Object.assign(
       {
         serverPort: 8080,
-        dist: "mockServer"
+        dist: "mockServer",
+        log: "error"
       },
       typeof build2 === "object" ? build2 : {}
     ) : false

package/dist/index.d.cts

@@ -208,6 +208,13 @@ interface ServerBuildOption {
      * @default 'dist/mockServer'
      */
     dist?: string;
+    /**
+     * Service application log level
+     *
+     * 服务应用日志级别
+     * @default 'error'
+     */
+    log?: LogLevel;
 }
 type Method = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | 'TRACE' | 'OPTIONS';
 type Headers = http.IncomingHttpHeaders;

package/dist/index.d.ts

@@ -208,6 +208,13 @@ interface ServerBuildOption {
      * @default 'dist/mockServer'
      */
     dist?: string;
+    /**
+     * Service application log level
+     *
+     * 服务应用日志级别
+     * @default 'error'
+     */
+    log?: LogLevel;
 }
 type Method = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | 'TRACE' | 'OPTIONS';
 type Headers = http.IncomingHttpHeaders;

package/dist/index.js

@@ -9,11 +9,11 @@ import process2 from "node:process";
 import { toArray } from "@pengzhanbo/utils";
 import fg from "fast-glob";
 import isCore from "is-core-module";
-import { createFilter, normalizePath } from "vite";
+import { createFilter } from "@rollup/pluginutils";
 
 // package.json
 var name = "vite-plugin-mock-dev-server";
-var version = "1.4.1";
+var version = "1.4.2";
 
 // src/compiler.ts
 import fs2, { promises as fsp } from "node:fs";
@@ -28,6 +28,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { parse as queryParse } from "node:querystring";
 import { URL as URL2, fileURLToPath } from "node:url";
+import os from "node:os";
 import Debug from "debug";
 import { match } from "path-to-regexp";
 function isStream(stream) {
@@ -81,6 +82,14 @@ function urlParse(input) {
   const query = queryParse(url.search.replace(/^\?/, ""));
   return { pathname, query };
 }
+var windowsSlashRE = /\\/g;
+var isWindows = os.platform() === "win32";
+function slash(p) {
+  return p.replace(windowsSlashRE, "/");
+}
+function normalizePath(id) {
+  return path.posix.normalize(isWindows ? slash(id) : id);
+}
 
 // src/compiler.ts
 var externalizeDeps = {
@@ -351,7 +360,7 @@ async function generateMockServer(ctx, config, options) {
         wsProxies,
         options.cookiesOptions,
         options.priority,
-        options.build.serverPort
+        options.build
       )
     },
     {
@@ -361,7 +370,8 @@ async function generateMockServer(ctx, config, options) {
   ];
   try {
     if (path3.isAbsolute(outputDir)) {
-      await fsp2.rm(outputDir, { recursive: true });
+      for (const { filename } of outputList)
+        await fsp2.rm(filename);
       fs3.mkdirSync(outputDir, { recursive: true });
       for (const { filename, source } of outputList)
         await fsp2.writeFile(filename, source, "utf-8");
@@ -411,7 +421,8 @@ function generatePackageJson(pkg, mockDeps) {
   });
   return JSON.stringify(mockPkg, null, 2);
 }
-function generatorServerEntryCode(httpProxies, wsProxies, cookiesOptions = {}, priority = {}, port = 8080) {
+function generatorServerEntryCode(httpProxies, wsProxies, cookiesOptions = {}, priority = {}, build2) {
+  const { serverPort, log } = build2;
   return `import { createServer } from 'node:http';
 import connect from 'connect';
 import corsMiddleware from 'cors';
@@ -420,7 +431,7 @@ import mockData from './mock-data.js';
 
 const app = connect();
 const server = createServer(app);
-const logger = createLogger('mock-server', 'error');
+const logger = createLogger('mock-server', '${log}');
 const httpProxies = ${JSON.stringify(httpProxies)};
 const wsProxies = ${JSON.stringify(wsProxies)};
 const cookiesOptions = ${JSON.stringify(cookiesOptions)};
@@ -443,9 +454,9 @@ app.use(baseMiddleware({ mockData }, {
   logger,
 }));
 
-server.listen(${port});
+server.listen(${serverPort});
 
-console.log('listen: http://localhost:${port}');
+console.log('listen: http://localhost:${serverPort}');
 `;
 }
 async function generateMockEntryCode(cwd, include, exclude) {
@@ -931,7 +942,7 @@ async function provideHeaders(req, res, mock, logger) {
   contentType2 && res.setHeader("Content-Type", contentType2);
   res.setHeader("Cache-Control", "no-cache,max-age=0");
   res.setHeader("X-Mock-Power-By", "vite-plugin-mock-dev-server");
-  res.setHeader("X-File-Path", filepath);
+  filepath && res.setHeader("X-File-Path", filepath);
   if (!headers)
     return;
   try {
@@ -1024,7 +1035,7 @@ import process3 from "node:process";
 import { hasOwn, isArray as isArray5, promiseParallel, toArray as toArray2 } from "@pengzhanbo/utils";
 import chokidar from "chokidar";
 import fastGlob from "fast-glob";
-import { createFilter as createFilter2, normalizePath as normalizePath2 } from "vite";
+import { createFilter as createFilter2 } from "@rollup/pluginutils";
 
 // src/transform.ts
 import {
@@ -1150,17 +1161,17 @@ var MockLoader = class extends EventEmitter {
     });
     otherGlob.length > 0 && otherGlob.forEach((glob) => watcher.add(glob));
     watcher.on("add", async (filepath) => {
-      filepath = normalizePath2(filepath);
+      filepath = normalizePath(filepath);
       this.emit("mock:update", filepath);
       debug("watcher:add", filepath);
     });
     watcher.on("change", async (filepath) => {
-      filepath = normalizePath2(filepath);
+      filepath = normalizePath(filepath);
       this.emit("mock:update", filepath);
       debug("watcher:change", filepath);
     });
     watcher.on("unlink", async (filepath) => {
-      filepath = normalizePath2(filepath);
+      filepath = normalizePath(filepath);
       this.emit("mock:unlink", filepath);
       debug("watcher:unlink", filepath);
     });
@@ -1176,14 +1187,14 @@ var MockLoader = class extends EventEmitter {
       cwd: this.cwd
     });
     this.depsWatcher.on("change", (filepath) => {
-      filepath = normalizePath2(filepath);
+      filepath = normalizePath(filepath);
       const mockFiles = this.moduleDeps.get(filepath);
       mockFiles && mockFiles.forEach((file) => {
         this.emit("mock:update", file);
       });
     });
     this.depsWatcher.on("unlink", (filepath) => {
-      filepath = normalizePath2(filepath);
+      filepath = normalizePath(filepath);
       this.moduleDeps.delete(filepath);
     });
     this.on("update:deps", () => {
@@ -1531,7 +1542,8 @@ function mockDevServerPlugin({
     build: build2 ? Object.assign(
       {
         serverPort: 8080,
-        dist: "mockServer"
+        dist: "mockServer",
+        log: "error"
       },
       typeof build2 === "object" ? build2 : {}
     ) : false

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-plugin-mock-dev-server",
   "type": "module",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "packageManager": "pnpm@8.11.0",
   "author": "pengzhanbo <q942450674@outlook.com> (https://github.com/pengzhanbo)",
   "license": "MIT",
@@ -44,6 +44,7 @@
   },
   "dependencies": {
     "@pengzhanbo/utils": "^1.1.1",
+    "@rollup/pluginutils": "^5.1.0",
     "chokidar": "^3.5.3",
     "co-body": "^6.1.0",
     "cookies": "^0.8.0",