f

Author: fengmk2

package.json

@@ -93,5 +93,6 @@
     "src"
   ],
   "types": "./dist/commonjs/index.d.ts",
-  "main": "./dist/commonjs/index.js"
+  "main": "./dist/commonjs/index.js",
+  "module": "./dist/esm/index.js"
 }

src/app/middleware/egg_loader_trace.ts

@@ -9,7 +9,7 @@ export default (_: unknown, app: EggCore): MiddlewareFunc => {
     if (ctx.path !== '/__loader_trace__') {
       return await next();
     }
-    const template = await fs.readFile(getSourceFile('lib/loader_trace.html'), 'utf8');
+    const template = await fs.readFile(getSourceFile('config/loader_trace.html'), 'utf8');
     const data = await loadTimingData(app);
     ctx.body = template.replace('{{placeholder}}', JSON.stringify(data));
   };

src/lib/loader_trace.html src/config/loader_trace.html

@@ -0,0 +1,4 @@
+// make sure to import egg typings and let typescript know about it
+// @see https://github.com/whxaxes/blog/issues/11
+// and https://www.typescriptlang.org/docs/handbook/declaration-merging.html
+import 'egg';

src/typings/index.d.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs/promises';
 import { scheduler } from 'node:timers/promises';
 import { mm, MockApplication } from '@eggjs/mock';
-import { escape, getFilepath, DELAY } from './utils.js';
+import { escape, getFilepath } from './utils.js';
 
 describe('test/override.test.ts', () => {
   let app: MockApplication;
@@ -23,19 +23,19 @@ describe('test/override.test.ts', () => {
     it('should reload', async () => {
       const filepath = getFilepath('override/app/service/a.js');
       await fs.writeFile(filepath, '');
-      await scheduler.wait(DELAY);
-
+      await scheduler.wait(1000);
       await fs.unlink(filepath);
+      await scheduler.wait(5000);
       app.expect('stdout', /a\.js/);
     });
 
     it('should not reload', async () => {
       app.debug();
       const filepath = getFilepath('override/app/no-trigger/index.js');
       await fs.writeFile(filepath, '');
-      await scheduler.wait(DELAY);
-
+      await scheduler.wait(1000);
       await fs.unlink(filepath);
+      await scheduler.wait(5000);
       app.notExpect('stdout', /index\.js/);
     });
   });
@@ -52,19 +52,19 @@ describe('test/override.test.ts', () => {
     it('should reload', async () => {
       const filepath = getFilepath('override-ignore/app/web/a.js');
       await fs.writeFile(filepath, '');
-      await scheduler.wait(DELAY);
-
+      await scheduler.wait(1000);
       await fs.unlink(filepath);
+      await scheduler.wait(5000);
       app.expect('stdout', new RegExp(escape(`reload worker because ${filepath}`)));
     });
 
     it('should not reload', async () => {
       app.debug();
       const filepath = getFilepath('override-ignore/app/public/index.js');
       await fs.writeFile(filepath, '');
-      await scheduler.wait(DELAY);
-
+      await scheduler.wait(1000);
       await fs.unlink(filepath);
+      await scheduler.wait(5000);
       app.notExpect('stdout', new RegExp(escape(`reload worker because ${filepath} change`)));
     });
   });