change mockCtxStorage default to false

Author: fengmk2

example/helloworld-commonjs/config/config.js example/helloworld-commonjs/config/config.default.js

@@ -6,5 +6,8 @@ export const hello: MiddlewareFunc = async (ctx, next) => {
   console.log(ctx.performanceStarttime);
   const res = await ctx.curl('https://eggjs.org');
   console.log(res.status);
+
+  // egg watcher
+  // console.log('egg watcher', ctx.app.watcher);
   await next();
 };

example/helloworld-typescript/app/middleware/hello.ts

@@ -24,7 +24,7 @@
     "@eggjs/core": "^6.2.3",
     "@eggjs/schedule": "^5.0.2",
     "@eggjs/utils": "^4.0.2",
-    "@eggjs/watcher": "^4.0.0",
+    "@eggjs/watcher": "^4.0.1",
     "circular-json-for-egg": "^1.0.0",
     "cluster-client": "^3.7.0",
     "delegates": "^1.0.0",

package.json

@@ -13,7 +13,7 @@ export interface SiteFileMiddlewareOptions {
 
 const BUFFER_CACHE = Symbol('siteFile URL buffer cache');
 
-module.exports = (options: SiteFileMiddlewareOptions) => {
+export default (options: SiteFileMiddlewareOptions) => {
   return async function siteFile(ctx: ContextDelegation, next: Next) {
     if (ctx.method !== 'HEAD' && ctx.method !== 'GET') {
       return next();

src/app/middleware/site_file.ts

@@ -15,6 +15,9 @@ import type { MetaMiddlewareOptions } from '../app/middleware/meta.js';
 import type { NotFoundMiddlewareOptions } from '../app/middleware/notfound.js';
 import type { SiteFileMiddlewareOptions } from '../app/middleware/site_file.js';
 
+// import @eggjs/watcher types
+// import '@eggjs/watcher';
+
 type IgnoreItem = string | RegExp | ((ctx: ContextDelegation) => boolean);
 type IgnoreOrMatch = IgnoreItem | IgnoreItem[];
 

src/lib/type.ts

@@ -63,7 +63,7 @@ describe('test/app/extend/context.test.ts', () => {
       const errorContent = fs.readFileSync(path.join(logDir, 'common-error.log'), 'utf8');
       assert(errorContent.includes('nodejs.Error: error foo'));
       assert(errorContent.includes('nodejs.Error: core error foo'));
-      assert(/\[123123\/[\d.]+\/-\/\d+ms GET \/logger\?message=foo]/.test(errorContent));
+      assert.match(errorContent, /\[123123\/[\d\.]+\/-\/[\d\.]+ms GET \/logger\?message=foo]/);
 
       const loggerContent = fs.readFileSync(path.join(logDir, 'demo-web.log'), 'utf8');
       assert(!loggerContent.includes('debug foo'));

test/app/extend/context.test.ts

@@ -1,5 +1,3 @@
-'use strict';
-
 module.exports = async function() {
   const message = this.query.message;
 

test/fixtures/apps/demo/app/controller/logger.js

@@ -236,7 +236,7 @@ describe('test/lib/core/logger.test.js', () => {
         enableFastContextLogger: true,
       });
     await utils.sleep(1000);
-    app.expectLog(/ INFO \d+ \[-\/127\.0\.0\.1\/mock-trace-id-123\/\d+ms GET \/] enableFastContextLogger: true/);
+    app.expectLog(/ INFO \d+ \[-\/127\.0\.0\.1\/mock-trace-id-123\/[\d\.]+ms GET \/] enableFastContextLogger: true/);
   });
 
   describe('logger.level = DEBUG', () => {

test/lib/core/logger.test.js

@@ -145,6 +145,8 @@ function formatOptions(name: string | MockOption, options?: MockOption) {
     baseDir,
     framework: eggPath,
     cache: false,
+    // change default mockCtxStorage to false because we don't need it in framework test
+    mockCtxStorage: false,
     ...options,
   };
 }