@expo/build-tools 18.0.1 → 18.0.2

package/dist/buildErrors/userErrorHandlers.js

@@ -13,7 +13,7 @@ exports.userErrorHandlers = [
         // [!] `React` requires CocoaPods version `>= 1.10.1`, which is not satisfied by your current version, `1.10.0`.
         createError: () => new UserFacingError('EAS_BUILD_UNSUPPORTED_COCOAPODS_VERSION_ERROR', `Your project requires a newer version of CocoaPods. You can update it in the build profile in eas.json by either:
 - changing the current version under key "cocoapods"
-- switching to an image that supports that version under key "image"`, 'https://docs.expo.dev/build-reference/eas-json/'),
+- switching to an image that supports that version under key "image"`, { docsUrl: 'https://docs.expo.dev/build-reference/eas-json/' }),
     },
     {
         platform: eas_build_job_1.Platform.IOS,
@@ -21,7 +21,7 @@ exports.userErrorHandlers = [
         regexp: /Could not find 'bundler' (.*) required by your/,
         // example log:
         // /System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/lib/ruby/2.6.0/rubygems/dependency.rb:313:in `to_specs': Could not find 'bundler' (2.2.3) required by your /Users/expo/project/build/ios/Gemfile.lock. (Gem::MissingSpecVersionError)
-        createError: () => new UserFacingError('EAS_BUILD_UNSUPPORTED_BUNDLER_VERSION_ERROR', `Your project requires a different version of the Ruby "bundler" program than the version installed in this EAS Build environment. You can specify which version of "bundler" to install by specifying the version under "build"→[buildProfileName]→"ios"→"bundler" in eas.json.`, 'https://docs.expo.dev/build-reference/eas-json/'),
+        createError: () => new UserFacingError('EAS_BUILD_UNSUPPORTED_BUNDLER_VERSION_ERROR', `Your project requires a different version of the Ruby "bundler" program than the version installed in this EAS Build environment. You can specify which version of "bundler" to install by specifying the version under "build"→[buildProfileName]→"ios"→"bundler" in eas.json.`, { docsUrl: 'https://docs.expo.dev/build-reference/eas-json/' }),
     },
     {
         platform: eas_build_job_1.Platform.ANDROID,
@@ -48,7 +48,7 @@ exports.userErrorHandlers = [
         // [11:17:29] [android.dangerous]: withAndroidDangerousBaseMod: Cannot copy google-services.json from /home/expo/workingdir/build/test/test-google-services.json to /home/expo/workingdir/build/android/app/google-services.json. Please make sure the source and destination paths exist.
         // [11:17:29] Error: [android.dangerous]: withAndroidDangerousBaseMod: Cannot copy google-services.json from /home/expo/workingdir/build/test/test-google-services.json to /home/expo/workingdir/build/android/app/google-services.json. Please make sure the source and destination paths exist.
         regexp: /Cannot copy google-services\.json/,
-        createError: () => new UserFacingError('EAS_BUILD_MISSING_GOOGLE_SERVICES_JSON_ERROR', '"google-services.json" is missing, make sure that the file exists. Remember that EAS Build only uploads the files tracked by git. Use EAS environment variables to provide EAS Build with the file.', 'https://docs.expo.dev/eas/environment-variables/#file-environment-variables'),
+        createError: () => new UserFacingError('EAS_BUILD_MISSING_GOOGLE_SERVICES_JSON_ERROR', '"google-services.json" is missing, make sure that the file exists. Remember that EAS Build only uploads the files tracked by git. Use EAS environment variables to provide EAS Build with the file.', { docsUrl: 'https://docs.expo.dev/eas/environment-variables/#file-environment-variables' }),
     },
     {
         platform: eas_build_job_1.Platform.ANDROID,
@@ -57,7 +57,7 @@ exports.userErrorHandlers = [
         // > File google-services.json is missing. The Google Services Plugin cannot function without it.
         //    Searched Location:
         regexp: /File google-services\.json is missing\. The Google Services Plugin cannot function without it/,
-        createError: () => new UserFacingError('EAS_BUILD_MISSING_GOOGLE_SERVICES_JSON_ERROR', '"google-services.json" is missing, make sure that the file exists. Remember that EAS Build only uploads the files tracked by git. Use EAS environment variables to provide EAS Build with the file.', 'https://docs.expo.dev/eas/environment-variables/#file-environment-variables'),
+        createError: () => new UserFacingError('EAS_BUILD_MISSING_GOOGLE_SERVICES_JSON_ERROR', '"google-services.json" is missing, make sure that the file exists. Remember that EAS Build only uploads the files tracked by git. Use EAS environment variables to provide EAS Build with the file.', { docsUrl: 'https://docs.expo.dev/eas/environment-variables/#file-environment-variables' }),
     },
     {
         platform: eas_build_job_1.Platform.IOS,
@@ -65,7 +65,7 @@ exports.userErrorHandlers = [
         // example log:
         // [08:44:18] ENOENT: no such file or directory, copyfile '/Users/expo/workingdir/build/managed/abc' -> '/Users/expo/workingdir/build/managed/ios/testapp/GoogleService-Info.plist'
         regexp: /ENOENT: no such file or directory, copyfile .*GoogleService-Info.plist/,
-        createError: () => new UserFacingError('EAS_BUILD_MISSING_GOOGLE_SERVICES_PLIST_ERROR', '"GoogleService-Info.plist" is missing, make sure that the file exists. Remember that EAS Build only uploads the files tracked by git. Use EAS environment variables to provide EAS Build with the file.', 'https://docs.expo.dev/eas/environment-variables/#file-environment-variables'),
+        createError: () => new UserFacingError('EAS_BUILD_MISSING_GOOGLE_SERVICES_PLIST_ERROR', '"GoogleService-Info.plist" is missing, make sure that the file exists. Remember that EAS Build only uploads the files tracked by git. Use EAS environment variables to provide EAS Build with the file.', { docsUrl: 'https://docs.expo.dev/eas/environment-variables/#file-environment-variables' }),
     },
     {
         platform: eas_build_job_1.Platform.IOS,
@@ -176,9 +176,13 @@ You are seeing this error because either:
         regexp: /error: Signing for "[a-zA-Z-0-9_]+" requires a development team/,
         createError: (_, { job }) => 'type' in job && job.type === eas_build_job_1.Workflow.MANAGED
             ? new UserFacingError('XCODE_RESOURCE_BUNDLE_CODE_SIGNING_ERROR', `Starting from Xcode 14, resource bundles are signed by default, which requires setting the development team for each resource bundle target.
-To resolve this issue, downgrade to an older Xcode version using the "image" field in eas.json, or upgrade to SDK 46 or higher.`, 'https://docs.expo.dev/build-reference/infrastructure/#ios-build-server-configurations')
+To resolve this issue, downgrade to an older Xcode version using the "image" field in eas.json, or upgrade to SDK 46 or higher.`, {
+                docsUrl: 'https://docs.expo.dev/build-reference/infrastructure/#ios-build-server-configurations',
+            })
             : new UserFacingError('XCODE_RESOURCE_BUNDLE_CODE_SIGNING_ERROR', `Starting from Xcode 14, resource bundles are signed by default, which requires setting the development team for each resource bundle target.
-To resolve this issue, downgrade to an older Xcode version using the "image" field in eas.json, or turn off signing resource bundles in your Podfile: https://expo.fyi/r/disable-bundle-resource-signing`, 'https://docs.expo.dev/build-reference/infrastructure/#ios-build-server-configurations'),
+To resolve this issue, downgrade to an older Xcode version using the "image" field in eas.json, or turn off signing resource bundles in your Podfile: https://expo.fyi/r/disable-bundle-resource-signing`, {
+                docsUrl: 'https://docs.expo.dev/build-reference/infrastructure/#ios-build-server-configurations',
+            }),
     },
     {
         platform: eas_build_job_1.Platform.ANDROID,

package/dist/steps/easFunctions.js

@@ -20,6 +20,7 @@ const installNodeModules_1 = require("./functions/installNodeModules");
 const installPods_1 = require("./functions/installPods");
 const internalMaestroTest_1 = require("./functions/internalMaestroTest");
 const prebuild_1 = require("./functions/prebuild");
+const readIpaInfo_1 = require("./functions/readIpaInfo");
 const repack_1 = require("./functions/repack");
 const resolveAppleTeamIdFromCredentials_1 = require("./functions/resolveAppleTeamIdFromCredentials");
 const resolveBuildConfig_1 = require("./functions/resolveBuildConfig");
@@ -44,6 +45,7 @@ function getEasFunctions(ctx) {
         (0, useNpmToken_1.createSetUpNpmrcBuildFunction)(),
         (0, installNodeModules_1.createInstallNodeModulesBuildFunction)(),
         (0, prebuild_1.createPrebuildBuildFunction)(),
+        (0, readIpaInfo_1.createReadIpaInfoBuildFunction)(),
         (0, downloadBuild_1.createDownloadBuildFunction)(),
         (0, repack_1.createRepackBuildFunction)(),
         (0, restoreCache_1.createRestoreCacheFunction)(),

package/dist/steps/functions/readIpaInfo.d.ts

@@ -0,0 +1,8 @@
+import { BuildFunction } from '@expo/steps';
+export type IpaInfo = {
+    bundleIdentifier: string;
+    bundleShortVersion: string;
+    bundleVersion: string;
+};
+export declare function createReadIpaInfoBuildFunction(): BuildFunction;
+export declare function readIpaInfoAsync(ipaPath: string): Promise<IpaInfo>;

package/dist/steps/functions/readIpaInfo.js

@@ -0,0 +1,111 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createReadIpaInfoBuildFunction = createReadIpaInfoBuildFunction;
+exports.readIpaInfoAsync = readIpaInfoAsync;
+const errors_1 = require("@expo/eas-build-job/dist/errors");
+const steps_1 = require("@expo/steps");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const node_path_1 = __importDefault(require("node:path"));
+const node_stream_zip_1 = __importDefault(require("node-stream-zip"));
+const zod_1 = require("zod");
+const bplist_parser_1 = __importDefault(require("bplist-parser"));
+const plist_1 = __importDefault(require("plist"));
+const INFO_PLIST_PATH_REGEXP = /^Payload\/[^/]+\.app\/Info\.plist$/;
+function createReadIpaInfoBuildFunction() {
+    return new steps_1.BuildFunction({
+        namespace: 'eas',
+        id: 'read_ipa_info',
+        name: 'Read IPA Info',
+        __metricsId: 'eas/read_ipa_info',
+        inputProviders: [
+            steps_1.BuildStepInput.createProvider({
+                id: 'ipa_path',
+                required: true,
+                allowedValueTypeName: steps_1.BuildStepInputValueTypeName.STRING,
+            }),
+        ],
+        outputProviders: [
+            steps_1.BuildStepOutput.createProvider({
+                id: 'bundle_identifier',
+                required: true,
+            }),
+            steps_1.BuildStepOutput.createProvider({
+                id: 'bundle_short_version',
+                required: true,
+            }),
+            steps_1.BuildStepOutput.createProvider({
+                id: 'bundle_version',
+                required: true,
+            }),
+        ],
+        fn: async (stepCtx, { inputs, outputs }) => {
+            const ipaPathInput = zod_1.z.string().parse(inputs.ipa_path.value);
+            const ipaPath = node_path_1.default.resolve(stepCtx.workingDirectory, ipaPathInput);
+            if (!(await fs_extra_1.default.pathExists(ipaPath))) {
+                throw new errors_1.UserFacingError('EAS_READ_IPA_INFO_FILE_NOT_FOUND', `IPA file not found: ${ipaPath}`);
+            }
+            const ipaInfo = await readIpaInfoAsync(ipaPath);
+            outputs.bundle_identifier.set(ipaInfo.bundleIdentifier);
+            outputs.bundle_short_version.set(ipaInfo.bundleShortVersion);
+            outputs.bundle_version.set(ipaInfo.bundleVersion);
+        },
+    });
+}
+async function readIpaInfoAsync(ipaPath) {
+    try {
+        const infoPlistBuffer = await readInfoPlistBufferFromIpaAsync(ipaPath);
+        const infoPlist = parseInfoPlistBuffer(infoPlistBuffer);
+        const bundleIdentifier = infoPlist.CFBundleIdentifier;
+        if (typeof bundleIdentifier !== 'string') {
+            throw new errors_1.UserFacingError('EAS_READ_IPA_INFO_INVALID_INFO_PLIST', 'Failed to read IPA info: Missing or invalid CFBundleIdentifier in Info.plist');
+        }
+        const bundleShortVersion = infoPlist.CFBundleShortVersionString;
+        if (typeof bundleShortVersion !== 'string') {
+            throw new errors_1.UserFacingError('EAS_READ_IPA_INFO_INVALID_INFO_PLIST', 'Failed to read IPA info: Missing or invalid CFBundleShortVersionString in Info.plist');
+        }
+        const bundleVersion = infoPlist.CFBundleVersion;
+        if (typeof bundleVersion !== 'string') {
+            throw new errors_1.UserFacingError('EAS_READ_IPA_INFO_INVALID_INFO_PLIST', 'Failed to read IPA info: Missing or invalid CFBundleVersion in Info.plist');
+        }
+        return {
+            bundleIdentifier,
+            bundleShortVersion,
+            bundleVersion,
+        };
+    }
+    catch (error) {
+        if (error instanceof errors_1.UserFacingError) {
+            throw error;
+        }
+        throw new errors_1.UserFacingError('EAS_READ_IPA_INFO_FAILED', `Failed to read IPA info: ${error.message}`, { cause: error });
+    }
+}
+function parseInfoPlistBuffer(data) {
+    const isBinaryPlist = data.subarray(0, 8).toString('ascii') === 'bplist00';
+    if (isBinaryPlist) {
+        const parsedBinaryPlists = bplist_parser_1.default.parseBuffer(data);
+        const parsedBinaryPlist = parsedBinaryPlists[0];
+        if (!parsedBinaryPlist || typeof parsedBinaryPlist !== 'object') {
+            throw new errors_1.UserFacingError('EAS_READ_IPA_INFO_INVALID_BINARY_PLIST', 'Invalid binary plist in IPA');
+        }
+        return parsedBinaryPlist;
+    }
+    return plist_1.default.parse(data.toString('utf8'));
+}
+async function readInfoPlistBufferFromIpaAsync(ipaPath) {
+    const zip = new node_stream_zip_1.default.async({ file: ipaPath });
+    try {
+        const entries = Object.values(await zip.entries());
+        const infoPlistEntry = entries.find(entry => INFO_PLIST_PATH_REGEXP.test(entry.name));
+        if (!infoPlistEntry) {
+            throw new errors_1.UserFacingError('EAS_READ_IPA_INFO_INFO_PLIST_NOT_FOUND', `Failed to read IPA info: Could not find Info.plist in ${ipaPath}`);
+        }
+        return await zip.entryData(infoPlistEntry.name);
+    }
+    finally {
+        await zip.close();
+    }
+}

package/dist/steps/functions/uploadToAsc.js

@@ -223,7 +223,7 @@ function createUploadToAscBuildFunction() {
             }
             stepsCtx.logger.info('Checking build upload status...');
             const waitingForBuildStartedAt = Date.now();
-            while (Date.now() - waitingForBuildStartedAt < 10 * 60 * 1000 /* 10 minutes */) {
+            while (Date.now() - waitingForBuildStartedAt < 30 * 60 * 1000 /* 30 minutes */) {
                 const { data: { attributes: { state }, }, } = await client.getAsync(`/v1/buildUploads/:id`, { 'fields[buildUploads]': ['state', 'build'], include: ['build'] }, { id: buildUploadId });
                 if (state.state === 'AWAITING_UPLOAD' || state.state === 'PROCESSING') {
                     stepsCtx.logger.info(`Waiting for build upload to complete... (status = ${state.state})`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "18.0.1",
+  "version": "18.0.2",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -38,19 +38,20 @@
     "@expo/config": "10.0.6",
     "@expo/config-plugins": "9.0.12",
     "@expo/downloader": "18.0.1",
-    "@expo/eas-build-job": "18.0.1",
+    "@expo/eas-build-job": "18.0.2",
     "@expo/env": "^0.4.0",
     "@expo/logger": "18.0.1",
     "@expo/package-manager": "1.9.10",
     "@expo/plist": "^0.2.0",
     "@expo/results": "^1.0.0",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "18.0.1",
+    "@expo/steps": "18.0.2",
     "@expo/template-file": "18.0.1",
     "@expo/turtle-spawn": "18.0.1",
     "@expo/xcpretty": "^4.3.1",
     "@google-cloud/storage": "^7.11.2",
     "@urql/core": "^6.0.1",
+    "bplist-parser": "0.3.2",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
     "gql.tada": "^1.8.13",
@@ -59,6 +60,7 @@
     "lodash": "^4.17.21",
     "node-fetch": "^2.7.0",
     "node-forge": "^1.3.1",
+    "node-stream-zip": "1.15.0",
     "nullthrows": "^1.1.1",
     "plist": "^3.1.0",
     "promise-limit": "^2.7.0",
@@ -94,5 +96,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "772d4dd654a71b0d88e73341106d417222dd401e"
+  "gitHead": "d5da4f416791938a7c1ffdaf83a7c644e7aa6261"
 }