esa-cli 0.0.2-beta.6 → 0.0.2-beta.8

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

@@ -106,27 +106,13 @@ const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(
         if (currentIds[0] && /^\d+$/.test(currentIds[0])) {
             // 删除没有用到的入口
             for (let currentId of currentIds) {
-                const useful = yield checkPort(currentConfigObj[currentId].port);
-                if (useful) {
-                    const unusedEntry = path.resolve(userRoot, `.dev/index-${currentId}.js`);
-                    const unusedTemp = path.resolve(userRoot, `.dev/devEntry-${currentId}.js`);
-                    const unusedConfig = path.resolve(userRoot, `.dev/config-${currentId}.toml`);
-                    if (fs.existsSync(unusedEntry)) {
-                        fs.rmSync(unusedEntry, {
-                            force: true,
-                            recursive: true,
-                            maxRetries: 5
-                        });
-                    }
-                    if (fs.existsSync(unusedTemp)) {
-                        fs.rmSync(unusedTemp, {
-                            force: true,
-                            recursive: true,
-                            maxRetries: 5
-                        });
-                    }
-                    if (fs.existsSync(unusedConfig)) {
-                        fs.rmSync(unusedConfig, {
+                const unused = yield checkPort(currentConfigObj[currentId].port);
+                if (unused) {
+                    const devDir = path.resolve(userRoot, '.dev');
+                    const files = fs.readdirSync(devDir);
+                    const filesToDelete = files.filter((file) => file.includes(currentId));
+                    for (const file of filesToDelete) {
+                        fs.rmSync(path.resolve(devDir, file), {
                             force: true,
                             recursive: true,
                             maxRetries: 5
@@ -164,8 +150,7 @@ const devPack = (...args_1) => __awaiter(void 0, [...args_1], void 0, function*
         .then(() => {
         logger.ora.succeed(t('dev_pack_config_success').d('Config created successfully'));
         return devBuild({
-            minify,
-            isNode: true
+            minify
         });
     })
         .then(() => {

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

@@ -51,22 +51,24 @@ const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(
             .readFileSync(configPath, 'utf-8')
             .replace('export default ', '');
         const currentConfigObj = JSON.parse(currentConfig);
-        const cIds = Object.keys(currentConfigObj);
-        if (cIds[0] && /^\d+$/.test(cIds[0])) {
-            for (let cid of cIds) {
-                const useful = yield checkPort(currentConfigObj[cid].port);
-                if (useful) {
-                    const unusedEntry = path.resolve(userRoot, `.dev/index-${cid}.js`);
-                    const unusedTemp = path.resolve(userRoot, `.dev/devEntry-${cid}.js`);
-                    if (fs.existsSync(unusedEntry)) {
-                        fs.rmSync(unusedEntry);
-                    }
-                    if (fs.existsSync(unusedTemp)) {
-                        fs.rmSync(unusedTemp);
+        const currentIds = Object.keys(currentConfigObj);
+        if (currentIds[0] && /^\d+$/.test(currentIds[0])) {
+            for (let currentId of currentIds) {
+                const unused = yield checkPort(currentConfigObj[currentId].port);
+                if (unused) {
+                    const devDir = path.resolve(userRoot, '.dev');
+                    const files = fs.readdirSync(devDir);
+                    const filesToDelete = files.filter((file) => file.includes(currentId));
+                    for (const file of filesToDelete) {
+                        fs.rmSync(path.resolve(devDir, file), {
+                            force: true,
+                            recursive: true,
+                            maxRetries: 5
+                        });
                     }
                 }
                 else {
-                    options[cid] = currentConfigObj[cid];
+                    options[currentId] = currentConfigObj[currentId];
                 }
             }
         }

package/dist/i18n/locales.json

@@ -476,8 +476,8 @@
     "zh_CN": "route不合法"
   },
   "install_runtime_explain": {
-    "en": "Under the beta phase, we are temporarily using Deno as the local development runtime. It needs to be installed first.",
-    "zh_CN": "在Beta阶段，我们使用了Deno暂时作为本地开发运行时，需要先安装才可以dev。"
+    "en": "Our runtime does not yet support this OS. We are temporarily using Deno as the local development runtime, which needs to be installed first.",
+    "zh_CN": "我们的Runtime还不支持此操作系统，我们暂时使用Deno作为本地开发runtime，需要先安装。"
   },
   "install_runtime_tip": {
     "en": "🔔 Runtime must be installed to use esa dev. Installing...",
@@ -917,6 +917,6 @@
   },
   "deno_install_success_tips": {
     "en": "Please run ${dev} again",
-    "zh_CN": ""
+    "zh_CN": "请重新运行 ${dev}"
   }
 }

package/dist/utils/download.js

@@ -111,43 +111,50 @@ export function downloadRuntimeAndUnzipForWindows() {
             const DenoZip = path.join(BinDir, 'deno.zip');
             const Target = 'x86_64-pc-windows-msvc';
             const DownloadUrl = `http://esa-runtime.myalicdn.com/runtime/deno-${Target}.zip`;
+            logger.ora.start('Downloading...');
             try {
                 yield fs.mkdir(BinDir, { recursive: true });
             }
             catch (error) {
                 const err = error;
+                logger.ora.fail();
                 logger.error(`mkdir error ${BinDir}: ${err.message}`);
                 process.exit(1);
             }
             try {
                 yield downloadFile(DownloadUrl, DenoZip);
-                logger.success(`${t('deno_download_success').d('Download success')}: ${DenoZip}`);
             }
             catch (error) {
                 const err = error;
+                logger.ora.fail();
                 logger.error(`${t('deno_download_failed').d('Download failed')}: ${err.message}`);
                 process.exit(1);
             }
             logger.info(`Unzip file to: ${BinDir}`);
             try {
+                logger.ora.text = 'Unzip...';
                 unzipFile(DenoZip, BinDir);
             }
             catch (error) {
                 const err = error;
+                logger.ora.fail();
                 logger.error(`${t('deno_unzip_failed').d('Unzip failed')}: ${err.message}`);
                 process.exit(1);
             }
             try {
+                logger.ora.text = 'Deleting temp file...';
                 yield fs.unlink(DenoZip);
+                logger.ora.succeed('Download success');
                 logger.info(`Delete temp file: ${DenoZip}`);
             }
             catch (error) {
                 logger.warn(`Delete temp file ${DenoZip} failed: ${error}`);
             }
             try {
+                logger.ora.text = 'Adding Bin dir to PATH...';
                 const inPath = yield isBinDirInPath(BinDir);
                 if (!inPath) {
-                    logger.info(`${BinDir} not in PATH, adding...`);
+                    logger.info(`${BinDir} not in PATH`);
                     yield addBinDirToPath(BinDir);
                 }
                 else {
@@ -156,6 +163,7 @@ export function downloadRuntimeAndUnzipForWindows() {
             }
             catch (error) {
                 const err = error;
+                logger.ora.fail();
                 logger.error(`${t('deno_add_path_failed').d('Add BinDir to Path failed')}: ${err.message}`);
                 process.exit(1);
             }
@@ -166,6 +174,7 @@ export function downloadRuntimeAndUnzipForWindows() {
         }
         catch (error) {
             const err = error;
+            logger.ora.fail();
             logger.error(`Download Error: ${err.message}`);
             process.exit(1);
         }

package/dist/utils/installDeno.js

@@ -18,7 +18,7 @@ export function preCheckDeno() {
     return __awaiter(this, void 0, void 0, function* () {
         const command = yield checkDenoInstalled();
         if (!command) {
-            logger.error(t('install_runtime_explain').d('Under the beta phase, we are temporarily using Deno as the local development runtime. It needs to be installed first.'));
+            logger.error(t('install_runtime_explain').d('Our runtime does not yet support this OS. We are temporarily using Deno as the local development runtime, which needs to be installed first.'));
             yield installDeno();
             return false;
         }
@@ -46,7 +46,6 @@ export function checkDenoInstalled() {
             resolve(res);
         })
             .catch((err) => {
-            console.log(err);
             resolve(false);
         });
     });

package/package.json

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