From 593854e5a21a195c916602b329b52beb9bc9f2fe Mon Sep 17 00:00:00 2001 From: liangsky <640634387@qq.com> Date: Wed, 6 Dec 2023 21:05:29 +0800 Subject: [PATCH] feat(mock): add "type": "module" as default,for support esm --- packages/mock/bin/index.cjs | 5 ++ packages/mock/bin/index.js | 5 +- packages/mock/docs/cli-mock-socket.md | 2 +- packages/mock/docs/express-mock-socket.md | 2 +- packages/mock/docs/mock-server-socket.md | 2 +- packages/mock/docs/webpack-mock-socket.md | 45 +++++++++-------- packages/mock/docs/webpack-mock.md | 48 +++++++++++-------- packages/mock/mock/socket/package.json | 3 ++ packages/mock/mock/socket/sock.ts | 8 ++-- packages/mock/mock/socket/sock3.ts | 14 ++++++ packages/mock/package.json | 26 +++++++--- packages/mock/rollup.config.js | 6 ++- packages/mock/src/http/mock/utils.ts | 7 ++- packages/mock/src/http/server/middleware.ts | 2 +- packages/mock/src/http/server/server.ts | 2 +- .../mock/src/http/server/socket-server.ts | 7 ++- packages/mock/test/esm/mock-esm.config.ts | 21 ++++++++ packages/mock/test/esm/mock.config.ts | 25 ++++++++++ packages/mock/test/esm/package.json | 3 ++ packages/mock/test/esm/server-mock-esm.ts | 32 +++++++++++++ packages/mock/test/esm/server.ts | 32 +++++++++++++ packages/mock/test/esm/tsconfig.json | 16 +++++++ packages/mock/test/middleware.ts | 3 +- packages/mock/test/mock.config.ts | 2 +- packages/mock/test/mock/socket/sock.ts | 8 ++-- packages/mock/test/mock/socket/sock3.ts | 4 +- packages/mock/test/package.json | 3 ++ packages/mock/test/server.ts | 4 +- packages/mock/test/socket.html | 4 +- packages/mock/test/webpack.config.ts | 39 ++++++++------- 30 files changed, 285 insertions(+), 95 deletions(-) create mode 100644 packages/mock/bin/index.cjs create mode 100644 packages/mock/mock/socket/package.json create mode 100644 packages/mock/mock/socket/sock3.ts create mode 100644 packages/mock/test/esm/mock-esm.config.ts create mode 100644 packages/mock/test/esm/mock.config.ts create mode 100644 packages/mock/test/esm/package.json create mode 100644 packages/mock/test/esm/server-mock-esm.ts create mode 100644 packages/mock/test/esm/server.ts create mode 100644 packages/mock/test/esm/tsconfig.json create mode 100644 packages/mock/test/package.json diff --git a/packages/mock/bin/index.cjs b/packages/mock/bin/index.cjs new file mode 100644 index 0000000..4f2b2d7 --- /dev/null +++ b/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); diff --git a/packages/mock/bin/index.js b/packages/mock/bin/index.js index 4f2b2d7..7a65e65 100755 --- a/packages/mock/bin/index.js +++ b/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); diff --git a/packages/mock/docs/cli-mock-socket.md b/packages/mock/docs/cli-mock-socket.md index 14a9ea3..6768547 100644 --- a/packages/mock/docs/cli-mock-socket.md +++ b/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, '/'), diff --git a/packages/mock/docs/express-mock-socket.md b/packages/mock/docs/express-mock-socket.md index d581e9f..36926ca 100644 --- a/packages/mock/docs/express-mock-socket.md +++ b/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: { diff --git a/packages/mock/docs/mock-server-socket.md b/packages/mock/docs/mock-server-socket.md index d437aa1..92e97b1 100644 --- a/packages/mock/docs/mock-server-socket.md +++ b/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, '/'), diff --git a/packages/mock/docs/webpack-mock-socket.md b/packages/mock/docs/webpack-mock-socket.md index 495b26c..1ca673f 100644 --- a/packages/mock/docs/webpack-mock-socket.md +++ b/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, + }); + } + }, + ); }, }, }; diff --git a/packages/mock/docs/webpack-mock.md b/packages/mock/docs/webpack-mock.md index 5026971..6c40522 100644 --- a/packages/mock/docs/webpack-mock.md +++ b/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(); -``` \ No newline at end of file +``` diff --git a/packages/mock/mock/socket/package.json b/packages/mock/mock/socket/package.json new file mode 100644 index 0000000..5bbefff --- /dev/null +++ b/packages/mock/mock/socket/package.json @@ -0,0 +1,3 @@ +{ + "type": "commonjs" +} diff --git a/packages/mock/mock/socket/sock.ts b/packages/mock/mock/socket/sock.ts index f7e0673..52fb591 100644 --- a/packages/mock/mock/socket/sock.ts +++ b/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); }); }, }; diff --git a/packages/mock/mock/socket/sock3.ts b/packages/mock/mock/socket/sock3.ts new file mode 100644 index 0000000..d88458f --- /dev/null +++ b/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; diff --git a/packages/mock/package.json b/packages/mock/package.json index 1807c89..49d0480 100644 --- a/packages/mock/package.json +++ b/packages/mock/package.json @@ -20,12 +20,21 @@ }, "license": "MIT", "author": "liangsky <640634387@qq.com>", - "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" diff --git a/packages/mock/rollup.config.js b/packages/mock/rollup.config.js index fdf119b..439e490 100644 --- a/packages/mock/rollup.config.js +++ b/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)]; diff --git a/packages/mock/src/http/mock/utils.ts b/packages/mock/src/http/mock/utils.ts index 659963b..427113d 100644 --- a/packages/mock/src/http/mock/utils.ts +++ b/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', diff --git a/packages/mock/src/http/server/middleware.ts b/packages/mock/src/http/server/middleware.ts index 29d6193..638423d 100644 --- a/packages/mock/src/http/server/middleware.ts +++ b/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'; diff --git a/packages/mock/src/http/server/server.ts b/packages/mock/src/http/server/server.ts index 4b54644..73a74f4 100644 --- a/packages/mock/src/http/server/server.ts +++ b/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'; diff --git a/packages/mock/src/http/server/socket-server.ts b/packages/mock/src/http/server/socket-server.ts index a5d5265..d9b5c54 100644 --- a/packages/mock/src/http/server/socket-server.ts +++ b/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; diff --git a/packages/mock/test/esm/mock-esm.config.ts b/packages/mock/test/esm/mock-esm.config.ts new file mode 100644 index 0000000..b3fc8ae --- /dev/null +++ b/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', + }, +}); diff --git a/packages/mock/test/esm/mock.config.ts b/packages/mock/test/esm/mock.config.ts new file mode 100644 index 0000000..e4ac103 --- /dev/null +++ b/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', + }, +}); diff --git a/packages/mock/test/esm/package.json b/packages/mock/test/esm/package.json new file mode 100644 index 0000000..3dbc1ca --- /dev/null +++ b/packages/mock/test/esm/package.json @@ -0,0 +1,3 @@ +{ + "type": "module" +} diff --git a/packages/mock/test/esm/server-mock-esm.ts b/packages/mock/test/esm/server-mock-esm.ts new file mode 100644 index 0000000..95d14a1 --- /dev/null +++ b/packages/mock/test/esm/server-mock-esm.ts @@ -0,0 +1,32 @@ +import mockServer from '@liangskyli/mock'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + +//mockServer(); +//mockServer({ mockDir: 'test' }); +mockServer({ + mockDir: path.join(__dirname, '../../'), + exclude: ['mock/b.ts'], + port: 8002, + socketConfig: { + enable: true, + namespaceList: ['/namespace'], + opts: { + path: '/socket.io/', + cors: { + origin: ['http://localhost:63342'], + credentials: true, + }, + }, + mockControllerUrl: 'mock/socket/sock.ts', + }, +}); +//mockServer({port: 9001 }); +//mockServer({hostname: '127.0.0.1',port: 9001 }); +//console.log(path.join(__dirname, '../../http-mock-gen/test/all-gen-dirs/gen-mock/')); +/*mockServer({ + port: 7010, + mockDir: path.join(__dirname, '../../http-mock-gen/test/all-gen-dirs/gen-mock/'), +});*/ diff --git a/packages/mock/test/esm/server.ts b/packages/mock/test/esm/server.ts new file mode 100644 index 0000000..56207b5 --- /dev/null +++ b/packages/mock/test/esm/server.ts @@ -0,0 +1,32 @@ +import mockServer from '@liangskyli/mock'; +import { fileURLToPath } from 'node:url'; +import * as path from 'path'; + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + +//mockServer(); +//mockServer({ mockDir: 'test' }); +mockServer({ + mockDir: path.join(__dirname, '../'), + exclude: ['mock/b.ts'], + port: 8002, + socketConfig: { + enable: true, + namespaceList: ['/namespace'], + opts: { + path: '/socket.io/', + cors: { + origin: ['http://localhost:63342'], + credentials: true, + }, + }, + mockControllerUrl: 'mock/socket/sock.ts', + }, +}); +//mockServer({port: 9001 }); +//mockServer({hostname: '127.0.0.1',port: 9001 }); +//console.log(path.join(__dirname, '../../http-mock-gen/test/all-gen-dirs/gen-mock/')); +/*mockServer({ + port: 7010, + mockDir: path.join(__dirname, '../../http-mock-gen/test/all-gen-dirs/gen-mock/'), +});*/ diff --git a/packages/mock/test/esm/tsconfig.json b/packages/mock/test/esm/tsconfig.json new file mode 100644 index 0000000..50b9a04 --- /dev/null +++ b/packages/mock/test/esm/tsconfig.json @@ -0,0 +1,16 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "rootDir": "../../", + "moduleResolution": "node", + }, + "include": [ + "../../mock/**/*.ts", + "../../test/**/*.ts", + ], + "ts-node": { + "compilerOptions": { + "module": "esnext" + } + } +} diff --git a/packages/mock/test/middleware.ts b/packages/mock/test/middleware.ts index 784f50b..5395905 100644 --- a/packages/mock/test/middleware.ts +++ b/packages/mock/test/middleware.ts @@ -1,6 +1,5 @@ -// @ts-ignore +import { getMiddleware, initSocketServer } from '@liangskyli/mock'; import express from 'express'; -import { getMiddleware, initSocketServer } from '../src'; import mockConfig from './mock.config'; const app = express(); diff --git a/packages/mock/test/mock.config.ts b/packages/mock/test/mock.config.ts index f54eec0..fa9a66e 100644 --- a/packages/mock/test/mock.config.ts +++ b/packages/mock/test/mock.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from '@liangskyli/mock'; -import path from 'path'; +import path from 'node:path'; export default defineConfig({ mockDir: path.join(__dirname, '/'), diff --git a/packages/mock/test/mock/socket/sock.ts b/packages/mock/test/mock/socket/sock.ts index 9097f57..52fb591 100644 --- a/packages/mock/test/mock/socket/sock.ts +++ b/packages/mock/test/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); }); }, }; diff --git a/packages/mock/test/mock/socket/sock3.ts b/packages/mock/test/mock/socket/sock3.ts index 6e41703..d88458f 100644 --- a/packages/mock/test/mock/socket/sock3.ts +++ b/packages/mock/test/mock/socket/sock3.ts @@ -1,4 +1,4 @@ -import type { ISocketDefaultController } from '../../../src'; +import type { ISocketDefaultController } from '@liangskyli/mock'; const socketDefaultController: ISocketDefaultController = (socket) => { const data = { a: 112 }; @@ -7,7 +7,7 @@ const socketDefaultController: ISocketDefaultController = (socket) => { // 接收客户端数据 socket.on('toServer', (clientData) => { - console.log('from client:', clientData); + console.log('from client default namespace:', clientData); }); }; diff --git a/packages/mock/test/package.json b/packages/mock/test/package.json new file mode 100644 index 0000000..5bbefff --- /dev/null +++ b/packages/mock/test/package.json @@ -0,0 +1,3 @@ +{ + "type": "commonjs" +} diff --git a/packages/mock/test/server.ts b/packages/mock/test/server.ts index 6b7e5dd..1f1f08a 100644 --- a/packages/mock/test/server.ts +++ b/packages/mock/test/server.ts @@ -1,5 +1,5 @@ -import * as path from 'path'; -import mockServer from '../src/index'; +import mockServer from '@liangskyli/mock'; +import * as path from 'node:path'; //mockServer(); //mockServer({ mockDir: 'test' }); diff --git a/packages/mock/test/socket.html b/packages/mock/test/socket.html index a4a3473..0f353b5 100644 --- a/packages/mock/test/socket.html +++ b/packages/mock/test/socket.html @@ -9,8 +9,8 @@