defang 3.5.2 → 3.5.4

package/bin/clilib.js

@@ -1,25 +1,24 @@
 import AdmZip from "adm-zip";
-import axios from "axios";
 import * as child_process from "child_process";
 import * as fs from "fs";
 import * as path from "path";
 import * as tar from "tar";
 import { promisify } from "util";
-import { dirname } from 'path';
 import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+const __dirname = path.dirname(__filename);
 const SEMVER_REGEX = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
 const EXECUTABLE = "defang";
 const URL_LATEST_RELEASE = "https://api.github.com/repos/DefangLabs/defang/releases/latest";
-const HTTP_STATUS_OK = 200;
-const exec = promisify(child_process.exec);
+const execFile = promisify(child_process.execFile);
 async function getLatestVersion() {
-    const response = await axios.get(URL_LATEST_RELEASE);
-    if (response.status !== HTTP_STATUS_OK) {
+    const response = await fetch(URL_LATEST_RELEASE);
+    if (!response.ok) {
         throw new Error(`Failed to get latest version from GitHub. Status code: ${response.status}`);
     }
-    return response.data?.tag_name?.replace("v", "").trim();
+    const data = await response.json();
+    const version = data.tag_name?.trim().replace(/^v/, "");
+    return version && SEMVER_REGEX.test(version) ? version : undefined;
 }
 async function downloadAppArchive(archiveFilename, outputPath) {
     const downloadUrl = `https://s.defang.io/${archiveFilename}?x-defang-source=npm`;
@@ -28,21 +27,17 @@ async function downloadAppArchive(archiveFilename, outputPath) {
 }
 async function downloadFile(downloadUrl, downloadTargetFile) {
     try {
-        const response = await axios.get(downloadUrl, {
-            responseType: "arraybuffer",
-            headers: {
-                "Content-Type": "application/octet-stream",
-            },
-        });
-        if (response.data == null) {
-            throw new Error(`Failed to download ${downloadUrl}. No data in response.`);
+        const response = await fetch(downloadUrl);
+        if (!response.ok) {
+            throw new Error(`Failed to download ${downloadUrl}. Status code: ${response.status}`);
         }
-        await fs.promises.writeFile(downloadTargetFile, response.data);
+        const buffer = Buffer.from(await response.arrayBuffer());
+        await fs.promises.writeFile(downloadTargetFile, buffer);
         return downloadTargetFile;
     }
     catch (error) {
         console.error(error);
-        await fs.promises.unlink(downloadTargetFile);
+        await fs.promises.rm(downloadTargetFile, { force: true });
         return null;
     }
 }
@@ -70,7 +65,7 @@ async function extractZip(zipPath, outputPath) {
         }
         const executableFullName = EXECUTABLE + extension;
         const result = zip.extractEntryTo(executableFullName, outputPath, true, true);
-        await fs.promises.chmod(path.join(outputPath, executableFullName), 755);
+        await fs.promises.chmod(path.join(outputPath, executableFullName), 0o755);
         return result;
     }
     catch (error) {
@@ -165,9 +160,9 @@ async function getVersionInfo() {
         const execPath = getPathToExecutable();
         if (!execPath) {
             const latestVersion = await getLatestVersion();
-            return { current: null, latest: latestVersion };
+            return { current: null, latest: latestVersion ?? null };
         }
-        const versionInfo = await exec(quoteIfNeeded(execPath) + " version");
+        const versionInfo = await execFile(execPath, ["version"]);
         const verInfo = extractCLIVersions(versionInfo.stdout);
         result.current = verInfo.defangCLI;
         result.latest = verInfo.latestCLI;

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "defang",
-  "version": "3.5.2",
+  "version": "3.5.4",
   "author": "Defang Software Labs Inc.",
   "description": "CLI to take your app from Docker Compose to a secure and scalable deployment on your favorite cloud in minutes",
   "license": "MIT",
   "type": "module",
-  "ts-node": {
-    "esm": true
-  },
   "bin": {
     "defang": "bin/cli.js"
   },
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "keywords": [],
   "homepage": "https://defang.io",
   "repository": {
@@ -20,19 +20,6 @@
   "bugs": {
     "url": "https://github.com/DefangLabs/defang/issues"
   },
-  "mocha": {
-    "require": [
-      "ts-node/register"
-    ],
-    "extension": [
-      "ts",
-      "js"
-    ],
-    "spec": [
-      "test/**/*.spec.ts"
-    ],
-    "recursive": true
-  },
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "postbuild": "chmod +x bin/cli.js",
@@ -40,7 +27,6 @@
   },
   "dependencies": {
     "adm-zip": "^0.5.14",
-    "axios": "^1.8.2",
     "tar": "^7.0.1"
   },
   "devDependencies": {
@@ -48,16 +34,15 @@
     "@types/chai": "^5.1.1",
     "@types/chai-as-promised": "^8.0.0",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^20.12.7",
-    "@types/sinon": "^17.0.3",
+    "@types/node": "^24.12.0",
+    "@types/sinon": "^21.0.1",
     "@types/tar": "^6.1.13",
-    "chai": "^5.1.1",
+    "chai": "^6.2.2",
     "chai-as-promised": "^8.0.0",
-    "mocha": "^10.8.2",
-    "sinon": "^18.0.0",
-    "ts-node": "^10.9.2",
+    "mocha": "^11.3.0",
+    "sinon": "^21.0.3",
     "tsx": "^4.19.3",
-    "typescript": "^5.8.3"
+    "typescript": "^6.0.2"
   },
   "main": "./bin/cli.js"
 }