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

package/dist/index.cjs

@@ -32,9 +32,11 @@ var src_exports = {};
 __export(src_exports, {
   baseMiddleware: () => baseMiddleware,
   createDefineMock: () => createDefineMock,
+  createLogger: () => createLogger,
   default: () => src_default,
   defineMock: () => defineMock,
   defineMockData: () => defineMockData,
+  logLevels: () => logLevels,
   mockDevServerPlugin: () => mockDevServerPlugin,
   mockWebSocket: () => mockWebSocket,
   sortByValidator: () => sortByValidator,
@@ -42,7 +44,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
-// node_modules/.pnpm/tsup@8.0.1_typescript@5.3.2/node_modules/tsup/assets/cjs_shims.js
+// node_modules/.pnpm/tsup@8.0.1_typescript@5.3.3/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl = () => typeof document === "undefined" ? new URL("file:" + __filename).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
 var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 
@@ -61,7 +63,7 @@ var import_vite = require("vite");
 
 // package.json
 var name = "vite-plugin-mock-dev-server";
-var version = "1.4.0";
+var version = "1.4.1";
 
 // src/compiler.ts
 var import_node_fs2 = __toESM(require("fs"), 1);
@@ -169,7 +171,7 @@ function aliasPlugin(alias) {
     name: "alias-plugin",
     setup(build2) {
       build2.onResolve({ filter: /.*/ }, async ({ path: id }) => {
-        const matchedEntry = alias.find(({ find: find2 }) => matches(find2, id));
+        const matchedEntry = alias.find(({ find: find2 }) => aliasMatches(find2, id));
         if (!matchedEntry)
           return null;
         const { find, replacement } = matchedEntry;
@@ -186,7 +188,7 @@ function aliasPlugin(alias) {
     }
   };
 }
-function matches(pattern, importee) {
+function aliasMatches(pattern, importee) {
   if (pattern instanceof RegExp)
     return pattern.test(importee);
   if (importee.length < pattern.length)
@@ -385,7 +387,7 @@ async function generateMockServer(ctx, config, options) {
     define,
     alias: config.resolve.alias
   });
-  const mockDeps = getMockDependencies(deps);
+  const mockDeps = getMockDependencies(deps, config.resolve.alias);
   await import_promises.default.unlink(mockEntry);
   const outputList = [
     {
@@ -425,11 +427,12 @@ async function generateMockServer(ctx, config, options) {
   } catch {
   }
 }
-function getMockDependencies(deps) {
+function getMockDependencies(deps, alias) {
   const list = /* @__PURE__ */ new Set();
   const excludeDeps = [name, "connect", "cors"];
+  const isAlias = (p) => alias.find(({ find }) => aliasMatches(find, p));
   Object.keys(deps).forEach((mPath) => {
-    const imports = deps[mPath].imports.filter((_) => _.external && !_.path.startsWith("<define:")).map((_) => _.path);
+    const imports = deps[mPath].imports.filter((_) => _.external && !_.path.startsWith("<define:") && !isAlias(_.path)).map((_) => _.path);
     imports.forEach((dep) => {
       if (!excludeDeps.includes(dep) && !(0, import_is_core_module.default)(dep))
         list.add(dep);
@@ -462,17 +465,24 @@ function generatorServerEntryCode(httpProxies, wsProxies, cookiesOptions = {}, p
   return `import { createServer } from 'node:http';
 import connect from 'connect';
 import corsMiddleware from 'cors';
-import { baseMiddleware, mockWebSocket } from 'vite-plugin-mock-dev-server';
+import { baseMiddleware, mockWebSocket, createLogger } from 'vite-plugin-mock-dev-server';
 import mockData from './mock-data.js';
 
 const app = connect();
 const server = createServer(app);
+const logger = createLogger('mock-server', 'error');
 const httpProxies = ${JSON.stringify(httpProxies)};
 const wsProxies = ${JSON.stringify(wsProxies)};
 const cookiesOptions = ${JSON.stringify(cookiesOptions)};
 const priority = ${JSON.stringify(priority)};
 
-mockWebSocket({ mockData }, server, wsProxies, cookiesOptions);
+mockWebSocket({ 
+  loader: { mockData },
+  httpServer: server,
+  proxies: wsProxies,
+  cookiesOptions,
+  logger,
+});
 
 app.use(corsMiddleware());
 app.use(baseMiddleware({ mockData }, {
@@ -480,6 +490,7 @@ app.use(baseMiddleware({ mockData }, {
   proxies: httpProxies,
   priority,
   cookiesOptions,
+  logger,
 }));
 
 server.listen(${port});
@@ -511,7 +522,7 @@ const mockList = exporters.map((raw) => {
   } else {
     mockConfig = []
     Object.keys(raw || {}).forEach((key) => {
-      isArray(raw[key])
+      Array.isArray(raw[key])
         ? mockConfig.push(...raw[key])
         : mockConfig.push(raw[key])
     })
@@ -1697,10 +1708,24 @@ var src_default = mockDevServerPlugin;
 0 && (module.exports = {
   baseMiddleware,
   createDefineMock,
+  createLogger,
   defineMock,
   defineMockData,
+  logLevels,
   mockDevServerPlugin,
   mockWebSocket,
   sortByValidator,
   transformMockData
 });
+
+warnCjsUsage()
+function warnCjsUsage() {
+  if (process.env.VITE_CJS_IGNORE_WARNING) return
+  const yellow = (str) => `\u001b[33m${str}\u001b[39m`
+  const log = process.env.VITE_CJS_TRACE ? console.trace : console.warn
+  log(
+    yellow(
+      `The CJS build of Vite's Node API is deprecated. See https://vitejs.dev/guide/troubleshooting.html#vite-cjs-node-api-deprecated for more details.`,
+    ),
+  )
+}

package/dist/index.d.cts

@@ -542,6 +542,7 @@ type FormidableFile = formidable.File | formidable.File[];
 type LogType = 'info' | 'warn' | 'error' | 'debug';
 type LogLevel = LogType | 'silent';
 
+/** @deprecated The CJS build of Vite's Node API is deprecated. See https://vitejs.dev/guide/troubleshooting.html#vite-cjs-node-api-deprecated for more details. */
 declare function mockDevServerPlugin({ prefix, wsPrefix, include, exclude, reload, log, cors, formidableOptions, build, cookiesOptions, priority, }?: MockServerPluginOptions): Plugin[];
 
 /**
@@ -624,6 +625,8 @@ interface Logger {
     warn(msg: string, level?: boolean | LogLevel): void;
     error(msg: string, level?: boolean | LogLevel): void;
 }
+declare const logLevels: Record<LogLevel, number>;
+declare function createLogger(prefix: string, defaultLevel?: LogLevel): Logger;
 
 interface MockLoaderOptions {
     cwd?: string;
@@ -692,4 +695,4 @@ declare function mockWebSocket({ loader, httpServer, proxies, cookiesOptions, lo
 declare function transformMockData(mockList: Map<string, MockHttpItem | MockWebsocketItem | MockOptions> | (MockHttpItem | MockWebsocketItem | MockOptions)[]): Record<string, MockOptions>;
 declare function sortByValidator(mocks: MockOptions): (MockHttpItem | MockWebsocketItem)[];
 
-export { type BaseMiddlewareOptions, type FormidableFile, type MockData, type MockHttpItem, type MockOptions, type MockRequest, type MockServerPluginOptions, type MockSocketOptions, type MockWebsocketItem, baseMiddleware, createDefineMock, mockDevServerPlugin as default, defineMock, defineMockData, mockDevServerPlugin, mockWebSocket, sortByValidator, transformMockData };
+export { type BaseMiddlewareOptions, type FormidableFile, type Logger, type MockData, type MockHttpItem, type MockOptions, type MockRequest, type MockServerPluginOptions, type MockSocketOptions, type MockWebsocketItem, baseMiddleware, createDefineMock, createLogger, mockDevServerPlugin as default, defineMock, defineMockData, logLevels, mockDevServerPlugin, mockWebSocket, sortByValidator, transformMockData };

package/dist/index.d.ts

@@ -624,6 +624,8 @@ interface Logger {
     warn(msg: string, level?: boolean | LogLevel): void;
     error(msg: string, level?: boolean | LogLevel): void;
 }
+declare const logLevels: Record<LogLevel, number>;
+declare function createLogger(prefix: string, defaultLevel?: LogLevel): Logger;
 
 interface MockLoaderOptions {
     cwd?: string;
@@ -692,4 +694,4 @@ declare function mockWebSocket({ loader, httpServer, proxies, cookiesOptions, lo
 declare function transformMockData(mockList: Map<string, MockHttpItem | MockWebsocketItem | MockOptions> | (MockHttpItem | MockWebsocketItem | MockOptions)[]): Record<string, MockOptions>;
 declare function sortByValidator(mocks: MockOptions): (MockHttpItem | MockWebsocketItem)[];
 
-export { type BaseMiddlewareOptions, type FormidableFile, type MockData, type MockHttpItem, type MockOptions, type MockRequest, type MockServerPluginOptions, type MockSocketOptions, type MockWebsocketItem, baseMiddleware, createDefineMock, mockDevServerPlugin as default, defineMock, defineMockData, mockDevServerPlugin, mockWebSocket, sortByValidator, transformMockData };
+export { type BaseMiddlewareOptions, type FormidableFile, type Logger, type MockData, type MockHttpItem, type MockOptions, type MockRequest, type MockServerPluginOptions, type MockSocketOptions, type MockWebsocketItem, baseMiddleware, createDefineMock, createLogger, mockDevServerPlugin as default, defineMock, defineMockData, logLevels, mockDevServerPlugin, mockWebSocket, sortByValidator, transformMockData };

package/dist/index.js

@@ -13,7 +13,7 @@ import { createFilter, normalizePath } from "vite";
 
 // package.json
 var name = "vite-plugin-mock-dev-server";
-var version = "1.4.0";
+var version = "1.4.1";
 
 // src/compiler.ts
 import fs2, { promises as fsp } from "node:fs";
@@ -121,7 +121,7 @@ function aliasPlugin(alias) {
     name: "alias-plugin",
     setup(build2) {
       build2.onResolve({ filter: /.*/ }, async ({ path: id }) => {
-        const matchedEntry = alias.find(({ find: find2 }) => matches(find2, id));
+        const matchedEntry = alias.find(({ find: find2 }) => aliasMatches(find2, id));
         if (!matchedEntry)
           return null;
         const { find, replacement } = matchedEntry;
@@ -138,7 +138,7 @@ function aliasPlugin(alias) {
     }
   };
 }
-function matches(pattern, importee) {
+function aliasMatches(pattern, importee) {
   if (pattern instanceof RegExp)
     return pattern.test(importee);
   if (importee.length < pattern.length)
@@ -337,7 +337,7 @@ async function generateMockServer(ctx, config, options) {
     define,
     alias: config.resolve.alias
   });
-  const mockDeps = getMockDependencies(deps);
+  const mockDeps = getMockDependencies(deps, config.resolve.alias);
   await fsp2.unlink(mockEntry);
   const outputList = [
     {
@@ -377,11 +377,12 @@ async function generateMockServer(ctx, config, options) {
   } catch {
   }
 }
-function getMockDependencies(deps) {
+function getMockDependencies(deps, alias) {
   const list = /* @__PURE__ */ new Set();
   const excludeDeps = [name, "connect", "cors"];
+  const isAlias = (p) => alias.find(({ find }) => aliasMatches(find, p));
   Object.keys(deps).forEach((mPath) => {
-    const imports = deps[mPath].imports.filter((_) => _.external && !_.path.startsWith("<define:")).map((_) => _.path);
+    const imports = deps[mPath].imports.filter((_) => _.external && !_.path.startsWith("<define:") && !isAlias(_.path)).map((_) => _.path);
     imports.forEach((dep) => {
       if (!excludeDeps.includes(dep) && !isCore(dep))
         list.add(dep);
@@ -414,17 +415,24 @@ function generatorServerEntryCode(httpProxies, wsProxies, cookiesOptions = {}, p
   return `import { createServer } from 'node:http';
 import connect from 'connect';
 import corsMiddleware from 'cors';
-import { baseMiddleware, mockWebSocket } from 'vite-plugin-mock-dev-server';
+import { baseMiddleware, mockWebSocket, createLogger } from 'vite-plugin-mock-dev-server';
 import mockData from './mock-data.js';
 
 const app = connect();
 const server = createServer(app);
+const logger = createLogger('mock-server', 'error');
 const httpProxies = ${JSON.stringify(httpProxies)};
 const wsProxies = ${JSON.stringify(wsProxies)};
 const cookiesOptions = ${JSON.stringify(cookiesOptions)};
 const priority = ${JSON.stringify(priority)};
 
-mockWebSocket({ mockData }, server, wsProxies, cookiesOptions);
+mockWebSocket({ 
+  loader: { mockData },
+  httpServer: server,
+  proxies: wsProxies,
+  cookiesOptions,
+  logger,
+});
 
 app.use(corsMiddleware());
 app.use(baseMiddleware({ mockData }, {
@@ -432,6 +440,7 @@ app.use(baseMiddleware({ mockData }, {
   proxies: httpProxies,
   priority,
   cookiesOptions,
+  logger,
 }));
 
 server.listen(${port});
@@ -463,7 +472,7 @@ const mockList = exporters.map((raw) => {
   } else {
     mockConfig = []
     Object.keys(raw || {}).forEach((key) => {
-      isArray(raw[key])
+      Array.isArray(raw[key])
         ? mockConfig.push(...raw[key])
         : mockConfig.push(raw[key])
     })
@@ -1667,9 +1676,11 @@ var src_default = mockDevServerPlugin;
 export {
   baseMiddleware,
   createDefineMock,
+  createLogger,
   src_default as default,
   defineMock,
   defineMockData,
+  logLevels,
   mockDevServerPlugin,
   mockWebSocket,
   sortByValidator,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-plugin-mock-dev-server",
   "type": "module",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "packageManager": "pnpm@8.11.0",
   "author": "pengzhanbo <q942450674@outlook.com> (https://github.com/pengzhanbo)",
   "license": "MIT",
@@ -49,7 +49,7 @@
     "cookies": "^0.8.0",
     "cors": "^2.8.5",
     "debug": "^4.3.4",
-    "esbuild": "^0.19.8",
+    "esbuild": "^0.19.9",
     "fast-glob": "^3.3.2",
     "formidable": "2.1.1",
     "http-status": "^1.7.3",
@@ -58,10 +58,10 @@
     "mime-types": "^2.1.35",
     "path-to-regexp": "^6.2.1",
     "picocolors": "^1.0.0",
-    "ws": "^8.14.2"
+    "ws": "^8.15.1"
   },
   "devDependencies": {
-    "@pengzhanbo/eslint-config": "^1.2.5",
+    "@pengzhanbo/eslint-config": "^1.3.1",
     "@types/co-body": "^6.1.3",
     "@types/cookies": "^0.7.10",
     "@types/cors": "^2.8.17",
@@ -69,20 +69,20 @@
     "@types/formidable": "2.0.6",
     "@types/is-core-module": "^2.2.2",
     "@types/mime-types": "^2.1.4",
-    "@types/node": "^20.10.2",
+    "@types/node": "^20.10.3",
     "@types/ws": "^8.5.10",
-    "bumpp": "^9.2.0",
+    "bumpp": "^9.2.1",
     "conventional-changelog-cli": "^4.1.0",
     "eslint": "^8.55.0",
     "mockjs": "^1.1.0",
     "tsup": "^8.0.1",
-    "typescript": "^5.3.2",
-    "vite": "^5.0.4",
+    "typescript": "^5.3.3",
+    "vite": "^5.0.8",
     "vitepress": "^1.0.0-rc.31",
-    "vitest": "^0.34.6"
+    "vitest": "^1.0.4"
   },
   "scripts": {
-    "build": "tsup",
+    "build": "tsup && node ./deprecate.mjs",
     "dev": "DEBUG=vite:mock-dev-server vite example --config ./example/vite.config.ts",
     "example:build": "DEBUG=vite:mock-dev-server vite build example --config ./example/vite.config.ts",
     "docs:build": "vitepress build docs",