vona-core 5.1.6 → 5.1.8

package/dist/index.js

@@ -2344,7 +2344,7 @@ class AppMeta extends BeanSimple {
     this.metadata = appMetadata;
   }
   _prepareEnv() {
-    const mode = this.app.configMeta.mode;
+    const mode = this.env.META_MODE;
     this.isProd = mode === 'prod';
     this.isTest = mode === 'test';
     this.isDev = mode === 'dev';
@@ -2458,9 +2458,6 @@ class VonaApplication extends KoaApplication {
   get projectPath() {
     return this.options.projectPath;
   }
-  get configMeta() {
-    return this.options.configMeta;
-  }
   get ctx() {
     return this.currentContext;
   }
@@ -2507,7 +2504,7 @@ class VonaApplication extends KoaApplication {
 
 async function combineConfigDefault(app, configDefault, configDev, configProd, configTest) {
   let config = await configDefault(app);
-  const mode = app.config.meta.mode;
+  const mode = app.meta.env.META_MODE;
   if (mode === 'dev' && configDev) {
     config = deepExtend(config, await configDev(app));
   } else if (mode === 'prod' && configProd) {
@@ -2518,7 +2515,7 @@ async function combineConfigDefault(app, configDefault, configDev, configProd, c
   return config;
 }
 function getLoggerPathPhysicalRoot(app) {
-  const mode = app.configMeta.mode;
+  const mode = app.meta.env.META_MODE;
   let loggerDir;
   if (mode === 'test' || mode === 'dev') {
     loggerDir = path.join(app.projectPath, '.app/logs');
@@ -2529,7 +2526,7 @@ function getLoggerPathPhysicalRoot(app) {
   return loggerDir;
 }
 function getPublicPathPhysicalRoot(app) {
-  const mode = app.configMeta.mode;
+  const mode = app.meta.env.META_MODE;
   let publicDir;
   if (mode === 'test' || mode === 'dev') {
     publicDir = path.join(app.projectPath, '.app/public');
@@ -2540,7 +2537,7 @@ function getPublicPathPhysicalRoot(app) {
   return publicDir;
 }
 function getRuntimePathPhysicalRoot(app) {
-  const mode = app.config.meta.mode;
+  const mode = app.meta.env.META_MODE;
   let runtimeDir;
   if (mode === 'test' || mode === 'dev') {
     runtimeDir = path.join(app.options.projectPath, '.app/runtime');
@@ -2754,7 +2751,7 @@ async function loadConfig (app, modules) {
       const module = modules[key];
       // module config
       if (module.resource.config) {
-        const configModule = await module.resource.config(app, app.options.env);
+        const configModule = await module.resource.config(app);
         // configNew is not used by now
         await app.util.monkeyModule(app.meta.appMonkey, app.meta.modulesMonkey, true, 'configLoaded', module, configModule);
         app.config.modules[module.info.relativeName] = deepExtend({}, configModule, app.config.modules[module.info.relativeName]);
@@ -2981,7 +2978,7 @@ async function __prepareConfig(app) {
   const configItems = (await app.options.config()).default;
   const configItemsPromise = [];
   for (const configItem of configItems) {
-    configItemsPromise.push(configItem(app, app.options.env));
+    configItemsPromise.push(configItem(app));
   }
   const configItemsRes = await Promise.all(configItemsPromise);
   for (const configItem of configItemsRes) {
@@ -3058,7 +3055,6 @@ function __createApp({
   const options = {
     name: appInfo.name,
     projectPath: appInfo.projectPath,
-    configMeta: appInfo.configMeta,
     modulesMeta,
     locales,
     config,
@@ -3070,11 +3066,7 @@ function __createApp({
 function prepareAppInfo(env) {
   return {
     name: env.APP_NAME,
-    projectPath: process.cwd(),
-    configMeta: {
-      flavor: cast(env).META_FLAVOR,
-      mode: cast(env).META_MODE
-    }
+    projectPath: process.cwd()
   };
 }
 
@@ -3305,7 +3297,7 @@ async function retry(options, fn) {
 }
 
 function getSqlite3DatabaseNameDefault(app) {
-  const mode = app.configMeta.mode;
+  const mode = app.meta.env.META_MODE;
   if (mode !== 'prod') return '';
   const dbPath = path.join(os.homedir(), 'vona', app.name, 'sqlite3');
   fse.ensureDirSync(dbPath);