Merge pull request #32 from aliyun/feat-optional-esa-cli

Feat optional esa cli

Author: Kinice

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [1.0.6] - 2026-01-20
+
+### Added
+
+- Update template version to latest
+- Support to skip install esa-cli when init a project
+
+### Fixed
+
+- Fix init command error in Windows
+
 ## [1.0.5] - 2026-01-13
 
 ### Fixed
@@ -18,6 +29,8 @@
 ### Fixed
 
 - Fix mock KV storage issues in development environment
+- Fix mock cache error in the top of workers code
+- Fix API update config bug
 
 ## [1.0.2] - 2025-11-19
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "A CLI for operating Alibaba Cloud ESA Functions and Pages.",
   "main": "bin/enter.cjs",
   "type": "module",
@@ -15,7 +15,7 @@
     "README.md"
   ],
   "scripts": {
-    "build": "rm -rf ./dist && rm -rf ./build && node ./genLocale.cjs && tsc && node ./copy.cjs",
+    "build": "rimraf ./dist ./build && node ./genLocale.cjs && tsc && node ./copy.cjs",
     "dev": "tsc --watch",
     "eslint": "eslint src/ --ext .js,.jsx,.ts,.tsx",
     "prepare": "husky install",
@@ -64,9 +64,6 @@
     "jsdom": "^25.0.1",
     "lint-staged": "^15.0.2",
     "prettier": "^3.0.3",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "rimraf": "^6.0.1",
     "tsc-files": "^1.1.4",
     "typescript": "^5.2.2",
     "vitest": "^2.0.4"
@@ -86,7 +83,7 @@
     "chokidar": "^3.5.3",
     "cli-table3": "^0.6.5",
     "cross-spawn": "^7.0.3",
-    "esa-template": "^0.0.9",
+    "esa-template": "^0.0.10",
     "esbuild": "^0.21.1",
     "esbuild-plugin-less": "^1.3.8",
     "form-data": "^4.0.0",
@@ -106,7 +103,10 @@
     "portscanner": "^2.2.0",
     "winston": "^3.11.0",
     "winston-daily-rotate-file": "^5.0.0",
-    "yargs": "^17.7.2"
+    "yargs": "^17.7.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "rimraf": "^6.0.1"
   },
   "lint-staged": {
     "src/**/*.{ts,tsx,js,jsx}": [

src/commands/config.ts

@@ -1,4 +1,5 @@
 import fs from 'fs';
+import os from 'os';
 
 import spawn from 'cross-spawn';
 import { CommandModule, ArgumentsCamelCase, Argv } from 'yargs';
@@ -7,8 +8,20 @@ import t from '../i18n/index.js';
 import logger from '../libs/logger.js';
 import { projectConfigPath, cliConfigPath } from '../utils/fileUtils/index.js';
 
+const getDefaultEditor = (): string => {
+  // Use environment variable if set
+  if (process.env.EDITOR) {
+    return process.env.EDITOR;
+  }
+  // Platform-specific default editors
+  if (os.platform() === 'win32') {
+    return 'notepad';
+  }
+  return 'vi';
+};
+
 const editConfigFile = (configPath: string) => {
-  const editor = process.env.EDITOR || 'vi';
+  const editor = getDefaultEditor();
   spawn(editor, [configPath], {
     stdio: 'inherit'
   });

src/commands/dev/index.ts

@@ -236,9 +236,7 @@ const dev: CommandModule = {
         if (path.includes('.dev')) {
           if (userFileRepacking) {
             userFileRepacking = false;
-            return;
           }
-          worker.restart(devPack);
           return;
         }
         logger.info('Dev repack');

src/commands/init/helper.ts

@@ -1,4 +1,5 @@
 import { execSync } from 'child_process';
+import os from 'os';
 import path from 'path';
 import { exit } from 'process';
 
@@ -148,9 +149,8 @@ export async function checkAndUpdatePackage(
       spinner.text = t('template_updating').d(
         'Updating templates to latest...'
       );
-      execSync(`rm -rf node_modules/${packageName}`, {
-        cwd: packageJsonPath
-      });
+      // Cross-platform: use fs-extra.removeSync instead of rm -rf
+      fs.removeSync(path.join(packageJsonPath, 'node_modules', packageName));
       execSync(`npm install ${packageName}@latest`, {
         cwd: packageJsonPath,
         stdio: 'inherit'
@@ -196,12 +196,9 @@ export async function checkAndUpdatePackage(
         spinner.start(
           t('template_updating').d('Updating templates to latest...')
         );
-        execSync(`rm -rf node_modules/${packageName}`, {
-          cwd: packageJsonPath
-        });
-        execSync(`rm -rf package-lock.json`, {
-          cwd: packageJsonPath
-        });
+        // Cross-platform: use fs-extra.removeSync instead of rm -rf
+        fs.removeSync(path.join(packageJsonPath, 'node_modules', packageName));
+        fs.removeSync(path.join(packageJsonPath, 'package-lock.json'));
         execSync(`npm install ${packageName}@latest`, {
           cwd: packageJsonPath,
           stdio: 'inherit'
@@ -277,6 +274,7 @@ export function getInitParamsFromArgv(argv: ArgumentsCamelCase): initParams {
     params.framework = undefined;
     params.language = undefined;
     params.yes = true;
+    params.installEsaCli = false;
   }
 
   if (typeof a.name === 'string') params.name = a.name;
@@ -298,6 +296,8 @@ export function getInitParamsFromArgv(argv: ArgumentsCamelCase): initParams {
   }
   if (typeof a.git === 'boolean') params.git = Boolean(a.git);
   if (typeof a.deploy === 'boolean') params.deploy = Boolean(a.deploy);
+  if (typeof a['install-esa-cli'] === 'boolean')
+    params.installEsaCli = Boolean(a['install-esa-cli']);
 
   return params;
 }
@@ -593,6 +593,20 @@ export const applyFileEdits = async (
 };
 
 export const installESACli = async (initParams: initParams) => {
+  if (!initParams.installEsaCli) {
+    const install = (await promptParameter<boolean>({
+      type: 'confirm',
+      question: 'Do you want to install esa-cli as a dev dependency?',
+      label: 'Install ESA CLI',
+      defaultValue: false
+    })) as boolean;
+    initParams.installEsaCli = install;
+  }
+
+  if (!initParams.installEsaCli) {
+    return;
+  }
+
   const targetPath = path.join(process.cwd(), initParams.name);
   const res = await execCommand(['npm', 'install', '-D', 'esa-cli'], {
     cwd: targetPath,
@@ -859,6 +873,9 @@ export async function initializeProject(
 
   const targetPath = path.join(process.cwd(), name);
   if (fs.existsSync(targetPath)) {
+    // Cross-platform delete command hint
+    const isWindows = os.platform() === 'win32';
+    const deleteCmd = isWindows ? `rmdir /s /q "${name}"` : `rm -rf "${name}"`;
     logger.block();
     logger.tree([
       `${chalk.bgRed(' ERROR ')} ${chalk.bold.red(
@@ -871,7 +888,7 @@ export async function initializeProject(
       chalk.gray(t('try').d('Try one of the following:')),
       `- ${chalk.white(t('try_diff_name').d('Choose a different project name'))}`,
       `- ${chalk.white(t('try_remove').d('Remove the directory:'))} ${chalk.yellow(
-        `rm -rf "${name}”`
+        deleteCmd
       )}`,
       `- ${chalk.white(
         t('try_another_dir').d('Run the command in another directory')

src/commands/init/index.ts

@@ -66,6 +66,11 @@ const init: CommandModule = {
         alias: 'd',
         describe: 'Deploy after initialization',
         type: 'boolean'
+      })
+      .option('install-esa-cli', {
+        describe: 'Install esa-cli as a dev dependency',
+        type: 'boolean',
+        default: false
       });
   },
   handler: async (argv: ArgumentsCamelCase) => {

src/commands/init/types.ts

@@ -12,6 +12,7 @@ export interface initParams {
   category?: 'framework' | 'template';
   yes?: boolean;
   skip?: boolean;
+  installEsaCli?: boolean;
 }
 
 export type FileEdit = {

src/commands/routine/index.ts

@@ -8,8 +8,8 @@ import routineList from './list.js';
 let yargsIns: Argv;
 const routineCommand: CommandModule<{}> = {
   command: 'project [script]',
-  aliases: ['routine'],
-  describe: `🧭 ${t('routine_describe').d('Manage your project')}`,
+  aliases: ['Functions & Pages'],
+  describe: `🧭 ${t('routine_describe').d('Manage your Functions & Pages project')}`,
   builder: (yargs) => {
     yargsIns = yargs;
     return yargs

src/i18n/locales.json

@@ -468,7 +468,7 @@
     "zh_CN": "用这个命令登录：${namedCommand}"
   },
   "routine_describe": {
-    "en": "Manage your project",
+    "en": "Manage your Functions & Pages project",
     "zh_CN": "管理函数和Pages"
   },
   "route_input": {

src/utils/command.ts

@@ -42,7 +42,7 @@ export const execCommand = async (
     transformOutput,
     fallbackOutput,
     errorMessage,
-    shell = false
+    shell = isWindows
   } = options;
 
   // Determine stdio mode based on options