expo-release-it 0.1.2 → 0.1.3

package/build/index.js

@@ -6,7 +6,7 @@ var package_default = {
   name: "expo-release-it",
   module: "src/index.ts",
   type: "module",
-  version: "0.1.1",
+  version: "0.1.2",
   license: "MIT",
   scripts: {
     build: "tsup",
@@ -56,26 +56,26 @@ 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);
@@ -87,27 +87,24 @@ function write(p, content) {
 function copy(src, dest, options) {
   fs.copySync(src, dest, options);
 }
-function move(src, dest, options) {
-  fs.moveSync(src, dest, options);
+function writeJson(path2, json) {
+  return write(path2, JSON.stringify(json, null, 2));
 }
-function writeJson(path3, json) {
-  return write(path3, JSON.stringify(json, null, 2));
-}
-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);
   }
 }
@@ -124,7 +121,7 @@ var OptionHolder = {
   keyholderMap: {},
   templateDirNames: ["key"],
   projectDir: "",
-  outputOfInitDir: "",
+  resourcesDir: "",
   keyDir: "",
   keyholderFilePath: "",
   versionName: "",
@@ -365,10 +362,10 @@ async function setup() {
 }
 async function setupBasicOptions() {
   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");
-  OptionHolder.tempDir = resolve2(OptionHolder.outputOfInitDir, ".temp");
+  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/command/init.ts
@@ -507,7 +504,7 @@ async function copyTemplates() {
   }
   async function copyDirRecursively(dir) {
     const sourceDirPath = join2(OptionHolder.cli.templateDir, dir);
-    const destDirPath = join2(OptionHolder.outputOfInitDir, dir);
+    const destDirPath = join2(OptionHolder.resourcesDir, dir);
     copy(sourceDirPath, destDirPath, { overwrite: dir !== "key" });
   }
 }
@@ -574,18 +571,12 @@ async function iterateAllFiles(root, callback) {
 }
 
 // src/util/injectTemplatePlaceHolders.ts
-import * as path2 from "node:path";
 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);
   });
 }
@@ -601,6 +592,47 @@ async function spinner(text, promise) {
   });
 }
 
