@expo/cli 0.24.6 → 0.24.8

package/build/src/utils/remote-build-cache-providers/index.js

@@ -0,0 +1,168 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    resolvePluginFunction: function() {
+        return resolvePluginFunction;
+    },
+    resolveRemoteBuildCache: function() {
+        return resolveRemoteBuildCache;
+    },
+    resolveRemoteBuildCacheProvider: function() {
+        return resolveRemoteBuildCacheProvider;
+    },
+    uploadRemoteBuildCache: function() {
+        return uploadRemoteBuildCache;
+    }
+});
+function _resolvefrom() {
+    const data = /*#__PURE__*/ _interop_require_default(require("resolve-from"));
+    _resolvefrom = function() {
+        return data;
+    };
+    return data;
+}
+const _eas = require("./eas");
+const _helpers = require("./helpers");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const debug = require('debug')('expo:run:remote-build');
+const resolveRemoteBuildCacheProvider = (provider, projectRoot)=>{
+    if (!provider) {
+        return;
+    }
+    if (provider === 'eas') {
+        return {
+            plugin: _eas.EASRemoteBuildCacheProvider,
+            options: {}
+        };
+    }
+    if (typeof provider === 'object' && typeof provider.plugin === 'string') {
+        const plugin = resolvePluginFunction(projectRoot, provider.plugin);
+        return {
+            plugin,
+            options: provider.options
+        };
+    }
+    throw new Error('Invalid remote build cache provider');
+};
+async function resolveRemoteBuildCache({ projectRoot, platform, provider, runOptions }) {
+    const fingerprintHash = await calculateFingerprintHashAsync({
+        projectRoot,
+        platform,
+        provider,
+        runOptions
+    });
+    if (!fingerprintHash) {
+        return null;
+    }
+    return await provider.plugin.resolveRemoteBuildCache({
+        fingerprintHash,
+        platform,
+        runOptions,
+        projectRoot
+    }, provider.options);
+}
+async function uploadRemoteBuildCache({ projectRoot, platform, provider, buildPath, runOptions }) {
+    const fingerprintHash = await calculateFingerprintHashAsync({
+        projectRoot,
+        platform,
+        provider,
+        runOptions
+    });
+    if (!fingerprintHash) {
+        debug('No fingerprint hash found, skipping upload');
+        return;
+    }
+    await provider.plugin.uploadRemoteBuildCache({
+        projectRoot,
+        platform,
+        fingerprintHash,
+        buildPath,
+        runOptions
+    }, provider.options);
+}
+async function calculateFingerprintHashAsync({ projectRoot, platform, provider, runOptions }) {
+    if (provider.plugin.calculateFingerprintHash) {
+        return await provider.plugin.calculateFingerprintHash({
+            projectRoot,
+            platform,
+            runOptions
+        }, provider.options);
+    }
+    const Fingerprint = importFingerprintForDev(projectRoot);
+    if (!Fingerprint) {
+        debug('@expo/fingerprint is not installed in the project, unable to calculate fingerprint');
+        return null;
+    }
+    const fingerprint = await Fingerprint.createFingerprintAsync(projectRoot);
+    return fingerprint.hash;
+}
+function importFingerprintForDev(projectRoot) {
+    try {
+        return require(require.resolve('@expo/fingerprint', {
+            paths: [
+                projectRoot
+            ]
+        }));
+    } catch  {
+        return null;
+    }
+}
+/**
+ * Resolve the provider plugin from a node module or package.
+ * If the module or package does not include a provider plugin, this function throws.
+ * The resolution is done in following order:
+ *   1. Is the reference a relative file path or an import specifier with file path? e.g. `./file.js`, `pkg/file.js` or `@org/pkg/file.js`?
+ *     - Resolve the provider plugin as-is
+ *   2. Does the module have a valid provider plugin in the `main` field?
+ *     - Resolve the `main` entry point as provider plugin
+ */ function resolvePluginFilePathForModule(projectRoot, pluginReference) {
+    if ((0, _helpers.moduleNameIsDirectFileReference)(pluginReference)) {
+        // Only resolve `./file.js`, `package/file.js`, `@org/package/file.js`
+        const pluginScriptFile = _resolvefrom().default.silent(projectRoot, pluginReference);
+        if (pluginScriptFile) {
+            return pluginScriptFile;
+        }
+    } else if ((0, _helpers.moduleNameIsPackageReference)(pluginReference)) {
+        // Try to resole the `main` entry as config plugin
+        const packageMainEntry = _resolvefrom().default.silent(projectRoot, pluginReference);
+        if (packageMainEntry) {
+            return packageMainEntry;
+        }
+    }
+    throw new Error(`Failed to resolve provider plugin for module "${pluginReference}" relative to "${projectRoot}". Do you have node modules installed?`);
+}
+function resolvePluginFunction(projectRoot, pluginReference) {
+    const pluginFile = resolvePluginFilePathForModule(projectRoot, pluginReference);
+    try {
+        let plugin = require(pluginFile);
+        if ((plugin == null ? void 0 : plugin.default) != null) {
+            plugin = plugin.default;
+        }
+        if (typeof plugin !== 'object' || typeof plugin.resolveRemoteBuildCache !== 'function' || typeof plugin.uploadRemoteBuildCache !== 'function') {
+            throw new Error(`
+        The provider plugin "${pluginReference}" must export an object containing
+        the resolveRemoteBuildCache and uploadRemoteBuildCache functions.
+      `);
+        }
+        return plugin;
+    } catch (error) {
+        if (error instanceof SyntaxError) {
+        // Add error linking to the docs of how create a valid provider plugin
+        }
+        throw error;
+    }
+}
+
+//# sourceMappingURL=index.js.map

