esa-cli 0.0.2-beta.12 → 0.0.2-beta.13

package/dist/commands/dev/index.js

@@ -10,21 +10,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { exec } from 'child_process';
 import { isIP } from 'net';
 import chokidar from 'chokidar';
-import doProcess from './doProcess.js';
-import { getProjectConfig, generateConfigFile, getDevConf } from '../../utils/fileUtils/index.js';
-import { getRoot } from '../../utils/fileUtils/base.js';
 import SelectItems from '../../components/selectInput.js';
-import logger from '../../libs/logger.js';
-import MockServer from './mockWorker/server.js';
-import mockPack from './mockWorker/devPack.js';
-import Ew2Server from './ew2/server.js';
-import ew2Pack from './ew2/devPack.js';
-import { preCheckDeno } from '../../utils/installDeno.js';
-import { preCheckEw2 } from '../../utils/installEw2.js';
-import debounce from '../../utils/debounce.js';
 import t from '../../i18n/index.js';
+import logger from '../../libs/logger.js';
 import checkAndInputPort from '../../utils/checkDevPort.js';
 import { checkOS, Platforms } from '../../utils/checkOS.js';
+import debounce from '../../utils/debounce.js';
+import { getRoot } from '../../utils/fileUtils/base.js';
+import { getProjectConfig, generateConfigFile, getDevConf } from '../../utils/fileUtils/index.js';
+import { preCheckDeno } from '../../utils/installDeno.js';
+import { preCheckEw2 } from '../../utils/installEw2.js';
+import doProcess from './doProcess.js';
+import ew2Pack from './ew2/devPack.js';
+import Ew2Server from './ew2/server.js';
+import mockPack from './mockWorker/devPack.js';
+import MockServer from './mockWorker/server.js';
 let yargsIns;
 const OS = checkOS();
 const EW2OS = [Platforms.AppleArm, Platforms.AppleIntel, Platforms.LinuxX86];
@@ -221,7 +221,7 @@ const dev = {
         const { waitUntilExit } = devElement;
         yield waitUntilExit();
         function onWorkerClosed() {
-            exit && exit();
+            exit === null || exit === void 0 ? void 0 : exit();
         }
         watcher.close();
     })

package/dist/commands/dev/mockWorker/devPack.js

@@ -7,14 +7,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import path from 'path';
 import fs from 'fs';
-import logger from '../../../libs/logger.js';
-import devBuild from '../build.js';
+import path from 'path';
 import t from '../../../i18n/index.js';
-import { getDevConf } from '../../../utils/fileUtils/index.js';
-import { getRoot, getDirName } from '../../../utils/fileUtils/base.js';
+import logger from '../../../libs/logger.js';
 import { checkPort } from '../../../utils/checkDevPort.js';
