vite-plugin-mock-dev-server 1.0.1 → 1.0.2

package/README.md

@@ -11,8 +11,10 @@
 <a href="https://www.npmjs.com/package/vite-plugin-mock-dev-server"><img alt="npm" src="https://img.shields.io/npm/v/vite-plugin-mock-dev-server?style=flat-square"></a>
 <img alt="node-current" src="https://img.shields.io/node/v/vite-plugin-mock-dev-server?style=flat-square">
 <img alt="npm peer dependency version" src="https://img.shields.io/npm/dependency-version/vite-plugin-mock-dev-server/peer/vite?style=flat-square">
-<img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/pengzhanbo/vite-plugin-mock-dev-server/lint.yml?style=flat-square">
 <img alt="npm" src="https://img.shields.io/npm/dm/vite-plugin-mock-dev-server?style=flat-square">
+<br>
+<img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/pengzhanbo/vite-plugin-mock-dev-server/lint.yml?style=flat-square">
+<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fpengzhanbo%2Fvite-plugin-mock-dev-server?ref=badge_shield"><img alt="fossa status" src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fpengzhanbo%2Fvite-plugin-mock-dev-server.svg?type=shield"></a>
 </p>
 <br>
 <p align="center">
@@ -50,7 +52,6 @@ See the [documentation](https://vite-plugin-mock-dev-server.netlify.app/) to lea
 ## 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)
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fpengzhanbo%2Fvite-plugin-mock-dev-server.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fpengzhanbo%2Fvite-plugin-mock-dev-server?ref=badge_shield)
 
 ## Usage
 

package/README.zh-CN.md

@@ -13,8 +13,10 @@
 <a href="https://www.npmjs.com/package/vite-plugin-mock-dev-server"><img alt="npm" src="https://img.shields.io/npm/v/vite-plugin-mock-dev-server?style=flat-square"></a>
 <img alt="node-current" src="https://img.shields.io/node/v/vite-plugin-mock-dev-server?style=flat-square">
 <img alt="npm peer dependency version" src="https://img.shields.io/npm/dependency-version/vite-plugin-mock-dev-server/peer/vite?style=flat-square">
-<img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/pengzhanbo/vite-plugin-mock-dev-server/lint.yml?style=flat-square">
 <img alt="npm" src="https://img.shields.io/npm/dm/vite-plugin-mock-dev-server?style=flat-square">
+<br>
+<img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/pengzhanbo/vite-plugin-mock-dev-server/lint.yml?style=flat-square">
+<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fpengzhanbo%2Fvite-plugin-mock-dev-server?ref=badge_shield"><img alt="fossa status" src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fpengzhanbo%2Fvite-plugin-mock-dev-server.svg?type=shield"></a>
 </p>
 <br>
 <p align="center">

package/dist/index.cjs

@@ -52,7 +52,7 @@ var import_vite = require("vite");
 
 // package.json
 var name = "vite-plugin-mock-dev-server";
-var version = "1.0.1";
+var version = "1.0.2";
 
 // src/esbuildPlugin.ts
 var import_promises = __toESM(require("fs/promises"), 1);
@@ -236,8 +236,10 @@ function generatePackageJson(pkg, mockDeps) {
     },
     dependencies: {
       "connect": "^3.7.0",
-      "vite-plugin-mock-dev-server": `^${version}`
-    }
+      "vite-plugin-mock-dev-server": `^${version}`,
+      "cors": "^2.8.5"
+    },
+    pnpm: { peerDependencyRules: { ignoreMissing: ["vite"] } }
   };
   mockDeps.forEach((dep) => {
     mockPkg.dependencies[dep] = dependents[dep] || "latest";
@@ -245,16 +247,20 @@ function generatePackageJson(pkg, mockDeps) {
   return JSON.stringify(mockPkg, null, 2);
 }
 function generatorServerEntryCode(proxies, port = 8080) {
-  return `import connect from 'connect'
-import { baseMiddleware } from 'vite-plugin-mock-dev-server'
-import mockData from './mock-data.js'
-const app = connect()
+  return `import connect from 'connect';
+import corsMiddleware from 'cors';
+import { baseMiddleware } from 'vite-plugin-mock-dev-server';
+import mockData from './mock-data.js';
+
+const app = connect();
+app.use(corsMiddleware());
 app.use(baseMiddleware({ mockData }, {
   formidableOptions: { multiples: true },
   proxies: ${JSON.stringify(proxies)}
-}))
-app.listen(${port})
-console.log('listen: http://localhost:${port}')
+}));
+app.listen(${port});
+
+console.log('listen: http://localhost:${port}');
 `;
 }
 async function generateMockEntryCode(cwd, include, exclude) {
@@ -263,11 +269,11 @@ async function generateMockEntryCode(cwd, include, exclude) {
     resolve: false
   });
   const mockFiles = includePaths.filter(includeFilter);
-  let importers = "";
+  let importers = "import { parse as urlParse } from 'node:url';\n";
   let exporters = "";
   mockFiles.forEach((filepath, index) => {
     const file = import_node_path3.default.join(cwd, filepath);
-    importers += `import * as m${index} from '${file}'
+    importers += `import * as m${index} from '${file}';
 `;
     exporters += `m${index}, `;
   });
