@expo/build-tools 24.1.0 → 24.2.0

package/dist/common/git.d.ts

@@ -4,6 +4,7 @@ export declare function shallowCloneRepositoryAsync({ logger, archiveSource, des
     logger: bunyan;
     archiveSource: ArchiveSource & {
         type: ArchiveSourceType.GIT;
+        repositoryUrl: string;
     };
     destinationDirectory: string;
 }): Promise<void>;

package/dist/common/projectSources.js

@@ -19,28 +19,21 @@ const zod_1 = require("zod");
 const git_1 = require("./git");
 const turtleFetch_1 = require("../utils/turtleFetch");
 async function prepareProjectSourcesAsync(ctx, destinationDirectory) {
-    let projectArchive = ctx.job.projectArchive;
     if (ctx.isLocal) {
-        console.warn('Local build, skipping project archive refresh');
-    }
-    else {
-        const projectArchiveResult = await (0, results_1.asyncResult)(fetchProjectArchiveSourceAsync(ctx));
-        if (!projectArchiveResult.ok) {
-            throw new eas_build_job_1.SystemError('Failed to fetch project sources. Re-run the job.', {
-                cause: projectArchiveResult.reason,
-            });
+        if (ctx.job.projectArchive.type !== eas_build_job_1.ArchiveSourceType.PATH) {
+            throw new eas_build_job_1.SystemError(`Expected a PATH project source for a local build, received ${ctx.job.projectArchive.type}.`, { trackingCode: 'INVALID_LOCAL_PROJECT_SOURCE' });
         }
-        projectArchive = projectArchiveResult.value;
+        await prepareProjectSourcesLocallyAsync(ctx, ctx.job.projectArchive.path, destinationDirectory);
+        return { handled: true };
+    }
+    const projectArchiveResult = await (0, results_1.asyncResult)(fetchProjectArchiveSourceAsync(ctx));
+    if (!projectArchiveResult.ok) {
+        throw new eas_build_job_1.SystemError('Failed to fetch project sources. Re-run the job.', {
+            cause: projectArchiveResult.reason,
+        });
     }
+    const projectArchive = projectArchiveResult.value;
     switch (projectArchive.type) {
-        case eas_build_job_1.ArchiveSourceType.R2:
-        case eas_build_job_1.ArchiveSourceType.GCS: {
-            throw new Error('Remote project sources should be resolved earlier to URL');
-        }
-        case eas_build_job_1.ArchiveSourceType.PATH: {
-            await prepareProjectSourcesLocallyAsync(ctx, projectArchive.path, destinationDirectory); // used in eas build --local
-            return { handled: true };
-        }
         case eas_build_job_1.ArchiveSourceType.NONE: {
             // May be used in no-sources jobs like submission jobs.
             return { handled: true };
@@ -207,7 +200,20 @@ async function fetchProjectArchiveSourceAsync(ctx) {
     if (!jsonResult.ok) {
         throw new Error(`Expected JSON response from server (${response.status}): ${jsonResult.reason}`);
     }
-    const dataResult = zod_1.z.object({ data: eas_build_job_1.ArchiveSourceSchemaZ }).safeParse(jsonResult.value);
+    const dataResult = zod_1.z
+        .object({
+        data: zod_1.z.discriminatedUnion('type', [
+            zod_1.z.object({
+                type: zod_1.z.literal(eas_build_job_1.ArchiveSourceType.GIT),
+                repositoryUrl: zod_1.z.string().url(),
+                gitRef: zod_1.z.string().nullable(),
+                gitCommitHash: zod_1.z.string(),
+            }),
+            zod_1.z.object({ type: zod_1.z.literal(eas_build_job_1.ArchiveSourceType.URL), url: zod_1.z.string().url() }),
+            zod_1.z.object({ type: zod_1.z.literal(eas_build_job_1.ArchiveSourceType.NONE) }),
+        ]),
+    })
+        .safeParse(jsonResult.value);
     if (!dataResult.success) {
         throw new Error(`Unexpected data from server (${response.status}): ${zod_1.z.prettifyError(dataResult.error)}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "24.1.0",
+  "version": "24.2.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -40,14 +40,14 @@
     "@expo/config": "55.0.10",
     "@expo/config-plugins": "55.0.7",
     "@expo/downloader": "24.0.0",
-    "@expo/eas-build-job": "24.0.0",
+    "@expo/eas-build-job": "24.2.0",
     "@expo/env": "^0.4.0",
     "@expo/logger": "24.0.0",
     "@expo/package-manager": "1.9.10",
     "@expo/plist": "^0.3.5",
     "@expo/results": "^1.0.0",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "24.0.0",
+    "@expo/steps": "24.2.0",
     "@expo/template-file": "24.0.0",
     "@expo/turtle-spawn": "24.0.0",
     "@expo/xcpretty": "^4.3.1",
@@ -102,5 +102,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "8373ae353ca615ba2170eac2399f7592ad72d36a"
+  "gitHead": "97553334d4275d9f18ec23b92e6c3ebe9593767e"
 }