egg 4.0.0-beta.14 → 4.0.0-beta.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/dist/commonjs/lib/types.d.ts +3 -36
  2. package/dist/commonjs/lib/types.js +3 -1
  3. package/dist/commonjs/lib/utils.js +1 -1
  4. package/dist/esm/lib/types.d.ts +3 -36
  5. package/dist/esm/lib/types.js +3 -2
  6. package/dist/esm/lib/utils.js +1 -1
  7. package/dist/package.json +1 -1
  8. package/package.json +4 -4
  9. package/src/lib/types.ts +36 -37
  10. package/src/lib/utils.ts +0 -1
package/dist/commonjs/lib/types.d.ts CHANGED
@@ -1,11 +1,12 @@
1
1
  import type { Socket } from 'node:net';
2
2
  import type { RequestOptions as HttpClientRequestOptions } from 'urllib';
3
3
  import type { EggLoggerOptions, EggLoggersOptions } from 'egg-logger';
4
- import type { FileLoaderOptions } from '@eggjs/core';
4
+ import type { FileLoaderOptions, EggAppConfig as EggCoreAppConfig } from '@eggjs/core';
5
5
  import type { EggApplicationCore, Context } from './egg.js';
6
6
  import type { MetaMiddlewareOptions } from '../app/middleware/meta.js';
7
7
  import type { NotFoundMiddlewareOptions } from '../app/middleware/notfound.js';
8
8
  import type { SiteFileMiddlewareOptions } from '../app/middleware/site_file.js';
9
+ import '@eggjs/watcher';
9
10
  export type { EggAppInfo, } from '@eggjs/core';
10
11
  type IgnoreItem = string | RegExp | ((ctx: Context) => boolean);
11
12
  type IgnoreOrMatch = IgnoreItem | IgnoreItem[];
@@ -42,7 +43,7 @@ export interface CustomLoaderConfig extends Omit<FileLoaderOptions, 'inject' | '
42
43
  */
43
44
  loadunit?: boolean;
44
45
  }
