zova-cli-set-front 1.2.97 → 1.2.99

package/cli/templates/openapi/config/boilerplate/project/openapi.config.ts

@@ -1,9 +1,13 @@
 import type { ZovaOpenapiConfig } from 'zova-openapi';
 
 export default function (): ZovaOpenapiConfig {
+  const apiBaseURL = process.env.API_BASE_URL;
+  if (!apiBaseURL) {
+    throw new Error('Missing API_BASE_URL');
+  }
   return {
     default: {
-      source: 'http://localhost:7102/swagger/json?version=V31',
+      source: `${apiBaseURL.replace(/\/$/, '')}/swagger/json?version=V31`,
     },
     modules: {},
   };

package/dist/index.js

@@ -158,6 +158,13 @@ function getControllerFileName(module, type, beanName) {
   }
   return 'controller.tsx';
 }
+function loadZovaEnvs(appDir, configMeta) {
+  const configUtils = createConfigUtils(configMeta, {
+    appDir,
+    runtimeDir: '.zova'
+  });
+  return configUtils.loadEnvs();
+}
 async function loadJSONFile(fileName) {
   const pkgContent = (await fse.readFile(fileName)).toString();
   return JSON.parse(pkgContent);
@@ -326,8 +333,9 @@ class CliBinBuildRest extends BeanCliBase {
       plugins: [svgResolverPlugin()],
       deps: {
         alwaysBundle: id => {
-          if (bundleModules.includes(id)) return true;
-          return false;
+          return bundleModules.some(moduleName => {
+            return id === moduleName || id.startsWith(`${moduleName}/`);
+          });
         }
       }
       // minify: true,
@@ -790,33 +798,17 @@ class CliCreatePageBase extends BeanCliBase {
     await this.logUrl(argv);
   }
   async logUrl(argv) {
-    const env = await this.loadEnvs();
+    const env = loadZovaEnvs(argv.projectPath, {
+      flavor: 'admin',
+      mode: 'development',
+      appMode: 'spa'
+    });
     const host = !env.DEV_SERVER_HOSTNAME || env.DEV_SERVER_HOSTNAME === 'true' ? 'localhost' : env.DEV_SERVER_HOSTNAME;
     const port = env.DEV_SERVER_PORT;
     const url = `http://${host}:${port}/${argv.moduleInfo.pid}/${argv.moduleInfo.name}/${argv.pageName}`;
     const message = `Page URL: ${url}`;
     await this.console.log(message);
   }
-  async loadEnvs() {
-    const configMeta = {
-      flavor: 'admin',
-      mode: 'development',
-      appMode: 'spa'
-    };
-    const configOptions = {
-      appDir: process.cwd(),
-      runtimeDir: '.zova',
-      zovaManualChunk: {
-        debug: false,
-        vendors: []
-      }
-    };
-    // config utils
-    const configUtils = createConfigUtils(configMeta, configOptions);
-    // env
-    const env = configUtils.loadEnvs();
-    return env;
-  }
 }
 
 class CliCreatePage extends CliCreatePageBase {
@@ -1527,6 +1519,12 @@ class CliOpenapiGenerate extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
+    // env
+    loadZovaEnvs(argv.projectPath, {
+      flavor: 'admin',
+      mode: 'development',
+      appMode: 'spa'
+    });
     // config file
     const configFile = path.join(argv.projectPath, 'openapi.config.ts');
     if (!fse.existsSync(configFile)) {

package/dist/lib/common/cliCreatePage.d.ts

@@ -14,7 +14,4 @@ export declare class CliCreatePageBase extends BeanCliBase {
     constructor(options: CmdOptions, pageMode: any);
     execute(): Promise<void>;
     logUrl(argv: any): Promise<void>;
-    loadEnvs(): Promise<{
-        [name: string]: string;
-    }>;
 }

package/dist/lib/common/utils.d.ts

@@ -1,6 +1,9 @@
-import type { IModule } from '@cabloy/module-info';
+import type { IModule, ZovaConfigMeta } from '@cabloy/module-info';
 export declare function getControllerFileName(module: IModule, type: 'page' | 'component', beanName: any): "controller.ts" | "controller.tsx";
 export declare function copyTemplateIfNeed(fileSrc: any, fileDest: any): void;
 export declare function pathToHref(fileName: string): string;
+export declare function loadZovaEnvs(appDir: string, configMeta: ZovaConfigMeta): {
+    [name: string]: string;
+};
 export declare function loadJSONFile(fileName: string): Promise<any>;
 export declare function saveJSONFile(fileName: string, json: object): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.97",
-  "gitHead": "1968aab5fdd054c1c58184e34fed8ea4368b09d2",
+  "version": "1.2.99",
+  "gitHead": "5afd89dc6f19a6b284b48002636d4b7dd20b662a",
   "description": "zova cli-set-front",
   "keywords": [
     "framework",