@gluhar/cli 2.5.0 → 2.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gluhar/cli",
-    "version": "2.5.0",
+    "version": "2.5.2",
     "description": "Gluhar cli commands and scripts",
     "exports": {
         ".": "./src/index.ts",
@@ -44,5 +44,5 @@
         "tsconfig-paths": "^4.2.0",
         "typescript": "^5.5.4"
     },
-    "gitHead": "9b937011632811599d7e82eeb136136228548ca5"
+    "gitHead": "215aeaf1dc8234df2b12ceb4d3eba695990cddfd"
 }

package/src/commands/deploy/deploy.d.ts

@@ -1,3 +1,3 @@
 import { DeployOptions } from "./DeployOptions";
-export declare const deploy: (options: DeployOptions) => void;
+export declare const deploy: (options: DeployOptions) => Promise<void>;
 //# sourceMappingURL=deploy.d.ts.map

package/src/commands/deploy/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/deploy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAKhD,eAAO,MAAM,MAAM,YAAa,aAAa,SAsC5C,CAAC"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/deploy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAMhD,eAAO,MAAM,MAAM,YAAmB,aAAa,kBA+BlD,CAAC"}

package/src/commands/deploy/deploy.js

@@ -5,7 +5,7 @@ const git_1 = require("../../scripts/git");
 const log_1 = require("./log");
 const deployIos_1 = require("./deployIos");
 const setSsr_1 = require("./setSsr");
-const deploy = (options) => {
+const deploy = async (options) => {
     log_1.log.info("Deploying app...", options);
     // Deploy app to iOS
     if (options.ios) {
@@ -20,12 +20,8 @@ const deploy = (options) => {
     }
     // Default Deploy app to web
     const fromBranch = options.from || "dev";
-    const { local, remote } = git_1.git.branch.exists("deploy");
-    if (!local || !remote) {
-        log_1.log.error("Branch 'deploy' does not exists or has not been pushed to or pulled from remote yet.");
-        return;
-    }
-    git_1.git.branch.checkout("deploy");
+    const { remote } = git_1.git.branch.exists("deploy");
+    git_1.git.branch.checkout("deploy", { newBranch: !remote });
     log_1.log.info("Checked out to deploy branch");
     git_1.git.merge(fromBranch, true);
     log_1.log.info(`Merged with ${fromBranch}`);

package/src/commands/deploy/index.js

@@ -5,7 +5,7 @@ const deploy_1 = require("./deploy");
 exports.default = new commander_1.Command()
     .name("deploy")
     .description("Deploy a Nuxt app. Check out to deploy branch, merge with dev and check out back to dev.")
-    .option("--from", "From what branch to deploy. Default is 'dev' so this is used in the event we are deploying from a different branch.", "dev")
+    .option("--from <branch>", "From what branch to deploy. Default is 'dev' so this is used in the event we are deploying from a different branch.", "dev")
     .option("--ios", "Deploy app to iOS device using Capacitor.")
     .option("--android", "Deploy app to Android device using Capacitor.")
     .option("--ssr", "Set SSR before deployment. Default is undefined for no change.")