+// src/util/MetadataSyncUtil.ts
+import chalk5 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 ${chalk5.inverse(relativePath(OptionHolder.projectDir, resourcesDir))}. You can edit inside contents.`
+    );
+  } else {
+    copy(metadataResourcesDir, metadataNativeDir);
+    copy(screenshotsResourcesDir, screenshotsNativeDir);
+    logger.done(
+      `iOS Metadata copyed to ${chalk5.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 ${chalk5.inverse(relativePath(OptionHolder.projectDir, resourcesDir))}. You can edit inside contents.`
+    );
+  } else {
+    copy(resourcesDir, nativeDir);
+    logger.done(
+      `Android Metadata copyed to ${chalk5.inverse(relativePath(OptionHolder.projectDir, nativeDir))}`
+    );
+  }
+}
+
 // src/util/setup/prepareAndroid.ts
 async function prepareAndroid() {
   const srcDir = resolve2(OptionHolder.cli.templateDir, "android");
@@ -624,6 +656,7 @@ async function prepareAndroid() {
   );
   await exe({ cwd: destDir })`bundle install`;
   logger.success("Bunder Install - Done");
+  copyAndroidMetadata("native");
 }
 async function replaceAndroidSigningConfig(destDir) {
   const buildGradleDirPath = resolve2(destDir, "app");
@@ -638,7 +671,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}'
@@ -671,10 +704,11 @@ async function prepareIos() {
   );
   await exe({ cwd: destDir })`bundle install`;
   logger.success("Bunder Install - Done");
+  copyIosMetadata("native");
 }
 
 // src/command/upload.ts
-import chalk5 from "chalk";
+import chalk6 from "chalk";
 
 // src/util/calculateElapsed.ts
 import { padZero } from "@mj-studio/js-util";
@@ -689,11 +723,12 @@ function calculateElapsed(t) {
 function getAndroidFastlaneOptions() {
   return [
     ...Object.entries(OptionHolder.keyholderMap).map(([k, v]) => `${k}:${v}`),
+    `json_key:${resolve2(OptionHolder.keyDir, "android_play_console_service_account.json")}`,
     `version_name:${OptionHolder.versionName}`,
     `version_code:${OptionHolder.versionCode}`,
     `upload_metadata:${OptionHolder.input.uploadMetadata}`,
-    `aab_path:${resolve2(OptionHolder.outputOfInitDir, "output", "android", "aab", "app-release.aab")}`,
-    `apk_path:${resolve2(OptionHolder.outputOfInitDir, "output", "android", "apk", "app-release.apk")}`,
+    `aab_path:${resolve2(OptionHolder.resourcesDir, "output", "android", "aab", "app-release.aab")}`,
+    `apk_path:${resolve2(OptionHolder.resourcesDir, "output", "android", "apk", "app-release.apk")}`,
     `skip_upload_apk:${OptionHolder.input.androidOutput !== "apk"}`,
     `skip_upload_aab:${OptionHolder.input.androidOutput !== "aab"}`
   ];
@@ -705,8 +740,8 @@ function getIosFastlaneOptions() {
     `version_code:${OptionHolder.versionCode}`,
     `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`
   ];
 }
@@ -721,10 +756,10 @@ async function upload({ options }) {
   logger.info(`Version: ${OptionHolder.versionName}(${OptionHolder.versionCode})`);
   if (OptionHolder.input.platform === "ios") {
     await uploadIos();
-    logger.success(`iOS Upload ${chalk5.bold.inverse(calculateElapsed(startTime))}`);
+    logger.success(`iOS Upload ${chalk6.bold.inverse(calculateElapsed(startTime))}`);
   } else {
     await uploadAndroid();
-    logger.success(`Android Upload ${chalk5.bold.inverse(calculateElapsed(startTime))}`);
+    logger.success(`Android Upload ${chalk6.bold.inverse(calculateElapsed(startTime))}`);
   }
 }
 async function promptInputs2() {
@@ -761,7 +796,7 @@ async function uploadAndroid() {
 }
 
 // src/command/submit.ts
-import chalk6 from "chalk";
+import chalk7 from "chalk";
 async function submit({ options }) {
   Object.assign(OptionHolder.input, options);
   const startTime = Date.now();
@@ -771,10 +806,10 @@ async function submit({ options }) {
   logger.info(`Version: ${OptionHolder.versionName}(${OptionHolder.versionCode})`);
   if (OptionHolder.input.platform === "ios") {
     await submitIos();
-    logger.success(`Appstore Review Submitted ${chalk6.bold.inverse(calculateElapsed(startTime))}`);
+    logger.success(`Appstore Review Submitted ${chalk7.bold.inverse(calculateElapsed(startTime))}`);
   } else {
     await submitAndroid();
-    logger.success(`Playstore Review Submitted ${chalk6.bold.inverse(calculateElapsed(startTime))}`);
+    logger.success(`Playstore Review Submitted ${chalk7.bold.inverse(calculateElapsed(startTime))}`);
   }
 }
 async function promptInputs3() {
@@ -803,7 +838,7 @@ async function submitIos() {
 }
 
 // src/command/build.ts
-import chalk7 from "chalk";
+import chalk8 from "chalk";
 async function build({ options }) {
   Object.assign(OptionHolder.input, options);
   const startTime = Date.now();
@@ -813,10 +848,10 @@ async function build({ options }) {
   logger.info(`Version: ${OptionHolder.versionName}(${OptionHolder.versionCode})`);
   if (OptionHolder.input.platform === "ios") {
     await buildIos();
-    logger.success(`iOS Build ${chalk7.bold.inverse(calculateElapsed(startTime))}`);
+    logger.success(`iOS Build ${chalk8.bold.inverse(calculateElapsed(startTime))}`);
   } else {
     await buildAndroid();
-    logger.success(`Android Build ${chalk7.bold.inverse(calculateElapsed(startTime))}`);
+    logger.success(`Android Build ${chalk8.bold.inverse(calculateElapsed(startTime))}`);
   }
 }
 async function promptInputs4() {
@@ -842,7 +877,7 @@ async function buildIos() {
     remove(resolve2(iosDir, ".xcode.env.local"));
     await exeEnv("bundle", ["exec", "fastlane", "build", ...getIosFastlaneOptions()]);
     logger.success(
-      `artifact generated: ${relativePath(OptionHolder.projectDir, resolve2(OptionHolder.outputOfInitDir, "output", "ios", "app.ipa"))}`
+      `artifact generated: ${relativePath(OptionHolder.projectDir, resolve2(OptionHolder.resourcesDir, "output", "ios", "app.ipa"))}`
     );
   }
 }
@@ -857,19 +892,15 @@ async function buildAndroid() {
     let buildOutputDir;
     let outputDir;
     if (OptionHolder.input.androidOutput === "aab") {
-      await spinner(
-        "Bundle AAB",
-        exeEnv(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 spinner(
-        "Bundle APK",
-        exeEnv(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);
@@ -930,17 +961,26 @@ async function pullIosMetadata() {
     "--api_key_path",
     generateAppStoreConnectApiKeyFile()
   ]);
-  const metadataSrcDir = join2(iosDir, "fastlane/metadata");
-  const screenshotsSrcDir = join2(iosDir, "fastlane/screenshots");
-  const metadataDestDir = join2(OptionHolder.outputOfInitDir, "metadata/ios/metadata");
-  const screenshotsDestDir = join2(OptionHolder.outputOfInitDir, "metadata/ios/screenshots");
-  move(metadataSrcDir, metadataDestDir);
-  move(screenshotsSrcDir, screenshotsDestDir);
+  copyIosMetadata("resources");
 }
 async function pullAndroidMetadata() {
   await prepareAndroid();
   const androidDir = join2(OptionHolder.projectDir, "android");
-  await exe("bundle", ["exec", "fastlane", "supply", "init"], { cwd: androidDir });
+  await exe(
+    "bundle",
+    [
+      "exec",
+      "fastlane",
+      "supply",
+      "init",
+      "--json_key",
+      resolve2(OptionHolder.keyDir, "android_play_console_service_account.json"),
+      "--package_name",
+      OptionHolder.keyholderMap.android_package_name
+    ],
+    { cwd: androidDir }
+  );
+  copyAndroidMetadata("resouces");
 }
 
 // src/index.ts