@expo/build-tools 0.1.170 → 0.1.172

package/dist/utils/appConfig.js

@@ -11,7 +11,7 @@ function readAppConfig(projectDir, env, logger) {
     const originalStderrWrite = process.stderr.write;
     const stdoutStore = [];
     try {
-        process.env = Object.assign({}, env);
+        process.env = { ...env };
         process.exit = () => {
             throw new Error('Failed to evaluate app config file');
         };

package/dist/utils/appConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"appConfig.js","sourceRoot":"","sources":["../../src/utils/appConfig.ts"],"names":[],"mappings":";;;AAAA,yCAAwD;AAExD,yCAAmD;AAEnD,SAAgB,aAAa,CAAC,UAAkB,EAAE,GAAQ,EAAE,MAAc;IACxE,MAAM,kBAAkB,GAAsB,OAAO,CAAC,GAAG,CAAC;IAC1D,MAAM,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IACzC,MAAM,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC;IACvC,MAAM,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;IACjD,MAAM,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;IAEjD,MAAM,WAAW,GAA2C,EAAE,CAAC;IAC/D,IAAI;QACF,OAAO,CAAC,GAAG,qBAAQ,GAAG,CAAE,CAAC;QACzB,OAAO,CAAC,IAAI,GAAG,GAAG,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC,CAAC;QACF,OAAO,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC;QAC/B,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,UAAU,GAAG,IAAS;YAC3C,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAW,CAAC,IAAI,EAAE,CAAC,CAAC;YACrE,OAAO,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACzD,CAAC,CAAC;QACF,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,UAAU,GAAG,IAAS;YAC3C,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAW,CAAC,KAAK,EAAE,CAAC,CAAC;YACtE,OAAO,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACzD,CAAC,CAAC;QACF,OAAO,IAAA,kBAAS,EAAC,UAAU,EAAE;YAC3B,yBAAyB,EAAE,IAAI;YAC/B,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAC;QAC3C,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAC;QAC3C,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;YACtC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,MAAM,GAAG,CAAC;KACX;YAAS;QACR,OAAO,CAAC,GAAG,GAAG,kBAAkB,CAAC;QACjC,OAAO,CAAC,IAAI,GAAG,mBAAmB,CAAC;QACnC,OAAO,CAAC,GAAG,GAAG,kBAAkB,CAAC;QACjC,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAC;QAC3C,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAC;KAC5C;AACH,CAAC;AAxCD,sCAwCC","sourcesContent":["import { getConfig, ProjectConfig } from '@expo/config';\nimport { Env } from '@expo/eas-build-job';\nimport { bunyan, LoggerLevel } from '@expo/logger';\n\nexport function readAppConfig(projectDir: string, env: Env, logger: bunyan): ProjectConfig {\n  const originalProcessEnv: NodeJS.ProcessEnv = process.env;\n  const originalProcessExit = process.exit;\n  const originalProcessCwd = process.cwd;\n  const originalStdoutWrite = process.stdout.write;\n  const originalStderrWrite = process.stderr.write;\n\n  const stdoutStore: { text: string; level: LoggerLevel }[] = [];\n  try {\n    process.env = { ...env };\n    process.exit = () => {\n      throw new Error('Failed to evaluate app config file');\n    };\n    process.cwd = () => projectDir;\n    process.stdout.write = function (...args: any) {\n      stdoutStore.push({ text: String(args[0]), level: LoggerLevel.INFO });\n      return originalStdoutWrite.apply(process.stdout, args);\n    };\n    process.stderr.write = function (...args: any) {\n      stdoutStore.push({ text: String(args[0]), level: LoggerLevel.ERROR });\n      return originalStderrWrite.apply(process.stderr, args);\n    };\n    return getConfig(projectDir, {\n      skipSDKVersionRequirement: true,\n      isPublicConfig: true,\n    });\n  } catch (err) {\n    process.stdout.write = originalStdoutWrite;\n    process.stderr.write = originalStderrWrite;\n    stdoutStore.forEach(({ text, level }) => {\n      logger[level](text.trim());\n    });\n    throw err;\n  } finally {\n    process.env = originalProcessEnv;\n    process.exit = originalProcessExit;\n    process.cwd = originalProcessCwd;\n    process.stdout.write = originalStdoutWrite;\n    process.stderr.write = originalStderrWrite;\n  }\n}\n"]}
+{"version":3,"file":"appConfig.js","sourceRoot":"","sources":["../../src/utils/appConfig.ts"],"names":[],"mappings":";;;AAAA,yCAAwD;AAExD,yCAAmD;AAEnD,SAAgB,aAAa,CAAC,UAAkB,EAAE,GAAQ,EAAE,MAAc;IACxE,MAAM,kBAAkB,GAAsB,OAAO,CAAC,GAAG,CAAC;IAC1D,MAAM,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IACzC,MAAM,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC;IACvC,MAAM,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;IACjD,MAAM,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;IAEjD,MAAM,WAAW,GAA2C,EAAE,CAAC;IAC/D,IAAI;QACF,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC;QACzB,OAAO,CAAC,IAAI,GAAG,GAAG,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC,CAAC;QACF,OAAO,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC;QAC/B,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,UAAU,GAAG,IAAS;YAC3C,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAW,CAAC,IAAI,EAAE,CAAC,CAAC;YACrE,OAAO,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACzD,CAAC,CAAC;QACF,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,UAAU,GAAG,IAAS;YAC3C,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAW,CAAC,KAAK,EAAE,CAAC,CAAC;YACtE,OAAO,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACzD,CAAC,CAAC;QACF,OAAO,IAAA,kBAAS,EAAC,UAAU,EAAE;YAC3B,yBAAyB,EAAE,IAAI;YAC/B,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAC;QAC3C,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAC;QAC3C,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;YACtC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,MAAM,GAAG,CAAC;KACX;YAAS;QACR,OAAO,CAAC,GAAG,GAAG,kBAAkB,CAAC;QACjC,OAAO,CAAC,IAAI,GAAG,mBAAmB,CAAC;QACnC,OAAO,CAAC,GAAG,GAAG,kBAAkB,CAAC;QACjC,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAC;QAC3C,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAC;KAC5C;AACH,CAAC;AAxCD,sCAwCC","sourcesContent":["import { getConfig, ProjectConfig } from '@expo/config';\nimport { Env } from '@expo/eas-build-job';\nimport { bunyan, LoggerLevel } from '@expo/logger';\n\nexport function readAppConfig(projectDir: string, env: Env, logger: bunyan): ProjectConfig {\n  const originalProcessEnv: NodeJS.ProcessEnv = process.env;\n  const originalProcessExit = process.exit;\n  const originalProcessCwd = process.cwd;\n  const originalStdoutWrite = process.stdout.write;\n  const originalStderrWrite = process.stderr.write;\n\n  const stdoutStore: { text: string; level: LoggerLevel }[] = [];\n  try {\n    process.env = { ...env };\n    process.exit = () => {\n      throw new Error('Failed to evaluate app config file');\n    };\n    process.cwd = () => projectDir;\n    process.stdout.write = function (...args: any) {\n      stdoutStore.push({ text: String(args[0]), level: LoggerLevel.INFO });\n      return originalStdoutWrite.apply(process.stdout, args);\n    };\n    process.stderr.write = function (...args: any) {\n      stdoutStore.push({ text: String(args[0]), level: LoggerLevel.ERROR });\n      return originalStderrWrite.apply(process.stderr, args);\n    };\n    return getConfig(projectDir, {\n      skipSDKVersionRequirement: true,\n      isPublicConfig: true,\n    });\n  } catch (err) {\n    process.stdout.write = originalStdoutWrite;\n    process.stderr.write = originalStderrWrite;\n    stdoutStore.forEach(({ text, level }) => {\n      logger[level](text.trim());\n    });\n    throw err;\n  } finally {\n    process.env = originalProcessEnv;\n    process.exit = originalProcessExit;\n    process.cwd = originalProcessCwd;\n    process.stdout.write = originalStdoutWrite;\n    process.stderr.write = originalStderrWrite;\n  }\n}\n"]}

package/dist/utils/hooks.js

@@ -33,7 +33,10 @@ async function runHookIfPresent(ctx, hook, { extraEnvs } = {}) {
         await (0, turtle_spawn_1.default)(packageManager, ['run', hook], {
             cwd: projectDir,
             logger: ctx.logger,
-            env: Object.assign(Object.assign({}, ctx.env), extraEnvs),
+            env: {
+                ...ctx.env,
+                ...extraEnvs,
+            },
         });
     }
 }

