shipthis 0.1.30 → 0.1.31

package/dist/{index-BTAL7EB_.js → index-CyvGh-kt.js}

@@ -3,9 +3,9 @@ import { Text, useInput, Box } from 'ink';
 import React, { useState, useEffect, useContext, useRef } from 'react';
 import Spinner from 'ink-spinner';
 import open from 'open';
-import { g as getShortUUID, h as getPlatformName, s as scriptDir } from './index-35Eswf6F.js';
-import { c as cacheKeys, u as useAndroidServiceAccountTestResult, K as KeyTestStatus, a as KeyTestError } from './useAndroidServiceAccountTestResult-CJLIEYmA.js';
-import { p as getAuthedHeaders, q as API_URL, I as castArrayObjectDates, P as Platform, a6 as getShortDateTime, J as JobStatus, a7 as getShortTimeDelta, E as getJob, F as getProject, a2 as getShortAuthRequiredUrl, K as queryClient, W as WEB_URL } from './index-DxzXU9Hd.js';
+import { g as getShortUUID, h as getPlatformName, s as scriptDir } from './index-DJ078v-U.js';
+import { c as cacheKeys, u as useAndroidServiceAccountTestResult, K as KeyTestStatus, a as KeyTestError } from './useAndroidServiceAccountTestResult-Dy3Ag7_r.js';
+import { p as getAuthedHeaders, q as API_URL, I as castArrayObjectDates, P as Platform, a5 as getShortDateTime, J as JobStatus, a6 as getShortTimeDelta, E as getJob, F as getProject, a2 as getShortAuthRequiredUrl, _ as queryClient, a7 as BuildType, W as WEB_URL } from './index-w3lHxk5O.js';
 import '@inkjs/ui';
 import axios from 'axios';
 import { useQuery } from '@tanstack/react-query';
@@ -37,13 +37,13 @@ async function queryBuilds({ projectId, ...pageAndSortParams }) {
   }
 }
 function getBuildSummary(build) {
-  const buildType = build.buildType || (build.platform == Platform.IOS ? "IPA" : "AAB");
-  const filename = `game.${buildType.toLowerCase()}`;
+  const ext = build.buildType || (build.platform == Platform.IOS ? "IPA" : "AAB");
+  const filename = `game.${ext.toLowerCase()}`;
   return {
     id: getShortUUID(build.id),
     jobId: getShortUUID(build.jobId),
     ...getJobDetailsSummary(build.jobDetails),
-    type: `${getPlatformName(build.platform)} ${buildType}`,
+    type: `${getPlatformName(build.platform)} ${build.buildType || ""}`.trim(),
     createdAt: getShortDateTime(build.createdAt),
     cmd: `shipthis game build download ${getShortUUID(build.id)} ${filename}`
   };
@@ -140,7 +140,16 @@ const getRenderedMarkdown = ({ filename, templateVars, ...options }) => {
   const root = path.dirname(entrypointPath);
   const mdPath = path.join(root, "..", "assets", "markdown", filename);
   const mdTemplate = fs__default.readFileSync(mdPath, "utf8").trim();
-  const markdown = !templateVars ? mdTemplate : mdTemplate.replace(/\${(.*?)}/g, (_, key) => templateVars[key.trim()] || "");
+  let markdown = mdTemplate;
+  if (templateVars) {
+    markdown = markdown.replace(/\${if (.*?)\}([\s\S]*?)\${endif}/g, (_, key, content) => {
+      return templateVars[key.trim()] ? content : "";
+    });
+    markdown = markdown.replace(/\${(.*?)}/g, (_, key) => {
+      const trimmed = key.trim();
+      return templateVars[trimmed] ? String(templateVars[trimmed]) : "";
+    });
+  }
   const rendered = parse(markdown).trim();
   const cleaned = cleanHyperlinks(rendered);
   return cleaned;
@@ -191,8 +200,10 @@ const Create = ({ onComplete, onError, gameId, ...boxProps }) => {
       queryKey: cacheKeys.androidKeyTestResult({ projectId: gameId })
     });
   });
