@gluhar/cli 2.3.2 → 2.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gluhar/cli",
-    "version": "2.3.2",
+    "version": "2.5.1",
     "description": "Gluhar cli commands and scripts",
     "exports": {
         ".": "./src/index.ts",
@@ -26,7 +26,8 @@
         "inquirer": "^8.2.6",
         "istextorbinary": "^9.5.0",
         "npmlog": "^7.0.1",
-        "shelljs": "^0.8.5"
+        "shelljs": "^0.8.5",
+        "ts-morph": "^25.0.0"
     },
     "devDependencies": {
         "@nuxt/eslint-config": "^0.5.6",
@@ -43,5 +44,5 @@
         "tsconfig-paths": "^4.2.0",
         "typescript": "^5.5.4"
     },
-    "gitHead": "1ade1c2c6ebb8dffa3261352ab6258aea045fe38"
+    "gitHead": "6aeb0ebe6cec454e140af6adacd4c77bb7d5913d"
 }

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

@@ -1,4 +1,7 @@
 export interface DeployOptions {
     from?: string;
+    ios?: boolean;
+    android?: boolean;
+    ssr?: boolean;
 }
 //# sourceMappingURL=DeployOptions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"DeployOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/DeployOptions.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf"}
+{"version":3,"file":"DeployOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/DeployOptions.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf"}

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;AAGhD,eAAO,MAAM,MAAM,YAAa,aAAa,SAwB5C,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

@@ -3,15 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploy = void 0;
 const git_1 = require("../../scripts/git");
 const log_1 = require("./log");
-const deploy = (options) => {
-    log_1.log.info("Deploying app...");
-    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.");
+const deployIos_1 = require("./deployIos");
+const setSsr_1 = require("./setSsr");
+const deploy = async (options) => {
+    log_1.log.info("Deploying app...", options);
+    // Deploy app to iOS
+    if (options.ios) {
+        (0, deployIos_1.deployIos)(options);
         return;
     }
-    git_1.git.branch.checkout("deploy");
+    // Handle ssr
+    if (options.ssr !== undefined) {
+        log_1.log.info(`Setting ssr to ${options.ssr} and committing to git`);
+        (0, setSsr_1.setSsr)(options.ssr);
+        git_1.git.commit("chore: Set SSR to " + options.ssr);
+    }
+    // Default Deploy app to web
+    const fromBranch = options.from || "dev";
+    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/deployIos.d.ts

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"deployIos.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/deployIos.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAUhD,eAAO,MAAM,SAAS,YAAmB,aAAa,kBA2BrD,CAAC"}

package/src/commands/deploy/deployIos.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deployIos = void 0;
+const cmd_1 = require("../../scripts/cmd");
+const log_1 = require("./log");
+const ts_morph_1 = require("ts-morph");
+const setSsr_1 = require("./setSsr");
+const project = new ts_morph_1.Project();
+const deployIos = async (options) => {
+    log_1.log.info("Deploying iOS app.");
+    // Remove server dev url from capacitor config
+    const capConfig = project.addSourceFileAtPathIfExists("./capacitor.config.ts");
+    if (!capConfig)
+        return;
+    const capConfigObject = capConfig
+        ?.getVariableDeclaration("config")
+        ?.getInitializerIfKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression);
+    if (!capConfigObject)
+        return;
+    capConfigObject.getProperty("server")?.remove();
+    capConfig.saveSync();
+    // Disable ssr from nuxt.config
+    (0, setSsr_1.setSsr)(false);
+    // Generate static nuxt app
+    (0, cmd_1.executeCmd)("nuxi generate");
+    // Sync and open iOS app with Capacitor
+    (0, cmd_1.executeCmd)("cap sync ios");
+    (0, cmd_1.executeCmd)("cap open ios");
+};
+exports.deployIos = deployIos;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;;AAGpC,wBAUkB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;;AAGpC,wBAgBkB"}

package/src/commands/deploy/index.js

@@ -6,4 +6,7 @@ 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("--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.")
     .action(deploy_1.deploy);

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

@@ -0,0 +1,2 @@
+export declare const setSsr: (ssr: boolean) => void;
+//# sourceMappingURL=setSsr.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"setSsr.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/setSsr.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,MAAM,QAAS,OAAO,SAoBlC,CAAC"}

package/src/commands/deploy/setSsr.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setSsr = void 0;
+const ts_morph_1 = require("ts-morph");
+const project = new ts_morph_1.Project();
+const setSsr = (ssr) => {
+    const nuxtConfig = project.addSourceFileAtPath("./nuxt.config.ts");
+    if (!nuxtConfig)
+        return;
+    const nuxtConfigDefault = nuxtConfig?.getFirstDescendantByKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression);
+    if (!nuxtConfigDefault)
+        return;
+    const nuxtConfigSsr = nuxtConfigDefault.getProperty("ssr");
+    if (nuxtConfigSsr) {
+        nuxtConfigSsr.set({ initializer: `${ssr}` });
+    }
+    else {
+        nuxtConfigDefault.addPropertyAssignment({
+            name: "ssr",
+            initializer: `${ssr}`,
+        });
+    }
+    nuxtConfig.saveSync();
+};
+exports.setSsr = setSsr;

package/src/preAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preAction.d.ts","sourceRoot":"","sources":["../../src/preAction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAmEzC,eAAO,MAAM,SAAS,YAAmB,OAAO,aAAa,OAAO,kBAoBnE,CAAC"}
+{"version":3,"file":"preAction.d.ts","sourceRoot":"","sources":["../../src/preAction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsEzC,eAAO,MAAM,SAAS,YAAmB,OAAO,aAAa,OAAO,kBAoBnE,CAAC"}

package/src/preAction.js

@@ -5,6 +5,7 @@ const utils_1 = require("./utils");
 // import { getConfigOpt, setConfigOpt } from './config';
 const cmd_1 = require("./scripts/cmd");
 const constants_1 = require("./constants");
+const git_1 = require("./scripts/git");
 const getOptions = (command) => command.opts();
 const log = (0, utils_1.logger)("cli");
 // const loadConfig = (rootCmd: Command, actionCmd: Command) => {
@@ -37,6 +38,8 @@ const logCli = (actionCmd) => {
     log.verbose("cwd:", process.cwd());
 };
 const checkCliVersion = async () => {
+    if (git_1.git.getRepo() === "gluhar")
+        return;
     const latestVersion = (0, cmd_1.getCmdOutput)("npm show @gluhar/cli version");
     // Version is up to date
     if (latestVersion === constants_1.VERSION)