feat(mock): add "type": "module" as default,for support esm

packages/mock/bin/index.cjs

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+const { commandHttpCli } = require('../lib/index.cjs');
+const { version } = require('../package.json');
+
+commandHttpCli(version);

packages/mock/bin/index.js

@@ -1,5 +1,8 @@
 #!/usr/bin/env node
-const { commandHttpCli } = require('../lib/index.cjs');
+import { createRequire } from 'node:module';
+import { commandHttpCli } from '../lib/index.js';
+
+const require = createRequire(import.meta.url);
 const { version } = require('../package.json');
 
 commandHttpCli(version);

packages/mock/docs/cli-mock-socket.md

@@ -5,7 +5,7 @@
 
 ```ts
 import { defineConfig } from '@liangskyli/mock';
-import path from 'path';
+import path from 'node:path';
 
 export default defineConfig({
   mockDir: path.join(__dirname, '/'),

packages/mock/docs/express-mock-socket.md

@@ -5,7 +5,7 @@
 
 ```ts
 import { defineConfig } from '@liangskyli/mock';
-import path from 'path';
+import path from 'node:path';
 
 export default defineConfig({
   socketConfig: {

packages/mock/docs/mock-server-socket.md

@@ -4,7 +4,7 @@
 
 ```ts
 import mockServer from '@liangskyli/mock';
-import path from 'path';
+import path from 'node:path';
 
 mockServer({
     mockDir: path.join(__dirname, '/'),

packages/mock/docs/webpack-mock-socket.md

@@ -5,7 +5,7 @@
 
 ```ts
 import { defineConfig } from '@liangskyli/mock';
-import path from 'path';
+import path from 'node:path';
 
 export default defineConfig({
   socketConfig: {
@@ -26,9 +26,9 @@ export default defineConfig({
 - webpack.config.ts 文件
 
 ```ts
-import type WebpackDevServer from 'webpack-dev-server';
+import { getMiddleware, initSocketServer } from '@liangskyli/mock';
 import type Webpack from 'webpack';
-import {getMiddleware, initSocketServer} from '../src';
+import type WebpackDevServer from 'webpack-dev-server';
 import mockConfig from './mock.config';
 
 const socketConfig = mockConfig.socketConfig;
@@ -42,28 +42,31 @@ const webpackConfig: Webpack.Configuration = {
     host,
     port,
     onBeforeSetupMiddleware: (devServer: WebpackDevServer) => {
-      if (!devServer) {
+      if (!devServer || !devServer.app) {
         throw new Error('webpack-dev-server is not defined');
       }
 
-      getMiddleware().then(({ middleware, middlewareWatcher }) => {
-        devServer.app.use(middleware);
-
-        devServer.app.get('/', (req, res) => {
-          res.send('homepage');
-        });
-        console.log('look in http://localhost:4000/');
-
-        if (socketConfig && socketConfig.enable) {
-          initSocketServer({
-            socketConfig,
-            server: devServer.server,
-            port,
-            hostname: host,
-            middlewareWatcher,
+      getMiddleware({ mockDir: mockConfig.mockDir }).then(
+        ({ middleware, middlewareWatcher }) => {
+          devServer.app!.use(middleware);
+
+          devServer.app!.get('/', (req, res) => {
+            res.send('homepage');
           });
-        }
-      });
+          console.log(`look in http://localhost:${port}/`);
+
+          if (socketConfig && socketConfig.enable) {
+            initSocketServer({
+              mockDir: mockConfig.mockDir,
+              socketConfig,
+              server: devServer.server!,
+              port,
+              hostname: host,
+              middlewareWatcher,
+            });
+          }
+        },
+      );
     },
   },
 };

packages/mock/docs/webpack-mock.md

@@ -3,31 +3,37 @@
 - webpack.config.ts 文件
 
 ```ts
-import type WebpackDevServer from 'webpack-dev-server';
-import type Webpack from 'webpack';
 import { getMiddleware } from '@liangskyli/mock';
+import type Webpack from 'webpack';
+import type WebpackDevServer from 'webpack-dev-server';
+
+const host = '0.0.0.0';
+const port = 8002;
 
 const webpackConfig: Webpack.Configuration = {
-    entry: './test/app.js',
-    mode: 'development',
-    devServer: {
-        host: '0.0.0.0',
-        port: 4000,
-        onBeforeSetupMiddleware: (devServer: WebpackDevServer) => {
-            if (!devServer) {
-                throw new Error('webpack-dev-server is not defined');
-            }
-
-            getMiddleware().then((middleware) => {
-                devServer.app.use(middleware);
-
-                devServer.app.get('/', (req, res) => {
-                    res.send('homepage');
-                });
-                console.log('look in http://localhost:4000/');
-            });
+  entry: './test/app.js',
+  mode: 'development',
+  devServer: {
+    host,
+    port,
+    onBeforeSetupMiddleware: (devServer: WebpackDevServer) => {
+      if (!devServer || !devServer.app) {
+        throw new Error('webpack-dev-server is not defined');
+      }
+
+      getMiddleware().then(
+        ({ middleware, middlewareWatcher }) => {
+          devServer.app!.use(middleware);
+
+          devServer.app!.get('/', (req, res) => {
+            res.send('homepage');
+          });
+          console.log(`look in http://localhost:${port}/`);
+
         },
+      );
     },