@@ -290,10 +296,19 @@ mockData.forEach(mock => {
 data
   .filter((mock) => mock.enabled || typeof mock.enabled === "undefined")
   .forEach((mock) => {
-    if (!mocks[mock.url]) {
-      mocks[mock.url] = [];
+    const { pathname, query } = urlParse(mock.url, true);
+    if (!mocks[pathname]) {
+      mocks[pathname] = [];
+    }
+    mock.url = pathname;
+    const list = mocks[pathname];
+    if (query && typeof mock.validator === 'function') {
+      mock.validator ??= {};
+      mock.validator.query = Object.assign(
+        query,
+        mock.validator.query || {},
+      );
     }
-    const list = mocks[mock.url];
     mock.validator ? list.unshift(mock) : list.push(mock);
   });
 export default mocks;

package/dist/index.js

@@ -9,7 +9,7 @@ import { createFilter } from "vite";
 
 // package.json
 var name = "vite-plugin-mock-dev-server";
-var version = "1.0.1";
+var version = "1.0.2";
 
 // src/esbuildPlugin.ts
 import fsp from "fs/promises";
@@ -193,8 +193,10 @@ function generatePackageJson(pkg, mockDeps) {
     },
     dependencies: {
       "connect": "^3.7.0",
-      "vite-plugin-mock-dev-server": `^${version}`
-    }
+      "vite-plugin-mock-dev-server": `^${version}`,
+      "cors": "^2.8.5"
+    },
+    pnpm: { peerDependencyRules: { ignoreMissing: ["vite"] } }
   };
   mockDeps.forEach((dep) => {
     mockPkg.dependencies[dep] = dependents[dep] || "latest";
@@ -202,16 +204,20 @@ function generatePackageJson(pkg, mockDeps) {
   return JSON.stringify(mockPkg, null, 2);
 }
 function generatorServerEntryCode(proxies, port = 8080) {
-  return `import connect from 'connect'
-import { baseMiddleware } from 'vite-plugin-mock-dev-server'
-import mockData from './mock-data.js'
-const app = connect()
+  return `import connect from 'connect';
+import corsMiddleware from 'cors';
+import { baseMiddleware } from 'vite-plugin-mock-dev-server';
+import mockData from './mock-data.js';
+
+const app = connect();
+app.use(corsMiddleware());
 app.use(baseMiddleware({ mockData }, {
   formidableOptions: { multiples: true },
   proxies: ${JSON.stringify(proxies)}
-}))
-app.listen(${port})
-console.log('listen: http://localhost:${port}')
+}));
+app.listen(${port});
+
+console.log('listen: http://localhost:${port}');
 `;
 }
 async function generateMockEntryCode(cwd, include, exclude) {
@@ -220,11 +226,11 @@ async function generateMockEntryCode(cwd, include, exclude) {
     resolve: false
   });
   const mockFiles = includePaths.filter(includeFilter);
-  let importers = "";
+  let importers = "import { parse as urlParse } from 'node:url';\n";
   let exporters = "";
   mockFiles.forEach((filepath, index) => {
     const file = path3.join(cwd, filepath);
-    importers += `import * as m${index} from '${file}'
+    importers += `import * as m${index} from '${file}';
 `;
     exporters += `m${index}, `;
   });
@@ -247,10 +253,19 @@ mockData.forEach(mock => {
 data
   .filter((mock) => mock.enabled || typeof mock.enabled === "undefined")
   .forEach((mock) => {
-    if (!mocks[mock.url]) {
-      mocks[mock.url] = [];
+    const { pathname, query } = urlParse(mock.url, true);
+    if (!mocks[pathname]) {
+      mocks[pathname] = [];
+    }
+    mock.url = pathname;
+    const list = mocks[pathname];
+    if (query && typeof mock.validator === 'function') {
+      mock.validator ??= {};
+      mock.validator.query = Object.assign(
+        query,
+        mock.validator.query || {},
+      );
     }
-    const list = mocks[mock.url];
     mock.validator ? list.unshift(mock) : list.push(mock);
   });
 export default mocks;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-mock-dev-server",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "keywords": [
     "vite",
     "plugin",