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

package/dist/commands/init/index.js

@@ -103,8 +103,8 @@ export function promptProjectName() {
             const defaultName = `edge-routine-${Date.now()}`;
             logger.log(`${t('init_input_name').d('Enter the name of edgeRoutine:')} ${defaultName}`);
             logger.replacePrevLines(2, `├ ${t('init_input_name').d('Enter the name of edgeRoutine')}`);
-            logger.cfStepKV('name', defaultName);
-            logger.cfStepSpacer();
+            logger.StepKV('name', defaultName);
+            logger.StepSpacer();
             return defaultName;
         }
         const { name } = yield inquirer.prompt([
@@ -123,8 +123,8 @@ export function promptProjectName() {
             }
         ]);
         logger.replacePrevLines(2, `├ ${t('init_input_name').d('Enter the name of edgeRoutine:')}`);
-        logger.cfStepKV('ER Name', name);
-        logger.cfStepSpacer();
+        logger.StepKV('ER Name', name);
+        logger.StepSpacer();
         return name;
     });
 }
@@ -150,7 +150,7 @@ export function selectTemplate(items_1) {
                 return null;
             }
         }
-        logger.cfStepEnd();
+        logger.StepEnd();
         const selectedTemplatePath = yield multiLevelSelect(items, 'Select a template:');
         if (!selectedTemplatePath) {
             logger.log(t('init_cancel').d('User canceled the operation.'));
@@ -199,13 +199,13 @@ export function handleGitInitialization(targetPath_1) {
         if (initGit === 'Yes') {
             const success = installGit(targetPath);
             if (success) {
-                logger.cfStepKV('git', t('git_installed_success').d('Git has been installed successfully.'));
-                logger.cfStepSpacer();
+                logger.StepKV('git', t('git_installed_success').d('Git has been installed successfully.'));
+                logger.StepSpacer();
             }
         }
         else {
-            logger.cfStepKV('git', t('init_skip_git').d('Git installation was skipped.'));
-            logger.cfStepSpacer();
+            logger.StepKV('git', t('init_skip_git').d('Git installation was skipped.'));
+            logger.StepSpacer();
         }
     });
 }
@@ -227,7 +227,7 @@ export function handleInit(argv) {
         var _a, _b;
         yield checkAndUpdatePackage('esa-template');
         // Step 1 of 3: Planning selections (Cloudflare-like)
-        logger.cfStepHeader('Create an ESA application', 1, 3);
+        logger.StepHeader('Create an ESA application', 1, 3);
         if (argv.config) {
             const configFormat = yield promptConfigFormat(argv.yes);
             yield generateConfigFile(undefined, undefined, undefined, configFormat);
@@ -252,9 +252,9 @@ export function handleInit(argv) {
             }
         }
         // Show chosen directory
-        logger.cfStepItem('In which directory do you want to create your application?');
-        logger.cfStepKV('dir', `./${name}`);
-        logger.cfStepSpacer();
+        logger.StepItem('In which directory do you want to create your application?');
+        logger.StepKV('dir', `./${name}`);
+        logger.StepSpacer();
         // Decide between framework or template if neither provided and not --yes
         let framework = argv.framework;
         let language = argv.language;
@@ -276,8 +276,8 @@ export function handleInit(argv) {
                 }
             ]);
             logger.replacePrevLine('├ How would you like to initialize the project?');
