vite-plugin-mock-dev-server 0.3.15 → 0.3.16

package/README.md

@@ -37,11 +37,17 @@
 - ⚖️ Use `server.proxy`
 - 🍕 Support `viteConfig.define` in mock file
 - 📤 Support `multipart` content-type，mock upload file.
+- 🌈 Support `vite preview` mode.
 ## Documentation
 
 See the [documentation](https://vite-plugin-mock-dev-server.netlify.app/) to learn more.
+
 [![Netlify Status](https://api.netlify.com/api/v1/badges/9ccda610-2c6a-4cd0-aeaa-a8932f2b477c/deploy-status)](https://app.netlify.com/sites/vite-plugin-mock-dev-server/deploys)
 
+## Playground
+
+[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/pengzhanbo/vite-plugin-mock-dev-server/tree/main/playground)
+
 ## Usage
 
 ### Install
@@ -221,14 +227,14 @@ export default defineMock({
    * configurations and determines which mock configuration
    * is valid according to the validator.
    * 
-   * @type { header?: object; body?: object; query?: object; params?: object  }
+   * @type { headers?: object; body?: object; query?: object; params?: object  }
    * 
    * If the validator incoming is an object, 
    * then the validation method is the comparison of the 
    * strict request of interface, headers/body/query/params 
    * each `key-value` congruent, congruent check through
    * 
-   * @type ({ header: object; body: object; query: object; params: object }) => boolean
+   * @type ({ headers: object; body: object; query: object; params: object }) => boolean
    * If the validator is passed a function, 
    * it takes the requested interface-related data as an input,
    * gives it to the consumer for custom validation, 
@@ -260,7 +266,7 @@ export default defineMock({
    * 
    * @type string | number | array | object
    * 
-   * @type (request: { header, query, body, params }) => any | Promise<any>
+   * @type (request: { headers, query, body, params }) => any | Promise<any>
    */
   body: {},
 

package/README.zh-CN.md

@@ -38,12 +38,18 @@
 - ⚖️ 使用 `server.proxy` 配置
 - 🍕 支持在 mock文件中使用 `viteConfig.define`配置字段
 - 📤 支持 multipart 类型，模拟文件上传
+- 🌈 支持 `vite preview` 模式.
 
 
 ## 文档
 
 查看 [Documentation](https://vite-plugin-mock-dev-server.netlify.app/) 了解更多。
+
 [![Netlify Status](https://api.netlify.com/api/v1/badges/9ccda610-2c6a-4cd0-aeaa-a8932f2b477c/deploy-status)](https://app.netlify.com/sites/vite-plugin-mock-dev-server/deploys)
+
+## Playground
+
+[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/pengzhanbo/vite-plugin-mock-dev-server/tree/main/playground)
 ## 使用
 
 ### 安装
@@ -133,7 +139,17 @@ export default defineConfig({
   
   配置读取 mock文件时，需要排除的文件， 可以是一个 目录、glob、或者一个数组
 
-  默认值：`['**/node_modules/**','**/test/**','**/cypress/**','src/**','**/.vscode/**','**/.git/**','**/dist/**',]`
+  默认值：
+  ```ts
+  [
+    '**/node_modules/**',
+    '**/test/**',
+    'src/**',
+    '**/.vscode/**',
+    '**/.git/**',
+    '**/dist/**'
+  ]
+  ```
 
 - `options.formidableOptions`
   
@@ -212,13 +228,13 @@ export default defineMock({
    * 验证器可以很好的解决这一类问题，将同个 url 分为多个 mock配置，
    * 根据 验证器来判断哪个mock配置生效。
    * 
-   * @type { header?: object; body?: object; query?: object; params?: object  }
+   * @type { headers?: object; body?: object; query?: object; params?: object  }
    * 
    * 如果 validator 传入的是一个对象，那么验证方式是严格比较 请求的接口
    * 中，headers/body/query/params 的各个`key`的`value`是否全等，
    * 全等则校验通过
    * 
-   * @type ({ header: object; body: object; query: object; params: object }) => boolean
+   * @type ({ headers: object; body: object; query: object; params: object }) => boolean
    * 如果 validator 传入的是一个函数，那么会讲 请求的接口相关数据作为入参，提供给使用者进行自定义校验，并返回一个 boolean
    * 
    */
@@ -250,7 +266,7 @@ export default defineMock({
    * @type string | number | array | object
    *  直接返回定义的数据
    * 
-   * @type (request: { header, query, body, params }) => any | Promise<any>
+   * @type (request: { headers, query, body, params }) => any | Promise<any>
    * 如果传入一个函数，那么可以更加灵活的定义返回响应体数据
    */
   body: {},

package/dist/index.cjs

@@ -88,7 +88,7 @@ var _MockLoader = class extends import_node_events.default {
     this.options = options;
     this.moduleCache = /* @__PURE__ */ new Map();
     this.moduleDeps = /* @__PURE__ */ new Map();
-    this._mockList = [];
+    this._mockList = {};
     this.moduleType = "cjs";
     this.cwd = options.cwd || process.cwd();
     try {
@@ -183,9 +183,15 @@ var _MockLoader = class extends import_node_events.default {
     for (const [, handle] of this.moduleCache.entries()) {
       isArray(handle) ? mockList.push(...handle) : mockList.push(handle);
     }
-    this._mockList = mockList.filter(
-      (mock) => mock.enabled || typeof mock.enabled === "undefined"
-    );
+    const mocks = {};
+    mockList.filter((mock) => mock.enabled || typeof mock.enabled === "undefined").forEach((mock) => {
+      if (!mocks[mock.url]) {
+        mocks[mock.url] = [];
+      }
+      const list = mocks[mock.url];
+      mock.validator ? list.unshift(mock) : list.push(mock);
+    });
+    this._mockList = mocks;
   }
   updateModuleDeps(filepath, deps) {
     Object.keys(deps).forEach((mPath) => {
@@ -388,13 +394,20 @@ async function mockServerMiddleware(httpServer, config, options) {
   httpServer == null ? void 0 : httpServer.on("close", () => loader.close());
   const proxies = Object.keys(config.server.proxy || {});
   return async function(req, res, next) {
-    if (proxies.length === 0 || !proxies.some((context) => doesProxyContextMatchUrl(context, req.url))) {
-      return next();
-    }
     const method = req.method.toUpperCase();
     const { query, pathname } = (0, import_node_url3.parse)(req.url, true);
+    if (!pathname || proxies.length === 0 || !proxies.some((context) => doesProxyContextMatchUrl(context, req.url))) {
+      return next();
+    }
+    const mockUrl = Object.keys(loader._mockList).find((key) => {
+      return (0, import_path_to_regexp.pathToRegexp)(key).test(pathname);
+    });
+    if (!mockUrl) {
+      return next();
+    }
+    const mockList = loader.mockList[mockUrl];
     const reqBody = await parseReqBody(req, options.formidableOptions);
-    const currentMock = loader.mockList.find((mock) => {
+    const currentMock = mockList.find((mock) => {
       if (!pathname || !mock || !mock.url)
         return false;
       const methods = mock.method ? isArray(mock.method) ? mock.method : [mock.method] : ["GET", "POST"];
@@ -479,6 +492,7 @@ function doesProxyContextMatchUrl(context, url) {
 }
 
 // src/plugin.ts
+var viteConfig = {};
 function mockDevServerPlugin({
   include = ["mock/**/*.mock.{js,ts,cjs,mjs,json,json5}"],
   exclude = [
@@ -495,6 +509,10 @@ function mockDevServerPlugin({
     name: "vite-plugin-mock-dev-server",
     enforce: "pre",
     apply: "serve",
+    configResolved(config) {
+      viteConfig = config;
+      config.logger.warn("");
+    },
     async configureServer({ middlewares, config, httpServer }) {
       const middleware = await mockServerMiddleware(httpServer, config, {
         include,
@@ -505,6 +523,17 @@ function mockDevServerPlugin({
         }
       });
       middlewares.use(middleware);
+    },
+    async configurePreviewServer({ middlewares, httpServer }) {
+      const middleware = await mockServerMiddleware(httpServer, viteConfig, {
+        include,
+        exclude,
+        formidableOptions: {
+          multiples: true,
+          ...formidableOptions
+        }
+      });
+      middlewares.use(middleware);
     }
   };
 }

package/dist/index.js

@@ -53,7 +53,7 @@ var _MockLoader = class extends EventEmitter {
     this.options = options;
     this.moduleCache = /* @__PURE__ */ new Map();
     this.moduleDeps = /* @__PURE__ */ new Map();
-    this._mockList = [];
+    this._mockList = {};
     this.moduleType = "cjs";
     this.cwd = options.cwd || process.cwd();
     try {
@@ -148,9 +148,15 @@ var _MockLoader = class extends EventEmitter {
     for (const [, handle] of this.moduleCache.entries()) {
       isArray(handle) ? mockList.push(...handle) : mockList.push(handle);
     }
-    this._mockList = mockList.filter(
-      (mock) => mock.enabled || typeof mock.enabled === "undefined"
-    );
+    const mocks = {};
+    mockList.filter((mock) => mock.enabled || typeof mock.enabled === "undefined").forEach((mock) => {
+      if (!mocks[mock.url]) {
+        mocks[mock.url] = [];
+      }
+      const list = mocks[mock.url];
+      mock.validator ? list.unshift(mock) : list.push(mock);
+    });
+    this._mockList = mocks;
   }
   updateModuleDeps(filepath, deps) {
     Object.keys(deps).forEach((mPath) => {
@@ -353,13 +359,20 @@ async function mockServerMiddleware(httpServer, config, options) {
   httpServer == null ? void 0 : httpServer.on("close", () => loader.close());
   const proxies = Object.keys(config.server.proxy || {});
   return async function(req, res, next) {
-    if (proxies.length === 0 || !proxies.some((context) => doesProxyContextMatchUrl(context, req.url))) {
-      return next();
-    }
     const method = req.method.toUpperCase();
     const { query, pathname } = urlParse(req.url, true);
+    if (!pathname || proxies.length === 0 || !proxies.some((context) => doesProxyContextMatchUrl(context, req.url))) {
+      return next();
+    }
+    const mockUrl = Object.keys(loader._mockList).find((key) => {
+      return pathToRegexp(key).test(pathname);
+    });
+    if (!mockUrl) {
+      return next();
+    }
+    const mockList = loader.mockList[mockUrl];
     const reqBody = await parseReqBody(req, options.formidableOptions);
-    const currentMock = loader.mockList.find((mock) => {
+    const currentMock = mockList.find((mock) => {
       if (!pathname || !mock || !mock.url)
         return false;
       const methods = mock.method ? isArray(mock.method) ? mock.method : [mock.method] : ["GET", "POST"];
@@ -444,6 +457,7 @@ function doesProxyContextMatchUrl(context, url) {
 }
 
 // src/plugin.ts
+var viteConfig = {};
 function mockDevServerPlugin({
   include = ["mock/**/*.mock.{js,ts,cjs,mjs,json,json5}"],
   exclude = [
@@ -460,6 +474,10 @@ function mockDevServerPlugin({
     name: "vite-plugin-mock-dev-server",
     enforce: "pre",
     apply: "serve",
+    configResolved(config) {
+      viteConfig = config;
+      config.logger.warn("");
+    },
     async configureServer({ middlewares, config, httpServer }) {
       const middleware = await mockServerMiddleware(httpServer, config, {
         include,
@@ -470,6 +488,17 @@ function mockDevServerPlugin({
         }
       });
       middlewares.use(middleware);
+    },
+    async configurePreviewServer({ middlewares, httpServer }) {
+      const middleware = await mockServerMiddleware(httpServer, viteConfig, {
+        include,
+        exclude,
+        formidableOptions: {
+          multiples: true,
+          ...formidableOptions
+        }
+      });
+      middlewares.use(middleware);
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-mock-dev-server",
-  "version": "0.3.15",
+  "version": "0.3.16",
   "keywords": [
     "vite",
     "plugin",
@@ -54,7 +54,6 @@
     "tsup": "^6.5.0",
     "typescript": "^4.9.4",
     "vite": "^4.0.2",
-    "vite-plugin-mock-dev-server": "file:",
     "vitepress": "1.0.0-alpha.35",
     "vue": "^3.2.45"
   },