f

Author: fengmk2

package.json

@@ -56,21 +56,20 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.17.1",
     "@eggjs/bin": "7",
+    "@eggjs/supertest": "^8.1.1",
     "@eggjs/tsconfig": "1",
     "@types/js-yaml": "4",
     "@types/mocha": "10",
     "@types/node": "22",
-    "@types/supertest": "6",
     "await-event": "2",
     "coffee": "5",
     "eslint": "8",
     "eslint-config-egg": "14",
     "gals": "1",
     "js-yaml": "3",
-    "mm": "3",
+    "mm": "^4.0.2",
     "pedding": "2",
     "rimraf": "6",
-    "supertest": "7",
     "ts-node": "10",
     "tshy": "3",
     "tshy-after": "1",

test/asyncLocalStorage.test.ts

@@ -1,6 +1,6 @@
 import { strict as assert } from 'node:assert';
 import { AsyncLocalStorage } from 'node:async_hooks';
-import request from 'supertest';
+import { request } from '@eggjs/supertest';
 import { getAsyncLocalStorage, kGALS } from 'gals';
 import { getFilepath } from './helper.js';
 import { Application } from './fixtures/egg-esm/index.js';

test/egg-ts.test.ts

@@ -1,6 +1,6 @@
 import { strict as assert } from 'node:assert';
-import mm from 'mm';
-import request from 'supertest';
+import { mm } from 'mm';
+import { request } from '@eggjs/supertest';
 import coffee from 'coffee';
 import { utils } from '../src/index.js';
 import { Application, createApp, getFilepath } from './helper.js';

test/egg.test.ts

@@ -3,8 +3,8 @@ import path from 'node:path';
 import { strict as assert } from 'node:assert';
 import fs from 'node:fs/promises';
 import { setTimeout as sleep } from 'node:timers/promises';
-import mm from 'mm';
-import request from 'supertest';
+import { mm } from 'mm';
+import { request } from '@eggjs/supertest';
 import { pending } from 'pedding';
 import coffee from 'coffee';
 import { createApp, getFilepath, Application } from './helper.js';

test/loader/context_loader.test.ts