-            logger.cfStepKV('category', initMode === 'framework' ? 'Framework Starter' : 'ESA Template');
-            logger.cfStepSpacer();
+            logger.StepKV('category', initMode === 'framework' ? 'Framework Starter' : 'ESA Template');
+            logger.StepSpacer();
             if (initMode === 'framework') {
                 const { fw } = yield inquirer.prompt([
                     {
@@ -293,15 +293,15 @@ export function handleInit(argv) {
                 ]);
                 logger.replacePrevLine('├ Select a framework');
                 framework = fw;
-                logger.cfStepKV('framework', String(framework));
+                logger.StepKV('framework', String(framework));
                 const frameworkConfig = getFrameworkConfig(framework);
                 if (frameworkConfig.templates) {
                     if (!language) {
                         language = yield promptLanguage(argv.yes);
                     }
-                    logger.cfStepKV(t('init_language_selected').d('Language'), language);
+                    logger.StepKV(t('init_language_selected').d('Language'), language);
                 }
-                logger.cfStepEnd('Configuration collected');
+                logger.StepEnd('Configuration collected');
             }
             else if (initMode === 'template') {
                 // Use ESA Template creation method
@@ -310,17 +310,17 @@ export function handleInit(argv) {
                 if (!selectedTemplatePath) {
                     return;
                 }
-                logger.cfStepEnd('Template selected');
+                logger.StepEnd('Template selected');
                 // Step 2 of 3: Scaffold project
-                logger.cfStepHeader('Scaffold project', 2, 3);
+                logger.StepHeader('Scaffold project', 2, 3);
                 const { template, targetPath } = (yield initializeProject(selectedTemplatePath, name)) || {};
                 if (!template || !targetPath) {
                     return;
                 }
-                logger.cfStepSpacer();
-                logger.cfStepEnd('Project initialized');
+                logger.StepSpacer();
+                logger.StepEnd('Project initialized');
                 // Step 3 of 3: Configure and finalize
-                logger.cfStepHeader('Configure and finalize', 3, 3);
+                logger.StepHeader('Configure and finalize', 3, 3);
                 if (!argv.skip) {
                     yield handleGitInitialization(targetPath, argv.yes);
                 }
@@ -343,13 +343,13 @@ export function handleInit(argv) {
                 return;
             }
             // Step 2 of 3: Scaffold project
-            logger.cfStepHeader('Scaffold project', 2, 3);
+            logger.StepHeader('Scaffold project', 2, 3);
             const command = frameworkConfig.command;
             const templateFlag = ((_a = frameworkConfig.templates) === null || _a === void 0 ? void 0 : _a[language || 'typescript']) || '';
             const fullCommand = `${command} ${name} ${templateFlag}`;
-            logger.cfStepItem(`Continue with ${framework} via \`${fullCommand}\``);
-            logger.cfStepKV('dir', `./${name}`);
-            logger.cfStepSpacer();
+            logger.StepItem(`Continue with ${framework} via \`${fullCommand}\``);
+            logger.StepKV('dir', `./${name}`);
+            logger.StepSpacer();
             logger.log(`Creating ${framework} app in ${targetPath} ...`);
             // Execute the command with proper arguments
             if (templateFlag) {
@@ -364,28 +364,27 @@ export function handleInit(argv) {
                     cwd: process.cwd()
                 });
             }
-            logger.cfStepSpacer();
+            logger.StepSpacer();
             // install dependencies
-            logger.cfStepItem('Install dependencies');
+            logger.StepItem('Install dependencies');
             execSync('npm install', {
                 stdio: 'inherit',
                 cwd: targetPath
             });
-            logger.cfStepSpacer();
+            logger.StepSpacer();
             // Post-process nextjs configuration for static export
             if (framework === 'nextjs') {
-                logger.cfStepItem('Configuring Next.js for static export');
+                logger.StepItem('Configuring Next.js for static export');
                 yield configureNextJsForStaticExport(targetPath);
-                logger.cfStepSpacer();
+                logger.StepSpacer();
             }
-            logger.cfStepEnd('Project initialized');
+            logger.StepEnd('Project initialized');
             const assetsDirectory = (_b = frameworkConfig.assets) === null || _b === void 0 ? void 0 : _b.directory;
             // Step 3 of 3: Configure and finalize
-            logger.cfStepHeader('Configure and finalize', 3, 3);
+            logger.StepHeader('Configure and finalize', 3, 3);
             const configFormat = yield promptConfigFormat(argv.yes);
-            // logger.cfStepItem('Generate config file');
-            logger.cfStepKV('format', configFormat);
-            logger.cfStepSpacer();
+            logger.StepKV('format', configFormat);
+            logger.StepSpacer();
             yield generateConfigFile(name, {
                 assets: assetsDirectory ? { directory: assetsDirectory } : undefined
             }, targetPath, configFormat);
@@ -495,19 +494,15 @@ export function configureNextJsForStaticExport(targetPath) {
         const nextConfigJsPath = path.join(targetPath, 'next.config.js');
         const nextConfigMjsPath = path.join(targetPath, 'next.config.mjs');
         let configPath = null;
-        let configContent = '';
         // Check which config file exists
         if (fs.existsSync(nextConfigTsPath)) {
             configPath = nextConfigTsPath;
-            configContent = fs.readFileSync(nextConfigTsPath, 'utf-8');
         }
         else if (fs.existsSync(nextConfigJsPath)) {
             configPath = nextConfigJsPath;
-            configContent = fs.readFileSync(nextConfigJsPath, 'utf-8');
         }
         else if (fs.existsSync(nextConfigMjsPath)) {
             configPath = nextConfigMjsPath;
-            configContent = fs.readFileSync(nextConfigMjsPath, 'utf-8');
         }
         if (!configPath) {
             // Create a new next.config.ts file if none exists
@@ -515,6 +510,7 @@ export function configureNextJsForStaticExport(targetPath) {
             const newConfig = `import type { NextConfig } from "next";
 
 const nextConfig: NextConfig = {
+  /* config options here */
   output: "export",
   trailingSlash: true,
   images: {
@@ -527,53 +523,21 @@ export default nextConfig;`;
             logger.success('Created next.config.ts with static export configuration');
             return;
         }
-        // Check if output: 'export' is already configured
-        if (configContent.includes('output: "export"') || configContent.includes("output: 'export'")) {
-            logger.success('Next.js is already configured for static export');
-            return;
-        }
-        // Modify existing config to add output: 'export'
-        let modifiedContent = configContent;
-        // Handle different config formats
-        if (configPath.endsWith('.ts')) {
-            // TypeScript config
-            if (configContent.includes('const nextConfig = {')) {
-                // Add output: 'export' after the opening brace
-                modifiedContent = configContent.replace(/(const nextConfig\s*=\s*\{)/, `$1
-  output: "export",`);
-            }
-            else if (configContent.includes('export default {')) {
-                // Add output: 'export' after the opening brace
-                modifiedContent = configContent.replace(/(export default\s*\{)/, `$1
-  output: "export",`);
-            }
-        }
-        else {
-            // JavaScript config
-            if (configContent.includes('const nextConfig = {')) {
-                // Add output: 'export' after the opening brace
-                modifiedContent = configContent.replace(/(const nextConfig\s*=\s*\{)/, `$1
-  output: "export",`);
-            }
-            else if (configContent.includes('module.exports = {')) {
-                // Add output: 'export' after the opening brace
-                modifiedContent = configContent.replace(/(module\.exports\s*=\s*\{)/, `$1
-  output: "export",`);
-            }
-        }
-        // Add trailingSlash and images configuration if not present
-        if (!modifiedContent.includes('trailingSlash')) {
-            modifiedContent = modifiedContent.replace(/(output: "export",)/, `$1
-  trailingSlash: true,`);
-        }
-        if (!modifiedContent.includes('images')) {
-            modifiedContent = modifiedContent.replace(/(trailingSlash: true,)/, `$1
+        // Always overwrite the config file with our static export configuration
+        const newConfig = `import type { NextConfig } from "next";
+
+const nextConfig: NextConfig = {
+  /* config options here */
+  output: "export",
+  trailingSlash: true,
   images: {
     unoptimized: true
-  }`);
-        }
-        // Write the modified config back to file
-        fs.writeFileSync(configPath, modifiedContent, 'utf-8');
-        logger.success('Next.js configured for static export successfully');
+  }
+};
+
+export default nextConfig;`;
+        // Write the new config to file, overwriting existing content
+        fs.writeFileSync(configPath, newConfig, 'utf-8');
+        logger.success('Next.js config file overwritten with static export configuration');
     });
 }

package/dist/commands/init/template.jsonc

@@ -27,8 +27,13 @@
     "label": "Next.js",
     "command": "npx create-next-app@latest",
     "assets": {
-      "directory": "./out",
-      "notFoundStrategy": "singlePageApplication"
-    }
+      "directory": "./out"
+    },
+    "config": [
+      {
+        "path": "next.config.js",
+        "content": ""
+      }
+    ]
   }
 }

package/dist/libs/git/index.js

@@ -51,6 +51,5 @@ export function installGit(path, debug = false) {
     }
     catch (error) {
         console.error('Error occurred during Git installation:', error);
-        exit(0);
     }
 }

package/dist/libs/logger.js

@@ -155,25 +155,24 @@ class Logger {
         }
         console.log(lines.join('\n'));
     }
-    // Cloudflare-like step rendering helpers
-    cfStepHeader(title, step, total) {
+    StepHeader(title, step, total) {
         console.log(`\n╭ ${title} ${chalk.green(`Step ${step} of ${total}`)}`);
         console.log('│');
     }
-    cfStepItem(prompt) {
+    StepItem(prompt) {
         console.log(`├ ${prompt}`);
     }
-    cfStepKV(key, value) {
+    StepKV(key, value) {
         const orange = chalk.hex('#FFA500');
         console.log(`│ ${orange(key)} ${value}`);
     }
-    cfStepSpacer() {
+    StepSpacer() {
         console.log('│');
     }
-    cfStepEnd(str) {
+    StepEnd(str) {
         console.log(`╰ ${str || ''}`);
     }
-    cfStepEndInline() {
+    StepEndInline() {
         try {
             process.stdout.write('╰ ');
         }

package/dist/utils/checkIsRoutineCreated.js

@@ -42,7 +42,8 @@ export function ensureRoutineExists(name) {
             const server = yield ApiService.getInstance();
             const createRes = yield server.createRoutine({
                 name: name,
-                description: ''
+                description: '',
+                hasAssets: true
             });
             const isSuccess = (createRes === null || createRes === void 0 ? void 0 : createRes.data.Status) === 'OK';
             if (isSuccess) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "0.0.2-beta.13",
+  "version": "0.0.2-beta.14",
   "description": "A CLI for operating Alibaba Cloud ESA EdgeRoutine (Edge Functions).",
   "main": "bin/enter.cjs",
   "type": "module",