@expo/build-tools 0.1.182 → 0.1.183

package/dist/builders/custom.js

@@ -8,46 +8,22 @@ const path_1 = __importDefault(require("path"));
 const eas_build_job_1 = require("@expo/eas-build-job");
 const steps_1 = require("@expo/steps");
 const nullthrows_1 = __importDefault(require("nullthrows"));
-const context_1 = require("../context");
 const projectSources_1 = require("../common/projectSources");
+const easFunctions_1 = require("../steps/easFunctions");
 async function runCustomBuildAsync(ctx) {
     var _a;
     await (0, projectSources_1.prepareProjectSourcesAsync)(ctx);
     const relativeConfigPath = (0, nullthrows_1.default)((_a = ctx.job.customBuildConfig) === null || _a === void 0 ? void 0 : _a.path, 'Custom build config must be defined for custom builds');
     const configPath = path_1.default.join(ctx.reactNativeProjectDirectory, relativeConfigPath);
     const buildStepContext = new steps_1.BuildStepContext(ctx.env.EAS_BUILD_ID, ctx.logger.child({ phase: eas_build_job_1.BuildPhase.CUSTOM }), false, ctx.reactNativeProjectDirectory);
-    const parser = new steps_1.BuildConfigParser(buildStepContext, { configPath });
+    const easFunctions = (0, easFunctions_1.getEasFunctions)(ctx);
+    const parser = new steps_1.BuildConfigParser(buildStepContext, {
+        configPath,
+        externalFunctions: easFunctions,
+    });
     const workflow = await parser.parseAsync();
     try {
-        try {
-            await workflow.executeAsync(ctx.env);
-        }
-        finally {
-            await ctx.runBuildPhase(eas_build_job_1.BuildPhase.UPLOAD_BUILD_ARTIFACTS, async () => {
-                var _a;
-                try {
-                    const artifacts = await workflow.collectArtifactsAsync();
-                    for (const buildArtifactType of Object.keys(artifacts)) {
-                        const type = buildArtifactType === steps_1.BuildArtifactType.APPLICATION_ARCHIVE
-                            ? context_1.ArtifactType.APPLICATION_ARCHIVE
-                            : context_1.ArtifactType.BUILD_ARTIFACTS;
-                        const filePaths = (_a = artifacts[buildArtifactType]) !== null && _a !== void 0 ? _a : [];
-                        if (filePaths.length > 0) {
-                            await ctx.uploadArtifacts(type, filePaths);
-                        }
-                    }
-                }
-                catch (err) {
-                    ctx.logger.error({ err }, 'Failed to upload artifacts');
-                }
-            });
-            try {
-                await workflow.cleanUpAsync();
-            }
-            catch (err) {
-                ctx.logger.error({ err }, 'Failed to clean up custom build temporary files');
-            }
-        }
+        await workflow.executeAsync(ctx.env);
     }
     catch (err) {
         err.artifacts = ctx.artifacts;

package/dist/builders/custom.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../src/builders/custom.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,uDAAsD;AACtD,uCAAqF;AACrF,4DAAoC;AAEpC,wCAAmE;AACnE,6DAAsE;AAE/D,KAAK,UAAU,mBAAmB,CAAgB,GAAoB;;IAC3E,MAAM,IAAA,2CAA0B,EAAC,GAAG,CAAC,CAAC;IAEtC,MAAM,kBAAkB,GAAG,IAAA,oBAAU,EACnC,MAAA,GAAG,CAAC,GAAG,CAAC,iBAAiB,0CAAE,IAAI,EAC/B,uDAAuD,CACxD,CAAC;IACF,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,CAAC,2BAA2B,EAAE,kBAAkB,CAAC,CAAC;IAElF,MAAM,gBAAgB,GAAG,IAAI,wBAAgB,CAC3C,GAAG,CAAC,GAAG,CAAC,YAAY,EACpB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,0BAAU,CAAC,MAAM,EAAE,CAAC,EAC9C,KAAK,EACL,GAAG,CAAC,2BAA2B,CAChC,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,yBAAiB,CAAC,gBAAgB,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;IAC3C,IAAI;QACF,IAAI;YACF,MAAM,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACtC;gBAAS;YACR,MAAM,GAAG,CAAC,aAAa,CAAC,0BAAU,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;;gBACpE,IAAI;oBACF,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,qBAAqB,EAAE,CAAC;oBACzD,KAAK,MAAM,iBAAiB,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;wBACtD,MAAM,IAAI,GACR,iBAAiB,KAAK,yBAAiB,CAAC,mBAAmB;4BACzD,CAAC,CAAC,sBAAY,CAAC,mBAAmB;4BAClC,CAAC,CAAC,sBAAY,CAAC,eAAe,CAAC;wBACnC,MAAM,SAAS,GAAG,MAAA,SAAS,CAAC,iBAAsC,CAAC,mCAAI,EAAE,CAAC;wBAC1E,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;4BACxB,MAAM,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;yBAC5C;qBACF;iBACF;gBAAC,OAAO,GAAQ,EAAE;oBACjB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,4BAA4B,CAAC,CAAC;iBACzD;YACH,CAAC,CAAC,CAAC;YAEH,IAAI;gBACF,MAAM,QAAQ,CAAC,YAAY,EAAE,CAAC;aAC/B;YAAC,OAAO,GAAQ,EAAE;gBACjB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,iDAAiD,CAAC,CAAC;aAC9E;SACF;KACF;IAAC,OAAO,GAAQ,EAAE;QACjB,GAAG,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAC9B,MAAM,GAAG,CAAC;KACX;IAED,OAAO,GAAG,CAAC,SAAS,CAAC;AACvB,CAAC;AAnDD,kDAmDC","sourcesContent":["import path from 'path';\n\nimport { BuildPhase, Job } from '@expo/eas-build-job';\nimport { BuildArtifactType, BuildConfigParser, BuildStepContext } from '@expo/steps';\nimport nullthrows from 'nullthrows';\n\nimport { Artifacts, ArtifactType, BuildContext } from '../context';\nimport { prepareProjectSourcesAsync } from '../common/projectSources';\n\nexport async function runCustomBuildAsync<T extends Job>(ctx: BuildContext<T>): Promise<Artifacts> {\n  await prepareProjectSourcesAsync(ctx);\n\n  const relativeConfigPath = nullthrows(\n    ctx.job.customBuildConfig?.path,\n    'Custom build config must be defined for custom builds'\n  );\n  const configPath = path.join(ctx.reactNativeProjectDirectory, relativeConfigPath);\n\n  const buildStepContext = new BuildStepContext(\n    ctx.env.EAS_BUILD_ID,\n    ctx.logger.child({ phase: BuildPhase.CUSTOM }),\n    false,\n    ctx.reactNativeProjectDirectory\n  );\n  const parser = new BuildConfigParser(buildStepContext, { configPath });\n  const workflow = await parser.parseAsync();\n  try {\n    try {\n      await workflow.executeAsync(ctx.env);\n    } finally {\n      await ctx.runBuildPhase(BuildPhase.UPLOAD_BUILD_ARTIFACTS, async () => {\n        try {\n          const artifacts = await workflow.collectArtifactsAsync();\n          for (const buildArtifactType of Object.keys(artifacts)) {\n            const type: ArtifactType =\n              buildArtifactType === BuildArtifactType.APPLICATION_ARCHIVE\n                ? ArtifactType.APPLICATION_ARCHIVE\n                : ArtifactType.BUILD_ARTIFACTS;\n            const filePaths = artifacts[buildArtifactType as BuildArtifactType] ?? [];\n            if (filePaths.length > 0) {\n              await ctx.uploadArtifacts(type, filePaths);\n            }\n          }\n        } catch (err: any) {\n          ctx.logger.error({ err }, 'Failed to upload artifacts');\n        }\n      });\n\n      try {\n        await workflow.cleanUpAsync();\n      } catch (err: any) {\n        ctx.logger.error({ err }, 'Failed to clean up custom build temporary files');\n      }\n    }\n  } catch (err: any) {\n    err.artifacts = ctx.artifacts;\n    throw err;\n  }\n\n  return ctx.artifacts;\n}\n"]}
+{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../src/builders/custom.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,uDAAsD;AACtD,uCAAkE;AAClE,4DAAoC;AAGpC,6DAAsE;AACtE,wDAAwD;AAEjD,KAAK,UAAU,mBAAmB,CAAgB,GAAoB;;IAC3E,MAAM,IAAA,2CAA0B,EAAC,GAAG,CAAC,CAAC;IAEtC,MAAM,kBAAkB,GAAG,IAAA,oBAAU,EACnC,MAAA,GAAG,CAAC,GAAG,CAAC,iBAAiB,0CAAE,IAAI,EAC/B,uDAAuD,CACxD,CAAC;IACF,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,CAAC,2BAA2B,EAAE,kBAAkB,CAAC,CAAC;IAElF,MAAM,gBAAgB,GAAG,IAAI,wBAAgB,CAC3C,GAAG,CAAC,GAAG,CAAC,YAAY,EACpB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,0BAAU,CAAC,MAAM,EAAE,CAAC,EAC9C,KAAK,EACL,GAAG,CAAC,2BAA2B,CAChC,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,8BAAe,EAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAI,yBAAiB,CAAC,gBAAgB,EAAE;QACrD,UAAU;QACV,iBAAiB,EAAE,YAAY;KAChC,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;IAC3C,IAAI;QACF,MAAM,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KACtC;IAAC,OAAO,GAAQ,EAAE;QACjB,GAAG,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAC9B,MAAM,GAAG,CAAC;KACX;IAED,OAAO,GAAG,CAAC,SAAS,CAAC;AACvB,CAAC;AA7BD,kDA6BC","sourcesContent":["import path from 'path';\n\nimport { BuildPhase, Job } from '@expo/eas-build-job';\nimport { BuildConfigParser, BuildStepContext } from '@expo/steps';\nimport nullthrows from 'nullthrows';\n\nimport { Artifacts, BuildContext } from '../context';\nimport { prepareProjectSourcesAsync } from '../common/projectSources';\nimport { getEasFunctions } from '../steps/easFunctions';\n\nexport async function runCustomBuildAsync<T extends Job>(ctx: BuildContext<T>): Promise<Artifacts> {\n  await prepareProjectSourcesAsync(ctx);\n\n  const relativeConfigPath = nullthrows(\n    ctx.job.customBuildConfig?.path,\n    'Custom build config must be defined for custom builds'\n  );\n  const configPath = path.join(ctx.reactNativeProjectDirectory, relativeConfigPath);\n\n  const buildStepContext = new BuildStepContext(\n    ctx.env.EAS_BUILD_ID,\n    ctx.logger.child({ phase: BuildPhase.CUSTOM }),\n    false,\n    ctx.reactNativeProjectDirectory\n  );\n  const easFunctions = getEasFunctions(ctx);\n  const parser = new BuildConfigParser(buildStepContext, {\n    configPath,\n    externalFunctions: easFunctions,\n  });\n  const workflow = await parser.parseAsync();\n  try {\n    await workflow.executeAsync(ctx.env);\n  } catch (err: any) {\n    err.artifacts = ctx.artifacts;\n    throw err;\n  }\n\n  return ctx.artifacts;\n}\n"]}

package/dist/steps/easFunctions.d.ts

@@ -0,0 +1,4 @@
+import { Job } from '@expo/eas-build-job';
+import { BuildFunction } from '@expo/steps';
+import { BuildContext } from '../context';
+export declare function getEasFunctions<T extends Job>(ctx: BuildContext<T>): BuildFunction[];

package/dist/steps/easFunctions.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEasFunctions = void 0;
+const uploadArtifact_1 = require("./functions/uploadArtifact");
+function getEasFunctions(ctx) {
+    return [(0, uploadArtifact_1.createUploadArtifactStepsFunction)(ctx)];
+}
+exports.getEasFunctions = getEasFunctions;
+//# sourceMappingURL=easFunctions.js.map

package/dist/steps/easFunctions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"easFunctions.js","sourceRoot":"","sources":["../../src/steps/easFunctions.ts"],"names":[],"mappings":";;;AAKA,+DAA+E;AAE/E,SAAgB,eAAe,CAAgB,GAAoB;IACjE,OAAO,CAAC,IAAA,kDAAiC,EAAC,GAAG,CAAC,CAAC,CAAC;AAClD,CAAC;AAFD,0CAEC","sourcesContent":["import { Job } from '@expo/eas-build-job';\nimport { BuildFunction } from '@expo/steps';\n\nimport { BuildContext } from '../context';\n\nimport { createUploadArtifactStepsFunction } from './functions/uploadArtifact';\n\nexport function getEasFunctions<T extends Job>(ctx: BuildContext<T>): BuildFunction[] {\n  return [createUploadArtifactStepsFunction(ctx)];\n}\n"]}

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

@@ -0,0 +1,4 @@
+import { Job } from '@expo/eas-build-job';
+import { BuildFunction } from '@expo/steps';
+import { BuildContext } from '../../context';
+export declare function createUploadArtifactStepsFunction<T extends Job>(ctx: BuildContext<T>): BuildFunction;

package/dist/steps/functions/uploadArtifact.js

@@ -0,0 +1,49 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createUploadArtifactStepsFunction = void 0;
+const path_1 = __importDefault(require("path"));
+const steps_1 = require("@expo/steps");
+const nullthrows_1 = __importDefault(require("nullthrows"));
+const context_1 = require("../../context");
+var BuildArtifactType;
+(function (BuildArtifactType) {
+    BuildArtifactType["APPLICATION_ARCHIVE"] = "application-archive";
+    BuildArtifactType["BUILD_ARTIFACT"] = "build-artifact";
+})(BuildArtifactType || (BuildArtifactType = {}));
+function createUploadArtifactStepsFunction(ctx) {
+    return new steps_1.BuildFunction({
+        namespace: 'eas',
+        id: 'upload_artifact',
+        name: 'Upload artifact',
+        inputProviders: [
+            // TODO: refactor when BuildStepInput supports "allowedValues" option
+            // either "application-archive" or "build-artifact"
+            steps_1.BuildStepInput.createProvider({
+                id: 'type',
+                defaultValue: BuildArtifactType.APPLICATION_ARCHIVE,
+            }),
+            steps_1.BuildStepInput.createProvider({ id: 'path', required: true }),
+        ],
+        fn: async (stepsCtx, { inputs }) => {
+            const artifactType = validateAndConvertBuildArtifactType((0, nullthrows_1.default)(inputs.type.value));
+            const filePath = path_1.default.resolve(stepsCtx.workingDirectory, (0, nullthrows_1.default)(inputs.path.value));
+            await ctx.uploadArtifacts(artifactType, [filePath], stepsCtx.logger);
+        },
+    });
+}
+exports.createUploadArtifactStepsFunction = createUploadArtifactStepsFunction;
+function validateAndConvertBuildArtifactType(input) {
+    const allowedValues = Object.values(BuildArtifactType);
+    if (!allowedValues.includes(input)) {
+        throw new Error(`"${input}" is not allowed artifact type, allowed values: ${allowedValues
+            .map((i) => `"${i}"`)
+            .join(', ')}`);
+    }
+    return input === BuildArtifactType.APPLICATION_ARCHIVE
+        ? context_1.ArtifactType.APPLICATION_ARCHIVE
+        : context_1.ArtifactType.BUILD_ARTIFACTS;
+}
+//# sourceMappingURL=uploadArtifact.js.map

package/dist/steps/functions/uploadArtifact.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uploadArtifact.js","sourceRoot":"","sources":["../../../src/steps/functions/uploadArtifact.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAGxB,uCAA4D;AAC5D,4DAAoC;AAEpC,2CAA2D;AAE3D,IAAK,iBAGJ;AAHD,WAAK,iBAAiB;IACpB,gEAA2C,CAAA;IAC3C,sDAAiC,CAAA;AACnC,CAAC,EAHI,iBAAiB,KAAjB,iBAAiB,QAGrB;AAED,SAAgB,iCAAiC,CAC/C,GAAoB;IAEpB,OAAO,IAAI,qBAAa,CAAC;QACvB,SAAS,EAAE,KAAK;QAChB,EAAE,EAAE,iBAAiB;QACrB,IAAI,EAAE,iBAAiB;QACvB,cAAc,EAAE;YACd,qEAAqE;YACrE,mDAAmD;YACnD,sBAAc,CAAC,cAAc,CAAC;gBAC5B,EAAE,EAAE,MAAM;gBACV,YAAY,EAAE,iBAAiB,CAAC,mBAAmB;aACpD,CAAC;YACF,sBAAc,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;SAC9D;QACD,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACjC,MAAM,YAAY,GAAG,mCAAmC,CAAC,IAAA,oBAAU,EAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACxF,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,EAAE,IAAA,oBAAU,EAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACxF,MAAM,GAAG,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QACvE,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAtBD,8EAsBC;AAED,SAAS,mCAAmC,CAAC,KAAa;IACxD,MAAM,aAAa,GAAa,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IACjE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAClC,MAAM,IAAI,KAAK,CACb,IAAI,KAAK,mDAAmD,aAAa;aACtE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;aACpB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;KACH;IACD,OAAO,KAAK,KAAK,iBAAiB,CAAC,mBAAmB;QACpD,CAAC,CAAC,sBAAY,CAAC,mBAAmB;QAClC,CAAC,CAAC,sBAAY,CAAC,eAAe,CAAC;AACnC,CAAC","sourcesContent":["import path from 'path';\n\nimport { Job } from '@expo/eas-build-job';\nimport { BuildFunction, BuildStepInput } from '@expo/steps';\nimport nullthrows from 'nullthrows';\n\nimport { ArtifactType, BuildContext } from '../../context';\n\nenum BuildArtifactType {\n  APPLICATION_ARCHIVE = 'application-archive',\n  BUILD_ARTIFACT = 'build-artifact',\n}\n\nexport function createUploadArtifactStepsFunction<T extends Job>(\n  ctx: BuildContext<T>\n): BuildFunction {\n  return new BuildFunction({\n    namespace: 'eas',\n    id: 'upload_artifact',\n    name: 'Upload artifact',\n    inputProviders: [\n      // TODO: refactor when BuildStepInput supports \"allowedValues\" option\n      // either \"application-archive\" or \"build-artifact\"\n      BuildStepInput.createProvider({\n        id: 'type',\n        defaultValue: BuildArtifactType.APPLICATION_ARCHIVE,\n      }),\n      BuildStepInput.createProvider({ id: 'path', required: true }),\n    ],\n    fn: async (stepsCtx, { inputs }) => {\n      const artifactType = validateAndConvertBuildArtifactType(nullthrows(inputs.type.value));\n      const filePath = path.resolve(stepsCtx.workingDirectory, nullthrows(inputs.path.value));\n      await ctx.uploadArtifacts(artifactType, [filePath], stepsCtx.logger);\n    },\n  });\n}\n\nfunction validateAndConvertBuildArtifactType(input: string): ArtifactType {\n  const allowedValues: string[] = Object.values(BuildArtifactType);\n  if (!allowedValues.includes(input)) {\n    throw new Error(\n      `\"${input}\" is not allowed artifact type, allowed values: ${allowedValues\n        .map((i) => `\"${i}\"`)\n        .join(', ')}`\n    );\n  }\n  return input === BuildArtifactType.APPLICATION_ARCHIVE\n    ? ArtifactType.APPLICATION_ARCHIVE\n    : ArtifactType.BUILD_ARTIFACTS;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "0.1.182",
+  "version": "0.1.183",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -27,7 +27,7 @@
     "@expo/logger": "0.0.27",
     "@expo/package-manager": "^0.0.57",
     "@expo/plist": "^0.0.20",
-    "@expo/steps": "0.0.8",
+    "@expo/steps": "0.0.9",
     "@expo/template-file": "0.1.25",
     "@expo/turtle-spawn": "0.0.28",
     "@expo/xcpretty": "^4.2.2",