@eggjs/tegg-plugin 3.5.0 → 3.5.2
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.
- package/lib/CompatibleUtil.js +11 -3
- package/lib/EggAppLoader.d.ts +1 -0
- package/lib/EggAppLoader.js +13 -7
- package/lib/EggContextCompatibleHook.d.ts +0 -1
- package/lib/EggContextCompatibleHook.js +1 -8
- package/lib/EggQualifierProtoHook.d.ts +2 -0
- package/lib/EggQualifierProtoHook.js +14 -6
- package/package.json +3 -3
package/lib/CompatibleUtil.js
CHANGED
|
@@ -27,10 +27,14 @@ class CompatibleUtil {
|
|
|
27
27
|
return this.requestProtoCache.get(name);
|
|
28
28
|
}
|
|
29
29
|
static singletonModuleProxyFactory(app, loadUnitInstance) {
|
|
30
|
+
let deprecated = false;
|
|
30
31
|
return function (_, p) {
|
|
31
32
|
const proto = CompatibleUtil.getSingletonProto(p);
|
|
32
33
|
const eggObj = tegg_runtime_1.EggContainerFactory.getEggObject(proto);
|
|
33
|
-
|
|
34
|
+
if (!deprecated) {
|
|
35
|
+
deprecated = true;
|
|
36
|
+
app.deprecate(`[egg/module] Please use await app.getEggObject(clazzName) instead of app.${loadUnitInstance.name}.${String(p)}`);
|
|
37
|
+
}
|
|
34
38
|
return eggObj.obj;
|
|
35
39
|
};
|
|
36
40
|
}
|
|
@@ -44,10 +48,14 @@ class CompatibleUtil {
|
|
|
44
48
|
static contextModuleProxyFactory(holder, ctx, loadUnitInstance) {
|
|
45
49
|
const cacheKey = `_${loadUnitInstance.name}Proxy`;
|
|
46
50
|
if (!holder[cacheKey]) {
|
|
51
|
+
let deprecated = false;
|
|
47
52
|
const getter = function (_, p) {
|
|
48
53
|
const proto = CompatibleUtil.getRequestProto(p);
|
|
49
54
|
const eggObj = tegg_runtime_1.EggContainerFactory.getEggObject(proto, p);
|
|
50
|
-
|
|
55
|
+
if (!deprecated) {
|
|
56
|
+
deprecated = true;
|
|
57
|
+
ctx.app.deprecate(`[egg/module] Please use await ctx.getEggObject(clazzName) instead of ctx.${loadUnitInstance.name}.${String(p)}`);
|
|
58
|
+
}
|
|
51
59
|
return eggObj.obj;
|
|
52
60
|
};
|
|
53
61
|
holder[cacheKey] = tegg_common_util_1.ProxyUtil.safeProxy(loadUnitInstance, getter);
|
|
@@ -87,4 +95,4 @@ class CompatibleUtil {
|
|
|
87
95
|
exports.CompatibleUtil = CompatibleUtil;
|
|
88
96
|
CompatibleUtil.singletonProtoCache = new Map();
|
|
89
97
|
CompatibleUtil.requestProtoCache = new Map();
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29tcGF0aWJsZVV0aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJDb21wYXRpYmxlVXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSx3REFBeUU7QUFDekUsc0NBQXlFO0FBQ3pFLHNEQUE0RTtBQUM1RSw4REFBb0Q7QUFFcEQsTUFBYSxjQUFjO0lBSXpCLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxJQUFpQjtRQUN4QyxJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN2QyxNQUFNLEtBQUssR0FBRyxtQ0FBbUIsQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQztvQkFDeEUsU0FBUyxFQUFFLGlDQUEwQjtvQkFDckMsS0FBSyxFQUFFLHFCQUFjLENBQUMsU0FBUztpQkFDaEMsQ0FBQyxDQUFDLENBQUM7WUFDSixJQUFJLENBQUMsbUJBQW1CLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztTQUMzQztRQUNELE9BQU8sSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUUsQ0FBQztJQUM3QyxDQUFDO0lBRUQsTUFBTSxDQUFDLGVBQWUsQ0FBQyxJQUFpQjtRQUN0QyxJQUFJLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUNyQyxNQUFNLEtBQUssR0FBRyxtQ0FBbUIsQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQztvQkFDeEUsU0FBUyxFQUFFLGlDQUEwQjtvQkFDckMsS0FBSyxFQUFFLHFCQUFjLENBQUMsT0FBTztpQkFDOUIsQ0FBQyxDQUFDLENBQUM7WUFDSixJQUFJLENBQUMsaUJBQWlCLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztTQUN6QztRQUNELE9BQU8s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
|
package/lib/EggAppLoader.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Loader } from '@eggjs/tegg-metadata';
|
|
2
2
|
import { EggProtoImplClass } from '@eggjs/tegg';
|
|
3
3
|
export declare const APP_CLAZZ_BLACK_LIST: string[];
|
|
4
|
+
export declare const CONTEXT_CLAZZ_BLACK_LIST: string[];
|
|
4
5
|
export declare const DEFAULT_APP_CLAZZ: string[];
|
|
5
6
|
export declare const DEFAULT_CONTEXT_CLAZZ: string[];
|
|
6
7
|
export declare class EggAppLoader implements Loader {
|
package/lib/EggAppLoader.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.EggAppLoader = exports.DEFAULT_CONTEXT_CLAZZ = exports.DEFAULT_APP_CLAZZ = exports.APP_CLAZZ_BLACK_LIST = void 0;
|
|
3
|
+
exports.EggAppLoader = exports.DEFAULT_CONTEXT_CLAZZ = exports.DEFAULT_APP_CLAZZ = exports.CONTEXT_CLAZZ_BLACK_LIST = exports.APP_CLAZZ_BLACK_LIST = void 0;
|
|
4
4
|
const tegg_metadata_1 = require("@eggjs/tegg-metadata");
|
|
5
5
|
const tegg_1 = require("@eggjs/tegg");
|
|
6
6
|
const tegg_common_util_1 = require("@eggjs/tegg-common-util");
|
|
@@ -8,6 +8,10 @@ const EggCompatibleProtoImpl_1 = require("./EggCompatibleProtoImpl");
|
|
|
8
8
|
const tegg_background_task_1 = require("@eggjs/tegg-background-task");
|
|
9
9
|
const tegg_dynamic_inject_runtime_1 = require("@eggjs/tegg-dynamic-inject-runtime");
|
|
10
10
|
exports.APP_CLAZZ_BLACK_LIST = ['eggObjectFactory'];
|
|
11
|
+
exports.CONTEXT_CLAZZ_BLACK_LIST = [
|
|
12
|
+
// just use the app.logger, ctx logger is deprecated.
|
|
13
|
+
'logger',
|
|
14
|
+
];
|
|
11
15
|
exports.DEFAULT_APP_CLAZZ = [];
|
|
12
16
|
exports.DEFAULT_CONTEXT_CLAZZ = [
|
|
13
17
|
'user',
|
|
@@ -77,10 +81,10 @@ class EggAppLoader {
|
|
|
77
81
|
tegg_1.QualifierUtil.addProtoQualifier(func, tegg_1.EggQualifierAttribute, tegg_1.EggType.APP);
|
|
78
82
|
return func;
|
|
79
83
|
}
|
|
80
|
-
getLoggerNames(ctxClazzNames) {
|
|
84
|
+
getLoggerNames(ctxClazzNames, singletonClazzNames) {
|
|
81
85
|
const loggerNames = Array.from(this.app.loggers.keys());
|
|
82
86
|
// filter logger/coreLogger
|
|
83
|
-
return loggerNames.filter(t => !ctxClazzNames.includes(t));
|
|
87
|
+
return loggerNames.filter(t => !ctxClazzNames.includes(t) && !singletonClazzNames.includes(t));
|
|
84
88
|
}
|
|
85
89
|
load() {
|
|
86
90
|
const app = this.app;
|
|
@@ -93,11 +97,13 @@ class EggAppLoader {
|
|
|
93
97
|
]);
|
|
94
98
|
exports.APP_CLAZZ_BLACK_LIST.forEach(t => allSingletonClazzNameSet.delete(t));
|
|
95
99
|
const allSingletonClazzNames = Array.from(allSingletonClazzNameSet);
|
|
96
|
-
const
|
|
100
|
+
const allContextClazzNamesSet = new Set([
|
|
97
101
|
...contextProperties,
|
|
98
102
|
...exports.DEFAULT_CONTEXT_CLAZZ,
|
|
99
|
-
])
|
|
100
|
-
|
|
103
|
+
]);
|
|
104
|
+
exports.CONTEXT_CLAZZ_BLACK_LIST.forEach(t => allContextClazzNamesSet.delete(t));
|
|
105
|
+
const allContextClazzNames = Array.from(allContextClazzNamesSet);
|
|
106
|
+
const loggerNames = this.getLoggerNames(allContextClazzNames, allSingletonClazzNames);
|
|
101
107
|
const allSingletonClazzs = allSingletonClazzNames.map(name => this.buildClazz(name, tegg_1.EggType.APP));
|
|
102
108
|
const allContextClazzs = allContextClazzNames.map(name => this.buildClazz(name, tegg_1.EggType.CONTEXT));
|
|
103
109
|
const appLoggerClazzs = loggerNames.map(name => this.buildAppLoggerClazz(name));
|
|
@@ -113,4 +119,4 @@ class EggAppLoader {
|
|
|
113
119
|
}
|
|
114
120
|
}
|
|
115
121
|
exports.EggAppLoader = EggAppLoader;
|
|
116
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
122
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnQXBwTG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRWdnQXBwTG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHdEQUF5RDtBQUN6RCxzQ0FVcUI7QUFDckIsOERBQXNEO0FBQ3RELHFFQUF1RTtBQUN2RSxzRUFBbUU7QUFDbkUsb0ZBQXNFO0FBRXpELFFBQUEsb0JBQW9CLEdBQUcsQ0FBRSxrQkFBa0IsQ0FBRSxDQUFDO0FBRTlDLFFBQUEsd0JBQXdCLEdBQUc7SUFDdEMscURBQXFEO0lBQ3JELFFBQVE7Q0FDVCxDQUFDO0FBQ1csUUFBQSxpQkFBaUIsR0FBYSxFQUFFLENBQUM7QUFDakMsUUFBQSxxQkFBcUIsR0FBRztJQUNuQyxNQUFNO0NBQ1AsQ0FBQztBQUVGLE1BQWEsWUFBWTtJQUd2QixZQUFZLEdBQUc7UUFDYixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztJQUNqQixDQUFDO0lBRU8sVUFBVSxDQUFDLElBQVksRUFBRSxPQUFnQjtRQUMvQyxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDO1FBQ3JCLElBQUksSUFBdUIsQ0FBQztRQUM1QixJQUFJLE9BQU8sS0FBSyxjQUFPLENBQUMsR0FBRyxFQUFFO1lBQzNCLElBQUksR0FBRztnQkFDTCxPQUFPLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNuQixDQUFRLENBQUM7U0FDVjthQUFNO1lBQ0wsSUFBSSxHQUFHO2dCQUNMLE1BQU0sR0FBRyxHQUFHLEdBQUcsQ0FBQyxjQUFjLENBQUM7Z0JBQy9CLElBQUksQ0FBQyxHQUFHLEVBQUU7b0JBQ1Isb0RBQW9EO29CQUNwRCxNQUFNLHlCQUFTLENBQUMsTUFBTSxDQUFDLDJCQUEyQixJQUFJLHVDQUF1QyxFQUFFLDBCQUEwQixDQUFDLENBQUM7aUJBQzVIO2dCQUVELE9BQU8sR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ25CLENBQVEsQ0FBQztTQUNWO1FBQ0QsTUFBTSxD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
|
|
@@ -4,7 +4,6 @@ import { ModuleHandler } from './ModuleHandler';
|
|
|
4
4
|
export declare class EggContextCompatibleHook implements LifecycleHook<EggContextLifecycleContext, EggContext> {
|
|
5
5
|
private readonly moduleHandler;
|
|
6
6
|
private requestProtoList;
|
|
7
|
-
private initProtoList;
|
|
8
7
|
constructor(moduleHandler: ModuleHandler);
|
|
9
8
|
preCreate(_: any, ctx: EggContext): Promise<void>;
|
|
10
9
|
}
|
|
@@ -7,7 +7,6 @@ const egg_module_common_1 = require("@eggjs/egg-module-common");
|
|
|
7
7
|
class EggContextCompatibleHook {
|
|
8
8
|
constructor(moduleHandler) {
|
|
9
9
|
this.requestProtoList = [];
|
|
10
|
-
this.initProtoList = [];
|
|
11
10
|
this.moduleHandler = moduleHandler;
|
|
12
11
|
for (const loadUnitInstance of this.moduleHandler.loadUnitInstances) {
|
|
13
12
|
const iterator = loadUnitInstance.loadUnit.iterateEggPrototype();
|
|
@@ -15,9 +14,6 @@ class EggContextCompatibleHook {
|
|
|
15
14
|
if (proto.initType === tegg_1.ObjectInitType.CONTEXT) {
|
|
16
15
|
this.requestProtoList.push(proto);
|
|
17
16
|
}
|
|
18
|
-
else if (proto.initType === tegg_1.ObjectInitType.SINGLETON) {
|
|
19
|
-
this.initProtoList.push(proto);
|
|
20
|
-
}
|
|
21
17
|
}
|
|
22
18
|
}
|
|
23
19
|
}
|
|
@@ -27,9 +23,6 @@ class EggContextCompatibleHook {
|
|
|
27
23
|
for (const proto of this.requestProtoList) {
|
|
28
24
|
ctx.addProtoToCreate(proto.name, proto);
|
|
29
25
|
}
|
|
30
|
-
await Promise.all(this.initProtoList.map(async (proto) => {
|
|
31
|
-
await tegg_runtime_1.EggContainerFactory.getOrCreateEggObject(proto);
|
|
32
|
-
}));
|
|
33
26
|
}
|
|
34
27
|
else {
|
|
35
28
|
// Use for ctx.runInBackground.
|
|
@@ -42,4 +35,4 @@ class EggContextCompatibleHook {
|
|
|
42
35
|
}
|
|
43
36
|
}
|
|
44
37
|
exports.EggContextCompatibleHook = EggContextCompatibleHook;
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnQ29udGV4dENvbXBhdGlibGVIb29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRWdnQ29udGV4dENvbXBhdGlibGVIb29rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQUFpRztBQUNqRyxzREFBa0c7QUFHbEcsZ0VBQXNEO0FBRXRELE1BQWEsd0JBQXdCO0lBSW5DLFlBQVksYUFBNEI7UUFGaEMscUJBQWdCLEdBQXdCLEVBQUUsQ0FBQztRQUdqRCxJQUFJLENBQUMsYUFBYSxHQUFHLGFBQWEsQ0FBQztRQUNuQyxLQUFLLE1BQU0sZ0JBQWdCLElBQUksSUFBSSxDQUFDLGFBQWEsQ0FBQyxpQkFBaUIsRUFBRTtZQUNuRSxNQUFNLFFBQVEsR0FBRyxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsbUJBQW1CLEVBQUUsQ0FBQztZQUNqRSxLQUFLLE1BQU0sS0FBSyxJQUFJLFFBQVEsRUFBRTtnQkFDNUIsSUFBSSxLQUFLLENBQUMsUUFBUSxLQUFLLHFCQUFjLENBQUMsT0FBTyxFQUFFO29CQUM3QyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO2lCQUNuQzthQUNGO1NBQ0Y7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsR0FBZTtRQUNoQyw2Q0FBNkM7UUFDN0MsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsOEJBQVUsQ0FBQyxFQUFFO1lBQ3hCLEtBQUssTUFBTSxLQUFLLElBQUksSUFBSSxDQUFDLGdCQUFnQixFQUFFO2dCQUN6QyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQzthQUN6QztTQUNGO2FBQU07WUFDTCwrQkFBK0I7WUFDL0IsMkNBQTJDO1lBQzNDLCtEQUErRDtZQUMvRCw2QkFBNkI7WUFDN0IsTUFBTSxRQUFRLEdBQUcsb0JBQWEsQ0FBQyxhQUFhLENBQUMsMkJBQW9CLENBQUMsQ0FBQztZQUNuRSxNQUFNLGtDQUFtQixDQUFDLG9CQUFvQixDQUFDLFFBQXdCLENBQUMsQ0FBQztTQUMxRTtJQUNILENBQUM7Q0FDRjtBQS9CRCw0REErQkMifQ==
|
|
@@ -3,6 +3,8 @@ import { LifecycleHook } from '@eggjs/tegg';
|
|
|
3
3
|
import { Application } from 'egg';
|
|
4
4
|
export declare class EggQualifierProtoHook implements LifecycleHook<LoadUnitLifecycleContext, LoadUnit> {
|
|
5
5
|
private readonly app;
|
|
6
|
+
private readonly appProperties;
|
|
7
|
+
private readonly ctxProperties;
|
|
6
8
|
constructor(app: Application);
|
|
7
9
|
preCreate(ctx: LoadUnitLifecycleContext): Promise<void>;
|
|
8
10
|
private isAppObject;
|
|
@@ -3,9 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.EggQualifierProtoHook = void 0;
|
|
4
4
|
const tegg_1 = require("@eggjs/tegg");
|
|
5
5
|
const EggAppLoader_1 = require("./EggAppLoader");
|
|
6
|
+
const tegg_common_util_1 = require("@eggjs/tegg-common-util");
|
|
6
7
|
class EggQualifierProtoHook {
|
|
7
8
|
constructor(app) {
|
|
8
9
|
this.app = app;
|
|
10
|
+
this.appProperties = tegg_common_util_1.ObjectUtils.getProperties(this.app);
|
|
11
|
+
this.ctxProperties = tegg_common_util_1.ObjectUtils.getProperties(this.app.context);
|
|
9
12
|
}
|
|
10
13
|
async preCreate(ctx) {
|
|
11
14
|
const clazzList = ctx.loader.load();
|
|
@@ -26,20 +29,25 @@ class EggQualifierProtoHook {
|
|
|
26
29
|
}
|
|
27
30
|
}
|
|
28
31
|
isAppObject(name) {
|
|
29
|
-
|
|
32
|
+
name = String(name);
|
|
33
|
+
if (EggAppLoader_1.APP_CLAZZ_BLACK_LIST.includes(name)) {
|
|
30
34
|
return false;
|
|
31
35
|
}
|
|
32
|
-
if (EggAppLoader_1.DEFAULT_APP_CLAZZ.includes(
|
|
36
|
+
if (EggAppLoader_1.DEFAULT_APP_CLAZZ.includes(name)) {
|
|
33
37
|
return true;
|
|
34
38
|
}
|
|
35
|
-
return this.
|
|
39
|
+
return this.appProperties.includes(name);
|
|
36
40
|
}
|
|
37
41
|
isCtxObject(name) {
|
|
38
|
-
|
|
42
|
+
name = String(name);
|
|
43
|
+
if (EggAppLoader_1.CONTEXT_CLAZZ_BLACK_LIST.includes(name)) {
|
|
44
|
+
return false;
|
|
45
|
+
}
|
|
46
|
+
if (EggAppLoader_1.DEFAULT_CONTEXT_CLAZZ.includes(name)) {
|
|
39
47
|
return true;
|
|
40
48
|
}
|
|
41
|
-
return this.
|
|
49
|
+
return this.ctxProperties.includes(name);
|
|
42
50
|
}
|
|
43
51
|
}
|
|
44
52
|
exports.EggQualifierProtoHook = EggQualifierProtoHook;
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnUXVhbGlmaWVyUHJvdG9Ib29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRWdnUXVhbGlmaWVyUHJvdG9Ib29rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHNDQU1xQjtBQUVyQixpREFLd0I7QUFDeEIsOERBQXNEO0FBRXRELE1BQWEscUJBQXFCO0lBS2hDLFlBQVksR0FBZ0I7UUFDMUIsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsYUFBYSxHQUFHLDhCQUFXLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN6RCxJQUFJLENBQUMsYUFBYSxHQUFHLDhCQUFXLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDbkUsQ0FBQztJQUVELEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBNkI7UUFDM0MsTUFBTSxTQUFTLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNwQyxLQUFLLE1BQU0sS0FBSyxJQUFJLFNBQVMsRUFBRTtZQUM3QixLQUFLLE1BQU0sWUFBWSxJQUFJLG9CQUFhLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxFQUFFO2dCQUN0RSxNQUFNLGtCQUFrQixHQUFHLG9CQUFhLENBQUMsbUJBQW1CLENBQUMsS0FBSyxFQUFFLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDMUYsTUFBTSxlQUFlLEdBQUcsa0JBQWtCLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsS0FBSyw0QkFBcUIsQ0FBQyxDQUFDO2dCQUM1RixJQUFJLGVBQWUsRUFBRTtvQkFDbkIsU0FBUztpQkFDVjtnQkFDRCxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxFQUFFO29CQUMxQyxvQkFBYSxDQUFDLGtCQUFrQixDQUFDLEtBQUssRUFBRSxZQUFZLENBQUMsT0FBTyxFQUFFLDRCQUFxQixFQUFFLGNBQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztpQkFDdkc7cUJBQU0sSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsRUFBRTtvQkFDakQsb0JBQWEsQ0FBQyxrQkFBa0IsQ0FBQyxLQUFLLEVBQUUsWUFBWSxDQUFDLE9BQU8sRUFBRSw0QkFBcUIsRUFBRSxjQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7aUJBQ25HO2FBQ0Y7U0FDRjtJQUNILENBQUM7SUFFTyxXQUFXLENBQUMsSUFBaUI7UUFDbkMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNwQixJQUFJLG1DQUFvQixDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN2QyxPQUFPLEtBQUssQ0FBQztTQUNkO1FBQ0QsSUFBSSxnQ0FBaUIsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDcEMsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUNELE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUVPLFdBQVcsQ0FBQyxJQUFpQjtRQUNuQyxJQUFJLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3BCLElBQUksdUNBQXdCLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQzNDLE9BQU8sS0FBSyxDQUFDO1NBQ2Q7UUFDRCxJQUFJLG9DQUFxQixDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN4QyxPQUFPLElBQUksQ0FBQztTQUNiO1FBQ0QsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMzQyxDQUFDO0NBQ0Y7QUFsREQsc0RBa0RDIn0=
|
package/package.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
"teggConfig"
|
|
7
7
|
]
|
|
8
8
|
},
|
|
9
|
-
"version": "3.5.
|
|
9
|
+
"version": "3.5.2",
|
|
10
10
|
"description": "module plugin for egg",
|
|
11
11
|
"keywords": [
|
|
12
12
|
"egg",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"@eggjs/egg-module-common": "^3.2.3",
|
|
49
|
-
"@eggjs/tegg": "^3.5.
|
|
49
|
+
"@eggjs/tegg": "^3.5.2",
|
|
50
50
|
"@eggjs/tegg-background-task": "^3.5.0",
|
|
51
51
|
"@eggjs/tegg-common-util": "^3.2.3",
|
|
52
52
|
"@eggjs/tegg-dynamic-inject-runtime": "^3.5.0",
|
|
@@ -73,5 +73,5 @@
|
|
|
73
73
|
"publishConfig": {
|
|
74
74
|
"access": "public"
|
|
75
75
|
},
|
|
76
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "961a1e12f78050b620edf8fe1a2c9a34ded2ff83"
|
|
77
77
|
}
|