@@ -1,4 +1,4 @@
-import request from 'supertest';
+import { request } from '@eggjs/supertest';
 import { getFilepath, createApp, Application } from '../helper.js';
 
 describe('test/loader/context_loader.test.ts', () => {

test/loader/egg_loader.test.ts

@@ -1,7 +1,7 @@
 import { strict as assert } from 'node:assert';
 import os from 'node:os';
 import path from 'node:path';
-import mm from 'mm';
+import { mm } from 'mm';
 import { getPlugins } from '@eggjs/utils';
 import { Application, createApp, getFilepath } from '../helper.js';
 import { EggLoader } from '../../src/index.js';

test/loader/get_app_info.test.ts

@@ -1,5 +1,5 @@
 import { strict as assert } from 'node:assert';
-import mm from 'mm';
+import { mm } from 'mm';
 import { Application, createApp, getFilepath } from '../helper.js';
 
 describe('test/loader/get_app_info.test.ts', () => {

test/loader/get_framework_paths.test.ts

@@ -1,5 +1,5 @@
 import { strict as assert } from 'node:assert';
-import mm from 'mm';
+import { mm } from 'mm';
 import { importModule } from '@eggjs/utils';
 import { Application, createApp, getFilepath } from '../helper.js';
 import { EggLoader, EggCore } from '../../src/index.js';

test/loader/get_load_units.test.ts

@@ -1,5 +1,5 @@
 import { strict as assert } from 'node:assert';
-import mm from 'mm';
+import { mm } from 'mm';
 import { Application, createApp, getFilepath } from '../helper.js';
 
 describe('test/loader/get_load_units.test.ts', () => {

test/loader/get_server_env.test.ts

@@ -1,5 +1,5 @@
 import { strict as assert } from 'node:assert';
-import mm from 'mm';
+import { mm } from 'mm';
 import { Application, createApp } from '../helper.js';
 
 describe('test/loader/get_server_env.test.ts', () => {

test/loader/load_file.test.ts

@@ -1,5 +1,5 @@
 import { strict as assert } from 'node:assert';
-import mm from 'mm';
+import { mm } from 'mm';
 import { createApp, Application, getFilepath } from '../helper.js';
 
 describe('test/loader/load_file.test.ts', () => {

test/loader/mixin/load_config.test.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { strict as assert } from 'node:assert';
-import mm from 'mm';
+import { mm } from 'mm';
 import { EggCore } from '../../../src/index.js';
 import { Application, createApp, getFilepath } from '../../helper.js';
 

test/loader/mixin/load_controller.test.ts

@@ -1,6 +1,6 @@
 import { strict as assert } from 'node:assert';
 import path from 'node:path';
-import request from 'supertest';
+import { request } from '@eggjs/supertest';
 import is from 'is-type-of';
 import { Application, createApp, getFilepath } from '../../helper.js';
 

test/loader/mixin/load_custom_loader.test.ts

@@ -1,5 +1,5 @@
 import { strict as assert } from 'node:assert';
-import request from 'supertest';
+import { request } from '@eggjs/supertest';
 import { Application, createApp } from '../../helper.js';
 
 describe('test/loader/mixin/load_custom_loader.test.ts', () => {

test/loader/mixin/load_extend.test.ts

@@ -1,6 +1,6 @@
 import { strict as assert } from 'node:assert';
-import request from 'supertest';
-import mm from 'mm';
+import { request } from '@eggjs/supertest';
+import { mm } from 'mm';
 import { Application, createApp } from '../../helper.js';
 
 describe('test/loader/mixin/load_extend.test.ts', () => {

test/loader/mixin/load_extend_class.test.ts

@@ -1,6 +1,6 @@
 import { strict as assert } from 'node:assert';
-import request from 'supertest';
-import mm from 'mm';
+import { request } from '@eggjs/supertest';
+import { mm } from 'mm';
 import { Application, createApp } from '../../helper.js';
 
 describe('test/loader/mixin/load_extend_class.test.ts', () => {

test/loader/mixin/load_helper_extend.test.ts

@@ -1,4 +1,4 @@
-import request from 'supertest';
+import { request } from '@eggjs/supertest';
 import { Application, createApp } from '../../helper.js';
 
 describe('test/loader/mixin/load_helper_extend.test.ts', () => {

test/loader/mixin/load_middleware.test.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { strict as assert } from 'node:assert';
-import request from 'supertest';
+import { request } from '@eggjs/supertest';
 import { Application, createApp, getFilepath } from '../../helper.js';
 
 describe('test/loader/mixin/load_middleware.test.ts', () => {

test/loader/mixin/load_plugin.test.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import fs from 'node:fs';
 import { strict as assert } from 'node:assert';
-import mm from 'mm';
+import { mm } from 'mm';
 import { Application, createApp, getFilepath } from '../../helper.js';
 import { EggCore, EggLoader } from '../../../src/index.js';
 

test/loader/mixin/load_service.test.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import { strict as assert } from 'node:assert';
-import request from 'supertest';
-import mm from 'mm';
+import { request } from '@eggjs/supertest';
+import { mm } from 'mm';
 import { Application, createApp, getFilepath } from '../../helper.js';
 
 describe('test/loader/mixin/load_service.test.ts', () => {

test/support-typescript.test.ts

@@ -1,5 +1,5 @@
 import { strict as assert } from 'node:assert';
-import request from 'supertest';
+import { request } from '@eggjs/supertest';
 import { getFilepath } from './helper.js';
 import { Application } from './fixtures/egg-esm/index.js';
 

test/utils/index.test.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { strict as assert } from 'node:assert';
-import mm from 'mm';
+import { mm } from 'mm';
 import utils from '../../src/utils/index.js';
 import { getFilepath } from '../helper.js';
 

test/utils/router.test.ts

@@ -1,5 +1,5 @@
 import { strict as assert } from 'node:assert';
-import request from 'supertest';
+import { request } from '@eggjs/supertest';
 import { Application, createApp } from '../helper.js';
 
 describe('test/utils/router.test.ts', () => {