+  },
 };
 export default webpackConfig;
 ```
@@ -49,4 +55,4 @@ const runServer = async () => {
 };
 
 runServer().then();
-```
+```

packages/mock/mock/socket/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

packages/mock/mock/socket/sock.ts

@@ -1,8 +1,8 @@
-import mockjs from 'mockjs';
 import type {
   ISocketDefaultController,
   ISocketNamespaceController,
-} from '../../src';
+} from '@liangskyli/mock';
+import mockjs from 'mockjs';
 
 const socketDefaultController: ISocketDefaultController = (socket) => {
   const data = mockjs.mock({
@@ -19,7 +19,7 @@ const socketDefaultController: ISocketDefaultController = (socket) => {
 
   // 接收客户端数据
   socket.on('toServer', (clientData) => {
-    console.log('from client:', clientData);
+    console.log('from client default namespace:', clientData);
   });
 };
 
@@ -38,7 +38,7 @@ const socketNamespaceController: ISocketNamespaceController = () => {
 
       // 接收客户端数据
       socket.on('toServer', (clientData) => {
-        console.log('from client:', clientData);
+        console.log('from client custom namespace:', clientData);
       });
     },
   };

packages/mock/mock/socket/sock3.ts

@@ -0,0 +1,14 @@
+import type { ISocketDefaultController } from '@liangskyli/mock';
+
+const socketDefaultController: ISocketDefaultController = (socket) => {
+  const data = { a: 112 };
+  // 数据发送客户端
+  socket.emit('toClient', data);
+
+  // 接收客户端数据
+  socket.on('toServer', (clientData) => {
+    console.log('from client default namespace:', clientData);
+  });
+};
+
+export default socketDefaultController;

packages/mock/package.json

@@ -20,12 +20,21 @@
   },
   "license": "MIT",
   "author": "liangsky <[email protected]>",
-  "main": "./lib/index.cjs.js",
-  "module": "./lib/index.esm.js",
+  "type": "module",
+  "main": "./lib/index.cjs",
+  "module": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "typings": "./lib/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "import": "./lib/index.js",
+      "require": "./lib/index.cjs"
+    }
+  },
   "bin": {
-    "mock-server": "./bin/index.js"
+    "mock-server": "./bin/index.js",
+    "mock-server-cjs": "./bin/index.cjs"
   },
   "files": [
     "lib",
@@ -37,9 +46,14 @@
     "package.json"
   ],
   "scripts": {
-    "build": "rollup --bundleConfigAsCjs --config=./rollup.config.js",
-    "start": "cross-env DEBUG=mock:utils cross-env TS_NODE_PROJECT=test/tsconfig.json node -r ts-node/register test/server.ts",
-    "test-http-cli": "cross-env DEBUG=mock:utils node bin/index.js -d ./test -e mock/b.ts -c ./test/mock.config.ts",
+    "build": "rollup --config=./rollup.config.js",
+    "start-esm": "cross-env DEBUG=mock:* cross-env TS_NODE_PROJECT=test/esm/tsconfig.json node --loader ts-node/esm test/esm/server.ts",
+    "start-esm-mock": "cross-env DEBUG=mock:* cross-env TS_NODE_PROJECT=test/esm/tsconfig.json node --loader ts-node/esm test/esm/server-mock-esm.ts",
+    "start": "cross-env DEBUG=mock:* cross-env TS_NODE_PROJECT=test/tsconfig.json node -r ts-node/register test/server.ts",
+    "test-http-cli": "cross-env DEBUG=mock:* node bin/index.js -d ./test -e mock/b.ts -c ./test/mock.config.ts",
+    "test-http-cli-esm-config": "cross-env DEBUG=mock:* node bin/index.js -d ./test -e mock/b.ts -c ./test/esm/mock.config.ts",
+    "test-http-cli-esm-mock": "cross-env DEBUG=mock:* node bin/index.js -e mock/b.ts -c ./test/esm/mock-esm.config.ts",
+    "test-http-cli-cjs": "cross-env DEBUG=mock:* node bin/index.cjs -d ./test -e mock/b.ts -c ./test/mock.config.ts",
     "test:middleware": "cross-env TS_NODE_PROJECT=test/tsconfig.json node -r ts-node/register test/middleware.ts",
     "test:webpack-middleware": "cross-env TS_NODE_PROJECT=test/tsconfig.json node -r ts-node/register test/webpack-middleware.ts",
     "update:deps": "pnpm update --interactive --latest"

packages/mock/rollup.config.js

@@ -1,4 +1,6 @@
-import { getConfig } from '../rollup.base.config';
-import packageJSON from './package.json';
+import { createRequire } from 'node:module';
+import { getConfig } from '../rollup.base.config.js';
 
+const require = createRequire(import.meta.url);
+const packageJSON = require('./package.json');
 export default [getConfig(packageJSON)];

packages/mock/src/http/mock/utils.ts

@@ -2,12 +2,15 @@ import { createDebug, winPath } from '@liangskyli/utils';
 import assert from 'assert';
 import bodyParser from 'body-parser';
 import type { NextFunction, Request, RequestHandler } from 'express';
-import { existsSync } from 'fs';
 import { globSync } from 'glob';
 import multer from 'multer';
-import { join } from 'path';
+import { existsSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import { join } from 'node:path';
 import { pathToRegexp } from 'path-to-regexp';
 
+const require = createRequire(import.meta.url);
+
 // support all openapi method
 const VALID_METHODS = [
   'get',

packages/mock/src/http/server/middleware.ts

@@ -1,7 +1,7 @@
 import { register, winPath } from '@liangskyli/utils';
 import type { FSWatcher } from 'chokidar';
 import type { NextFunction, Request, Response } from 'express';
-import { isAbsolute, join } from 'path';
+import { isAbsolute, join } from 'node:path';
 import createMiddleware from '../mock/createMiddleware';
 import { getMockData } from '../mock/utils';
 import { killProcess } from '../tools';

packages/mock/src/http/server/server.ts

@@ -1,6 +1,6 @@
 import { colors, ip } from '@liangskyli/utils';
 import express from 'express';
-import type http from 'http';
+import type http from 'node:http';
 import { killProcess } from '../tools';
 import getMiddleware from './middleware';
 import type { ISocketConfig } from './socket-server';

packages/mock/src/http/server/socket-server.ts

@@ -1,10 +1,13 @@
 import { colors, ip, winPath } from '@liangskyli/utils';
 import type { FSWatcher } from 'chokidar';
-import type http from 'http';
-import { isAbsolute, join } from 'path';
+import type http from 'node:http';
+import { createRequire } from 'node:module';
+import { isAbsolute, join } from 'node:path';
 import type { ServerOptions, Socket } from 'socket.io';
 import { Server as SocketServer } from 'socket.io';
 
+const require = createRequire(import.meta.url);
+
 export type ISocketConfig = {
   enable: boolean;
   opts?: Partial<ServerOptions>;

packages/mock/test/esm/mock-esm.config.ts

@@ -0,0 +1,21 @@
+import { defineConfig } from '@liangskyli/mock';
+
+export default defineConfig({
+  //mockDir: path.join(curDirName, '../'),
+  //mockDir: path.join(__dirname, '/gen-mock'),
+  //mockDir: path.join(__dirname, '../../http-mock-gen/test/all-gen-dirs/gen-mock/'),
+  port: 8002,
+  socketConfig: {
+    enable: true,
+    opts: {
+      path: '/socket.io/',
+      cors: {
+        origin: ['http://localhost:63342'],
+      },
+    },
+    //mockControllerUrl: path.join(__dirname, '/mock/socket/sock.ts'),
+    //mockControllerUrl: 'mock/socket/sock.ts',
+    //mockControllerUrl: 'mock/socket/sock2.js',
+    mockControllerUrl: 'mock/socket/sock3.ts',
+  },
+});

packages/mock/test/esm/mock.config.ts

@@ -0,0 +1,25 @@
+import { defineConfig } from '@liangskyli/mock';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const curDirName = path.dirname(fileURLToPath(import.meta.url));
+
+export default defineConfig({
+  mockDir: path.join(curDirName, '../'),
+  //mockDir: path.join(__dirname, '/gen-mock'),
+  //mockDir: path.join(__dirname, '../../http-mock-gen/test/all-gen-dirs/gen-mock/'),
+  port: 8002,
+  socketConfig: {
+    enable: true,
+    opts: {
+      path: '/socket.io/',
+      cors: {
+        origin: ['http://localhost:63342'],
+      },
+    },
+    //mockControllerUrl: path.join(__dirname, '/mock/socket/sock.ts'),
+    //mockControllerUrl: 'mock/socket/sock.ts',
+    //mockControllerUrl: 'mock/socket/sock2.js',
+    mockControllerUrl: 'mock/socket/sock3.ts',
+  },
+});

packages/mock/test/esm/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}