+import { getRoot, getDirName } from '../../../utils/fileUtils/base.js';
+import { getDevConf } from '../../../utils/fileUtils/index.js';
+import devBuild from '../build.js';
 const generateEntry = (id, projectEntry, userRoot) => __awaiter(void 0, void 0, void 0, function* () {
     const __dirname = getDirName(import.meta.url);
     const devDir = path.resolve(userRoot, '.dev');
@@ -78,10 +78,19 @@ const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(
 const devPack = () => __awaiter(void 0, void 0, void 0, function* () {
     logger.ora.start('Processing...\n');
     const userRoot = getRoot();
-    const configPath = path.resolve(userRoot, 'esa.toml');
+    // Try to find config file in order of preference: .jsonc, .toml
+    const configFormats = ['esa.jsonc', 'esa.toml'];
+    let configPath = null;
+    for (const format of configFormats) {
+        const testPath = path.resolve(userRoot, format);
+        if (fs.existsSync(testPath)) {
+            configPath = testPath;
+            break;
+        }
+    }
     let port, minify, localUpstream, entry;
     let projectEntry = path.resolve(userRoot, 'src/index.js');
-    if (fs.existsSync(configPath)) {
+    if (configPath) {
         port = getDevConf('port', 'dev', 18080);
         minify = getDevConf('minify', 'dev', false);
         localUpstream = getDevConf('localUpstream', 'dev', '');

package/dist/commands/dev/mockWorker/server.js

@@ -7,12 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import spawn from 'cross-spawn';
-import logger from '../../../libs/logger.js';
 import path from 'path';
+import spawn from 'cross-spawn';
 import t from '../../../i18n/index.js';
-import { getDevConf } from '../../../utils/fileUtils/index.js';
+import logger from '../../../libs/logger.js';
 import { getRoot } from '../../../utils/fileUtils/base.js';
+import { getDevConf } from '../../../utils/fileUtils/index.js';
 class MockWorkerServer {
     constructor(props) {
         this.instance = null;
@@ -63,10 +63,11 @@ class MockWorkerServer {
         logger.subError(chunk.toString().trim());
     }
     errorHandler(err) {
+        var _a;
         logger.error(err.message ? err.message : err);
-        this.instance && this.instance.kill();
+        (_a = this.instance) === null || _a === void 0 ? void 0 : _a.kill();
     }
-    closeHandler(code, signal) {
+    closeHandler() {
         if (this.restarting) {
             this.restarting = false;
             return;
@@ -86,7 +87,7 @@ class MockWorkerServer {
                 resolve(false);
                 return;
             }
-            const onExit = (code, signal) => {
+            const onExit = () => {
                 this.instance = null;
                 resolve(true);
             };

package/dist/commands/domain/add.js

@@ -7,14 +7,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { bindRoutineWithDomain, checkDirectory, checkIsLoginSuccess, validDomain, validName } from '../utils.js';
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
 import t from '../../i18n/index.js';
 import logger from '../../libs/logger.js';
 import { validRoutine } from '../../utils/checkIsRoutineCreated.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import { bindRoutineWithDomain, checkDirectory, checkIsLoginSuccess, validDomain, validName } from '../utils.js';
 const addDomain = {
     command: 'add <domain>',
-    describe: `🔗 ${t('domain_add_describe').d('Bind a domain to a routine')}`,
+    describe: `📥 ${t('domain_add_describe').d('Bind a domain to a routine')}`,
     builder: (yargs) => {
         return yargs
             .positional('domain', {

package/dist/commands/domain/delete.js

@@ -7,12 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
-import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
-import { ApiService } from '../../libs/apiService.js';
 import t from '../../i18n/index.js';
+import { ApiService } from '../../libs/apiService.js';
 import logger from '../../libs/logger.js';
 import { validRoutine } from '../../utils/checkIsRoutineCreated.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
 const deleteDomain = {
     command: 'delete <domain>',
     describe: `🗑  ${t('domain_delete_describe').d('Delete a related domain')}`,

package/dist/commands/domain/index.js

@@ -1,11 +1,11 @@
+import t from '../../i18n/index.js';
 import addDomain from './add.js';
-import listDomain from './list.js';
 import deleteDomain from './delete.js';
-import t from '../../i18n/index.js';
+import listDomain from './list.js';
 let yargsIns;
 const domainCommand = {
     command: 'domain [script]',
-    describe: `🔗 ${t('domain_describe').d('Manage the domain names bound to your routine')}`,
+    describe: `🚀 ${t('domain_describe').d('Manage the domain names bound to your routine')}`,
     builder: (yargs) => {
         yargsIns = yargs;
         return yargs

package/dist/commands/domain/list.js

@@ -7,21 +7,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
-import logger from '../../libs/logger.js';
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
-import { ApiService } from '../../libs/apiService.js';
 import t from '../../i18n/index.js';
+import { ApiService } from '../../libs/apiService.js';
+import logger from '../../libs/logger.js';
 import { validRoutine } from '../../utils/checkIsRoutineCreated.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
 const listDomain = {
     command: 'list',
     describe: `🔍 ${t('domain_list_describe').d('List all related domains')}`,
-    handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
-        handleListDomains(argv);
+    handler: () => __awaiter(void 0, void 0, void 0, function* () {
+        handleListDomains();
     })
 };
 export default listDomain;
-export function handleListDomains(argv) {
+export function handleListDomains() {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         if (!checkDirectory()) {

package/dist/commands/init/helper.js

@@ -7,16 +7,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import fs from 'fs-extra';
-import path from 'path';
-import Template from '../../libs/templates/index.js';
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
-import logger from '../../libs/logger.js';
 import { execSync } from 'child_process';
-import t from '../../i18n/index.js';
+import path from 'path';
 import chalk from 'chalk';
+import fs from 'fs-extra';
 import inquirer from 'inquirer';
+import t from '../../i18n/index.js';
+import logger from '../../libs/logger.js';
+import Template from '../../libs/templates/index.js';
 import { getDirName } from '../../utils/fileUtils/base.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
 export const getTemplateInstances = (templateHubPath) => {
     return fs
         .readdirSync(templateHubPath)
@@ -66,11 +66,34 @@ export const preInstallDependencies = (targetPath) => __awaiter(void 0, void 0,
         else {
             logger.log(t('no_build_script').d('No build script found in package.json, skipping build step.'));
         }
+        // After build, try to infer assets directory if not explicitly known
+        try {
+            const candidates = ['dist', 'build', 'out'];
+            for (const dir of candidates) {
+                const abs = path.join(targetPath, dir);
+                if (fs.existsSync(abs) && fs.statSync(abs).isDirectory()) {
+                    // Update config file if present and assets not set
+                    const projectConfig = getProjectConfig(targetPath);
+                    if (projectConfig) {
+                        const { updateProjectConfigFile } = yield import('../../utils/fileUtils/index.js');
+                        if (!projectConfig.assets || !projectConfig.assets.directory) {
+                            yield updateProjectConfigFile({ assets: { directory: dir } }, targetPath);
+                            logger.success(`Detected build output "${dir}" and updated assets.directory`);
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+        catch (_a) { }
     }
 });
 export function checkAndUpdatePackage(packageName) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
+            const spinner = logger.ora;
+            spinner.text = t('checking_template_update').d('Checking esa-template updates...');
+            spinner.start();
             // 获取当前安装的版本
             const __dirname = getDirName(import.meta.url);
             const packageJsonPath = path.join(__dirname, '../../../');
@@ -81,6 +104,7 @@ export function checkAndUpdatePackage(packageName) {
                 }).toString();
             }
             catch (e) {
+                spinner.text = t('template_updating').d('Updating templates to latest...');
                 execSync(`rm -rf node_modules/${packageName}`, {
                     cwd: packageJsonPath
                 });
@@ -88,6 +112,8 @@ export function checkAndUpdatePackage(packageName) {
                     cwd: packageJsonPath,
                     stdio: 'inherit'
                 });
+                spinner.stop();
+                logger.log(`├ ${t('template_updated_to_latest').d('Templates updated to latest.')}`);
                 return;
             }
             const match = versionInfo.match(new RegExp(`(${packageName})@([0-9.]+)`));
@@ -99,6 +125,7 @@ export function checkAndUpdatePackage(packageName) {
                 .toString()
                 .trim();
             if (currentVersion !== latestVersion) {
+                spinner.stop();
                 logger.log(t('display_current_esa_template_version').d(`Current esa-template version:`) +
                     chalk.green(currentVersion) +
                     '    ' +
@@ -110,6 +137,7 @@ export function checkAndUpdatePackage(packageName) {
                     message: t('is_update_to_latest_version').d('Do you want to update templates to latest version?')
                 });
                 if (isUpdate) {
+                    spinner.start(t('template_updating').d('Updating templates to latest...'));
                     execSync(`rm -rf node_modules/${packageName}`, {
                         cwd: packageJsonPath
                     });
@@ -120,18 +148,40 @@ export function checkAndUpdatePackage(packageName) {
                         cwd: packageJsonPath,
                         stdio: 'inherit'
                     });
-                    logger.log(t('updated_esa_template_to_latest_version', { packageName }).d(`${packageName} updated successfully`));
+                    spinner.stop();
+                    logger.log(`├ ${t('updated_esa_template_to_latest_version', { packageName }).d(`${packageName} updated successfully`)}`);
                 }
             }
             else {
-                logger.log(t('esa_template_is_latest_version', { packageName }).d(`${packageName} is latest.`));
+                spinner.stop();
+                logger.log(` ${t('checking_esa_template_finished').d(`Checking esa-template finished.`)}`);
+                t('esa_template_is_latest_version', { packageName }).d(`${packageName} is latest.`);
+                logger.divider();
             }
         }
         catch (error) {
             console.log(error);
             if (error instanceof Error) {
-                logger.error('检测和更新包时发生错误，跳过更新模版');
+                logger.ora.fail(t('check_and_update_package_error').d('Error: An error occurred while checking and updating the package, skipping template update'));
             }
         }
     });
 }
+export const getFrameworkConfig = (framework) => {
+    // 从init目录读取template.jsonc
+    const templatePath = path.join(getDirName(import.meta.url), 'template.jsonc');
+    const jsonc = fs.readFileSync(templatePath, 'utf-8');
+    const json = JSON.parse(jsonc);
+    return json[framework];
+};
+/**
+ * 获取框架全部配置
+ * @returns 框架全部配置
+ */
+export const getAllFrameworkConfig = () => {
+    // 从init目录读取template.jsonc
+    const templatePath = path.join(getDirName(import.meta.url), 'template.jsonc');
+    const jsonc = fs.readFileSync(templatePath, 'utf-8');
+    const json = JSON.parse(jsonc);
+    return json;
+};