package/build/src/utils/remote-build-cache-providers/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/utils/remote-build-cache-providers/index.ts"],"sourcesContent":["import {\n  ExpoConfig,\n  RemoteBuildCachePlugin,\n  RemoteBuildCacheProvider,\n  RunOptions,\n} from '@expo/config';\nimport resolveFrom from 'resolve-from';\n\nimport { EASRemoteBuildCacheProvider } from './eas';\nimport { moduleNameIsDirectFileReference, moduleNameIsPackageReference } from './helpers';\n\nconst debug = require('debug')('expo:run:remote-build') as typeof console.log;\n\nexport const resolveRemoteBuildCacheProvider = (\n  provider:\n    | Required<Required<ExpoConfig>['experiments']>['remoteBuildCache']['provider']\n    | undefined,\n  projectRoot: string\n): RemoteBuildCacheProvider | undefined => {\n  if (!provider) {\n    return;\n  }\n\n  if (provider === 'eas') {\n    return { plugin: EASRemoteBuildCacheProvider, options: {} };\n  }\n\n  if (typeof provider === 'object' && typeof provider.plugin === 'string') {\n    const plugin = resolvePluginFunction(projectRoot, provider.plugin);\n\n    return { plugin, options: provider.options };\n  }\n\n  throw new Error('Invalid remote build cache provider');\n};\n\nexport async function resolveRemoteBuildCache({\n  projectRoot,\n  platform,\n  provider,\n  runOptions,\n}: {\n  projectRoot: string;\n  platform: 'android' | 'ios';\n  provider: RemoteBuildCacheProvider;\n  runOptions: RunOptions;\n}): Promise<string | null> {\n  const fingerprintHash = await calculateFingerprintHashAsync({\n    projectRoot,\n    platform,\n    provider,\n    runOptions,\n  });\n  if (!fingerprintHash) {\n    return null;\n  }\n\n  return await provider.plugin.resolveRemoteBuildCache(\n    { fingerprintHash, platform, runOptions, projectRoot },\n    provider.options\n  );\n}\n\nexport async function uploadRemoteBuildCache({\n  projectRoot,\n  platform,\n  provider,\n  buildPath,\n  runOptions,\n}: {\n  projectRoot: string;\n  platform: 'android' | 'ios';\n  provider: RemoteBuildCacheProvider;\n  buildPath: string;\n  runOptions: RunOptions;\n}): Promise<void> {\n  const fingerprintHash = await calculateFingerprintHashAsync({\n    projectRoot,\n    platform,\n    provider,\n    runOptions,\n  });\n  if (!fingerprintHash) {\n    debug('No fingerprint hash found, skipping upload');\n    return;\n  }\n\n  await provider.plugin.uploadRemoteBuildCache(\n    {\n      projectRoot,\n      platform,\n      fingerprintHash,\n      buildPath,\n      runOptions,\n    },\n    provider.options\n  );\n}\n\nasync function calculateFingerprintHashAsync({\n  projectRoot,\n  platform,\n  provider,\n  runOptions,\n}: {\n  projectRoot: string;\n  platform: 'android' | 'ios';\n  provider: RemoteBuildCacheProvider;\n  runOptions: RunOptions;\n}): Promise<string | null> {\n  if (provider.plugin.calculateFingerprintHash) {\n    return await provider.plugin.calculateFingerprintHash(\n      { projectRoot, platform, runOptions },\n      provider.options\n    );\n  }\n\n  const Fingerprint = importFingerprintForDev(projectRoot);\n  if (!Fingerprint) {\n    debug('@expo/fingerprint is not installed in the project, unable to calculate fingerprint');\n    return null;\n  }\n  const fingerprint = await Fingerprint.createFingerprintAsync(projectRoot);\n\n  return fingerprint.hash;\n}\n\nfunction importFingerprintForDev(projectRoot: string): null | typeof import('@expo/fingerprint') {\n  try {\n    return require(require.resolve('@expo/fingerprint', { paths: [projectRoot] }));\n  } catch {\n    return null;\n  }\n}\n\n/**\n * Resolve the provider plugin from a node module or package.\n * If the module or package does not include a provider plugin, this function throws.\n * The resolution is done in following order:\n *   1. Is the reference a relative file path or an import specifier with file path? e.g. `./file.js`, `pkg/file.js` or `@org/pkg/file.js`?\n *     - Resolve the provider plugin as-is\n *   2. Does the module have a valid provider plugin in the `main` field?\n *     - Resolve the `main` entry point as provider plugin\n */\nfunction resolvePluginFilePathForModule(projectRoot: string, pluginReference: string) {\n  if (moduleNameIsDirectFileReference(pluginReference)) {\n    // Only resolve `./file.js`, `package/file.js`, `@org/package/file.js`\n    const pluginScriptFile = resolveFrom.silent(projectRoot, pluginReference);\n    if (pluginScriptFile) {\n      return pluginScriptFile;\n    }\n  } else if (moduleNameIsPackageReference(pluginReference)) {\n    // Try to resole the `main` entry as config plugin\n    const packageMainEntry = resolveFrom.silent(projectRoot, pluginReference);\n    if (packageMainEntry) {\n      return packageMainEntry;\n    }\n  }\n\n  throw new Error(\n    `Failed to resolve provider plugin for module \"${pluginReference}\" relative to \"${projectRoot}\". Do you have node modules installed?`\n  );\n}\n\n// Resolve the module function and assert type\nexport function resolvePluginFunction(\n  projectRoot: string,\n  pluginReference: string\n): RemoteBuildCachePlugin {\n  const pluginFile = resolvePluginFilePathForModule(projectRoot, pluginReference);\n\n  try {\n    let plugin = require(pluginFile);\n    if (plugin?.default != null) {\n      plugin = plugin.default;\n    }\n\n    if (\n      typeof plugin !== 'object' ||\n      typeof plugin.resolveRemoteBuildCache !== 'function' ||\n      typeof plugin.uploadRemoteBuildCache !== 'function'\n    ) {\n      throw new Error(`\n        The provider plugin \"${pluginReference}\" must export an object containing\n        the resolveRemoteBuildCache and uploadRemoteBuildCache functions.\n      `);\n    }\n    return plugin;\n  } catch (error) {\n    if (error instanceof SyntaxError) {\n      // Add error linking to the docs of how create a valid provider plugin\n    }\n    throw error;\n  }\n}\n"],"names":["resolvePluginFunction","resolveRemoteBuildCache","resolveRemoteBuildCacheProvider","uploadRemoteBuildCache","debug","require","provider","projectRoot","plugin","EASRemoteBuildCacheProvider","options","Error","platform","runOptions","fingerprintHash","calculateFingerprintHashAsync","buildPath","calculateFingerprintHash","Fingerprint","importFingerprintForDev","fingerprint","createFingerprintAsync","hash","resolve","paths","resolvePluginFilePathForModule","pluginReference","moduleNameIsDirectFileReference","pluginScriptFile","resolveFrom","silent","moduleNameIsPackageReference","packageMainEntry","pluginFile","default","error","SyntaxError"],"mappings":"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"}

package/build/src/utils/telemetry/clients/FetchClient.js

@@ -33,7 +33,7 @@ class FetchClient {
         this.headers = {
             accept: 'application/json',
             'content-type': 'application/json',
-            'user-agent': `expo-cli/${"0.24.6"}`,
+            'user-agent': `expo-cli/${"0.24.8"}`,
             authorization: 'Basic ' + _nodebuffer().Buffer.from(`${target}:`).toString('base64')
         };
     }

package/build/src/utils/telemetry/utils/context.js

@@ -83,7 +83,7 @@ function createContext() {
         cpu: summarizeCpuInfo(),
         app: {
             name: 'expo/cli',
-            version: "0.24.6"
+            version: "0.24.8"
         },
         ci: _ciinfo().isCI ? {
             name: _ciinfo().name,

package/build/src/utils/tsconfig/evaluateTsConfig.js

@@ -54,8 +54,13 @@ function evaluateTsConfig(ts, tsConfigPath) {
                 ]
         }, _path().default.dirname(tsConfigPath));
         if (jsonFileContents.errors) {
-            // filter out "no inputs were found in config file" error
-            jsonFileContents.errors = jsonFileContents.errors.filter(({ code })=>code !== 18003);
+            jsonFileContents.errors = jsonFileContents.errors.filter(({ code })=>{
+                // TS18003: filter out "no inputs were found in config file" error */
+                // TS6046: filter out "Argument for '--module' option must be" error
+                //         this error can be ignored since we're only typically interested in `paths` and `baseUrl`
+                return code !== 18003 && code !== 6046;
+            })// filter out non-error diagnostics
+            .filter(({ category })=>category !== 1 /*DiagnosticCategory.Error = 1*/ );
         }
         if ((_jsonFileContents_errors = jsonFileContents.errors) == null ? void 0 : _jsonFileContents_errors.length) {
             throw new Error(ts.formatDiagnostic(jsonFileContents.errors[0], formatDiagnosticsHost));

package/build/src/utils/tsconfig/evaluateTsConfig.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/utils/tsconfig/evaluateTsConfig.ts"],"sourcesContent":["import path from 'path';\nimport resolveFrom from 'resolve-from';\n\nexport function evaluateTsConfig(ts: typeof import('typescript'), tsConfigPath: string) {\n  const formatDiagnosticsHost: import('typescript').FormatDiagnosticsHost = {\n    getNewLine: () => require('os').EOL,\n    getCurrentDirectory: ts.sys.getCurrentDirectory,\n    getCanonicalFileName: (fileName: string) => fileName,\n  };\n\n  try {\n    const { config, error } = ts.readConfigFile(tsConfigPath, ts.sys.readFile);\n\n    if (error) {\n      throw new Error(ts.formatDiagnostic(error, formatDiagnosticsHost));\n    }\n\n    const jsonFileContents = ts.parseJsonConfigFileContent(\n      config,\n      {\n        ...ts.sys,\n        readDirectory: (_, ext) => [ext ? `file${ext[0]}` : `file.ts`],\n      },\n      path.dirname(tsConfigPath)\n    );\n\n    if (jsonFileContents.errors) {\n      // filter out \"no inputs were found in config file\" error\n      jsonFileContents.errors = jsonFileContents.errors.filter(({ code }) => code !== 18003);\n    }\n\n    if (jsonFileContents.errors?.length) {\n      throw new Error(ts.formatDiagnostic(jsonFileContents.errors[0], formatDiagnosticsHost));\n    }\n\n    return { compilerOptions: jsonFileContents.options, raw: config.raw };\n  } catch (error: any) {\n    if (error?.name === 'SyntaxError') {\n      throw new Error('tsconfig.json is invalid:\\n' + (error.message ?? ''));\n    }\n    throw error;\n  }\n}\n\nexport function importTypeScriptFromProjectOptionally(\n  projectRoot: string\n): typeof import('typescript') | null {\n  const resolvedPath = resolveFrom.silent(projectRoot, 'typescript');\n  if (!resolvedPath) {\n    return null;\n  }\n  return require(resolvedPath);\n}\n"],"names":["evaluateTsConfig","importTypeScriptFromProjectOptionally","ts","tsConfigPath","formatDiagnosticsHost","getNewLine","require","EOL","getCurrentDirectory","sys","getCanonicalFileName","fileName","jsonFileContents","config","error","readConfigFile","readFile","Error","formatDiagnostic","parseJsonConfigFileContent","readDirectory","_","ext","path","dirname","errors","filter","code","length","compilerOptions","options","raw","name","message","projectRoot","resolvedPath","resolveFrom","silent"],"mappings":";;;;;;;;;;;IAGgBA,gBAAgB;eAAhBA;;IAyCAC,qCAAqC;eAArCA;;;;gEA5CC;;;;;;;gEACO;;;;;;;;;;;AAEjB,SAASD,iBAAiBE,EAA+B,EAAEC,YAAoB;IACpF,MAAMC,wBAAoE;QACxEC,YAAY,IAAMC,QAAQ,MAAMC,GAAG;QACnCC,qBAAqBN,GAAGO,GAAG,CAACD,mBAAmB;QAC/CE,sBAAsB,CAACC,WAAqBA;IAC9C;IAEA,IAAI;YAqBEC;QApBJ,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAE,GAAGZ,GAAGa,cAAc,CAACZ,cAAcD,GAAGO,GAAG,CAACO,QAAQ;QAEzE,IAAIF,OAAO;YACT,MAAM,IAAIG,MAAMf,GAAGgB,gBAAgB,CAACJ,OAAOV;QAC7C;QAEA,MAAMQ,mBAAmBV,GAAGiB,0BAA0B,CACpDN,QACA;YACE,GAAGX,GAAGO,GAAG;YACTW,eAAe,CAACC,GAAGC,MAAQ;oBAACA,MAAM,CAAC,IAAI,EAAEA,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC;iBAAC;QAChE,GACAC,eAAI,CAACC,OAAO,CAACrB;QAGf,IAAIS,iBAAiBa,MAAM,EAAE;YAC3B,yDAAyD;YACzDb,iBAAiBa,MAAM,GAAGb,iBAAiBa,MAAM,CAACC,MAAM,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAAS;QAClF;QAEA,KAAIf,2BAAAA,iBAAiBa,MAAM,qBAAvBb,yBAAyBgB,MAAM,EAAE;YACnC,MAAM,IAAIX,MAAMf,GAAGgB,gBAAgB,CAACN,iBAAiBa,MAAM,CAAC,EAAE,EAAErB;QAClE;QAEA,OAAO;YAAEyB,iBAAiBjB,iBAAiBkB,OAAO;YAAEC,KAAKlB,OAAOkB,GAAG;QAAC;IACtE,EAAE,OAAOjB,OAAY;QACnB,IAAIA,CAAAA,yBAAAA,MAAOkB,IAAI,MAAK,eAAe;YACjC,MAAM,IAAIf,MAAM,gCAAiCH,CAAAA,MAAMmB,OAAO,IAAI,EAAC;QACrE;QACA,MAAMnB;IACR;AACF;AAEO,SAASb,sCACdiC,WAAmB;IAEnB,MAAMC,eAAeC,sBAAW,CAACC,MAAM,CAACH,aAAa;IACrD,IAAI,CAACC,cAAc;QACjB,OAAO;IACT;IACA,OAAO7B,QAAQ6B;AACjB"}
+{"version":3,"sources":["../../../../src/utils/tsconfig/evaluateTsConfig.ts"],"sourcesContent":["import path from 'path';\nimport resolveFrom from 'resolve-from';\n\nexport function evaluateTsConfig(ts: typeof import('typescript'), tsConfigPath: string) {\n  const formatDiagnosticsHost: import('typescript').FormatDiagnosticsHost = {\n    getNewLine: () => require('os').EOL,\n    getCurrentDirectory: ts.sys.getCurrentDirectory,\n    getCanonicalFileName: (fileName: string) => fileName,\n  };\n\n  try {\n    const { config, error } = ts.readConfigFile(tsConfigPath, ts.sys.readFile);\n\n    if (error) {\n      throw new Error(ts.formatDiagnostic(error, formatDiagnosticsHost));\n    }\n\n    const jsonFileContents = ts.parseJsonConfigFileContent(\n      config,\n      {\n        ...ts.sys,\n        readDirectory: (_, ext) => [ext ? `file${ext[0]}` : `file.ts`],\n      },\n      path.dirname(tsConfigPath)\n    );\n\n    if (jsonFileContents.errors) {\n      jsonFileContents.errors = jsonFileContents.errors\n        .filter(({ code }) => {\n          // TS18003: filter out \"no inputs were found in config file\" error */\n          // TS6046: filter out \"Argument for '--module' option must be\" error\n          //         this error can be ignored since we're only typically interested in `paths` and `baseUrl`\n          return code !== 18003 && code !== 6046;\n        })\n        // filter out non-error diagnostics\n        .filter(({ category }) => category !== 1 /*DiagnosticCategory.Error = 1*/);\n    }\n\n    if (jsonFileContents.errors?.length) {\n      throw new Error(ts.formatDiagnostic(jsonFileContents.errors[0], formatDiagnosticsHost));\n    }\n\n    return { compilerOptions: jsonFileContents.options, raw: config.raw };\n  } catch (error: any) {\n    if (error?.name === 'SyntaxError') {\n      throw new Error('tsconfig.json is invalid:\\n' + (error.message ?? ''));\n    }\n    throw error;\n  }\n}\n\nexport function importTypeScriptFromProjectOptionally(\n  projectRoot: string\n): typeof import('typescript') | null {\n  const resolvedPath = resolveFrom.silent(projectRoot, 'typescript');\n  if (!resolvedPath) {\n    return null;\n  }\n  return require(resolvedPath);\n}\n"],"names":["evaluateTsConfig","importTypeScriptFromProjectOptionally","ts","tsConfigPath","formatDiagnosticsHost","getNewLine","require","EOL","getCurrentDirectory","sys","getCanonicalFileName","fileName","jsonFileContents","config","error","readConfigFile","readFile","Error","formatDiagnostic","parseJsonConfigFileContent","readDirectory","_","ext","path","dirname","errors","filter","code","category","length","compilerOptions","options","raw","name","message","projectRoot","resolvedPath","resolveFrom","silent"],"mappings":";;;;;;;;;;;IAGgBA,gBAAgB;eAAhBA;;IAgDAC,qCAAqC;eAArCA;;;;gEAnDC;;;;;;;gEACO;;;;;;;;;;;AAEjB,SAASD,iBAAiBE,EAA+B,EAAEC,YAAoB;IACpF,MAAMC,wBAAoE;QACxEC,YAAY,IAAMC,QAAQ,MAAMC,GAAG;QACnCC,qBAAqBN,GAAGO,GAAG,CAACD,mBAAmB;QAC/CE,sBAAsB,CAACC,WAAqBA;IAC9C;IAEA,IAAI;YA4BEC;QA3BJ,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAE,GAAGZ,GAAGa,cAAc,CAACZ,cAAcD,GAAGO,GAAG,CAACO,QAAQ;QAEzE,IAAIF,OAAO;YACT,MAAM,IAAIG,MAAMf,GAAGgB,gBAAgB,CAACJ,OAAOV;QAC7C;QAEA,MAAMQ,mBAAmBV,GAAGiB,0BAA0B,CACpDN,QACA;YACE,GAAGX,GAAGO,GAAG;YACTW,eAAe,CAACC,GAAGC,MAAQ;oBAACA,MAAM,CAAC,IAAI,EAAEA,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC;iBAAC;QAChE,GACAC,eAAI,CAACC,OAAO,CAACrB;QAGf,IAAIS,iBAAiBa,MAAM,EAAE;YAC3Bb,iBAAiBa,MAAM,GAAGb,iBAAiBa,MAAM,CAC9CC,MAAM,CAAC,CAAC,EAAEC,IAAI,EAAE;gBACf,qEAAqE;gBACrE,oEAAoE;gBACpE,mGAAmG;gBACnG,OAAOA,SAAS,SAASA,SAAS;YACpC,EACA,mCAAmC;aAClCD,MAAM,CAAC,CAAC,EAAEE,QAAQ,EAAE,GAAKA,aAAa,EAAE,8BAA8B;QAC3E;QAEA,KAAIhB,2BAAAA,iBAAiBa,MAAM,qBAAvBb,yBAAyBiB,MAAM,EAAE;YACnC,MAAM,IAAIZ,MAAMf,GAAGgB,gBAAgB,CAACN,iBAAiBa,MAAM,CAAC,EAAE,EAAErB;QAClE;QAEA,OAAO;YAAE0B,iBAAiBlB,iBAAiBmB,OAAO;YAAEC,KAAKnB,OAAOmB,GAAG;QAAC;IACtE,EAAE,OAAOlB,OAAY;QACnB,IAAIA,CAAAA,yBAAAA,MAAOmB,IAAI,MAAK,eAAe;YACjC,MAAM,IAAIhB,MAAM,gCAAiCH,CAAAA,MAAMoB,OAAO,IAAI,EAAC;QACrE;QACA,MAAMpB;IACR;AACF;AAEO,SAASb,sCACdkC,WAAmB;IAEnB,MAAMC,eAAeC,sBAAW,CAACC,MAAM,CAACH,aAAa;IACrD,IAAI,CAACC,cAAc;QACjB,OAAO;IACT;IACA,OAAO9B,QAAQ8B;AACjB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/cli",
-  "version": "0.24.6",
+  "version": "0.24.8",
   "description": "The Expo CLI",
   "main": "build/bin/cli",
   "bin": {
@@ -42,17 +42,17 @@
     "@0no-co/graphql.web": "^1.0.8",
     "@babel/runtime": "^7.20.0",
     "@expo/code-signing-certificates": "^0.0.5",
-    "@expo/config": "~11.0.5",
-    "@expo/config-plugins": "~9.1.7",
+    "@expo/config": "~11.0.6",
+    "@expo/config-plugins": "~10.0.0",
     "@expo/devcert": "^1.1.2",
     "@expo/env": "~1.0.4",
     "@expo/image-utils": "^0.7.3",
     "@expo/json-file": "^9.1.3",
-    "@expo/metro-config": "~0.20.8",
+    "@expo/metro-config": "~0.20.10",
     "@expo/osascript": "^2.2.3",
     "@expo/package-manager": "^1.8.3",
     "@expo/plist": "^0.3.3",
-    "@expo/prebuild-config": "^9.0.2",
+    "@expo/prebuild-config": "^9.0.3",
     "@expo/spawn-async": "^1.7.2",
     "@expo/ws-tunnel": "^1.0.1",
     "@expo/xcpretty": "^4.3.0",
@@ -152,5 +152,5 @@
     "tree-kill": "^1.2.2",
     "tsd": "^0.28.1"
   },
-  "gitHead": "a639a661a5329e58f916cf69b8f1a7718bbdd26e"
+  "gitHead": "bb2cf89d99a9d7f70b07419cc36cdf80c2764217"
 }

package/build/src/run/remoteBuildCache.js

@@ -1,80 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    resolveRemoteBuildCache: function() {
-        return resolveRemoteBuildCache;
-    },
-    uploadRemoteBuildCache: function() {
-        return uploadRemoteBuildCache;
-    }
-});
-const _eas = require("../utils/remote-build-cache-providers/eas");
-const debug = require('debug')('expo:run:remote-build');
-async function resolveRemoteBuildCache(projectRoot, { platform, provider, runOptions }) {
-    const fingerprintHash = await calculateFingerprintHashAsync(projectRoot, platform, provider);
-    if (!fingerprintHash) {
-        return null;
-    }
-    if (provider === 'eas') {
-        return await (0, _eas.resolveEASRemoteBuildCache)({
-            platform,
-            fingerprintHash,
-            projectRoot,
-            runOptions
-        });
-    }
-    return null;
-}
-async function uploadRemoteBuildCache(projectRoot, { platform, provider, buildPath }) {
-    const fingerprintHash = await calculateFingerprintHashAsync(projectRoot, platform, provider);
-    if (!fingerprintHash) {
-        return;
-    }
-    if (provider === 'eas') {
-        await (0, _eas.uploadEASRemoteBuildCache)({
-            projectRoot,
-            platform,
-            fingerprintHash,
-            buildPath
-        });
-    }
-}
-async function calculateFingerprintHashAsync(projectRoot, platform, provider) {
-    if (provider === 'eas') {
-        const easFingerprintHash = await (0, _eas.calculateEASFingerprintHashAsync)({
-            projectRoot,
-            platform
-        });
-        if (easFingerprintHash) {
-            return easFingerprintHash;
-        }
-    }
-    const Fingerprint = importFingerprintForDev(projectRoot);
-    if (!Fingerprint) {
-        debug('@expo/fingerprint is not installed in the project, skip checking for remote builds');
-        return null;
-    }
-    const fingerprint = await Fingerprint.createFingerprintAsync(projectRoot);
-    return fingerprint.hash;
-}
-function importFingerprintForDev(projectRoot) {
-    try {
-        return require(require.resolve('@expo/fingerprint', {
-            paths: [
-                projectRoot
-            ]
-        }));
-    } catch  {
-        return null;
-    }
-}
-
-//# sourceMappingURL=remoteBuildCache.js.map

package/build/src/run/remoteBuildCache.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/run/remoteBuildCache.ts"],"sourcesContent":["import { ExpoConfig } from '@expo/config';\nimport { ModPlatform } from '@expo/config-plugins';\n\nimport { type Options as AndroidRunOptions } from './android/resolveOptions';\nimport { type Options as IosRunOptions } from './ios/XcodeBuild.types';\nimport {\n  calculateEASFingerprintHashAsync,\n  resolveEASRemoteBuildCache,\n  uploadEASRemoteBuildCache,\n} from '../utils/remote-build-cache-providers/eas';\nconst debug = require('debug')('expo:run:remote-build') as typeof console.log;\n\nexport async function resolveRemoteBuildCache(\n  projectRoot: string,\n  {\n    platform,\n    provider,\n    runOptions,\n  }: {\n    platform: ModPlatform;\n    provider?: Required<Required<ExpoConfig>['experiments']>['remoteBuildCache']['provider'];\n    runOptions: AndroidRunOptions | IosRunOptions;\n  }\n): Promise<string | null> {\n  const fingerprintHash = await calculateFingerprintHashAsync(projectRoot, platform, provider);\n  if (!fingerprintHash) {\n    return null;\n  }\n\n  if (provider === 'eas') {\n    return await resolveEASRemoteBuildCache({ platform, fingerprintHash, projectRoot, runOptions });\n  }\n\n  return null;\n}\n\nexport async function uploadRemoteBuildCache(\n  projectRoot: string,\n  {\n    platform,\n    provider,\n    buildPath,\n  }: {\n    platform: ModPlatform;\n    provider?: Required<Required<ExpoConfig>['experiments']>['remoteBuildCache']['provider'];\n    buildPath?: string;\n  }\n): Promise<void> {\n  const fingerprintHash = await calculateFingerprintHashAsync(projectRoot, platform, provider);\n  if (!fingerprintHash) {\n    return;\n  }\n\n  if (provider === 'eas') {\n    await uploadEASRemoteBuildCache({\n      projectRoot,\n      platform,\n      fingerprintHash,\n      buildPath,\n    });\n  }\n}\n\nasync function calculateFingerprintHashAsync(\n  projectRoot: string,\n  platform: ModPlatform,\n  provider?: Required<Required<ExpoConfig>['experiments']>['remoteBuildCache']['provider']\n): Promise<string | null> {\n  if (provider === 'eas') {\n    const easFingerprintHash = await calculateEASFingerprintHashAsync({ projectRoot, platform });\n    if (easFingerprintHash) {\n      return easFingerprintHash;\n    }\n  }\n\n  const Fingerprint = importFingerprintForDev(projectRoot);\n  if (!Fingerprint) {\n    debug('@expo/fingerprint is not installed in the project, skip checking for remote builds');\n    return null;\n  }\n  const fingerprint = await Fingerprint.createFingerprintAsync(projectRoot);\n\n  return fingerprint.hash;\n}\n\nfunction importFingerprintForDev(projectRoot: string): null | typeof import('@expo/fingerprint') {\n  try {\n    return require(require.resolve('@expo/fingerprint', { paths: [projectRoot] }));\n  } catch {\n    return null;\n  }\n}\n"],"names":["resolveRemoteBuildCache","uploadRemoteBuildCache","debug","require","projectRoot","platform","provider","runOptions","fingerprintHash","calculateFingerprintHashAsync","resolveEASRemoteBuildCache","buildPath","uploadEASRemoteBuildCache","easFingerprintHash","calculateEASFingerprintHashAsync","Fingerprint","importFingerprintForDev","fingerprint","createFingerprintAsync","hash","resolve","paths"],"mappings":";;;;;;;;;;;IAYsBA,uBAAuB;eAAvBA;;IAwBAC,sBAAsB;eAAtBA;;;qBA3Bf;AACP,MAAMC,QAAQC,QAAQ,SAAS;AAExB,eAAeH,wBACpBI,WAAmB,EACnB,EACEC,QAAQ,EACRC,QAAQ,EACRC,UAAU,EAKX;IAED,MAAMC,kBAAkB,MAAMC,8BAA8BL,aAAaC,UAAUC;IACnF,IAAI,CAACE,iBAAiB;QACpB,OAAO;IACT;IAEA,IAAIF,aAAa,OAAO;QACtB,OAAO,MAAMI,IAAAA,+BAA0B,EAAC;YAAEL;YAAUG;YAAiBJ;YAAaG;QAAW;IAC/F;IAEA,OAAO;AACT;AAEO,eAAeN,uBACpBG,WAAmB,EACnB,EACEC,QAAQ,EACRC,QAAQ,EACRK,SAAS,EAKV;IAED,MAAMH,kBAAkB,MAAMC,8BAA8BL,aAAaC,UAAUC;IACnF,IAAI,CAACE,iBAAiB;QACpB;IACF;IAEA,IAAIF,aAAa,OAAO;QACtB,MAAMM,IAAAA,8BAAyB,EAAC;YAC9BR;YACAC;YACAG;YACAG;QACF;IACF;AACF;AAEA,eAAeF,8BACbL,WAAmB,EACnBC,QAAqB,EACrBC,QAAwF;IAExF,IAAIA,aAAa,OAAO;QACtB,MAAMO,qBAAqB,MAAMC,IAAAA,qCAAgC,EAAC;YAAEV;YAAaC;QAAS;QAC1F,IAAIQ,oBAAoB;YACtB,OAAOA;QACT;IACF;IAEA,MAAME,cAAcC,wBAAwBZ;IAC5C,IAAI,CAACW,aAAa;QAChBb,MAAM;QACN,OAAO;IACT;IACA,MAAMe,cAAc,MAAMF,YAAYG,sBAAsB,CAACd;IAE7D,OAAOa,YAAYE,IAAI;AACzB;AAEA,SAASH,wBAAwBZ,WAAmB;IAClD,IAAI;QACF,OAAOD,QAAQA,QAAQiB,OAAO,CAAC,qBAAqB;YAAEC,OAAO;gBAACjB;aAAY;QAAC;IAC7E,EAAE,OAAM;QACN,OAAO;IACT;AACF"}