eggjs · fengmk2 · Jan 1, 2023 · Jan 1, 2023 · Jan 1, 2023
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,9 @@ test/fixtures/apps/app-ts/**/*.js
 !test/fixtures/apps/app-ts/node_modules/**/*.js
 test/fixtures/apps/app-ts-esm/**/*.js
 test/fixtures/apps/app-ts-type-check/**/*.js
+test/fixtures/apps/app-ts-type-check/**/*.d.ts
+test/fixtures/apps/app-ts/**/*.d.ts
+test/fixtures/apps/app-ts-esm/**/*.d.ts
 
 # site
 site/dist

diff --git a/package.json b/package.json
@@ -59,6 +59,8 @@
     "ylru": "^1.3.2"
   },
   "devDependencies": {
+    "@eggjs/tsconfig": "^1.1.0",
+    "@types/node": "^18.11.18",
     "@umijs/preset-react": "^2.1.6",
     "address": "^1.2.1",
     "antd": "^4.23.2",
@@ -82,6 +84,7 @@
     "pedding": "^1.1.0",
     "prettier": "^2.7.1",
     "runscript": "^1.5.3",
+    "sdk-base": "^4.2.1",
     "spy": "^1.0.0",
     "supertest": "^6.2.4",
     "ts-node": "^10.9.1",

diff --git a/test/fixtures/apps/app-ts-esm/app/controller/foo.ts b/test/fixtures/apps/app-ts-esm/app/controller/foo.ts
@@ -1,4 +1,4 @@
-import { Controller, RequestObjectBody } from 'egg';
+import { Controller } from 'egg';
 
 // add user controller and service
 declare module 'egg' {

diff --git a/test/fixtures/apps/app-ts-type-check/tsconfig.json b/test/fixtures/apps/app-ts-type-check/tsconfig.json
@@ -1,9 +1,15 @@
 {
-  "extends": "../app-ts/tsconfig.json",
+  "extends": "@eggjs/tsconfig",
   "compilerOptions": {
-    "baseUrl": "."
+    "baseUrl": ".",
+    "paths": {
+      "egg": [
+        "../../../../index"
+      ]
+    },
+    "esModuleInterop": false
   },
   "exclude": [
     "./error.ts"
   ]
-}
+}
diff --git a/test/fixtures/apps/app-ts-type-check/yadan.d.ts b/test/fixtures/apps/app-ts-type-check/yadan.d.ts
@@ -20,4 +20,4 @@ declare module 'yadan' {
   }
 }
 
-export = Egg;
+export = Egg;
diff --git a/test/fixtures/apps/app-ts/app/controller/foo.ts b/test/fixtures/apps/app-ts/app/controller/foo.ts
@@ -59,6 +59,7 @@ export default class FooController extends Controller {
     result = await this.app.httpclient.request('url', request);
     result = await this.ctx.httpclient.curl('url', request);
     result = await this.ctx.httpclient.request('url', request);
+    console.log(result);
   }
 
   async requestWithHttpclient(request: RequestOptions) {
@@ -68,6 +69,7 @@ export default class FooController extends Controller {
     result = await this.app.httpclient.request('url', request);
     result = await this.ctx.httpclient.curl('url', request);
     result = await this.ctx.httpclient.request('url', request);
+    console.log(result);
   }
 
   async requestWithHttpclient2(request: RequestOptions2) {
@@ -77,6 +79,7 @@ export default class FooController extends Controller {
     result = await this.app.httpclient.request('url', request);
     result = await this.ctx.httpclient.curl('url', request);
     result = await this.ctx.httpclient.request('url', request);
+    console.log(result);
   }
 
   async httpclient() {

diff --git a/test/fixtures/apps/app-ts/lib/logger.ts b/test/fixtures/apps/app-ts/lib/logger.ts
@@ -13,4 +13,5 @@ export default (app: Application) => {
   ctx.getLogger('logger').info('test');
 
   const level: LoggerLevel = 'DEBUG';
+  console.log(level);
 };
diff --git a/test/fixtures/apps/app-ts/tsconfig.json b/test/fixtures/apps/app-ts/tsconfig.json
@@ -1,15 +1,11 @@
 {
+  "extends": "@eggjs/tsconfig",
   "compilerOptions": {
-    "target": "es2017",
     "baseUrl": ".",
     "paths": {
       "egg": [
         "../../../../index"
       ]
-    },
-    "types" : ["node"],
-    "module": "commonjs",
-    "strict": true,
-    "noImplicitAny": false
+    }
   }
 }
diff --git a/test/fixtures/apps/tracer-demo/tracer.js b/test/fixtures/apps/tracer-demo/tracer.js
@@ -1,18 +1,18 @@
 'use strict';
 
 const { performance } = require('perf_hooks');
-const uuid = require('uuid');
+const { randomUUID } = require('crypto');
 
 module.exports = app => {
   app.httpclient.on('request', req => {
     if (!req.ctx) {
       // auto set anonymous context
       req.ctx = req.args.ctx = app.createAnonymousContext();
-      req.ctx.traceId = 'anonymous-' + uuid.v1();
+      req.ctx.traceId = 'anonymous-' + randomUUID();
     }
     // set tracer id
     if (!req.ctx.traceId) {
-      req.ctx.traceId = uuid.v1();
+      req.ctx.traceId = randomUUID();
     }
     req.starttime = performance.now();
     req.args.headers = req.args.headers || {};

diff --git a/test/lib/core/httpclient_tracer_demo.test.js b/test/lib/core/httpclient_tracer_demo.test.js
@@ -1,5 +1,3 @@
-'use strict';
-
 const assert = require('assert');
 const utils = require('../../utils');
 
@@ -47,8 +45,7 @@ describe('test/lib/core/httpclient_tracer_demo.test.js', () => {
         assert(res.body.data['x-request-id'].startsWith('anonymous-'));
       })
       .expect(200);
-    // wait for windows log store
-    if (process.platform === 'win32') await utils.sleep(2000);
+    await utils.sleep(2000);
     app.expectLog(/ INFO \d+ \[-\/127.0.0.1\/mock-traceId-123123\/\d+ms GET \/foo\?url=http%3A%2F%2F127.0.0.1%3A\d+%2Fget_headers] app logger support traceId/);
   });
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,4 @@ declare module 'yadan' { @@
       }
     }
-    export = Egg;
+    export = Egg;