45
- export interface EggAppConfig {
46
+ export interface EggAppConfig extends EggCoreAppConfig {
46
47
  workerStartTimeout: number;
47
48
  baseDir: string;
48
49
  middleware: string[];
@@ -123,42 +124,9 @@ export interface EggAppConfig {
123
124
  */
124
125
  useHttpClientNext?: boolean;
125
126
  };
126
- development: {
127
- /**
128
- * dirs needed watch, when files under these change, application will reload, use relative path
129
- */
130
- watchDirs: string[];
131
- /**
132
- * dirs don't need watch, including subdirectories, use relative path
133
- */
134
- ignoreDirs: string[];
135
- /**
136
- * don't wait all plugins ready, default is true.
137
- */
138
- fastReady: boolean;
139
- /**
140
- * whether reload on debug, default is true.
141
- */
142
- reloadOnDebug: boolean;
143
- /**
144
- * whether override default watchDirs, default is false.
145
- */
146
- overrideDefault: boolean;
147
- /**
148
- * whether override default ignoreDirs, default is false.
149
- */
150
- overrideIgnore: boolean;
151
- /**
152
- * whether to reload, use https://github.com/sindresorhus/multimatch
153
- */
154
- reloadPattern: string[] | string;
155
- };
156
127
  /**
157
128
  * customLoader config
158
129
  */
159
- customLoader: {
160
- [key: string]: CustomLoaderConfig;
161
- };
162
130
  /**
163
131
  * It will ignore special keys when dumpConfig
164
132
  */
@@ -272,7 +240,6 @@ export interface EggAppConfig {
272
240
  enable: boolean;
273
241
  allowedMethods: string[];
274
242
  };
275
- watcher: Record<string, any>;
276
243
  onClientError?(err: Error, socket: Socket, app: EggApplicationCore): ClientErrorResponse | Promise<ClientErrorResponse>;
277
244
  /**
278
245
  * server timeout in milliseconds, default to 0 (no timeout).
package/dist/commonjs/lib/types.js CHANGED
@@ -1,3 +1,5 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==
3
+ // import @eggjs/watcher types
4
+ require("@eggjs/watcher");
5
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBa0JBLDhCQUE4QjtBQUM5QiwwQkFBd0IifQ==
package/dist/commonjs/lib/utils.js CHANGED
@@ -18,4 +18,4 @@ function getSourceDirname() {
18
18
  function getSourceFile(filename) {
19
19
  return node_path_1.default.join(getSourceDirname(), filename);
20
20
  }
21
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBSUEsNENBT0M7QUFFRCxzQ0FFQztBQWRELDBEQUE2QjtBQUM3Qix1Q0FBeUM7QUFFekMsU0FBZ0IsZ0JBQWdCO0lBQzlCLElBQUksT0FBTyxTQUFTLEtBQUssV0FBVyxFQUFFLENBQUM7UUFDckMsT0FBTyxtQkFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBQ0QsNkRBQTZEO0lBQzdELGFBQWE7SUFDYixPQUFPLG1CQUFJLENBQUMsT0FBTyxDQUFDLG1CQUFJLENBQUMsT0FBTyxDQUFDLElBQUEsd0JBQWEsRUFBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNwRSxDQUFDO0FBRUQsU0FBZ0IsYUFBYSxDQUFDLFFBQWdCO0lBQzVDLE9BQU8sbUJBQUksQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsRUFBRSxRQUFRLENBQUMsQ0FBQztBQUNqRCxDQUFDIn0=
21
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBR0EsNENBT0M7QUFFRCxzQ0FFQztBQWRELDBEQUE2QjtBQUM3Qix1Q0FBeUM7QUFFekMsU0FBZ0IsZ0JBQWdCO0lBQzlCLElBQUksT0FBTyxTQUFTLEtBQUssV0FBVyxFQUFFLENBQUM7UUFDckMsT0FBTyxtQkFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBQ0QsNkRBQTZEO0lBQzdELGFBQWE7SUFDYixPQUFPLG1CQUFJLENBQUMsT0FBTyxDQUFDLG1CQUFJLENBQUMsT0FBTyxDQUFDLElBQUEsd0JBQWEsRUFBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNwRSxDQUFDO0FBRUQsU0FBZ0IsYUFBYSxDQUFDLFFBQWdCO0lBQzVDLE9BQU8sbUJBQUksQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsRUFBRSxRQUFRLENBQUMsQ0FBQztBQUNqRCxDQUFDIn0=
package/dist/esm/lib/types.d.ts CHANGED
@@ -1,11 +1,12 @@
1
1
  import type { Socket } from 'node:net';
2
2
  import type { RequestOptions as HttpClientRequestOptions } from 'urllib';
3
3
  import type { EggLoggerOptions, EggLoggersOptions } from 'egg-logger';
4
- import type { FileLoaderOptions } from '@eggjs/core';
4
+ import type { FileLoaderOptions, EggAppConfig as EggCoreAppConfig } from '@eggjs/core';
5
5
  import type { EggApplicationCore, Context } from './egg.js';
6
6
  import type { MetaMiddlewareOptions } from '../app/middleware/meta.js';
7
7
  import type { NotFoundMiddlewareOptions } from '../app/middleware/notfound.js';
8
8
  import type { SiteFileMiddlewareOptions } from '../app/middleware/site_file.js';
9
+ import '@eggjs/watcher';
9
10
  export type { EggAppInfo, } from '@eggjs/core';
10
11
  type IgnoreItem = string | RegExp | ((ctx: Context) => boolean);
11
12
  type IgnoreOrMatch = IgnoreItem | IgnoreItem[];
@@ -42,7 +43,7 @@ export interface CustomLoaderConfig extends Omit<FileLoaderOptions, 'inject' | '
42
43
  */
43
44
  loadunit?: boolean;
44
45
  }
45
- export interface EggAppConfig {
46
+ export interface EggAppConfig extends EggCoreAppConfig {
46
47
  workerStartTimeout: number;
47
48
  baseDir: string;
48
49
  middleware: string[];
@@ -123,42 +124,9 @@ export interface EggAppConfig {
123
124
  */
124
125
  useHttpClientNext?: boolean;
125
126
  };
126
- development: {
127
- /**
128
- * dirs needed watch, when files under these change, application will reload, use relative path
129
- */
130
- watchDirs: string[];
131
- /**
132
- * dirs don't need watch, including subdirectories, use relative path
133
- */
134
- ignoreDirs: string[];
135
- /**
136
- * don't wait all plugins ready, default is true.
137
- */
138
- fastReady: boolean;
139
- /**
140
- * whether reload on debug, default is true.
141
- */
142
- reloadOnDebug: boolean;
143
- /**
144
- * whether override default watchDirs, default is false.
145
- */
146
- overrideDefault: boolean;
147
- /**
148
- * whether override default ignoreDirs, default is false.
149
- */
150
- overrideIgnore: boolean;
151
- /**
152
- * whether to reload, use https://github.com/sindresorhus/multimatch
153
- */
154
- reloadPattern: string[] | string;
155
- };
156
127
  /**
157
128
  * customLoader config
158
129
  */
159
- customLoader: {
160
- [key: string]: CustomLoaderConfig;
161
- };
162
130
  /**
163
131
  * It will ignore special keys when dumpConfig
164
132
  */
@@ -272,7 +240,6 @@ export interface EggAppConfig {
272
240
  enable: boolean;
273
241
  allowedMethods: string[];
274
242
  };
275
- watcher: Record<string, any>;
276
243
  onClientError?(err: Error, socket: Socket, app: EggApplicationCore): ClientErrorResponse | Promise<ClientErrorResponse>;
277
244
  /**
278
245
  * server timeout in milliseconds, default to 0 (no timeout).
package/dist/esm/lib/types.js CHANGED
@@ -1,2 +1,3 @@
1
- export {};
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==
1
+ // import @eggjs/watcher types
2
+ import '@eggjs/watcher';
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWtCQSw4QkFBOEI7QUFDOUIsT0FBTyxnQkFBZ0IsQ0FBQyJ9
package/dist/esm/lib/utils.js CHANGED
@@ -11,4 +11,4 @@ export function getSourceDirname() {
11
11
  export function getSourceFile(filename) {
12
12
  return path.join(getSourceDirname(), filename);
13
13
  }
14
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUM3QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBRXpDLE1BQU0sVUFBVSxnQkFBZ0I7SUFDOUIsSUFBSSxPQUFPLFNBQVMsS0FBSyxXQUFXLEVBQUUsQ0FBQztRQUNyQyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDakMsQ0FBQztJQUNELDZEQUE2RDtJQUM3RCxhQUFhO0lBQ2IsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3BFLENBQUM7QUFFRCxNQUFNLFVBQVUsYUFBYSxDQUFDLFFBQWdCO0lBQzVDLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0FBQ2pELENBQUMifQ==
14
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUM3QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBRXpDLE1BQU0sVUFBVSxnQkFBZ0I7SUFDOUIsSUFBSSxPQUFPLFNBQVMsS0FBSyxXQUFXLEVBQUUsQ0FBQztRQUNyQyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDakMsQ0FBQztJQUNELDZEQUE2RDtJQUM3RCxhQUFhO0lBQ2IsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3BFLENBQUM7QUFFRCxNQUFNLFVBQVUsYUFBYSxDQUFDLFFBQWdCO0lBQzVDLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0FBQ2pELENBQUMifQ==
package/dist/package.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "name": "egg",
3
- "version": "4.0.0-beta.14"
3
+ "version": "4.0.0-beta.15"
4
4
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "egg",
3
- "version": "4.0.0-beta.14",
3
+ "version": "4.0.0-beta.15",
4
4
  "engines": {
5
5
  "node": ">= 18.19.0"
6
6
  },
@@ -21,10 +21,10 @@
21
21
  "dependencies": {
22
22
  "@eggjs/cluster": "^3.0.0",
23
23
  "@eggjs/cookies": "^3.0.0",
24
- "@eggjs/core": "^6.2.11",
24
+ "@eggjs/core": "^6.2.13",
25
25
  "@eggjs/schedule": "^5.0.2",
26
- "@eggjs/utils": "^4.1.5",
27
- "@eggjs/watcher": "^4.0.1",
26
+ "@eggjs/utils": "^4.2.4",
27
+ "@eggjs/watcher": "^4.0.3",
28
28
  "circular-json-for-egg": "^1.0.0",
29
29
  "cluster-client": "^3.7.0",
30
30
  "egg-development": "^3.0.0",
package/src/lib/types.ts CHANGED
@@ -7,6 +7,7 @@ import type {
7
7
  } from 'egg-logger';
8
8
  import type {
9
9
  FileLoaderOptions,
10
+ EggAppConfig as EggCoreAppConfig,
10
11
  } from '@eggjs/core';
11
12
  import type {
12
13
  EggApplicationCore, Context,
@@ -16,7 +17,7 @@ import type { NotFoundMiddlewareOptions } from '../app/middleware/notfound.js';
16
17
  import type { SiteFileMiddlewareOptions } from '../app/middleware/site_file.js';
17
18
 
18
19
  // import @eggjs/watcher types
19
- // import '@eggjs/watcher';
20
+ import '@eggjs/watcher';
20
21
 
21
22
  export type {
22
23
  EggAppInfo,
@@ -61,7 +62,7 @@ export interface CustomLoaderConfig extends Omit<FileLoaderOptions, 'inject' | '
61
62
  loadunit?: boolean;
62
63
  }
63
64
 
64
- export interface EggAppConfig {
65
+ export interface EggAppConfig extends EggCoreAppConfig {
65
66
  workerStartTimeout: number;
66
67
  baseDir: string;
67
68
  middleware: string[];
@@ -147,43 +148,43 @@ export interface EggAppConfig {
147
148
  useHttpClientNext?: boolean;
148
149
  };
149
150
 
150
- development: {
151
- /**
152
- * dirs needed watch, when files under these change, application will reload, use relative path
153
- */
154
- watchDirs: string[];
155
- /**
156
- * dirs don't need watch, including subdirectories, use relative path
157
- */
158
- ignoreDirs: string[];
159
- /**
160
- * don't wait all plugins ready, default is true.
161
- */
162
- fastReady: boolean;
163
- /**
164
- * whether reload on debug, default is true.
165
- */
166
- reloadOnDebug: boolean;
167
- /**
168
- * whether override default watchDirs, default is false.
169
- */
170
- overrideDefault: boolean;
171
- /**
172
- * whether override default ignoreDirs, default is false.
173
- */
174
- overrideIgnore: boolean;
175
- /**
176
- * whether to reload, use https://github.com/sindresorhus/multimatch
177
- */
178
- reloadPattern: string[] | string;
179
- };
151
+ // development: {
152
+ // /**
153
+ // * dirs needed watch, when files under these change, application will reload, use relative path
154
+ // */
155
+ // watchDirs: string[];
156
+ // /**
157
+ // * dirs don't need watch, including subdirectories, use relative path
158
+ // */
159
+ // ignoreDirs: string[];
160
+ // /**
161
+ // * don't wait all plugins ready, default is true.
162
+ // */
163
+ // fastReady: boolean;
164
+ // /**
165
+ // * whether reload on debug, default is true.
166
+ // */
167
+ // reloadOnDebug: boolean;
168
+ // /**
169
+ // * whether override default watchDirs, default is false.
170
+ // */
171
+ // overrideDefault: boolean;
172
+ // /**
173
+ // * whether override default ignoreDirs, default is false.
174
+ // */
175
+ // overrideIgnore: boolean;
176
+ // /**
177
+ // * whether to reload, use https://github.com/sindresorhus/multimatch
178
+ // */
179
+ // reloadPattern: string[] | string;
180
+ // };
180
181
 
181
182
  /**
182
183
  * customLoader config
183
184
  */
184
- customLoader: {
185
- [key: string]: CustomLoaderConfig;
186
- };
185
+ // customLoader: {
186
+ // [key: string]: CustomLoaderConfig;
187
+ // };
187
188
 
188
189
  /**
189
190
  * It will ignore special keys when dumpConfig
@@ -308,8 +309,6 @@ export interface EggAppConfig {
308
309
  allowedMethods: string[];
309
310
  };
310
311
 
311
- watcher: Record<string, any>;
312
-
313
312
  onClientError?(err: Error, socket: Socket, app: EggApplicationCore): ClientErrorResponse | Promise<ClientErrorResponse>;
314
313
 
315
314
  /**
package/src/lib/utils.ts CHANGED
@@ -1,4 +1,3 @@
1
-
2
1
  import path from 'node:path';
3
2
  import { fileURLToPath } from 'node:url';
4
3