@expo/repack-app 0.1.2 → 0.1.4

package/build/cli.js

@@ -12,7 +12,7 @@ const program = new commander_1.Command('repack-app')
     .requiredOption('--source-app <path>', 'Path to the source app file')
     .option('--android-build-tools-dir <path>', 'Path to the Android build tools directory')
     .option('-w, --working-directory <path>', 'Path to the working directory')
-    .option('-o, --output <path>', 'Path to the output APK file')
+    .option('-o, --output <path>', 'Path to the output artifact')
     // Android signing options
     .option('--ks <path>', 'Path to the keystore file')
     .option('--ks-pass <password>', 'Keystore password', 'pass:android')
@@ -26,12 +26,13 @@ const program = new commander_1.Command('repack-app')
     .option('--embed-bundle-assets', 'Whether to execute export:embed to embed new bundle assets')
     .option('--bundle-assets-sourcemap-output <path>', 'Paired with --embed-bundle-assets and generate the sourcemap to the specified path')
     // arguments
-    .argument('<project-root>', 'Path to the project root')
+    .argument('[project-root]', 'Path to the project root', process.cwd())
+    .version(require('../package.json').version)
     .parse(process.argv);
 async function runAsync() {
     const logger = (0, logger_1.createLogger)({ name: 'repack-app' });
     const platform = program.opts().platform;
-    const projectRoot = program.args[0];
+    const projectRoot = program.processedArgs[0];
     const exportEmbedOptions = program.opts()
         .embedBundleAssets
         ? {

package/build/ios/build-tools.d.ts

@@ -1,13 +1,17 @@
 import { type ExpoConfig } from '@expo/config';
 import type { IosSigningOptions, NormalizedOptions } from '../types';
 /**
- * Unzip the IPA file.
+ * Extract the given iOS artifact and return the path to the .app directory.
  */
-export declare function unzipIpaAsync(options: NormalizedOptions): Promise<string>;
+export declare function extractIosArtifactAsync(options: NormalizedOptions): Promise<string>;
 /**
  * Update some binary files.
  */
 export declare function updateFilesAsync(config: ExpoConfig, appWorkingDirectory: string): Promise<string>;
+/**
+ * From the given working .app directory, create a new .app directory.
+ */
+export declare function createAppAsync(options: NormalizedOptions, appWorkingDirectory: string): Promise<string>;
 /**
  * From the given working .app directory, create a new .ipa file.
  */

package/build/ios/build-tools.js

@@ -3,37 +3,65 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unzipIpaAsync = unzipIpaAsync;
+exports.extractIosArtifactAsync = extractIosArtifactAsync;
 exports.updateFilesAsync = updateFilesAsync;
+exports.createAppAsync = createAppAsync;
 exports.createIpaAsync = createIpaAsync;
 exports.createResignLane = createResignLane;
 const steps_1 = require("@expo/steps");
+const glob_1 = require("glob");
 const node_assert_1 = __importDefault(require("node:assert"));
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
 const utils_1 = require("../utils");
 /**
- * Unzip the IPA file.
+ * Extract the given iOS artifact and return the path to the .app directory.
  */
-async function unzipIpaAsync(options) {
-    const unzipWorkingDirectory = node_path_1.default.join(options.workingDirectory, 'unzip');
-    await (0, steps_1.spawnAsync)('unzip', [options.sourceAppPath, '-d', unzipWorkingDirectory], options.verbose ? { logger: options.logger, stdio: 'pipe' } : undefined);
-    const appWorkingDirectory = node_path_1.default.join(unzipWorkingDirectory, 'Payload', 'HelloWorld.app');
-    (0, node_assert_1.default)(await (0, utils_1.directoryExistsAsync)(appWorkingDirectory));
+async function extractIosArtifactAsync(options) {
+    const { sourceAppPath } = options;
+    const extractedWorkingDirectory = node_path_1.default.join(options.workingDirectory, 'extracted');
+    await promises_1.default.mkdir(extractedWorkingDirectory, { recursive: true });
+    if (sourceAppPath.endsWith('.zip') || sourceAppPath.endsWith('.ipa')) {
+        await (0, steps_1.spawnAsync)('unzip', [sourceAppPath, '-d', extractedWorkingDirectory], options.verbose ? { logger: options.logger, stdio: 'pipe' } : undefined);
+    }
+    else if (sourceAppPath.endsWith('.tar.gz')) {
+        await (0, steps_1.spawnAsync)('tar', ['-xzf', sourceAppPath, '-C', extractedWorkingDirectory], options.verbose ? { logger: options.logger, stdio: 'pipe' } : undefined);
+    }
+    else if (sourceAppPath.endsWith('.app')) {
+        const basename = node_path_1.default.basename(sourceAppPath);
+        await (0, utils_1.copyDirAsync)(sourceAppPath, node_path_1.default.join(extractedWorkingDirectory, basename));
+    }
+    else {
+        throw new Error('Unsupported file type. Please provide a .zip, .tar.gz, or .app file.');
+    }
+    const matches = await (0, glob_1.glob)('{Payload/*.app,*.app}', {
+        cwd: extractedWorkingDirectory,
+        absolute: true,
+    });
+    const appWorkingDirectory = matches[0];
+    (0, node_assert_1.default)(appWorkingDirectory, `Failed to find the .app directory in the extracted artifact: ${extractedWorkingDirectory}`);
     return appWorkingDirectory;
 }
 /**
  * Update some binary files.
  */
 async function updateFilesAsync(config, appWorkingDirectory) {
-    const parentDir = node_path_1.default.dirname(appWorkingDirectory);
+    const { dir: parentDir, name } = node_path_1.default.parse(appWorkingDirectory);
     const newAppWorkingDirectory = node_path_1.default.join(parentDir, `${config.name}.app`);
     // [0] Update the .app directory
-    await promises_1.default.rename(node_path_1.default.join(parentDir, 'HelloWorld.app'), newAppWorkingDirectory);
+    await promises_1.default.rename(node_path_1.default.join(parentDir, `${name}.app`), newAppWorkingDirectory);
     // [1] Rename the executable
-    await promises_1.default.rename(node_path_1.default.join(newAppWorkingDirectory, 'HelloWorld'), node_path_1.default.join(newAppWorkingDirectory, config.name));
+    await promises_1.default.rename(node_path_1.default.join(newAppWorkingDirectory, name), node_path_1.default.join(newAppWorkingDirectory, config.name));
     return newAppWorkingDirectory;
 }
+/**
+ * From the given working .app directory, create a new .app directory.
+ */
+async function createAppAsync(options, appWorkingDirectory) {
+    const outputAppPath = node_path_1.default.resolve(options.workingDirectory, node_path_1.default.basename(appWorkingDirectory));
+    await (0, utils_1.copyDirAsync)(appWorkingDirectory, outputAppPath);
+    return outputAppPath;
+}
 /**
  * From the given working .app directory, create a new .ipa file.
  */

package/build/ios/index.js

@@ -30,12 +30,12 @@ async function repackAppIosAsync(_options) {
         ? await (0, expo_1.resolveRuntimeVersionAsync)(options, exp)
         : null;
     logger.info(picocolors_1.default.dim(`Resolved runtime version: ${updatesRuntimeVersion}`));
-    logger.info(`Unzipping IPA`);
-    let appWorkingDirectory = await (0, build_tools_1.unzipIpaAsync)(options);
+    logger.info(`Extracting artifact from ${options.sourceAppPath}`);
+    let appWorkingDirectory = await (0, build_tools_1.extractIosArtifactAsync)(options);
     appWorkingDirectory = await (0, build_tools_1.updateFilesAsync)(exp, appWorkingDirectory);
     const infoPlistPath = node_path_1.default.join(appWorkingDirectory, 'Info.plist');
     const originalAppId = await (0, resources_1.queryAppIdFromPlistAsync)(infoPlistPath, options);
-    logger.info(`Finished unzipping IPA ✅`);
+    logger.info(`Finished extracting artifact from ${options.sourceAppPath} ✅`);
     if (options.exportEmbedOptions != null) {
         logger.info(`Generating bundle`);
         const { assetRoot, bundleOutputPath } = await (0, expo_1.generateBundleAssetsAsync)(exp, options);
@@ -58,15 +58,22 @@ async function repackAppIosAsync(_options) {
     const appConfigPath = await (0, expo_1.generateAppConfigAsync)(options, exp);
     await promises_1.default.copyFile(appConfigPath, node_path_1.default.join(appWorkingDirectory, 'EXConstants.bundle', 'app.config'));
     logger.info(`Finished generating app.config ✅`);
-    logger.info(`Creating updated ipa`);
-    const outputIpa = await (0, build_tools_1.createIpaAsync)(options, appWorkingDirectory);
-    logger.info(`Finished creating updated ipa ✅`);
+    logger.info(`Creating updated artifact`);
+    let outputArtifact;
+    if (options.outputPath.endsWith('.app')) {
+        outputArtifact = await (0, build_tools_1.createAppAsync)(options, appWorkingDirectory);
+    }
+    else {
+        outputArtifact = await (0, build_tools_1.createIpaAsync)(options, appWorkingDirectory);
+    }
+    logger.info(`Finished creating updated artifact ✅`);
     if (options.iosSigningOptions) {
-        logger.info(`Resigning the IPA at ${outputIpa}`);
-        await resignIpaAsync(outputIpa, options.iosSigningOptions, options);
+        (0, node_assert_1.default)(outputArtifact.endsWith('.ipa'), 'Signing is only supported for .ipa files');
+        logger.info(`Resigning the IPA at ${outputArtifact}`);
+        await resignIpaAsync(outputArtifact, options.iosSigningOptions, options);
         logger.info(`Finished resigning the IPA ✅`);
     }
-    await promises_1.default.rename(outputIpa, options.outputPath);
+    await promises_1.default.rename(outputArtifact, options.outputPath);
     if (!options.skipWorkingDirCleanup) {
         try {
             await promises_1.default.rm(workingDirectory, { recursive: true });

package/build/ios/resources.js

@@ -88,7 +88,7 @@ async function addBundleAssetsAsync({ appWorkingDirectory, assetRoot, bundleOutp
     await promises_1.default.copyFile(bundleOutputPath, node_path_1.default.join(appWorkingDirectory, 'main.jsbundle'));
     // export:embed --assets-dest on iOS uses the app root as target directory,
     // so we just need to copy the assets to the app root.
-    await copyDirAsync(assetRoot, appWorkingDirectory);
+    await (0, utils_1.copyDirAsync)(assetRoot, appWorkingDirectory);
 }
 //#region Internals
 async function updateBinaryPlistAsync(plistPath, options, updater) {
@@ -100,18 +100,4 @@ async function updateBinaryPlistAsync(plistPath, options, updater) {
     await promises_1.default.writeFile(plistPath, updatedContents);
     await (0, steps_1.spawnAsync)('plutil', ['-convert', 'binary1', plistPath], options.verbose ? { logger: options.logger, stdio: 'pipe' } : undefined);
 }
-async function copyDirAsync(src, dst) {
-    await promises_1.default.mkdir(dst, { recursive: true });
-    const entries = await promises_1.default.readdir(src, { withFileTypes: true });
-    for (const entry of entries) {
-        const srcPath = node_path_1.default.join(src, entry.name);
-        const dstPath = node_path_1.default.join(dst, entry.name);
-        if (entry.isDirectory()) {
-            await copyDirAsync(srcPath, dstPath);
-        }
-        else if (entry.isFile()) {
-            await promises_1.default.copyFile(srcPath, dstPath);
-        }
-    }
-}
 //#endregion

package/build/utils.d.ts

@@ -11,3 +11,7 @@ export declare function requireNotNull<T>(value: T | null | undefined): T;
  * Normalize the options.
  */
 export declare function normalizeOptionAsync(options: Options): Promise<NormalizedOptions>;
+/**
+ * Copy a directory recursively.
+ */
+export declare function copyDirAsync(src: string, dst: string): Promise<void>;

package/build/utils.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.directoryExistsAsync = directoryExistsAsync;
 exports.requireNotNull = requireNotNull;
 exports.normalizeOptionAsync = normalizeOptionAsync;
+exports.copyDirAsync = copyDirAsync;
 const node_assert_1 = __importDefault(require("node:assert"));
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -33,3 +34,20 @@ async function normalizeOptionAsync(options) {
         outputPath: options.outputPath ?? node_path_1.default.join(options.projectRoot, `repacked${fileExt}`),
     };
 }
+/**
+ * Copy a directory recursively.
+ */
+async function copyDirAsync(src, dst) {
+    await promises_1.default.mkdir(dst, { recursive: true });
+    const entries = await promises_1.default.readdir(src, { withFileTypes: true });
+    for (const entry of entries) {
+        const srcPath = node_path_1.default.join(src, entry.name);
+        const dstPath = node_path_1.default.join(dst, entry.name);
+        if (entry.isDirectory()) {
+            await copyDirAsync(srcPath, dstPath);
+        }
+        else if (entry.isFile()) {
+            await promises_1.default.copyFile(srcPath, dstPath);
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/repack-app",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Repacking tool for Expo apps",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -32,7 +32,7 @@
     "glob": "^11.0.0",
     "picocolors": "^1.1.1",
     "resolve-from": "^5.0.0",
-    "temp-dir": "^3.0.0",
+    "temp-dir": "^2.0.0",
     "xml2js": "^0.6.2"
   },
   "devDependencies": {