package/dist/utils/hooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../src/utils/hooks.ts"],"names":[],"mappings":";;;;;;AACA,sEAAuC;AAIvC,qDAAkD;AAClD,uCAA0D;AAE1D,IAAY,IAUX;AAVD,WAAY,IAAI;IACd,6CAAqC,CAAA;IACrC,+CAAuC,CAAA;IACvC;;OAEG;IACH,+DAAuD,CAAA;IACvD,iDAAyC,CAAA;IACzC,6CAAqC,CAAA;IACrC,mDAA2C,CAAA;AAC7C,CAAC,EAVW,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAUf;AAEM,KAAK,UAAU,gBAAgB,CACpC,GAAuB,EACvB,IAAU,EACV,EAAE,SAAS,KAA6C,EAAE;;IAE1D,MAAM,UAAU,GAAG,GAAG,CAAC,2BAA2B,CAAC;IACnD,MAAM,WAAW,GAAG,IAAA,yBAAe,EAAC,UAAU,CAAC,CAAC;IAChD,IAAI,MAAA,WAAW,CAAC,OAAO,0CAAG,IAAI,CAAC,EAAE;QAC/B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,6CAA6C,CAAC,CAAC;QAC9E,wFAAwF;QACxF,yBAAyB;QACzB,MAAM,cAAc,GAClB,CAAC,MAAM,IAAA,sBAAY,EAAC,UAAU,CAAC,CAAC,IAAI,IAAI,KAAK,IAAI,CAAC,WAAW;YAC3D,CAAC,CAAC,+BAAc,CAAC,GAAG;YACpB,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC;QACzB,MAAM,IAAA,sBAAK,EAAC,cAAc,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE;YACzC,GAAG,EAAE,UAAU;YACf,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,GAAG,kCACE,GAAG,CAAC,GAAG,GACP,SAAS,CACb;SACF,CAAC,CAAC;KACJ;AACH,CAAC;AAxBD,4CAwBC","sourcesContent":["import { Job } from '@expo/eas-build-job';\nimport spawn from '@expo/turtle-spawn';\n\nimport { BuildContext } from '../context';\n\nimport { PackageManager } from './packageManager';\nimport { isUsingYarn2, readPackageJson } from './project';\n\nexport enum Hook {\n  PRE_INSTALL = 'eas-build-pre-install',\n  POST_INSTALL = 'eas-build-post-install',\n  /**\n   * @deprecated\n   */\n  PRE_UPLOAD_ARTIFACTS = 'eas-build-pre-upload-artifacts',\n  ON_BUILD_SUCCESS = 'eas-build-on-success',\n  ON_BUILD_ERROR = 'eas-build-on-error',\n  ON_BUILD_COMPLETE = 'eas-build-on-complete',\n}\n\nexport async function runHookIfPresent<TJob extends Job>(\n  ctx: BuildContext<TJob>,\n  hook: Hook,\n  { extraEnvs }: { extraEnvs?: Record<string, string> } = {}\n): Promise<void> {\n  const projectDir = ctx.reactNativeProjectDirectory;\n  const packageJson = readPackageJson(projectDir);\n  if (packageJson.scripts?.[hook]) {\n    ctx.logger.info(`Script '${hook}' is present in package.json, running it...`);\n    // when using yarn 2, it's not possible to run any scripts before running 'yarn install'\n    // use 'npm' in that case\n    const packageManager =\n      (await isUsingYarn2(projectDir)) && hook === Hook.PRE_INSTALL\n        ? PackageManager.NPM\n        : ctx.packageManager;\n    await spawn(packageManager, ['run', hook], {\n      cwd: projectDir,\n      logger: ctx.logger,\n      env: {\n        ...ctx.env,\n        ...extraEnvs,\n      },\n    });\n  }\n}\n"]}
+{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../src/utils/hooks.ts"],"names":[],"mappings":";;;;;;AACA,sEAAuC;AAIvC,qDAAkD;AAClD,uCAA0D;AAE1D,IAAY,IAUX;AAVD,WAAY,IAAI;IACd,6CAAqC,CAAA;IACrC,+CAAuC,CAAA;IACvC;;OAEG;IACH,+DAAuD,CAAA;IACvD,iDAAyC,CAAA;IACzC,6CAAqC,CAAA;IACrC,mDAA2C,CAAA;AAC7C,CAAC,EAVW,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAUf;AAEM,KAAK,UAAU,gBAAgB,CACpC,GAAuB,EACvB,IAAU,EACV,EAAE,SAAS,KAA6C,EAAE;;IAE1D,MAAM,UAAU,GAAG,GAAG,CAAC,2BAA2B,CAAC;IACnD,MAAM,WAAW,GAAG,IAAA,yBAAe,EAAC,UAAU,CAAC,CAAC;IAChD,IAAI,MAAA,WAAW,CAAC,OAAO,0CAAG,IAAI,CAAC,EAAE;QAC/B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,6CAA6C,CAAC,CAAC;QAC9E,wFAAwF;QACxF,yBAAyB;QACzB,MAAM,cAAc,GAClB,CAAC,MAAM,IAAA,sBAAY,EAAC,UAAU,CAAC,CAAC,IAAI,IAAI,KAAK,IAAI,CAAC,WAAW;YAC3D,CAAC,CAAC,+BAAc,CAAC,GAAG;YACpB,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC;QACzB,MAAM,IAAA,sBAAK,EAAC,cAAc,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE;YACzC,GAAG,EAAE,UAAU;YACf,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,GAAG,EAAE;gBACH,GAAG,GAAG,CAAC,GAAG;gBACV,GAAG,SAAS;aACb;SACF,CAAC,CAAC;KACJ;AACH,CAAC;AAxBD,4CAwBC","sourcesContent":["import { Job } from '@expo/eas-build-job';\nimport spawn from '@expo/turtle-spawn';\n\nimport { BuildContext } from '../context';\n\nimport { PackageManager } from './packageManager';\nimport { isUsingYarn2, readPackageJson } from './project';\n\nexport enum Hook {\n  PRE_INSTALL = 'eas-build-pre-install',\n  POST_INSTALL = 'eas-build-post-install',\n  /**\n   * @deprecated\n   */\n  PRE_UPLOAD_ARTIFACTS = 'eas-build-pre-upload-artifacts',\n  ON_BUILD_SUCCESS = 'eas-build-on-success',\n  ON_BUILD_ERROR = 'eas-build-on-error',\n  ON_BUILD_COMPLETE = 'eas-build-on-complete',\n}\n\nexport async function runHookIfPresent<TJob extends Job>(\n  ctx: BuildContext<TJob>,\n  hook: Hook,\n  { extraEnvs }: { extraEnvs?: Record<string, string> } = {}\n): Promise<void> {\n  const projectDir = ctx.reactNativeProjectDirectory;\n  const packageJson = readPackageJson(projectDir);\n  if (packageJson.scripts?.[hook]) {\n    ctx.logger.info(`Script '${hook}' is present in package.json, running it...`);\n    // when using yarn 2, it's not possible to run any scripts before running 'yarn install'\n    // use 'npm' in that case\n    const packageManager =\n      (await isUsingYarn2(projectDir)) && hook === Hook.PRE_INSTALL\n        ? PackageManager.NPM\n        : ctx.packageManager;\n    await spawn(packageManager, ['run', hook], {\n      cwd: projectDir,\n      logger: ctx.logger,\n      env: {\n        ...ctx.env,\n        ...extraEnvs,\n      },\n    });\n  }\n}\n"]}

package/dist/utils/packageManager.d.ts

@@ -5,3 +5,4 @@ export declare enum PackageManager {
 }
 export declare function resolvePackageManager(directory: string): PackageManager;
 export declare function findPackagerRootDir(currentDir: string): string;
+export declare function isAtLeastNpm7Async(): Promise<boolean>;

package/dist/utils/packageManager.js

@@ -22,9 +22,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findPackagerRootDir = exports.resolvePackageManager = exports.PackageManager = void 0;
+exports.isAtLeastNpm7Async = exports.findPackagerRootDir = exports.resolvePackageManager = exports.PackageManager = void 0;
+const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
 const PackageManagerUtils = __importStar(require("@expo/package-manager"));
+const semver_1 = __importDefault(require("semver"));
 var PackageManager;
 (function (PackageManager) {
     PackageManager["YARN"] = "yarn";
@@ -44,7 +49,7 @@ function resolvePackageManager(directory) {
             return PackageManager.YARN;
         }
     }
-    catch (_a) {
+    catch {
         return PackageManager.YARN;
     }
 }
@@ -54,4 +59,9 @@ function findPackagerRootDir(currentDir) {
     return (_a = PackageManagerUtils.findWorkspaceRoot(currentDir)) !== null && _a !== void 0 ? _a : currentDir;
 }
 exports.findPackagerRootDir = findPackagerRootDir;
+async function isAtLeastNpm7Async() {
+    const version = (await (0, turtle_spawn_1.default)('npm', ['--version'])).stdout.trim();
+    return semver_1.default.gte(version, '7.0.0');
+}
+exports.isAtLeastNpm7Async = isAtLeastNpm7Async;
 //# sourceMappingURL=packageManager.js.map

package/dist/utils/packageManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageManager.js","sourceRoot":"","sources":["../../src/utils/packageManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2EAA6D;AAE7D,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,+BAAa,CAAA;IACb,6BAAW,CAAA;IACX,+BAAa,CAAA;AACf,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AAED,SAAgB,qBAAqB,CAAC,SAAiB;IACrD,IAAI;QACF,MAAM,OAAO,GAAG,mBAAmB,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;QACrE,IAAI,OAAO,KAAK,KAAK,EAAE;YACrB,OAAO,cAAc,CAAC,GAAG,CAAC;SAC3B;aAAM,IAAI,OAAO,KAAK,MAAM,EAAE;YAC7B,OAAO,cAAc,CAAC,IAAI,CAAC;SAC5B;aAAM;YACL,OAAO,cAAc,CAAC,IAAI,CAAC;SAC5B;KACF;IAAC,WAAM;QACN,OAAO,cAAc,CAAC,IAAI,CAAC;KAC5B;AACH,CAAC;AAbD,sDAaC;AAED,SAAgB,mBAAmB,CAAC,UAAkB;;IACpD,OAAO,MAAA,mBAAmB,CAAC,iBAAiB,CAAC,UAAU,CAAC,mCAAI,UAAU,CAAC;AACzE,CAAC;AAFD,kDAEC","sourcesContent":["import * as PackageManagerUtils from '@expo/package-manager';\n\nexport enum PackageManager {\n  YARN = 'yarn',\n  NPM = 'npm',\n  PNPM = 'pnpm',\n}\n\nexport function resolvePackageManager(directory: string): PackageManager {\n  try {\n    const manager = PackageManagerUtils.resolvePackageManager(directory);\n    if (manager === 'npm') {\n      return PackageManager.NPM;\n    } else if (manager === 'pnpm') {\n      return PackageManager.PNPM;\n    } else {\n      return PackageManager.YARN;\n    }\n  } catch {\n    return PackageManager.YARN;\n  }\n}\n\nexport function findPackagerRootDir(currentDir: string): string {\n  return PackageManagerUtils.findWorkspaceRoot(currentDir) ?? currentDir;\n}\n"]}
+{"version":3,"file":"packageManager.js","sourceRoot":"","sources":["../../src/utils/packageManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAA4C;AAC5C,2EAA6D;AAC7D,oDAA4B;AAE5B,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,+BAAa,CAAA;IACb,6BAAW,CAAA;IACX,+BAAa,CAAA;AACf,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AAED,SAAgB,qBAAqB,CAAC,SAAiB;IACrD,IAAI;QACF,MAAM,OAAO,GAAG,mBAAmB,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;QACrE,IAAI,OAAO,KAAK,KAAK,EAAE;YACrB,OAAO,cAAc,CAAC,GAAG,CAAC;SAC3B;aAAM,IAAI,OAAO,KAAK,MAAM,EAAE;YAC7B,OAAO,cAAc,CAAC,IAAI,CAAC;SAC5B;aAAM;YACL,OAAO,cAAc,CAAC,IAAI,CAAC;SAC5B;KACF;IAAC,MAAM;QACN,OAAO,cAAc,CAAC,IAAI,CAAC;KAC5B;AACH,CAAC;AAbD,sDAaC;AAED,SAAgB,mBAAmB,CAAC,UAAkB;;IACpD,OAAO,MAAA,mBAAmB,CAAC,iBAAiB,CAAC,UAAU,CAAC,mCAAI,UAAU,CAAC;AACzE,CAAC;AAFD,kDAEC;AAEM,KAAK,UAAU,kBAAkB;IACtC,MAAM,OAAO,GAAG,CAAC,MAAM,IAAA,sBAAU,EAAC,KAAK,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACvE,OAAO,gBAAM,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACtC,CAAC;AAHD,gDAGC","sourcesContent":["import spawnAsync from '@expo/turtle-spawn';\nimport * as PackageManagerUtils from '@expo/package-manager';\nimport semver from 'semver';\n\nexport enum PackageManager {\n  YARN = 'yarn',\n  NPM = 'npm',\n  PNPM = 'pnpm',\n}\n\nexport function resolvePackageManager(directory: string): PackageManager {\n  try {\n    const manager = PackageManagerUtils.resolvePackageManager(directory);\n    if (manager === 'npm') {\n      return PackageManager.NPM;\n    } else if (manager === 'pnpm') {\n      return PackageManager.PNPM;\n    } else {\n      return PackageManager.YARN;\n    }\n  } catch {\n    return PackageManager.YARN;\n  }\n}\n\nexport function findPackagerRootDir(currentDir: string): string {\n  return PackageManagerUtils.findWorkspaceRoot(currentDir) ?? currentDir;\n}\n\nexport async function isAtLeastNpm7Async(): Promise<boolean> {\n  const version = (await spawnAsync('npm', ['--version'])).stdout.trim();\n  return semver.gte(version, '7.0.0');\n}\n"]}

package/dist/utils/project.d.ts

@@ -5,8 +5,9 @@ import { BuildContext } from '../context';
  * check if .yarnrc.yml exists in the project dir or in the workspace root dir
  */
 export declare function isUsingYarn2(projectDir: string): Promise<boolean>;
-export declare function runExpoCliCommand<TJob extends Job>(ctx: BuildContext<TJob>, args: string[], options: SpawnOptions, { forceUseGlobalExpoCli }?: {
-    forceUseGlobalExpoCli?: boolean | undefined;
+export declare function runExpoCliCommand<TJob extends Job>(ctx: BuildContext<TJob>, args: string[], options: SpawnOptions, { forceUseGlobalExpoCli, npmVersionAtLeast7, }: {
+    forceUseGlobalExpoCli?: boolean;
+    npmVersionAtLeast7: boolean;
 }): SpawnPromise<SpawnResult>;
 export declare function shouldUseGlobalExpoCli<TJob extends Job>(ctx: BuildContext<TJob>, forceUseGlobalExpoCli?: boolean): boolean;
 export declare function readPackageJson(projectDir: string): any;

package/dist/utils/project.js

@@ -18,9 +18,9 @@ async function isUsingYarn2(projectDir) {
     return (await fs_extra_1.default.pathExists(yarnrcPath)) || (await fs_extra_1.default.pathExists(yarnrcRootPath));
 }
 exports.isUsingYarn2 = isUsingYarn2;
-function runExpoCliCommand(ctx, args, options, { forceUseGlobalExpoCli = false } = {}) {
+function runExpoCliCommand(ctx, args, options, { forceUseGlobalExpoCli = false, npmVersionAtLeast7, }) {
     if (shouldUseGlobalExpoCli(ctx, forceUseGlobalExpoCli)) {
-        return ctx.runGlobalExpoCliCommand(args.join(' '), options);
+        return ctx.runGlobalExpoCliCommand(args, options, npmVersionAtLeast7);
     }
     else {
         const argsWithExpo = ['expo', ...args];

package/dist/utils/project.js.map

@@ -1 +1 @@
-{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/utils/project.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAGxB,sEAAoF;AACpF,wDAA0B;AAC1B,oDAA4B;AAG5B,4DAA8E;AAE9E;;GAEG;AACI,KAAK,UAAU,YAAY,CAAC,UAAkB;IACnD,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IACxD,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,IAAA,oCAAmB,EAAC,UAAU,CAAC,EAAE,aAAa,CAAC,CAAC;IACjF,OAAO,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC;AACpF,CAAC;AAJD,oCAIC;AAED,SAAgB,iBAAiB,CAC/B,GAAuB,EACvB,IAAc,EACd,OAAqB,EACrB,EAAE,qBAAqB,GAAG,KAAK,EAAE,GAAG,EAAE;IAEtC,IAAI,sBAAsB,CAAC,GAAG,EAAE,qBAAqB,CAAC,EAAE;QACtD,OAAO,GAAG,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;KAC7D;SAAM;QACL,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;QACvC,IAAI,GAAG,CAAC,cAAc,KAAK,+BAAc,CAAC,GAAG,EAAE;YAC7C,OAAO,IAAA,sBAAK,EAAC,KAAK,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;SAC5C;aAAM,IAAI,GAAG,CAAC,cAAc,KAAK,+BAAc,CAAC,IAAI,EAAE;YACrD,OAAO,IAAA,sBAAK,EAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;SAC7C;aAAM,IAAI,GAAG,CAAC,cAAc,KAAK,+BAAc,CAAC,IAAI,EAAE;YACrD,OAAO,IAAA,sBAAK,EAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;SAC7C;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC;SACvE;KACF;AACH,CAAC;AApBD,8CAoBC;AAED,SAAgB,sBAAsB,CACpC,GAAuB,EACvB,qBAAqB,GAAG,KAAK;IAE7B,OAAO,CACL,qBAAqB;QACrB,GAAG,CAAC,GAAG,CAAC,kBAAkB,KAAK,GAAG;QAClC,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU;QACzB,gBAAM,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAClD,CAAC;AACJ,CAAC;AAVD,wDAUC;AAED,SAAgB,eAAe,CAAC,UAAkB;IAChD,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAC9D,IAAI,CAAC,kBAAE,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,kCAAkC,UAAU,EAAE,CAAC,CAAC;KACjE;IACD,IAAI;QACF,OAAO,kBAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;KACzC;IAAC,OAAO,GAAQ,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;KACzE;AACH,CAAC;AAVD,0CAUC","sourcesContent":["import path from 'path';\n\nimport { Job } from '@expo/eas-build-job';\nimport spawn, { SpawnOptions, SpawnPromise, SpawnResult } from '@expo/turtle-spawn';\nimport fs from 'fs-extra';\nimport semver from 'semver';\n\nimport { BuildContext } from '../context';\nimport { findPackagerRootDir, PackageManager } from '../utils/packageManager';\n\n/**\n * check if .yarnrc.yml exists in the project dir or in the workspace root dir\n */\nexport async function isUsingYarn2(projectDir: string): Promise<boolean> {\n  const yarnrcPath = path.join(projectDir, '.yarnrc.yml');\n  const yarnrcRootPath = path.join(findPackagerRootDir(projectDir), '.yarnrc.yml');\n  return (await fs.pathExists(yarnrcPath)) || (await fs.pathExists(yarnrcRootPath));\n}\n\nexport function runExpoCliCommand<TJob extends Job>(\n  ctx: BuildContext<TJob>,\n  args: string[],\n  options: SpawnOptions,\n  { forceUseGlobalExpoCli = false } = {}\n): SpawnPromise<SpawnResult> {\n  if (shouldUseGlobalExpoCli(ctx, forceUseGlobalExpoCli)) {\n    return ctx.runGlobalExpoCliCommand(args.join(' '), options);\n  } else {\n    const argsWithExpo = ['expo', ...args];\n    if (ctx.packageManager === PackageManager.NPM) {\n      return spawn('npx', argsWithExpo, options);\n    } else if (ctx.packageManager === PackageManager.YARN) {\n      return spawn('yarn', argsWithExpo, options);\n    } else if (ctx.packageManager === PackageManager.PNPM) {\n      return spawn('pnpm', argsWithExpo, options);\n    } else {\n      throw new Error(`Unsupported package manager: ${ctx.packageManager}`);\n    }\n  }\n}\n\nexport function shouldUseGlobalExpoCli<TJob extends Job>(\n  ctx: BuildContext<TJob>,\n  forceUseGlobalExpoCli = false\n): boolean {\n  return (\n    forceUseGlobalExpoCli ||\n    ctx.env.EXPO_USE_LOCAL_CLI === '0' ||\n    !ctx.appConfig.sdkVersion ||\n    semver.satisfies(ctx.appConfig.sdkVersion, '<46')\n  );\n}\n\nexport function readPackageJson(projectDir: string): any {\n  const packageJsonPath = path.join(projectDir, 'package.json');\n  if (!fs.pathExistsSync(packageJsonPath)) {\n    throw new Error(`package.json does not exist in ${projectDir}`);\n  }\n  try {\n    return fs.readJSONSync(packageJsonPath);\n  } catch (err: any) {\n    throw new Error(`Failed to parse or read package.json: ${err.message}`);\n  }\n}\n"]}
+{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/utils/project.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAGxB,sEAAoF;AACpF,wDAA0B;AAC1B,oDAA4B;AAG5B,4DAA8E;AAE9E;;GAEG;AACI,KAAK,UAAU,YAAY,CAAC,UAAkB;IACnD,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IACxD,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,IAAA,oCAAmB,EAAC,UAAU,CAAC,EAAE,aAAa,CAAC,CAAC;IACjF,OAAO,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC;AACpF,CAAC;AAJD,oCAIC;AAED,SAAgB,iBAAiB,CAC/B,GAAuB,EACvB,IAAc,EACd,OAAqB,EACrB,EACE,qBAAqB,GAAG,KAAK,EAC7B,kBAAkB,GAC+C;IAEnE,IAAI,sBAAsB,CAAC,GAAG,EAAE,qBAAqB,CAAC,EAAE;QACtD,OAAO,GAAG,CAAC,uBAAuB,CAAC,IAAI,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;KACvE;SAAM;QACL,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;QACvC,IAAI,GAAG,CAAC,cAAc,KAAK,+BAAc,CAAC,GAAG,EAAE;YAC7C,OAAO,IAAA,sBAAK,EAAC,KAAK,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;SAC5C;aAAM,IAAI,GAAG,CAAC,cAAc,KAAK,+BAAc,CAAC,IAAI,EAAE;YACrD,OAAO,IAAA,sBAAK,EAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;SAC7C;aAAM,IAAI,GAAG,CAAC,cAAc,KAAK,+BAAc,CAAC,IAAI,EAAE;YACrD,OAAO,IAAA,sBAAK,EAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;SAC7C;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC;SACvE;KACF;AACH,CAAC;AAvBD,8CAuBC;AAED,SAAgB,sBAAsB,CACpC,GAAuB,EACvB,qBAAqB,GAAG,KAAK;IAE7B,OAAO,CACL,qBAAqB;QACrB,GAAG,CAAC,GAAG,CAAC,kBAAkB,KAAK,GAAG;QAClC,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU;QACzB,gBAAM,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAClD,CAAC;AACJ,CAAC;AAVD,wDAUC;AAED,SAAgB,eAAe,CAAC,UAAkB;IAChD,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAC9D,IAAI,CAAC,kBAAE,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,kCAAkC,UAAU,EAAE,CAAC,CAAC;KACjE;IACD,IAAI;QACF,OAAO,kBAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;KACzC;IAAC,OAAO,GAAQ,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;KACzE;AACH,CAAC;AAVD,0CAUC","sourcesContent":["import path from 'path';\n\nimport { Job } from '@expo/eas-build-job';\nimport spawn, { SpawnOptions, SpawnPromise, SpawnResult } from '@expo/turtle-spawn';\nimport fs from 'fs-extra';\nimport semver from 'semver';\n\nimport { BuildContext } from '../context';\nimport { findPackagerRootDir, PackageManager } from '../utils/packageManager';\n\n/**\n * check if .yarnrc.yml exists in the project dir or in the workspace root dir\n */\nexport async function isUsingYarn2(projectDir: string): Promise<boolean> {\n  const yarnrcPath = path.join(projectDir, '.yarnrc.yml');\n  const yarnrcRootPath = path.join(findPackagerRootDir(projectDir), '.yarnrc.yml');\n  return (await fs.pathExists(yarnrcPath)) || (await fs.pathExists(yarnrcRootPath));\n}\n\nexport function runExpoCliCommand<TJob extends Job>(\n  ctx: BuildContext<TJob>,\n  args: string[],\n  options: SpawnOptions,\n  {\n    forceUseGlobalExpoCli = false,\n    npmVersionAtLeast7,\n  }: { forceUseGlobalExpoCli?: boolean; npmVersionAtLeast7: boolean }\n): SpawnPromise<SpawnResult> {\n  if (shouldUseGlobalExpoCli(ctx, forceUseGlobalExpoCli)) {\n    return ctx.runGlobalExpoCliCommand(args, options, npmVersionAtLeast7);\n  } else {\n    const argsWithExpo = ['expo', ...args];\n    if (ctx.packageManager === PackageManager.NPM) {\n      return spawn('npx', argsWithExpo, options);\n    } else if (ctx.packageManager === PackageManager.YARN) {\n      return spawn('yarn', argsWithExpo, options);\n    } else if (ctx.packageManager === PackageManager.PNPM) {\n      return spawn('pnpm', argsWithExpo, options);\n    } else {\n      throw new Error(`Unsupported package manager: ${ctx.packageManager}`);\n    }\n  }\n}\n\nexport function shouldUseGlobalExpoCli<TJob extends Job>(\n  ctx: BuildContext<TJob>,\n  forceUseGlobalExpoCli = false\n): boolean {\n  return (\n    forceUseGlobalExpoCli ||\n    ctx.env.EXPO_USE_LOCAL_CLI === '0' ||\n    !ctx.appConfig.sdkVersion ||\n    semver.satisfies(ctx.appConfig.sdkVersion, '<46')\n  );\n}\n\nexport function readPackageJson(projectDir: string): any {\n  const packageJsonPath = path.join(projectDir, 'package.json');\n  if (!fs.pathExistsSync(packageJsonPath)) {\n    throw new Error(`package.json does not exist in ${projectDir}`);\n  }\n  try {\n    return fs.readJSONSync(packageJsonPath);\n  } catch (err: any) {\n    throw new Error(`Failed to parse or read package.json: ${err.message}`);\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "0.1.170",
+  "version": "0.1.172",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -13,50 +13,51 @@
     "build": "tsc",
     "prepack": "rm -rf dist && tsc -p tsconfig.build.json",
     "test": "jest --config jest.config.js",
-    "test:watch": "jest --config jest.config.js --watch"
+    "test:watch": "jest --config jest.config.js --watch",
+    "clean": "rm -rf node_modules dist coverage"
   },
   "author": "Expo <support@expo.io>",
   "bugs": "https://github.com/expo/eas-build/issues",
   "license": "BUSL-1.1",
   "dependencies": {
-    "@expo/config": "7.0.1",
-    "@expo/config-plugins": "5.0.1",
-    "@expo/downloader": "0.0.21",
-    "@expo/eas-build-job": "0.2.102",
-    "@expo/logger": "0.0.25",
-    "@expo/package-manager": "0.0.54",
-    "@expo/plist": "^0.0.11",
-    "@expo/template-file": "0.1.23",
-    "@expo/turtle-spawn": "0.0.26",
-    "@expo/xcpretty": "4.1.3",
-    "fast-glob": "^3.2.5",
-    "fs-extra": "^10.0.1",
-    "joi": "^17.4.2",
+    "@expo/config": "^7.0.3",
+    "@expo/config-plugins": "^5.0.4",
+    "@expo/downloader": "0.0.22",
+    "@expo/eas-build-job": "0.2.104",
+    "@expo/logger": "0.0.26",
+    "@expo/package-manager": "^0.0.57",
+    "@expo/plist": "^0.0.20",
+    "@expo/template-file": "0.1.24",
+    "@expo/turtle-spawn": "0.0.27",
+    "@expo/xcpretty": "^4.2.2",
+    "fast-glob": "^3.2.12",
+    "fs-extra": "^11.1.0",
+    "joi": "^17.7.0",
     "lodash": "^4.17.21",
-    "node-forge": "^1.2.1",
+    "node-forge": "^1.3.1",
     "nullthrows": "^1.1.1",
-    "plist": "^3.0.1",
-    "semver": "^7.3.7"
+    "plist": "^3.0.6",
+    "semver": "^7.3.8"
   },
   "devDependencies": {
-    "@types/fs-extra": "^9.0.13",
-    "@types/jest": "^26.0.20",
+    "@types/fs-extra": "^11.0.1",
+    "@types/jest": "^29.2.6",
     "@types/lodash": "^4.14.191",
-    "@types/node": "^16.11.26",
-    "@types/node-forge": "^1.0.1",
+    "@types/node": "^18.11.18",
+    "@types/node-forge": "^1.3.1",
     "@types/plist": "^3.0.2",
-    "@types/semver": "^7.3.9",
-    "@types/uuid": "^3.4.5",
-    "@types/xml2js": "^0.4.5",
-    "jest": "^27.5.1",
-    "memfs": "^3.4.1",
-    "ts-jest": "^27.1.3",
+    "@types/semver": "^7.3.13",
+    "@types/uuid": "^9.0.0",
+    "@types/xml2js": "^0.4.11",
+    "jest": "^29.4.0",
+    "memfs": "^3.4.13",
+    "ts-jest": "^29.0.5",
     "ts-mockito": "^2.6.1",
-    "typescript": "^4.6.2",
-    "uuid": "^8.3.2"
+    "typescript": "^4.9.4",
+    "uuid": "^9.0.0"
   },
   "volta": {
-    "node": "16.13.2",
-    "yarn": "1.22.17"
+    "node": "18.13.0",
+    "yarn": "1.22.19"
   }
 }