@expo/repack-app 0.1.5 → 0.1.6

package/build/android/apktool.js

@@ -73,7 +73,7 @@ async function getApktoolPathAsync() {
     }
     return cachedApktoolPath;
 }
-async function addApktoolResourceAsync(decodedApkRoot, assetSet) {
+async function addApktoolResourceAsync(decodedApkRoot, assetMap) {
     const apktoolPublicXmlPath = node_path_1.default.join(decodedApkRoot, 'res/values/public.xml');
     // [0] Retrieve the current max resource ID and the existing drawable names
     const contents = await promises_1.default.readFile(apktoolPublicXmlPath, 'utf8');
@@ -104,8 +104,12 @@ async function addApktoolResourceAsync(decodedApkRoot, assetSet) {
     }
     const drawableResIdBoundary = (maxDrawableResId & 0xffff0000) + 0x10000;
     const rawResIdBoundary = (maxRawResId & 0xffff0000) + 0x10000;
-    const newAssetSet = new Set([...assetSet].filter(({ name }) => !existingNameSet.has(name)));
-    for (const asset of newAssetSet) {
+    const newAssetNameSet = new Set([...assetMap.keys()].filter((name) => !existingNameSet.has(name)));
+    for (const assetName of newAssetNameSet) {
+        const asset = assetMap.get(assetName);
+        if (asset == null) {
+            continue;
+        }
         if (asset.type === 'drawable') {
             maxDrawableResId += 1;
             (0, node_assert_1.default)(maxDrawableResId < drawableResIdBoundary, 'Drawable resource ID boundary exceeded.');
@@ -143,7 +147,7 @@ function getAssetType(name) {
  * @param level The current depth level (starts at 0).
  * @param maxLevel The maximum depth level to process.
  */
-async function copyAssetsAsync(src, dest, level = 0, maxLevel = 2, assetType = undefined, assetSet = new Set()) {
+async function copyAssetsAsync(src, dest, level = 0, maxLevel = 2, assetType = undefined, assetMap = new Map()) {
     await promises_1.default.mkdir(dest, { recursive: true });
     const entries = await promises_1.default.readdir(src, { withFileTypes: true });
     await Promise.all(entries.map(async (entry) => {
@@ -152,7 +156,7 @@ async function copyAssetsAsync(src, dest, level = 0, maxLevel = 2, assetType = u
         if (entry.isDirectory()) {
             const _assetType = assetType ?? getAssetType(entry.name);
             if (level < maxLevel - 1) {
-                await copyAssetsAsync(srcPath, destPath, level + 1, maxLevel, _assetType, assetSet);
+                await copyAssetsAsync(srcPath, destPath, level + 1, maxLevel, _assetType, assetMap);
             }
             else {
                 // When the maximum level is reached, copy the directory without further recursion
@@ -163,9 +167,9 @@ async function copyAssetsAsync(src, dest, level = 0, maxLevel = 2, assetType = u
             await promises_1.default.copyFile(srcPath, destPath);
             const { name } = node_path_1.default.parse(entry.name);
             (0, node_assert_1.default)(assetType, 'Asset type must be defined.');
-            assetSet.add({ name, type: assetType });
+            assetMap.set(name, { name, type: assetType });
         }
     }));
-    return assetSet;
+    return assetMap;
 }
 //#endregion Internals

package/build/android/build-tools.js

@@ -105,6 +105,7 @@ async function searchDexClassesAsync(unzipApkRoot, grepAppIdPattern, options) {
     const { stdout } = await spawnAsync(dexdumpPath, ['classes*.dex', '|', 'grep', grepPattern], {
         cwd: unzipApkRoot,
         shell: true,
+        stdio: 'pipe',
     });
     const classes = stdout
         .split('\n')

package/build/android/index.js

@@ -26,7 +26,8 @@ async function repackAppAndroidAsync(_options) {
     });
     const decodedApkRoot = await (0, apktool_1.decodeApkAsync)(node_path_1.default.resolve(options.sourceAppPath), options);
     (0, node_assert_1.default)(exp.android?.package, 'Expected app ID (`android.package`) to be defined in app.json');
-    const updatesRuntimeVersion = (0, expo_1.isExpoUpdatesInstalled)(options.projectRoot)
+    const useExpoUpdates = (0, expo_1.isExpoUpdatesInstalled)(options.projectRoot);
+    const updatesRuntimeVersion = useExpoUpdates
         ? await (0, expo_1.resolveRuntimeVersionAsync)(options, exp)
         : null;
     logger.info(picocolors_1.default.dim(`Resolved runtime version: ${updatesRuntimeVersion}`));
@@ -41,6 +42,13 @@ async function repackAppAndroidAsync(_options) {
             bundleOutputPath,
         });
         logger.timeEnd(`Adding bundled resources`);
+        if (useExpoUpdates) {
+            logger.time(`Generating 'app.manifest' for expo-updates`);
+            const updateManifestFile = await (0, expo_1.generateUpdatesEmbeddedManifestAsync)(options);
+            const updateDirectory = node_path_1.default.join(decodedApkRoot, 'assets');
+            await promises_1.default.copyFile(updateManifestFile, node_path_1.default.join(updateDirectory, node_path_1.default.basename(updateManifestFile)));
+            logger.timeEnd(`Generating 'app.manifest' for expo-updates`);
+        }
     }
     logger.time(`Updating Androidmanifest.xml`);
     const androidManiestFilePath = node_path_1.default.join(decodedApkRoot, 'AndroidManifest.xml');

package/build/expo.d.ts

@@ -4,6 +4,10 @@ import type { NormalizedOptions } from './types';
  * Generate the app.config file for the Android app.
  */
 export declare function generateAppConfigAsync(options: NormalizedOptions, config: ExpoConfig): Promise<string>;
+/**
+ * Generate the embedded `app.manifest` for expo-updates
+ */
+export declare function generateUpdatesEmbeddedManifestAsync(options: NormalizedOptions): Promise<string>;
 /**
  * Returns whether expo-updates is installed in the project.
  */

package/build/expo.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateAppConfigAsync = generateAppConfigAsync;
+exports.generateUpdatesEmbeddedManifestAsync = generateUpdatesEmbeddedManifestAsync;
 exports.isExpoUpdatesInstalled = isExpoUpdatesInstalled;
 exports.resolveRuntimeVersionAsync = resolveRuntimeVersionAsync;
 exports.getExpoConfig = getExpoConfig;
@@ -21,6 +22,21 @@ async function generateAppConfigAsync(options, config) {
     await promises_1.default.writeFile(appConfigPath, JSON.stringify(config));
     return appConfigPath;
 }
+/**
+ * Generate the embedded `app.manifest` for expo-updates
+ */
+async function generateUpdatesEmbeddedManifestAsync(options) {
+    const { platform, projectRoot, spawnAsync, workingDirectory } = options;
+    // [0] Resolve entry point
+    const { stdout: entryFile } = await spawnAsync('node', ['-e', "require('expo/scripts/resolveAppEntry')", projectRoot, platform, 'absolute'], { cwd: projectRoot, stdio: 'pipe' });
+    // [1] Generate the `app.manifest` file
+    const binPath = resolve_from_1.default.silent(options.projectRoot, 'expo-updates/utils/build/createUpdatesResources.js');
+    (0, node_assert_1.default)(binPath, 'Failed to resolve `createUpdatesResources.js` within expo-updates package');
+    await spawnAsync('node', [binPath, platform, projectRoot, workingDirectory, 'all', entryFile.trim()], {
+        cwd: projectRoot,
+    });
+    return node_path_1.default.join(workingDirectory, 'app.manifest');
+}
 /**
  * Returns whether expo-updates is installed in the project.
  */
@@ -40,6 +56,7 @@ async function resolveRuntimeVersionAsync(options, config) {
         (0, resolve_from_1.default)(projectRoot, 'expo-updates/bin/cli.js');
     const { stdout } = await spawnAsync(cli, ['runtimeversion:resolve', '--platform', 'android', '--workflow', 'managed'], {
         cwd: projectRoot,
+        stdio: 'pipe',
     });
     const runtimeVersion = JSON.parse(stdout).runtimeVersion;
     return runtimeVersion ?? config.version ?? '1.0.0';
@@ -72,7 +89,7 @@ async function generateBundleAssetsAsync(expoConfig, options) {
     const bundleAssetRoot = node_path_1.default.resolve(workingDirectory, 'bundles');
     await promises_1.default.mkdir(bundleAssetRoot, { recursive: true });
     // [0] Resolve entry point
-    const { stdout: entryFile } = await spawnAsync('node', ['-e', "require('expo/scripts/resolveAppEntry')", projectRoot, platform, 'absolute'], { cwd: projectRoot });
+    const { stdout: entryFile } = await spawnAsync('node', ['-e', "require('expo/scripts/resolveAppEntry')", projectRoot, platform, 'absolute'], { cwd: projectRoot, stdio: 'pipe' });
     // [1] Execute export:embed
     const isEnableHermes = isEnableHermesManaged(expoConfig, platform);
     const bundleFileName = platform === 'android' ? 'index.android.bundle' : 'main.bundle';

package/build/ios/index.js

@@ -25,10 +25,13 @@ async function repackAppIosAsync(_options) {
         skipSDKVersionRequirement: true,
     });
     (0, node_assert_1.default)(exp.ios?.bundleIdentifier, 'Expected app ID (`ios.bundleIdentifier`) to be defined in app.json');
-    const updatesRuntimeVersion = (0, expo_1.isExpoUpdatesInstalled)(options.projectRoot)
+    const useExpoUpdates = (0, expo_1.isExpoUpdatesInstalled)(options.projectRoot);
+    const updatesRuntimeVersion = useExpoUpdates
         ? await (0, expo_1.resolveRuntimeVersionAsync)(options, exp)
         : null;
-    logger.info(picocolors_1.default.dim(`Resolved runtime version: ${updatesRuntimeVersion}`));
+    if (useExpoUpdates) {
+        logger.info(picocolors_1.default.dim(`Resolved runtime version: ${updatesRuntimeVersion}`));
+    }
     logger.time(`Extracting artifact from ${options.sourceAppPath}`);
     let appWorkingDirectory = await (0, build_tools_1.extractIosArtifactAsync)(options);
     appWorkingDirectory = await (0, build_tools_1.updateFilesAsync)(exp, appWorkingDirectory);
@@ -46,6 +49,14 @@ async function repackAppIosAsync(_options) {
             bundleOutputPath,
         });
         logger.timeEnd(`Adding bundled resources`);
+        if (useExpoUpdates) {
+            logger.time(`Generating 'app.manifest' for expo-updates`);
+            const updateManifestFile = await (0, expo_1.generateUpdatesEmbeddedManifestAsync)(options);
+            const updateDirectory = node_path_1.default.join(appWorkingDirectory, 'EXUpdates.bundle');
+            (0, node_assert_1.default)(await (0, utils_1.directoryExistsAsync)(updateDirectory), 'Expected EXUpdates.bundle directory to exist');
+            await promises_1.default.copyFile(updateManifestFile, node_path_1.default.join(updateDirectory, node_path_1.default.basename(updateManifestFile)));
+            logger.timeEnd(`Generating 'app.manifest' for expo-updates`);
+        }
     }
     logger.time(`Updating Info.plist`);
     await (0, resources_1.updateInfoPlistAsync)({ config: exp, infoPlistPath, originalAppId, options });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/repack-app",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Repacking tool for Expo apps",
   "main": "build/index.js",
   "types": "build/index.d.ts",