-  const initialBuild = builds?.data.find((build) => build.platform === Platform.ANDROID);
-  const downloadCmd = initialBuild ? `${getBuildSummary(initialBuild).cmd}` : "";
+  const initialBuild = builds?.data.find((build) => {
+    return build.platform === Platform.ANDROID && build.buildType === BuildType.AAB;
+  });
+  const downloadCmd = initialBuild ? `${getBuildSummary(initialBuild).cmd}` : "Initial AAB build not found!";
   const templateVars = {
     downloadCmd,
     dashboardURL: new URL(`/games/${getShortUUID(gameId)}/builds`, WEB_URL).toString()

package/dist/{index-35Eswf6F.js → index-DJ078v-U.js}

@@ -4,7 +4,7 @@ import readlineSync from 'readline-sync';
 import { promises } from 'node:readline';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { L as JobStage, P as Platform, M as LogLevel, J as JobStatus } from './index-DxzXU9Hd.js';
+import { K as JobStage, P as Platform, L as LogLevel, J as JobStatus } from './index-w3lHxk5O.js';
 import 'luxon';
 import 'axios';
 import 'isomorphic-git';
@@ -16,6 +16,7 @@ import 'uuid';
 import 'fast-glob';
 import 'yazl';
 import 'socket.io-client';
+import 'ink';
 
 function getShortUUID(originalUuid) {
   return originalUuid.slice(0, 8);

package/dist/{index--EbYyBAZ.js → index-DKQjnJrC.js}

@@ -2,8 +2,8 @@ import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { Box, Text } from 'ink';
 import { useState, useRef, useEffect, useContext } from 'react';
 import Spinner from 'ink-spinner';
-import { b as GameContext } from './index-BTAL7EB_.js';
-import { p as getAuthedHeaders, q as API_URL, a1 as castObjectDates, P as Platform, C as CredentialsType, R as getGoogleStatus } from './index-DxzXU9Hd.js';
+import { b as GameContext } from './index-CyvGh-kt.js';
+import { p as getAuthedHeaders, q as API_URL, a1 as castObjectDates, P as Platform, C as CredentialsType, Q as getGoogleStatus } from './index-w3lHxk5O.js';
 import axios from 'axios';
 import 'crypto-js';
 import 'uuid';
@@ -19,11 +19,11 @@ import 'node:path';
 import 'node:url';
 import 'isomorphic-git';
 import '@oclif/core';
-import { c as cacheKeys } from './useAndroidServiceAccountTestResult-CJLIEYmA.js';
+import { c as cacheKeys } from './useAndroidServiceAccountTestResult-Dy3Ag7_r.js';
 import 'fast-glob';
 import 'socket.io-client';
-import { u as useWebSocket } from './useWebSocket-BOCa8v6o.js';
-import { u as useProjectCredentials } from './useProjectCredentials-DX3e_PPc.js';
+import { u as useWebSocket } from './useWebSocket-gyuCsore.js';
+import { u as useProjectCredentials } from './useProjectCredentials-DpeXZcHP.js';
 import 'open';
 import 'marked';
 import 'marked-terminal';

package/dist/{index-DxzXU9Hd.js → index-w3lHxk5O.js}

@@ -20,6 +20,7 @@ import { QueryClient } from '@tanstack/react-query';
 import 'fast-glob';
 import 'yazl';
 import 'socket.io-client';
+import 'ink';
 
 const defaultExport = expo.default;
 const {
@@ -335,6 +336,12 @@ var CredentialsType = /* @__PURE__ */ ((CredentialsType2) => {
   CredentialsType2["KEY"] = "KEY";
   return CredentialsType2;
 })(CredentialsType || {});
+var BuildType = /* @__PURE__ */ ((BuildType2) => {
+  BuildType2["IPA"] = "IPA";
+  BuildType2["APK"] = "APK";
+  BuildType2["AAB"] = "AAB";
+  return BuildType2;
+})(BuildType || {});
 
 function isCWDGodotGame() {
   const cwd = process.cwd();
@@ -722,4 +729,4 @@ const DetailsFlags = {
   gcpServiceAccountId: Flags.string({ char: "c", description: "Set the GCP service account ID" })
 };
 
-export { getNewUploadTicket as $, ApiKey as A, BaseAuthenticatedCommand as B, CredentialsType as C, DetailsFlags as D, getJob as E, getProject as F, GODOT_CAPABILITIES as G, downloadBuildById as H, castArrayObjectDates as I, JobStatus as J, queryClient as K, JobStage as L, LogLevel as M, getAuthToken as N, WS_URL as O, Platform as P, getGodotAndroidPackageName as Q, getGoogleStatus as R, inviteServiceAccount as S, disconnectGoogle as T, UserRole as U, BaseCommand as V, WEB_URL as W, getSingleUseUrl as X, setAuthToken as Y, acceptTerms as Z, Auth as _, ApiKeyType as a, startJobsFromUpload as a0, castObjectDates as a1, getShortAuthRequiredUrl as a2, getGoogleAuthUrl as a3, castJobDates as a4, getShortTime as a5, getShortDateTime as a6, getShortTimeDelta as a7, updateProject as a8, getShortDate as b, BaseGameCommand as c, getGodotAppleBundleIdentifier as d, BundleId as e, App as f, getProjects as g, CapabilityTypeOption as h, BetaGroup as i, isCWDGodotGame as j, getProjectPlatformProgress as k, Certificate as l, CertificateType as m, Profile as n, ProfileType as o, getAuthedHeaders as p, API_URL as q, getGodotProjectCapabilities as r, CapabilityType as s, GameEngine as t, getGodotVersion as u, createProject as v, DEFAULT_IGNORED_FILES_GLOBS as w, DEFAULT_SHIPPED_FILES_GLOBS as x, getGodotProjectName as y, getProjectJobs as z };
+export { getNewUploadTicket as $, ApiKey as A, BaseAuthenticatedCommand as B, CredentialsType as C, DetailsFlags as D, getJob as E, getProject as F, GODOT_CAPABILITIES as G, downloadBuildById as H, castArrayObjectDates as I, JobStatus as J, JobStage as K, LogLevel as L, getAuthToken as M, WS_URL as N, getGodotAndroidPackageName as O, Platform as P, getGoogleStatus as Q, inviteServiceAccount as R, disconnectGoogle as S, BaseCommand as T, UserRole as U, getSingleUseUrl as V, WEB_URL as W, setAuthToken as X, acceptTerms as Y, Auth as Z, queryClient as _, ApiKeyType as a, startJobsFromUpload as a0, castObjectDates as a1, getShortAuthRequiredUrl as a2, castJobDates as a3, getShortTime as a4, getShortDateTime as a5, getShortTimeDelta as a6, BuildType as a7, getGoogleAuthUrl as a8, updateProject as a9, getShortDate as b, BaseGameCommand as c, getGodotAppleBundleIdentifier as d, BundleId as e, App as f, getProjects as g, CapabilityTypeOption as h, BetaGroup as i, isCWDGodotGame as j, getProjectPlatformProgress as k, Certificate as l, CertificateType as m, Profile as n, ProfileType as o, getAuthedHeaders as p, API_URL as q, getGodotProjectCapabilities as r, CapabilityType as s, GameEngine as t, getGodotVersion as u, createProject as v, DEFAULT_IGNORED_FILES_GLOBS as w, DEFAULT_SHIPPED_FILES_GLOBS as x, getGodotProjectName as y, getProjectJobs as z };

package/dist/{upload-Bw0zrS4M.js → upload-BTpxj3QP.js}

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { p as getAuthedHeaders, q as API_URL } from './index-DxzXU9Hd.js';
+import { p as getAuthedHeaders, q as API_URL } from './index-w3lHxk5O.js';
 
 async function getNewUploadTicket(projectId = null) {
   const url = projectId ? `${API_URL}/projects/${projectId}/credentials/url` : `${API_URL}/credentials/url`;

package/dist/{useAndroidServiceAccountTestResult-CJLIEYmA.js → useAndroidServiceAccountTestResult-Dy3Ag7_r.js}

@@ -1,4 +1,4 @@
-import { p as getAuthedHeaders, q as API_URL } from './index-DxzXU9Hd.js';
+import { p as getAuthedHeaders, q as API_URL } from './index-w3lHxk5O.js';
 import axios from 'axios';
 import { useQuery } from '@tanstack/react-query';
 

package/dist/{useAppleApp-cnb8gX0x.js → useAppleApp-h1Ogi_qc.js}

@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import { f as App } from './index-DxzXU9Hd.js';
+import { f as App } from './index-w3lHxk5O.js';
 
 const queryAppleApp = async ({ ctx, iosBundleId }) => {
   if (!iosBundleId) {

package/dist/{useAppleBundleId-B0Etav8g.js → useAppleBundleId-B3TTNap0.js}

@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import { e as BundleId, r as getGodotProjectCapabilities, P as Platform, G as GODOT_CAPABILITIES, s as CapabilityType } from './index-DxzXU9Hd.js';
+import { e as BundleId, r as getGodotProjectCapabilities, P as Platform, G as GODOT_CAPABILITIES, s as CapabilityType } from './index-w3lHxk5O.js';
 
 async function getBundleIdCapabilities(bundleId) {
   const current = await bundleId.getBundleIdCapabilitiesAsync();

package/dist/{useProjectCredentials-DX3e_PPc.js → useProjectCredentials-DpeXZcHP.js}

@@ -1,8 +1,8 @@
 import axios from 'axios';
 import { useQuery } from '@tanstack/react-query';
-import { c as cacheKeys } from './useAndroidServiceAccountTestResult-CJLIEYmA.js';
-import { b as getShortDate, p as getAuthedHeaders, q as API_URL, I as castArrayObjectDates } from './index-DxzXU9Hd.js';
-import { g as getShortUUID } from './index-35Eswf6F.js';
+import { c as cacheKeys } from './useAndroidServiceAccountTestResult-Dy3Ag7_r.js';
+import { b as getShortDate, p as getAuthedHeaders, q as API_URL, I as castArrayObjectDates } from './index-w3lHxk5O.js';
+import { g as getShortUUID } from './index-DJ078v-U.js';
 
 async function queryProjectCredentials({
   projectId,

package/dist/{useWebSocket-BOCa8v6o.js → useWebSocket-gyuCsore.js}

@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 import { io } from 'socket.io-client';
-import { N as getAuthToken, O as WS_URL } from './index-DxzXU9Hd.js';
+import { M as getAuthToken, N as WS_URL } from './index-w3lHxk5O.js';
 
 function useWebSocket(listeners = []) {
   const log = () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shipthis",
   "description": "ShipThis manages building and uploading your Godot games to the App Store and Google Play.",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "author": "Hello Invent Ltd",
   "bin": {
     "shipthis": "./bin/run.js"
@@ -22,6 +22,7 @@
     "deepmerge": "^4.3.1",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
+    "fullscreen-ink": "^0.0.2",
     "ini": "^5.0.0",
     "ink": "^5.0.1",
     "ink-spinner": "^5.0.0",

package/dist/Command-1p5alCz3.js

@@ -1,28 +0,0 @@
-import { jsx } from 'react/jsx-runtime';
-import { Box } from 'ink';
-import { QueryClientProvider } from '@tanstack/react-query';
-import { K as queryClient } from './index-DxzXU9Hd.js';
-import 'axios';
-import 'crypto';
-import 'fs';
-import 'readline-sync';
-import 'node:readline';
-import 'node:path';
-import 'node:url';
-import 'luxon';
-import 'isomorphic-git';
-import '@oclif/core';
-import 'react';
-import 'crypto-js';
-import 'uuid';
-import 'socket.io-client';
-import 'fast-glob';
-import 'yazl';
-import { C as CommandProvider } from './index-BTAL7EB_.js';
-
-const Command = ({ children, command }) => {
-  const width = process.stdout.columns || 80;
-  return /* @__PURE__ */ jsx(QueryClientProvider, { client: queryClient, children: /* @__PURE__ */ jsx(CommandProvider, { command, children: /* @__PURE__ */ jsx(Box, { width, flexDirection: "column", children }) }) });
-};
-
-export { Command as C };