cloudron 5.11.9 → 5.11.11

package/bin/cloudron-build

@@ -31,7 +31,6 @@ program.command('build', { isDefault: true })
 
 program.command('login')
     .description('Login to the build service')
-    .option('-t, --token <token>', 'Build service token')
     .action(buildActions.login);
 
 program.command('logs')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.11.9",
+  "version": "5.11.11",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -17,31 +17,29 @@
   },
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
-    "async": "^3.2.5",
+    "async": "^3.2.6",
     "cloudron-manifestformat": "^5.26.2",
     "commander": "^12.1.0",
-    "debug": "^4.3.5",
+    "debug": "^4.3.7",
     "easy-table": "^1.2.0",
     "ejs": "^3.1.10",
     "eventsource": "^2.0.2",
-    "micromatch": "^4.0.7",
-    "open": "^8.4.0",
+    "micromatch": "^4.0.8",
+    "open": "^10.1.0",
     "progress": "^2.0.3",
     "progress-stream": "^2.0.0",
     "readline-sync": "^1.4.10",
     "safetydance": "^2.4.0",
     "split2": "^4.2.0",
-    "superagent": "^9.0.2",
+    "superagent": "^10.1.1",
     "tar-fs": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.12.0.tgz",
-    "underscore": "^1.13.6"
+    "underscore": "^1.13.7"
   },
   "engines": {
     "node": ">= 18.x.x"
   },
   "devDependencies": {
     "expect.js": "^0.3.1",
-    "memorystream": "^0.3.1",
-    "mocha": "^10.4.0",
-    "rimraf": "^5.0.7"
+    "mocha": "^10.8.2"
   }
 }

package/src/actions.js

@@ -8,7 +8,6 @@ const assert = require('assert'),
     fs = require('fs'),
     https = require('https'),
     manifestFormat = require('cloudron-manifestformat'),
-    opn = require('open'),
     os = require('os'),
     path = require('path'),
     ProgressBar = require('progress'),
@@ -427,7 +426,8 @@ async function open(localOptions, cmd) {
 
     if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
-    opn(`https://${app.fqdn}`);
+    // pure esm module
+    (await import('open')).default(`https://${app.fqdn}`);
 }
 
 async function list(localOptions, cmd) {

package/src/appstore-actions.js

@@ -370,15 +370,19 @@ async function approve(localOptions, cmd) {
         // Git repo pre-flight checks: checking if latest tag matches latest commit
         defaultBranch = safe.child_process.execSync(`git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'`, { encoding: 'utf8' });
         if (safe.error) return exit(`Failed to get default branch: ${safe.error.message}`);
+        defaultBranch = defaultBranch.trim();
 
-        const defaultBranchSha = safe.child_process.execSync(`git rev-parse ${defaultBranch}`, { encoding: 'utf8' });
+        let defaultBranchSha = safe.child_process.execSync(`git rev-parse ${defaultBranch}`, { encoding: 'utf8' });
         if (safe.error) return exit(`Failed to get head of ${defaultBranch}: ${safe.error.message}`);
+        defaultBranchSha = defaultBranchSha.trim();
 
         latestTag = safe.child_process.execSync('git describe --tags --abbrev=0', { encoding: 'utf8' });
         if (safe.error) return exit(`Failed to get latest tag: ${safe.error.message}`);
+        latestTag = latestTag.trim();
 
-        const latestTagSha = safe.child_process.execSync(`git rev-list -n 1 ${latestTag}`, { encoding: 'utf8' });
+        let latestTagSha = safe.child_process.execSync(`git rev-list -n 1 ${latestTag}`, { encoding: 'utf8' });
         if (safe.error) return exit(`Failed to get head of ${defaultBranch}: ${safe.error.message}`);
+        latestTagSha = latestTagSha.trim();
 
         if (defaultBranchSha !== latestTagSha) return exit(`Latest tag ${latestTag} does not match HEAD of ${defaultBranch}`);
     }

package/src/build-actions.js

@@ -63,8 +63,8 @@ function getBuildServiceConfig(options) {
     return buildService;
 }
 
-async function login(options) {
-    assert.strictEqual(typeof options, 'object');
+async function login(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
 
     const buildServiceConfig = getBuildServiceConfig(options);
 

package/test/test.js

@@ -12,7 +12,6 @@ var child_process = require('child_process'),
     expect = require('expect.js'),
     fs = require('fs'),
     path = require('path'),
-    rimraf = require('rimraf'),
     safe = require('safetydance'),
     util = require('util');
 
@@ -203,7 +202,7 @@ describe('Pull', function () {
     });
 
     it('can pull a directory', function () {
-        rimraf.sync('/tmp/pulldir');
+        fs.rmSync('/tmp/pulldir', { recursive: true, force: true });
         safe.fs.mkdirSync('/tmp/pulldir');
         cli(util.format('pull --app %s /app/code/ /tmp/pulldir', app.id));
         expect(fs.existsSync('/tmp/pulldir/README.md')).to.be.ok();
@@ -213,7 +212,7 @@ describe('Pull', function () {
         var result = cli(util.format('exec --app %s md5sum /app/code/node_modules/uglify-js/bin/uglifyjs', app.id));
         expect(result.output[1]).to.contain(md5('/tmp/pulldir/node_modules/uglify-js/bin/uglifyjs'));
 
-        rimraf.sync('/tmp/pulldir');
+        fs.rmSync('/tmp/pulldir', { recursive: true, force: true });
     });
 
     it('can pull to directory', function () {