expo-release-it 0.1.1 → 0.1.3

package/README.md

@@ -52,6 +52,8 @@ npx expo-release-it (init|bump|build|upload|submit) [options]
 
 ## bump
 
+## pull
+
 ## build
 
 ## upload

package/build/command/build.js

@@ -1,31 +1,28 @@
-// src/util/setup/prepareAndroid.ts
-import { spinner, $ } from "zx";
-
 // src/util/FileUtil.ts
 import fs from "fs-extra";
 import * as path from "path";
 var join2 = path.join;
 var resolve2 = path.resolve;
-function exist(path3) {
-  return fs.existsSync(path3);
+function exist(path2) {
+  return fs.existsSync(path2);
 }
-function isDir(path3) {
-  return exist(path3) && fs.lstatSync(path3).isDirectory();
+function isDir(path2) {
+  return exist(path2) && fs.lstatSync(path2).isDirectory();
 }
 function relativePath(from, to) {
   return path.relative(from, to);
 }
-function isFile(path3) {
-  return exist(path3) && fs.lstatSync(path3).isFile();
+function isFile(path2) {
+  return exist(path2) && fs.lstatSync(path2).isFile();
 }
-function read(path3) {
-  return fs.readFileSync(path3, { encoding: "utf8" });
+function read(path2) {
+  return fs.readFileSync(path2, { encoding: "utf8" });
 }
-function readdir(path3) {
-  return fs.readdirSync(path3);
+function readdir(path2) {
+  return fs.readdirSync(path2);
 }
-function readJsonSlow(path3) {
-  return fs.readJSONSync(path3);
+function readJsonSlow(path2) {
+  return fs.readJSONSync(path2);
 }
 function write(p, content) {
   const dir = path.dirname(p);
@@ -37,21 +34,21 @@ function write(p, content) {
 function copy(src, dest, options) {
   fs.copySync(src, dest, options);
 }
-function remove(path3) {
-  if (!exist(path3)) {
+function remove(path2) {
+  if (!exist(path2)) {
     return;
   }
-  if (fs.lstatSync(path3).isDirectory()) {
-    return fs.rmSync(path3, { force: true, recursive: true });
+  if (fs.lstatSync(path2).isDirectory()) {
+    return fs.rmSync(path2, { force: true, recursive: true });
   } else {
-    return fs.rmSync(path3, { force: true });
+    return fs.rmSync(path2, { force: true });
   }
 }
-async function iterateDir(path3, fn) {
-  if (!isDir(path3)) {
+async function iterateDir(path2, fn) {
+  if (!isDir(path2)) {
     return;
   }
-  for (const file of fs.readdirSync(path3)) {
+  for (const file of fs.readdirSync(path2)) {
     await fn(file);
   }
 }
@@ -61,11 +58,11 @@ var package_default = {
   name: "expo-release-it",
   module: "src/index.ts",
   type: "module",
-  version: "0.1.0",
+  version: "0.1.2",
   license: "MIT",
   scripts: {
     build: "tsup",
-    dev: "bun run build && NODE_ENV=development node bin/expo-release-it.mjs",
+    dev: "yarn run build && NODE_ENV=development node bin/expo-release-it.mjs",
     release: "yarn build && release-it",
     android: "expo run:android",
     ios: "expo run:ios",
@@ -76,15 +73,15 @@ var package_default = {
     "@mj-studio/js-util": "^1.1.20",
     chalk: "^5.4.1",
     commander: "^13.1.0",
+    execa: "^9.5.2",
     "fs-extra": "^11.3.0",
+    ora: "^8.2.0",
     react: "18.3.1",
     "react-native": "0.76.9",
     semver: "^7.7.1",
-    url: "^0.11.4",
-    zx: "^8.5.3"
+    url: "^0.11.4"
   },
   devDependencies: {
-    "@types/bun": "latest",
     "@types/fs-extra": "^11.0.4",
     "@types/semver": "^7.7.0",
     prettier: "3.5.3",
@@ -117,26 +114,13 @@ var OptionHolder = {
   input: {},
   keyholderMap: {},
   templateDirNames: ["key"],
-  iosBundleIdentifier: "",
-  androidPackageName: "",
   projectDir: "",
-  outputOfInitDir: "",
+  resourcesDir: "",
   keyDir: "",
   keyholderFilePath: "",
   versionName: "",
-  versionCode: ""
-};
-
-// src/util/logger.ts
-import chalk from "chalk";
-var logger = {
-  success: (...msg) => console.log(chalk.green(`\u2714 ${msg.join(", ")}`)),
-  error: (...msg) => console.log(chalk.red(`\u2716 ${msg.join(", ")}`)),
-  warn: (...msg) => console.log(chalk.yellow(`\u26A0 ${msg.join(", ")}`)),
-  info: (...msg) => console.log(chalk.cyan(`\u2139 ${msg.join(", ")}`)),
-  title: (...msg) => console.log(chalk.bold.blue(`
-${msg.join(", ")}`)),
-  dim: (...msg) => console.log(chalk.dim(msg.join(", ")))
+  versionCode: "",
+  tempDir: ""
 };
 
 // src/util/iterateAllFiles.ts
@@ -155,41 +139,120 @@ async function iterateAllFiles(root, callback) {
 }
 
 // src/util/injectTemplatePlaceHolders.ts
-import { path as path2 } from "zx";
 async function injectTemplatePlaceHolders(root) {
   await iterateAllFiles(root, async (filePath) => {
-    const dirPath = path2.dirname(filePath);
     let content = read(filePath);
     for (const [key, value] of Object.entries(OptionHolder.keyholderMap)) {
       content = content.replaceAll(`{{${key}}}`, value);
     }
-    content = content.replaceAll(
-      "{{key_dir_relative_path}}",
-      relativePath(dirPath, OptionHolder.keyDir)
-    );
     write(filePath, content);
   });
 }
 
+// src/util/spinner.ts
+import { oraPromise } from "ora";
+import chalk from "chalk";
+async function spinner(text, promise) {
+  return oraPromise(promise, {
+    text,
+    successText: chalk.green(`${text} - Done`),
+    failText: chalk.red(`${text} - Failed`)
+  });
+}
+
+// src/util/setup/execShellScript.ts
+import { execa } from "execa";
+var exe = execa({
+  stdin: "pipe",
+  stdout: "inherit",
+  stderr: "inherit",
+  shell: false
+});
+var yesShell = (command, args = [], options) => {
+  const subProcess = exe(command, args, { ...options, stdin: "pipe" });
+  subProcess.stdin?.write("y\n");
+  subProcess.stdin?.end();
+  return subProcess;
+};
+
+// src/util/logger.ts
+import chalk2 from "chalk";
+var logger = {
+  success: (...msg) => console.log(chalk2.green(`\u2714 ${msg.join(", ")}`)),
+  done: (...msg) => console.log(chalk2.green(`\u2714 ${msg.join(", ")} - Done`)),
+  error: (...msg) => console.log(chalk2.red(`\u2716 ${msg.join(", ")}`)),
+  warn: (...msg) => console.log(chalk2.yellow(`\u26A0 ${msg.join(", ")}`)),
+  info: (...msg) => console.log(chalk2.cyan(`\u2139 ${msg.join(", ")}`)),
+  title: (...msg) => console.log(chalk2.bold.blue(`
+${msg.join(", ")}`)),
+  dim: (...msg) => console.log(chalk2.dim(msg.join(", ")))
+};
+
+// src/util/MetadataSyncUtil.ts
+import chalk3 from "chalk";
+function copyIosMetadata(to) {
+  const iosDir = join2(OptionHolder.projectDir, "ios");
+  const nativeDir = join2(iosDir, "fastlane");
+  const metadataNativeDir = join2(nativeDir, "metadata");
+  const screenshotsNativeDir = join2(nativeDir, "screenshots");
+  const resourcesDir = join2(OptionHolder.resourcesDir, "metadata/ios");
+  const metadataResourcesDir = join2(resourcesDir, "metadata");
+  const screenshotsResourcesDir = join2(resourcesDir, "screenshots");
+  if (to === "resources") {
+    copy(metadataNativeDir, metadataResourcesDir);
+    copy(screenshotsNativeDir, screenshotsResourcesDir);
+    logger.done(
+      `iOS Metadata saved in ${chalk3.inverse(relativePath(OptionHolder.projectDir, resourcesDir))}. You can edit inside contents.`
+    );
+  } else {
+    copy(metadataResourcesDir, metadataNativeDir);
+    copy(screenshotsResourcesDir, screenshotsNativeDir);
+    logger.done(
+      `iOS Metadata copyed to ${chalk3.inverse(relativePath(OptionHolder.projectDir, nativeDir))}`
+    );
+  }
+}
+function copyAndroidMetadata(to) {
+  const androidDir = join2(OptionHolder.projectDir, "android");
+  const nativeDir = join2(androidDir, "fastlane/metadata/android");
+  const resourcesDir = join2(OptionHolder.resourcesDir, "metadata/android");
+  if (to === "resouces") {
+    copy(nativeDir, resourcesDir);
+    logger.done(
+      `Android Metadata saved in ${chalk3.inverse(relativePath(OptionHolder.projectDir, resourcesDir))}. You can edit inside contents.`
+    );
+  } else {
+    copy(resourcesDir, nativeDir);
+    logger.done(
+      `Android Metadata copyed to ${chalk3.inverse(relativePath(OptionHolder.projectDir, nativeDir))}`
+    );
+  }
+}
+
 // src/util/setup/prepareAndroid.ts
 async function prepareAndroid() {
   const srcDir = resolve2(OptionHolder.cli.templateDir, "android");
   const destDir = resolve2(OptionHolder.projectDir, "android");
+  await yesShell("expo", ["prebuild", "-p", "android", "--no-install"], {
+    cwd: OptionHolder.projectDir
+  });
+  logger.success("Expo Prebuild - Done");
   await spinner(
-    "Prebuild Android",
-    () => $`cd ${OptionHolder.projectDir} && expo prebuild -p android --no-install`
+    "Inject Templates",
+    iterateDir(srcDir, async (file) => {
+      const filePath = resolve2(srcDir, file);
+      remove(resolve2(destDir, file));
+      copy(filePath, resolve2(destDir, file));
+    })
   );
-  logger.success("expo prebuild");
-  await iterateDir(srcDir, async (file) => {
-    const filePath = resolve2(srcDir, file);
-    remove(resolve2(destDir, file));
-    copy(filePath, resolve2(destDir, file));
-  });
-  logger.success("Inject Android templates");
-  await replaceAndroidSigningConfig(destDir);
-  logger.success("Overwrite Android Release Signing Config");
-  await injectTemplatePlaceHolders(resolve2(destDir, "fastlane"));
-  logger.success("Hydrate template placeholders");
+  await spinner("Overwrite Android Release Signing Config", replaceAndroidSigningConfig(destDir));
+  await spinner(
+    "Hydrate template placeholders",
+    injectTemplatePlaceHolders(resolve2(destDir, "fastlane"))
+  );
+  await exe({ cwd: destDir })`bundle install`;
+  logger.success("Bunder Install - Done");
+  copyAndroidMetadata("native");
 }
 async function replaceAndroidSigningConfig(destDir) {
   const buildGradleDirPath = resolve2(destDir, "app");
@@ -204,7 +267,7 @@ async function replaceAndroidSigningConfig(destDir) {
     `
   signingConfigs {
     debug {
-        storeFile file('${relativePath(buildGradleDirPath, resolve2(OptionHolder.outputOfInitDir, "key", "android_release_keystore.jks"))}')
+        storeFile file('${relativePath(buildGradleDirPath, resolve2(OptionHolder.resourcesDir, "key", "android_release_keystore.jks"))}')
         storePassword '${android_keystore_store_password}'
         keyAlias '${android_keystore_key_alias}'
         keyPassword '${android_keystore_key_password}'
@@ -215,21 +278,11 @@ async function replaceAndroidSigningConfig(destDir) {
   write(buildGradlePath, content);
 }
 
-// src/util/EnvUtil.ts
-var isDev = process.env.NODE_ENV === "development";
-var isWin = process.platform.startsWith("win");
-
-// src/util/setup/promptCommonInputs.ts
-async function promptCommonInputs() {
-  OptionHolder.projectDir = isDev ? resolve2("example") : resolve2(".");
-  OptionHolder.outputOfInitDir = resolve2(OptionHolder.projectDir, "expo-release-it");
-  OptionHolder.keyDir = resolve2(OptionHolder.outputOfInitDir, "key");
-  OptionHolder.keyholderFilePath = resolve2(OptionHolder.outputOfInitDir, "keyholder.json");
-}
-
-// src/util/hydrateKeyholderFileValues.ts
+// src/util/setup/hydrateKeyholderFileValues.ts
 async function hydrateKeyholderFileValues() {
-  Object.assign(OptionHolder.keyholderMap, readJsonSlow(OptionHolder.keyholderFilePath));
+  if (exist(OptionHolder.keyholderFilePath)) {
+    Object.assign(OptionHolder.keyholderMap, readJsonSlow(OptionHolder.keyholderFilePath));
+  }
 }
 
 // src/util/throwError.ts
@@ -242,7 +295,7 @@ function throwError(message, e) {
   process.exit(1);
 }
 
-// src/util/VersionUtil.ts
+// src/util/setup/VersionUtil.ts
 import semver from "semver";
 async function parseBinaryVersions() {
   const files = readdir(OptionHolder.projectDir);
@@ -299,36 +352,51 @@ async function parseBinaryVersions() {
   }
 }
 
+// src/util/EnvUtil.ts
+var isDev = process.env.NODE_ENV === "development";
+var isWin = process.platform.startsWith("win");
+
 // src/util/setup/setup.ts
 async function setup() {
-  await promptCommonInputs();
+  await setupBasicOptions();
   await hydrateKeyholderFileValues();
   await parseBinaryVersions();
 }
+async function setupBasicOptions() {
+  OptionHolder.projectDir = isDev ? resolve2("example") : resolve2(".");
+  OptionHolder.resourcesDir = resolve2(OptionHolder.projectDir, "expo-release-it");
+  OptionHolder.keyDir = resolve2(OptionHolder.resourcesDir, "key");
+  OptionHolder.keyholderFilePath = resolve2(OptionHolder.resourcesDir, "keyholder.json");
+  OptionHolder.tempDir = resolve2(OptionHolder.resourcesDir, ".temp");
+}
 
 // src/util/setup/prepareIos.ts
-import { $ as $2, spinner as spinner2 } from "zx";
 async function prepareIos() {
   const srcDir = resolve2(OptionHolder.cli.templateDir, "ios");
   const destDir = resolve2(OptionHolder.projectDir, "ios");
-  await spinner2(
-    "Prebuild iOS",
-    () => $2`cd ${OptionHolder.projectDir} && expo prebuild -p ios --no-install`
-  );
-  logger.success("expo prebuild");
-  await iterateDir(srcDir, async (file) => {
-    const filePath = resolve2(srcDir, file);
-    remove(resolve2(destDir, file));
-    copy(filePath, resolve2(destDir, file));
+  await yesShell("expo", ["prebuild", "-p", "ios", "--no-install"], {
+    cwd: OptionHolder.projectDir
   });
-  logger.success("Inject iOS templates");
-  await injectTemplatePlaceHolders(resolve2(destDir, "fastlane"));
-  logger.success("Hydrate template placeholders");
+  logger.success("Expo Prebuild - Done");
+  await spinner(
+    "Inject templates",
+    iterateDir(srcDir, async (file) => {
+      const filePath = resolve2(srcDir, file);
+      remove(resolve2(destDir, file));
+      copy(filePath, resolve2(destDir, file));
+    })
+  );
+  await spinner(
+    "Hydrate template placeholders",
+    injectTemplatePlaceHolders(resolve2(destDir, "fastlane"))
+  );
+  await exe({ cwd: destDir })`bundle install`;
+  logger.success("Bunder Install - Done");
+  copyIosMetadata("native");
 }
 
 // src/command/build.ts
-import { spinner as spinner3, $ as $3 } from "zx";
-import chalk3 from "chalk";
+import chalk5 from "chalk";
 
 // src/util/calculateElapsed.ts
 import { padZero } from "@mj-studio/js-util";
@@ -342,7 +410,7 @@ function calculateElapsed(t) {
 // src/util/input/InqueryInputs.ts
 import { select } from "@inquirer/prompts";
 import { is } from "@mj-studio/js-util";
-import chalk2 from "chalk";
+import chalk4 from "chalk";
 var InqueryInputs = {
   platform: async () => {
     if (!OptionHolder.input.platform) {
@@ -406,19 +474,19 @@ function constructInquirerFormattedMessage({
   referUrl,
   name
 }) {
-  let ret = `${chalk2.bold(name)}`;
+  let ret = `${chalk4.bold(name)}`;
   if (explanation) {
     ret += `
 
-${chalk2.italic.blue(explanation)}`;
+${chalk4.italic.blue(explanation)}`;
   }
   if (example) {
     ret += `
-${chalk2.italic(`${chalk2.greenBright("example    :")} ${example}`)}`;
+${chalk4.italic(`${chalk4.greenBright("example    :")} ${example}`)}`;
   }
   if (referUrl) {
     ret += `
-${chalk2.italic(`${chalk2.greenBright("references :")} ${chalk2.underline.blue(referUrl)}`)}`;
+${chalk4.italic(`${chalk4.greenBright("references :")} ${chalk4.underline.blue(referUrl)}`)}`;
   }
   if (explanation) {
     ret += "\n";
@@ -432,17 +500,13 @@ ${chalk2.italic(`${chalk2.greenBright("references :")} ${chalk2.underline.blue(r
 // src/util/FastlaneOption.ts
 function getIosFastlaneOptions() {
   return [
+    ...Object.entries(OptionHolder.keyholderMap).map(([k, v]) => `${k}:${v}`),
     `version_name:${OptionHolder.versionName}`,
     `version_code:${OptionHolder.versionCode}`,
-    `ios_app_identifier:${OptionHolder.iosBundleIdentifier}`,
-    `ios_xcode_project_target:${OptionHolder.keyholderMap.ios_xcode_project_target}`,
-    `ios_developer_team_id:${OptionHolder.keyholderMap.ios_developer_team_id}`,
-    `ios_app_store_connect_api_key_id:${OptionHolder.keyholderMap.ios_app_store_connect_api_key_id}`,
-    `ios_app_store_connect_api_key_issuer_id:${OptionHolder.keyholderMap.ios_app_store_connect_api_key_issuer_id}`,
     `api_key_filepath:${resolve2(OptionHolder.keyDir, "ios_testflight_upload_api_key.p8")}`,
     `upload_metadata:${OptionHolder.input.uploadMetadata}`,
-    `ipa_path:${resolve2(OptionHolder.outputOfInitDir, "output", "ios", "app.ipa")}`,
-    `ipa_dir:${resolve2(OptionHolder.outputOfInitDir, "output", "ios")}`,
+    `ipa_path:${resolve2(OptionHolder.resourcesDir, "output", "ios", "app.ipa")}`,
+    `ipa_dir:${resolve2(OptionHolder.resourcesDir, "output", "ios")}`,
     `ipa_name:app.ipa`
   ];
 }
@@ -457,10 +521,10 @@ async function build({ options }) {
   logger.info(`Version: ${OptionHolder.versionName}(${OptionHolder.versionCode})`);
   if (OptionHolder.input.platform === "ios") {
     await buildIos();
-    logger.success(`iOS Build ${chalk3.bold.inverse(calculateElapsed(startTime))}`);
+    logger.success(`iOS Build ${chalk5.bold.inverse(calculateElapsed(startTime))}`);
   } else {
     await buildAndroid();
-    logger.success(`Android Build ${chalk3.bold.inverse(calculateElapsed(startTime))}`);
+    logger.success(`Android Build ${chalk5.bold.inverse(calculateElapsed(startTime))}`);
   }
 }
 async function promptInputs() {
@@ -470,8 +534,7 @@ async function promptInputs() {
 }
 async function buildIos() {
   const iosDir = resolve2(OptionHolder.projectDir, "ios");
-  const $$ = $3({
-    verbose: false,
+  const exeEnv = exe({
     cwd: iosDir,
     env: {
       MATCH_PASSWORD: OptionHolder.keyholderMap.ios_match_password
@@ -480,43 +543,37 @@ async function buildIos() {
   await prepareIos();
   await fastlane();
   async function fastlane() {
-    await spinner3("Bundler Install", () => $$`bundle install`);
-    logger.success("Bundler Install");
     if (OptionHolder.input.pod) {
-      await spinner3("Pod Install", () => $$`bundle exec pod install`);
-      logger.success("Pod Install");
+      await exeEnv("bundle", ["exec", "pod", "install"]);
+      logger.done("Pod Install");
     }
     remove(resolve2(iosDir, ".xcode.env.local"));
-    await spinner3("Fastlane", () => $$`bundle exec fastlane build ${getIosFastlaneOptions()}`);
+    await exeEnv("bundle", ["exec", "fastlane", "build", ...getIosFastlaneOptions()]);
+    logger.success(
+      `artifact generated: ${relativePath(OptionHolder.projectDir, resolve2(OptionHolder.resourcesDir, "output", "ios", "app.ipa"))}`
+    );
   }
 }
 async function buildAndroid() {
   const androidDir = resolve2(OptionHolder.projectDir, "android");
-  const $$ = $3({
-    verbose: false,
+  const exeEnv = exe({
     cwd: androidDir
   });
   await prepareAndroid();
   await fastlane();
   async function fastlane() {
-    await spinner3("Bundler Install", () => $$`bundle install`);
-    logger.success("Bundler Install");
     let buildOutputDir;
     let outputDir;
     if (OptionHolder.input.androidOutput === "aab") {
-      await spinner3(
-        "Bundle AAB",
-        () => $$`${isWin ? "gradle.bat" : "./gradlew"} app:bundleRelease`
-      );
+      await exeEnv(isWin ? "gradle.bat" : "./gradlew", ["app:bundleRelease"]);
+      logger.done("Bundle AAB");
       buildOutputDir = resolve2(androidDir, "app", "build", "outputs", "bundle", "release");
-      outputDir = resolve2(OptionHolder.outputOfInitDir, "output", "android", "aab");
+      outputDir = resolve2(OptionHolder.resourcesDir, "output", "android", "aab");
     } else {
-      await spinner3(
-        "Bundle APK",
-        () => $$`${isWin ? "gradle.bat" : "./gradlew"} app:assembleRelease`
-      );
+      await exeEnv(isWin ? "gradle.bat" : "./gradlew", ["app:assembleRelease"]);
+      logger.done("Assemble APK");
       buildOutputDir = resolve2(androidDir, "app", "build", "outputs", "apk", "release");
-      outputDir = resolve2(OptionHolder.outputOfInitDir, "output", "android", "apk");
+      outputDir = resolve2(OptionHolder.resourcesDir, "output", "android", "apk");
     }
     remove(outputDir);
     copy(buildOutputDir, outputDir);