vona-core 5.0.31 → 5.0.33
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.
|
@@ -5,8 +5,8 @@ import type { PowerPartial } from '../../types/utils/powerPartial.ts';
|
|
|
5
5
|
import type { VonaApplication } from './application.ts';
|
|
6
6
|
export declare function combineAppConfigDefault(appInfo: VonaAppInfo, env: VonaConfigEnv): PowerPartial<import("../../types/config/config.ts").VonaConfig>;
|
|
7
7
|
export declare function configDefault(appInfo: VonaAppInfo, env: VonaConfigEnv): VonaConfigOptional;
|
|
8
|
-
export declare function
|
|
8
|
+
export declare function configDev(_env: VonaConfigEnv): VonaConfigOptional;
|
|
9
9
|
export declare function configProd(_env: VonaConfigEnv): VonaConfigOptional;
|
|
10
10
|
export declare function configTest(_env: VonaConfigEnv): VonaConfigOptional;
|
|
11
11
|
export type TypeConfigLoader<T> = (app: VonaApplication) => Promise<PowerPartial<T>>;
|
|
12
|
-
export declare function combineConfigDefault<T>(app: VonaApplication, configDefault: TypeConfigLoader<T>,
|
|
12
|
+
export declare function combineConfigDefault<T>(app: VonaApplication, configDefault: TypeConfigLoader<T>, configDev?: TypeConfigLoader<T>, configProd?: TypeConfigLoader<T>, configTest?: TypeConfigLoader<T>): Promise<PowerPartial<T>>;
|
package/dist/lib/core/config.js
CHANGED
|
@@ -8,7 +8,7 @@ export function combineAppConfigDefault(appInfo, env) {
|
|
|
8
8
|
let config = configDefault(appInfo, env);
|
|
9
9
|
const mode = appInfo.configMeta.mode;
|
|
10
10
|
if (mode === 'dev') {
|
|
11
|
-
config = deepExtend(config,
|
|
11
|
+
config = deepExtend(config, configDev(env));
|
|
12
12
|
}
|
|
13
13
|
else if (mode === 'prod') {
|
|
14
14
|
config = deepExtend(config, configProd(env));
|
|
@@ -59,7 +59,7 @@ export function configDefault(appInfo, env) {
|
|
|
59
59
|
modules: {},
|
|
60
60
|
};
|
|
61
61
|
}
|
|
62
|
-
export function
|
|
62
|
+
export function configDev(_env) {
|
|
63
63
|
return {
|
|
64
64
|
proxy: {
|
|
65
65
|
enabled: true,
|
|
@@ -104,11 +104,11 @@ function getPublicPathPhysicalRoot(appInfo) {
|
|
|
104
104
|
fse.ensureDirSync(publicDir);
|
|
105
105
|
return publicDir;
|
|
106
106
|
}
|
|
107
|
-
export async function combineConfigDefault(app, configDefault,
|
|
107
|
+
export async function combineConfigDefault(app, configDefault, configDev, configProd, configTest) {
|
|
108
108
|
let config = await configDefault(app);
|
|
109
109
|
const mode = app.config.meta.mode;
|
|
110
|
-
if (mode === 'dev' &&
|
|
111
|
-
config = deepExtend(config, await
|
|
110
|
+
if (mode === 'dev' && configDev) {
|
|
111
|
+
config = deepExtend(config, await configDev(app));
|
|
112
112
|
}
|
|
113
113
|
else if (mode === 'prod' && configProd) {
|
|
114
114
|
config = deepExtend(config, await configProd(app));
|
|
@@ -45,7 +45,7 @@ export function __prepareInjectSelectorInfo(beanInstance, useOptions) {
|
|
|
45
45
|
selectorInfo = __prepareInjectSelectorInfo_init(beanInstance, useOptions);
|
|
46
46
|
}
|
|
47
47
|
if (!selectorInfo && !isNilOrEmptyString(useOptions.selector)) {
|
|
48
|
-
const selector = evaluateExpressions(useOptions.selector, beanInstance);
|
|
48
|
+
const selector = evaluateExpressions(useOptions.selector, { self: beanInstance });
|
|
49
49
|
return { withSelector: true, args: [selector] };
|
|
50
50
|
}
|
|
51
51
|
return selectorInfo ?? { withSelector: false, args: [] };
|
|
@@ -69,6 +69,6 @@ function __prepareInjectSelectorInfo_init(beanInstance, useOptions) {
|
|
|
69
69
|
const _args = init.args ?? [init.arg];
|
|
70
70
|
if (!_args)
|
|
71
71
|
return;
|
|
72
|
-
const args = _args.map(arg => evaluateExpressions(arg, beanInstance));
|
|
72
|
+
const args = _args.map(arg => evaluateExpressions(arg, { self: beanInstance }));
|
|
73
73
|
return { withSelector, args };
|
|
74
74
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vona-core",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "5.0.
|
|
4
|
+
"version": "5.0.33",
|
|
5
5
|
"description": "vona",
|
|
6
6
|
"publishConfig": {
|
|
7
7
|
"access": "public"
|
|
@@ -30,10 +30,10 @@
|
|
|
30
30
|
"@cabloy/extend": "^3.1.10",
|
|
31
31
|
"@cabloy/json5": "^1.0.18",
|
|
32
32
|
"@cabloy/localeutil": "^2.0.10",
|
|
33
|
-
"@cabloy/module-info": "^1.3.
|
|
34
|
-
"@cabloy/module-info-pro": "^1.0.
|
|
33
|
+
"@cabloy/module-info": "^1.3.24",
|
|
34
|
+
"@cabloy/module-info-pro": "^1.0.32",
|
|
35
35
|
"@cabloy/set": "^1.0.17",
|
|
36
|
-
"@cabloy/utils": "^1.0.
|
|
36
|
+
"@cabloy/utils": "^1.0.33",
|
|
37
37
|
"@cabloy/word-utils": "^2.0.1",
|
|
38
38
|
"fs-extra": "^10.1.0",
|
|
39
39
|
"koa": "^3.0.0",
|