@expo/cli 56.1.5 → 56.1.6

package/build/src/start/server/middleware/openHandlers.js

@@ -0,0 +1,157 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get createInfoHandler () {
+        return createInfoHandler;
+    },
+    get createOpen () {
+        return createOpen;
+    },
+    get resolveOpenInfo () {
+        return resolveOpenInfo;
+    }
+});
+function createInfoHandler(deps) {
+    return ({ platform, runtime })=>resolveOpenInfo({
+            platform,
+            runtime
+        }, deps);
+}
+async function resolveOpenInfo({ platform, runtime }, deps) {
+    // Snapshot the live state once per request so the response is internally consistent even if a
+    // toggle happens between sub-resolutions.
+    const scheme = deps.urlCreator.getScheme();
+    const isDevClient = deps.getIsDevClient();
+    const isRedirectPageEnabled = deps.getIsRedirectPageEnabled();
+    const availableRuntimes = isDevClient ? [
+        'custom'
+    ] : isRedirectPageEnabled ? [
+        'expo',
+        'custom'
+    ] : [
+        'expo'
+    ];
+    if (platform) {
+        return {
+            scheme,
+            availableRuntimes,
+            ...await resolvePlatformInfo(platform, runtime, deps, {
+                isDevClient,
+                isRedirectPageEnabled
+            })
+        };
+    }
+    const [ios, android, web] = await Promise.all([
+        resolvePlatformInfo('ios', runtime, deps, {
+            isDevClient,
+            isRedirectPageEnabled
+        }),
+        resolvePlatformInfo('android', runtime, deps, {
+            isDevClient,
+            isRedirectPageEnabled
+        }),
+        resolvePlatformInfo('web', runtime, deps, {
+            isDevClient,
+            isRedirectPageEnabled
+        })
+    ]);
+    return {
+        scheme,
+        availableRuntimes,
+        platforms: {
+            ios,
+            android,
+            web
+        }
+    };
+}
+async function resolvePlatformInfo(platform, runtime, deps, state) {
+    const { urlCreator, getAppId } = deps;
+    const { isDevClient, isRedirectPageEnabled } = state;
+    const appId = await getAppId(platform);
+    if (platform === 'web') {
+        // constructUrl inherits the tunnel host from `defaults.hostType` when --tunnel is active,
+        // so this returns the ngrok URL instead of localhost in that case.
+        return {
+            runtime: 'web',
+            url: urlCreator.constructUrl({
+                scheme: 'http'
+            }),
+            appId
+        };
+    }
+    // Caller explicitly wants the disambiguation page — useful when they want the device (not the
+    // dev server) to pick between Expo Go and the dev build. No `runtime` field on the response
+    // since the actual runtime depends on the device's choice.
+    if (runtime === 'unknown') {
+        return {
+            url: urlCreator.constructLoadingUrl({}, platform),
+            appId
+        };
+    }
+    // `runtime: 'default'` mirrors what pressing `i` / `a` does in the terminal:
+    //   --dev-client server  → open the dev client directly.
+    //   project has both     → hand off to the disambiguation interstitial so the
+    //                          device resolves between Expo Go and the dev build.
+    //   else                 → open Expo Go directly.
+    if (runtime === 'default') {
+        if (isDevClient) {
+            return {
+                runtime: 'custom',
+                url: urlCreator.constructDevClientUrl(),
+                appId
+            };
+        }
+        if (isRedirectPageEnabled) {
+            return {
+                url: urlCreator.constructLoadingUrl({}, platform),
+                appId
+            };
+        }
+        return {
+            runtime: 'expo',
+            url: urlCreator.constructUrl({
+                scheme: 'exp'
+            }),
+            appId
+        };
+    }
+    return {
+        runtime,
+        url: runtime === 'custom' ? urlCreator.constructDevClientUrl() : urlCreator.constructUrl({
+            scheme: 'exp'
+        }),
+        appId
+    };
+}
+function createOpen(deps) {
+    return async ({ platform })=>{
+        if (platform === 'web') {
+            const result = await deps.openPlatformAsync('desktop');
+            return {
+                platform,
+                runtime: 'web',
+                url: result.url ?? ''
+            };
+        }
+        const launchTarget = platform === 'ios' ? 'simulator' : 'emulator';
+        const result = await deps.openPlatformAsync(launchTarget, {
+            shouldPrompt: false
+        });
+        return {
+            platform,
+            runtime: deps.getIsDevClient() ? 'custom' : 'expo',
+            url: result.url ?? ''
+        };
+    };
+}
+
+//# sourceMappingURL=openHandlers.js.map

package/build/src/start/server/middleware/openHandlers.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/start/server/middleware/openHandlers.ts"],"sourcesContent":["import type {\n  OpenActionResult,\n  OpenInfoResult,\n  OpenMiddlewareOptions,\n  OpenNativeRuntime,\n  OpenPlatform,\n  OpenPlatformInfo,\n  OpenRequestedRuntime,\n} from './OpenMiddleware';\nimport type { UrlCreator } from '../UrlCreator';\n\ninterface InfoHandlerDeps {\n  /** Stable UrlCreator instance — its `defaults` mutate when `toggleRuntimeMode` runs, so the same instance keeps producing fresh URLs and reflects the current scheme. */\n  urlCreator: UrlCreator;\n  /**\n   * Read live values every call. The dev server's runtime mode can flip mid-run via the `s` key\n   * in the terminal, and `expo-dev-client` can be installed while the server is running — both\n   * change `isDevClient` and `isRedirectPageEnabled`, and the endpoint should reflect the\n   * current state on every request.\n   */\n  getIsDevClient: () => boolean;\n  /** Live mirror of `BundlerDevServer.isRedirectPageEnabled()`. */\n  getIsRedirectPageEnabled: () => boolean;\n  /**\n   * Resolve the native application identifier for a platform (iOS bundle id / Android package\n   * name). Implementations should return `null` instead of throwing when the project has no\n   * configured identifier; the endpoint surfaces `null` so distributed preview systems can detect\n   * that the build can't be matched by app id and either bail out or prompt the user.\n   */\n  getAppId: (platform: OpenPlatform) => Promise<string | null>;\n}\n\n/**\n * Build the GET handler for `/_expo/open`. Resolves dry-run info for a single platform, or for\n * every platform in discovery mode. Extracted so it can be exercised with a real\n * {@link UrlCreator} in tests (covers tunnel routing in particular).\n */\nexport function createInfoHandler(deps: InfoHandlerDeps): OpenMiddlewareOptions['getInfo'] {\n  return ({ platform, runtime }) => resolveOpenInfo({ platform, runtime }, deps);\n}\n\nexport async function resolveOpenInfo(\n  { platform, runtime }: { platform: OpenPlatform | null; runtime: OpenRequestedRuntime },\n  deps: InfoHandlerDeps\n): Promise<OpenInfoResult> {\n  // Snapshot the live state once per request so the response is internally consistent even if a\n  // toggle happens between sub-resolutions.\n  const scheme = deps.urlCreator.getScheme();\n  const isDevClient = deps.getIsDevClient();\n  const isRedirectPageEnabled = deps.getIsRedirectPageEnabled();\n  const availableRuntimes: OpenNativeRuntime[] = isDevClient\n    ? ['custom']\n    : isRedirectPageEnabled\n      ? ['expo', 'custom']\n      : ['expo'];\n\n  if (platform) {\n    return {\n      scheme,\n      availableRuntimes,\n      ...(await resolvePlatformInfo(platform, runtime, deps, {\n        isDevClient,\n        isRedirectPageEnabled,\n      })),\n    };\n  }\n\n  const [ios, android, web] = await Promise.all([\n    resolvePlatformInfo('ios', runtime, deps, { isDevClient, isRedirectPageEnabled }),\n    resolvePlatformInfo('android', runtime, deps, { isDevClient, isRedirectPageEnabled }),\n    resolvePlatformInfo('web', runtime, deps, { isDevClient, isRedirectPageEnabled }),\n  ]);\n  return { scheme, availableRuntimes, platforms: { ios, android, web } };\n}\n\nasync function resolvePlatformInfo(\n  platform: OpenPlatform,\n  runtime: OpenRequestedRuntime,\n  deps: InfoHandlerDeps,\n  state: { isDevClient: boolean; isRedirectPageEnabled: boolean }\n): Promise<OpenPlatformInfo> {\n  const { urlCreator, getAppId } = deps;\n  const { isDevClient, isRedirectPageEnabled } = state;\n  const appId = await getAppId(platform);\n\n  if (platform === 'web') {\n    // constructUrl inherits the tunnel host from `defaults.hostType` when --tunnel is active,\n    // so this returns the ngrok URL instead of localhost in that case.\n    return { runtime: 'web', url: urlCreator.constructUrl({ scheme: 'http' }), appId };\n  }\n\n  // Caller explicitly wants the disambiguation page — useful when they want the device (not the\n  // dev server) to pick between Expo Go and the dev build. No `runtime` field on the response\n  // since the actual runtime depends on the device's choice.\n  if (runtime === 'unknown') {\n    return { url: urlCreator.constructLoadingUrl({}, platform), appId };\n  }\n\n  // `runtime: 'default'` mirrors what pressing `i` / `a` does in the terminal:\n  //   --dev-client server  → open the dev client directly.\n  //   project has both     → hand off to the disambiguation interstitial so the\n  //                          device resolves between Expo Go and the dev build.\n  //   else                 → open Expo Go directly.\n  if (runtime === 'default') {\n    if (isDevClient) {\n      return { runtime: 'custom', url: urlCreator.constructDevClientUrl(), appId };\n    }\n    if (isRedirectPageEnabled) {\n      return { url: urlCreator.constructLoadingUrl({}, platform), appId };\n    }\n    return { runtime: 'expo', url: urlCreator.constructUrl({ scheme: 'exp' }), appId };\n  }\n\n  return {\n    runtime,\n    url:\n      runtime === 'custom'\n        ? urlCreator.constructDevClientUrl()\n        : urlCreator.constructUrl({ scheme: 'exp' }),\n    appId,\n  };\n}\n\ninterface OpenHandlerDeps {\n  /** Live `BundlerDevServer.isDevClient` — `s` in the terminal can flip this between dispatch and response. */\n  getIsDevClient: () => boolean;\n  /** Same shape as `BundlerDevServer.openPlatformAsync`. */\n  openPlatformAsync: (\n    launchTarget: 'simulator' | 'emulator' | 'desktop',\n    resolver?: { shouldPrompt?: boolean }\n  ) => Promise<{ url: string | null }>;\n}\n\n/** Build the POST handler for `/_expo/open` — dispatches to the dev server's platform launcher. */\nexport function createOpen(deps: OpenHandlerDeps): OpenMiddlewareOptions['open'] {\n  return async ({ platform }): Promise<OpenActionResult> => {\n    if (platform === 'web') {\n      const result = await deps.openPlatformAsync('desktop');\n      return { platform, runtime: 'web', url: result.url ?? '' };\n    }\n    const launchTarget = platform === 'ios' ? 'simulator' : 'emulator';\n    const result = await deps.openPlatformAsync(launchTarget, { shouldPrompt: false });\n    return {\n      platform,\n      runtime: deps.getIsDevClient() ? 'custom' : 'expo',\n      url: result.url ?? '',\n    };\n  };\n}\n"],"names":["createInfoHandler","createOpen","resolveOpenInfo","deps","platform","runtime","scheme","urlCreator","getScheme","isDevClient","getIsDevClient","isRedirectPageEnabled","getIsRedirectPageEnabled","availableRuntimes","resolvePlatformInfo","ios","android","web","Promise","all","platforms","state","getAppId","appId","url","constructUrl","constructLoadingUrl","constructDevClientUrl","result","openPlatformAsync","launchTarget","shouldPrompt"],"mappings":"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"}

package/build/src/start/server/webTemplate.js

@@ -39,7 +39,7 @@ function _path() {
 }
 const _templates = require("../../customize/templates");
 const _html = require("../../export/html");
-const _env = require("../../utils/env");
+const _publicFolder = require("../../export/publicFolder");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -58,8 +58,8 @@ async function createTemplateHtmlFromExpoConfigAsync(projectRoot, { scripts, css
         themeColor: (_exp_web2 = exp.web) == null ? void 0 : _exp_web2.themeColor
     });
 }
-function getFileFromLocalPublicFolder(projectRoot, { publicFolder, filePath }) {
-    const localFilePath = _path().default.resolve(projectRoot, publicFolder, filePath);
+function getFileFromLocalPublicFolder(projectRoot, { filePath }) {
+    const localFilePath = _path().default.resolve((0, _publicFolder.getPublicFolderPath)(projectRoot), filePath);
     if (!_fs().default.existsSync(localFilePath)) {
         return null;
     }
@@ -67,8 +67,6 @@ function getFileFromLocalPublicFolder(projectRoot, { publicFolder, filePath }) {
 }
 /** Attempt to read the `index.html` from the local project before falling back on the template `index.html`. */ async function getTemplateIndexHtmlAsync(projectRoot) {
     let filePath = getFileFromLocalPublicFolder(projectRoot, {
-        // TODO: Maybe use the app.json override.
-        publicFolder: _env.env.EXPO_PUBLIC_FOLDER,
         filePath: 'index.html'
     });
     if (!filePath) {

package/build/src/start/server/webTemplate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/start/server/webTemplate.ts"],"sourcesContent":["import type { ExpoConfig } from '@expo/config';\nimport { getConfig, getNameFromConfig } from '@expo/config';\nimport fs from 'fs';\nimport path from 'path';\n\nimport { TEMPLATES } from '../../customize/templates';\nimport { appendLinkToHtml, appendScriptsToHtml } from '../../export/html';\nimport { env } from '../../utils/env';\n\n/**\n * Create a static HTML for SPA styled websites.\n * This method attempts to reuse the same patterns as `@expo/webpack-config`.\n */\nexport async function createTemplateHtmlFromExpoConfigAsync(\n  projectRoot: string,\n  {\n    scripts,\n    cssLinks,\n    exp = getConfig(projectRoot, { skipSDKVersionRequirement: true }).exp,\n  }: {\n    scripts: string[];\n    cssLinks?: string[];\n    exp?: ExpoConfig;\n  }\n) {\n  return createTemplateHtmlAsync(projectRoot, {\n    langIsoCode: exp.web?.lang ?? 'en',\n    scripts,\n    cssLinks,\n    title: getNameFromConfig(exp).webName ?? 'Expo App',\n    description: exp.web?.description,\n    themeColor: exp.web?.themeColor,\n  });\n}\n\nfunction getFileFromLocalPublicFolder(\n  projectRoot: string,\n  { publicFolder, filePath }: { publicFolder: string; filePath: string }\n): string | null {\n  const localFilePath = path.resolve(projectRoot, publicFolder, filePath);\n  if (!fs.existsSync(localFilePath)) {\n    return null;\n  }\n  return localFilePath;\n}\n\n/** Attempt to read the `index.html` from the local project before falling back on the template `index.html`. */\nasync function getTemplateIndexHtmlAsync(projectRoot: string): Promise<string> {\n  let filePath = getFileFromLocalPublicFolder(projectRoot, {\n    // TODO: Maybe use the app.json override.\n    publicFolder: env.EXPO_PUBLIC_FOLDER,\n    filePath: 'index.html',\n  });\n  if (!filePath) {\n    filePath = TEMPLATES.find((value) => value.id === 'index.html')!.file(projectRoot);\n  }\n  return fs.promises.readFile(filePath, 'utf8');\n}\n\n/** Return an `index.html` string with template values added. */\nexport async function createTemplateHtmlAsync(\n  projectRoot: string,\n  {\n    scripts,\n    cssLinks,\n    description,\n    langIsoCode,\n    title,\n    themeColor,\n  }: {\n    scripts: string[];\n    cssLinks?: string[];\n    description?: string;\n    langIsoCode: string;\n    title: string;\n    themeColor?: string;\n  }\n): Promise<string> {\n  // Resolve the best possible index.html template file.\n  let contents = await getTemplateIndexHtmlAsync(projectRoot);\n\n  contents = contents.replace('%LANG_ISO_CODE%', langIsoCode);\n  contents = contents.replace('%WEB_TITLE%', title);\n\n  contents = appendScriptsToHtml(contents, scripts);\n\n  if (cssLinks) {\n    contents = appendLinkToHtml(\n      contents,\n      cssLinks\n        .map((href) => [\n          // NOTE: We probably don't have to preload the CSS files for SPA-styled websites.\n          {\n            as: 'style',\n            rel: 'preload',\n            href,\n          },\n          {\n            rel: 'stylesheet',\n            href,\n          },\n        ])\n        .flat()\n    );\n  }\n\n  if (themeColor) {\n    contents = addMeta(contents, `name=\"theme-color\" content=\"${themeColor}\"`);\n  }\n\n  if (description) {\n    contents = addMeta(contents, `name=\"description\" content=\"${description}\"`);\n  }\n\n  return contents;\n}\n\n/** Add a `<meta />` tag to the `<head />` element. */\nfunction addMeta(contents: string, meta: string): string {\n  return contents.replace('</head>', `<meta ${meta}>\\n</head>`);\n}\n"],"names":["createTemplateHtmlAsync","createTemplateHtmlFromExpoConfigAsync","projectRoot","scripts","cssLinks","exp","getConfig","skipSDKVersionRequirement","langIsoCode","web","lang","title","getNameFromConfig","webName","description","themeColor","getFileFromLocalPublicFolder","publicFolder","filePath","localFilePath","path","resolve","fs","existsSync","getTemplateIndexHtmlAsync","env","EXPO_PUBLIC_FOLDER","TEMPLATES","find","value","id","file","promises","readFile","contents","replace","appendScriptsToHtml","appendLinkToHtml","map","href","as","rel","flat","addMeta","meta"],"mappings":";;;;;;;;;;;QA4DsBA;eAAAA;;QA/CAC;eAAAA;;;;yBAZuB;;;;;;;gEAC9B;;;;;;;gEACE;;;;;;2BAES;sBAC4B;qBAClC;;;;;;AAMb,eAAeA,sCACpBC,WAAmB,EACnB,EACEC,OAAO,EACPC,QAAQ,EACRC,MAAMC,IAAAA,mBAAS,EAACJ,aAAa;IAAEK,2BAA2B;AAAK,GAAGF,GAAG,EAKtE;QAGcA,UAIAA,WACDA;IANd,OAAOL,wBAAwBE,aAAa;QAC1CM,aAAaH,EAAAA,WAAAA,IAAII,GAAG,qBAAPJ,SAASK,IAAI,KAAI;QAC9BP;QACAC;QACAO,OAAOC,IAAAA,2BAAiB,EAACP,KAAKQ,OAAO,IAAI;QACzCC,WAAW,GAAET,YAAAA,IAAII,GAAG,qBAAPJ,UAASS,WAAW;QACjCC,UAAU,GAAEV,YAAAA,IAAII,GAAG,qBAAPJ,UAASU,UAAU;IACjC;AACF;AAEA,SAASC,6BACPd,WAAmB,EACnB,EAAEe,YAAY,EAAEC,QAAQ,EAA8C;IAEtE,MAAMC,gBAAgBC,eAAI,CAACC,OAAO,CAACnB,aAAae,cAAcC;IAC9D,IAAI,CAACI,aAAE,CAACC,UAAU,CAACJ,gBAAgB;QACjC,OAAO;IACT;IACA,OAAOA;AACT;AAEA,8GAA8G,GAC9G,eAAeK,0BAA0BtB,WAAmB;IAC1D,IAAIgB,WAAWF,6BAA6Bd,aAAa;QACvD,yCAAyC;QACzCe,cAAcQ,QAAG,CAACC,kBAAkB;QACpCR,UAAU;IACZ;IACA,IAAI,CAACA,UAAU;QACbA,WAAWS,oBAAS,CAACC,IAAI,CAAC,CAACC,QAAUA,MAAMC,EAAE,KAAK,cAAeC,IAAI,CAAC7B;IACxE;IACA,OAAOoB,aAAE,CAACU,QAAQ,CAACC,QAAQ,CAACf,UAAU;AACxC;AAGO,eAAelB,wBACpBE,WAAmB,EACnB,EACEC,OAAO,EACPC,QAAQ,EACRU,WAAW,EACXN,WAAW,EACXG,KAAK,EACLI,UAAU,EAQX;IAED,sDAAsD;IACtD,IAAImB,WAAW,MAAMV,0BAA0BtB;IAE/CgC,WAAWA,SAASC,OAAO,CAAC,mBAAmB3B;IAC/C0B,WAAWA,SAASC,OAAO,CAAC,eAAexB;IAE3CuB,WAAWE,IAAAA,yBAAmB,EAACF,UAAU/B;IAEzC,IAAIC,UAAU;QACZ8B,WAAWG,IAAAA,sBAAgB,EACzBH,UACA9B,SACGkC,GAAG,CAAC,CAACC,OAAS;gBACb,iFAAiF;gBACjF;oBACEC,IAAI;oBACJC,KAAK;oBACLF;gBACF;gBACA;oBACEE,KAAK;oBACLF;gBACF;aACD,EACAG,IAAI;IAEX;IAEA,IAAI3B,YAAY;QACdmB,WAAWS,QAAQT,UAAU,CAAC,4BAA4B,EAAEnB,WAAW,CAAC,CAAC;IAC3E;IAEA,IAAID,aAAa;QACfoB,WAAWS,QAAQT,UAAU,CAAC,4BAA4B,EAAEpB,YAAY,CAAC,CAAC;IAC5E;IAEA,OAAOoB;AACT;AAEA,oDAAoD,GACpD,SAASS,QAAQT,QAAgB,EAAEU,IAAY;IAC7C,OAAOV,SAASC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAES,KAAK,UAAU,CAAC;AAC9D"}
+{"version":3,"sources":["../../../../src/start/server/webTemplate.ts"],"sourcesContent":["import type { ExpoConfig } from '@expo/config';\nimport { getConfig, getNameFromConfig } from '@expo/config';\nimport fs from 'fs';\nimport path from 'path';\n\nimport { TEMPLATES } from '../../customize/templates';\nimport { appendLinkToHtml, appendScriptsToHtml } from '../../export/html';\nimport { getPublicFolderPath } from '../../export/publicFolder';\n\n/**\n * Create a static HTML for SPA styled websites.\n * This method attempts to reuse the same patterns as `@expo/webpack-config`.\n */\nexport async function createTemplateHtmlFromExpoConfigAsync(\n  projectRoot: string,\n  {\n    scripts,\n    cssLinks,\n    exp = getConfig(projectRoot, { skipSDKVersionRequirement: true }).exp,\n  }: {\n    scripts: string[];\n    cssLinks?: string[];\n    exp?: ExpoConfig;\n  }\n) {\n  return createTemplateHtmlAsync(projectRoot, {\n    langIsoCode: exp.web?.lang ?? 'en',\n    scripts,\n    cssLinks,\n    title: getNameFromConfig(exp).webName ?? 'Expo App',\n    description: exp.web?.description,\n    themeColor: exp.web?.themeColor,\n  });\n}\n\nfunction getFileFromLocalPublicFolder(\n  projectRoot: string,\n  { filePath }: { filePath: string }\n): string | null {\n  const localFilePath = path.resolve(getPublicFolderPath(projectRoot), filePath);\n  if (!fs.existsSync(localFilePath)) {\n    return null;\n  }\n  return localFilePath;\n}\n\n/** Attempt to read the `index.html` from the local project before falling back on the template `index.html`. */\nasync function getTemplateIndexHtmlAsync(projectRoot: string): Promise<string> {\n  let filePath = getFileFromLocalPublicFolder(projectRoot, {\n    filePath: 'index.html',\n  });\n  if (!filePath) {\n    filePath = TEMPLATES.find((value) => value.id === 'index.html')!.file(projectRoot);\n  }\n  return fs.promises.readFile(filePath, 'utf8');\n}\n\n/** Return an `index.html` string with template values added. */\nexport async function createTemplateHtmlAsync(\n  projectRoot: string,\n  {\n    scripts,\n    cssLinks,\n    description,\n    langIsoCode,\n    title,\n    themeColor,\n  }: {\n    scripts: string[];\n    cssLinks?: string[];\n    description?: string;\n    langIsoCode: string;\n    title: string;\n    themeColor?: string;\n  }\n): Promise<string> {\n  // Resolve the best possible index.html template file.\n  let contents = await getTemplateIndexHtmlAsync(projectRoot);\n\n  contents = contents.replace('%LANG_ISO_CODE%', langIsoCode);\n  contents = contents.replace('%WEB_TITLE%', title);\n\n  contents = appendScriptsToHtml(contents, scripts);\n\n  if (cssLinks) {\n    contents = appendLinkToHtml(\n      contents,\n      cssLinks\n        .map((href) => [\n          // NOTE: We probably don't have to preload the CSS files for SPA-styled websites.\n          {\n            as: 'style',\n            rel: 'preload',\n            href,\n          },\n          {\n            rel: 'stylesheet',\n            href,\n          },\n        ])\n        .flat()\n    );\n  }\n\n  if (themeColor) {\n    contents = addMeta(contents, `name=\"theme-color\" content=\"${themeColor}\"`);\n  }\n\n  if (description) {\n    contents = addMeta(contents, `name=\"description\" content=\"${description}\"`);\n  }\n\n  return contents;\n}\n\n/** Add a `<meta />` tag to the `<head />` element. */\nfunction addMeta(contents: string, meta: string): string {\n  return contents.replace('</head>', `<meta ${meta}>\\n</head>`);\n}\n"],"names":["createTemplateHtmlAsync","createTemplateHtmlFromExpoConfigAsync","projectRoot","scripts","cssLinks","exp","getConfig","skipSDKVersionRequirement","langIsoCode","web","lang","title","getNameFromConfig","webName","description","themeColor","getFileFromLocalPublicFolder","filePath","localFilePath","path","resolve","getPublicFolderPath","fs","existsSync","getTemplateIndexHtmlAsync","TEMPLATES","find","value","id","file","promises","readFile","contents","replace","appendScriptsToHtml","appendLinkToHtml","map","href","as","rel","flat","addMeta","meta"],"mappings":";;;;;;;;;;;QA0DsBA;eAAAA;;QA7CAC;eAAAA;;;;yBAZuB;;;;;;;gEAC9B;;;;;;;gEACE;;;;;;2BAES;sBAC4B;8BAClB;;;;;;AAM7B,eAAeA,sCACpBC,WAAmB,EACnB,EACEC,OAAO,EACPC,QAAQ,EACRC,MAAMC,IAAAA,mBAAS,EAACJ,aAAa;IAAEK,2BAA2B;AAAK,GAAGF,GAAG,EAKtE;QAGcA,UAIAA,WACDA;IANd,OAAOL,wBAAwBE,aAAa;QAC1CM,aAAaH,EAAAA,WAAAA,IAAII,GAAG,qBAAPJ,SAASK,IAAI,KAAI;QAC9BP;QACAC;QACAO,OAAOC,IAAAA,2BAAiB,EAACP,KAAKQ,OAAO,IAAI;QACzCC,WAAW,GAAET,YAAAA,IAAII,GAAG,qBAAPJ,UAASS,WAAW;QACjCC,UAAU,GAAEV,YAAAA,IAAII,GAAG,qBAAPJ,UAASU,UAAU;IACjC;AACF;AAEA,SAASC,6BACPd,WAAmB,EACnB,EAAEe,QAAQ,EAAwB;IAElC,MAAMC,gBAAgBC,eAAI,CAACC,OAAO,CAACC,IAAAA,iCAAmB,EAACnB,cAAce;IACrE,IAAI,CAACK,aAAE,CAACC,UAAU,CAACL,gBAAgB;QACjC,OAAO;IACT;IACA,OAAOA;AACT;AAEA,8GAA8G,GAC9G,eAAeM,0BAA0BtB,WAAmB;IAC1D,IAAIe,WAAWD,6BAA6Bd,aAAa;QACvDe,UAAU;IACZ;IACA,IAAI,CAACA,UAAU;QACbA,WAAWQ,oBAAS,CAACC,IAAI,CAAC,CAACC,QAAUA,MAAMC,EAAE,KAAK,cAAeC,IAAI,CAAC3B;IACxE;IACA,OAAOoB,aAAE,CAACQ,QAAQ,CAACC,QAAQ,CAACd,UAAU;AACxC;AAGO,eAAejB,wBACpBE,WAAmB,EACnB,EACEC,OAAO,EACPC,QAAQ,EACRU,WAAW,EACXN,WAAW,EACXG,KAAK,EACLI,UAAU,EAQX;IAED,sDAAsD;IACtD,IAAIiB,WAAW,MAAMR,0BAA0BtB;IAE/C8B,WAAWA,SAASC,OAAO,CAAC,mBAAmBzB;IAC/CwB,WAAWA,SAASC,OAAO,CAAC,eAAetB;IAE3CqB,WAAWE,IAAAA,yBAAmB,EAACF,UAAU7B;IAEzC,IAAIC,UAAU;QACZ4B,WAAWG,IAAAA,sBAAgB,EACzBH,UACA5B,SACGgC,GAAG,CAAC,CAACC,OAAS;gBACb,iFAAiF;gBACjF;oBACEC,IAAI;oBACJC,KAAK;oBACLF;gBACF;gBACA;oBACEE,KAAK;oBACLF;gBACF;aACD,EACAG,IAAI;IAEX;IAEA,IAAIzB,YAAY;QACdiB,WAAWS,QAAQT,UAAU,CAAC,4BAA4B,EAAEjB,WAAW,CAAC,CAAC;IAC3E;IAEA,IAAID,aAAa;QACfkB,WAAWS,QAAQT,UAAU,CAAC,4BAA4B,EAAElB,YAAY,CAAC,CAAC;IAC5E;IAEA,OAAOkB;AACT;AAEA,oDAAoD,GACpD,SAASS,QAAQT,QAAgB,EAAEU,IAAY;IAC7C,OAAOV,SAASC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAES,KAAK,UAAU,CAAC;AAC9D"}

package/build/src/utils/net.js

@@ -35,7 +35,13 @@ const isMatchingOrigin = (request, serverBaseUrl)=>{
     if (!request.headers.origin) {
         return true;
     }
-    const actualHost = new URL(`${request.headers.origin}`).host;
+    let actualHost;
+    try {
+        actualHost = new URL(`${request.headers.origin}`).host;
+    } catch  {
+        // Malformed Origin — treat as untrusted.
+        return false;
+    }
     const expectedHost = new URL(serverBaseUrl).host;
     return actualHost === expectedHost;
 };

package/build/src/utils/net.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utils/net.ts"],"sourcesContent":["import type { IncomingHttpHeaders } from 'node:http';\nimport type { Socket } from 'node:net';\n\nconst ipv6To4Prefix = '::ffff:';\n\nexport const isLocalSocket = (socket: Socket): boolean => {\n  let { localAddress, remoteAddress, remoteFamily } = socket;\n\n  const isLoopbackRequest = localAddress && localAddress === remoteAddress;\n  if (isLoopbackRequest) {\n    return true;\n  } else if (!remoteAddress || !remoteFamily) {\n    return false;\n  }\n\n  if (remoteFamily === 'IPv6' && remoteAddress.startsWith(ipv6To4Prefix)) {\n    remoteAddress = remoteAddress.slice(ipv6To4Prefix.length);\n  }\n\n  return remoteAddress === '::1' || remoteAddress.startsWith('127.');\n};\n\ninterface AbstractIncomingMessage {\n  headers: IncomingHttpHeaders | Record<string, string | string[]>;\n}\n\nexport const isMatchingOrigin = (\n  request: AbstractIncomingMessage,\n  serverBaseUrl: string\n): boolean => {\n  // NOTE(@kitten): The browser will always send an origin header for websocket upgrade connections\n  if (!request.headers.origin) {\n    return true;\n  }\n  const actualHost = new URL(`${request.headers.origin}`).host;\n  const expectedHost = new URL(serverBaseUrl).host;\n  return actualHost === expectedHost;\n};\n"],"names":["isLocalSocket","isMatchingOrigin","ipv6To4Prefix","socket","localAddress","remoteAddress","remoteFamily","isLoopbackRequest","startsWith","slice","length","request","serverBaseUrl","headers","origin","actualHost","URL","host","expectedHost"],"mappings":";;;;;;;;;;;QAKaA;eAAAA;;QAqBAC;eAAAA;;;AAvBb,MAAMC,gBAAgB;AAEf,MAAMF,gBAAgB,CAACG;IAC5B,IAAI,EAAEC,YAAY,EAAEC,aAAa,EAAEC,YAAY,EAAE,GAAGH;IAEpD,MAAMI,oBAAoBH,gBAAgBA,iBAAiBC;IAC3D,IAAIE,mBAAmB;QACrB,OAAO;IACT,OAAO,IAAI,CAACF,iBAAiB,CAACC,cAAc;QAC1C,OAAO;IACT;IAEA,IAAIA,iBAAiB,UAAUD,cAAcG,UAAU,CAACN,gBAAgB;QACtEG,gBAAgBA,cAAcI,KAAK,CAACP,cAAcQ,MAAM;IAC1D;IAEA,OAAOL,kBAAkB,SAASA,cAAcG,UAAU,CAAC;AAC7D;AAMO,MAAMP,mBAAmB,CAC9BU,SACAC;IAEA,iGAAiG;IACjG,IAAI,CAACD,QAAQE,OAAO,CAACC,MAAM,EAAE;QAC3B,OAAO;IACT;IACA,MAAMC,aAAa,IAAIC,IAAI,GAAGL,QAAQE,OAAO,CAACC,MAAM,EAAE,EAAEG,IAAI;IAC5D,MAAMC,eAAe,IAAIF,IAAIJ,eAAeK,IAAI;IAChD,OAAOF,eAAeG;AACxB"}
+{"version":3,"sources":["../../../src/utils/net.ts"],"sourcesContent":["import type { IncomingHttpHeaders } from 'node:http';\nimport type { Socket } from 'node:net';\n\nconst ipv6To4Prefix = '::ffff:';\n\nexport const isLocalSocket = (socket: Socket): boolean => {\n  let { localAddress, remoteAddress, remoteFamily } = socket;\n\n  const isLoopbackRequest = localAddress && localAddress === remoteAddress;\n  if (isLoopbackRequest) {\n    return true;\n  } else if (!remoteAddress || !remoteFamily) {\n    return false;\n  }\n\n  if (remoteFamily === 'IPv6' && remoteAddress.startsWith(ipv6To4Prefix)) {\n    remoteAddress = remoteAddress.slice(ipv6To4Prefix.length);\n  }\n\n  return remoteAddress === '::1' || remoteAddress.startsWith('127.');\n};\n\ninterface AbstractIncomingMessage {\n  headers: IncomingHttpHeaders | Record<string, string | string[]>;\n}\n\nexport const isMatchingOrigin = (\n  request: AbstractIncomingMessage,\n  serverBaseUrl: string\n): boolean => {\n  // NOTE(@kitten): The browser will always send an origin header for websocket upgrade connections\n  if (!request.headers.origin) {\n    return true;\n  }\n  let actualHost: string;\n  try {\n    actualHost = new URL(`${request.headers.origin}`).host;\n  } catch {\n    // Malformed Origin — treat as untrusted.\n    return false;\n  }\n  const expectedHost = new URL(serverBaseUrl).host;\n  return actualHost === expectedHost;\n};\n"],"names":["isLocalSocket","isMatchingOrigin","ipv6To4Prefix","socket","localAddress","remoteAddress","remoteFamily","isLoopbackRequest","startsWith","slice","length","request","serverBaseUrl","headers","origin","actualHost","URL","host","expectedHost"],"mappings":";;;;;;;;;;;QAKaA;eAAAA;;QAqBAC;eAAAA;;;AAvBb,MAAMC,gBAAgB;AAEf,MAAMF,gBAAgB,CAACG;IAC5B,IAAI,EAAEC,YAAY,EAAEC,aAAa,EAAEC,YAAY,EAAE,GAAGH;IAEpD,MAAMI,oBAAoBH,gBAAgBA,iBAAiBC;IAC3D,IAAIE,mBAAmB;QACrB,OAAO;IACT,OAAO,IAAI,CAACF,iBAAiB,CAACC,cAAc;QAC1C,OAAO;IACT;IAEA,IAAIA,iBAAiB,UAAUD,cAAcG,UAAU,CAACN,gBAAgB;QACtEG,gBAAgBA,cAAcI,KAAK,CAACP,cAAcQ,MAAM;IAC1D;IAEA,OAAOL,kBAAkB,SAASA,cAAcG,UAAU,CAAC;AAC7D;AAMO,MAAMP,mBAAmB,CAC9BU,SACAC;IAEA,iGAAiG;IACjG,IAAI,CAACD,QAAQE,OAAO,CAACC,MAAM,EAAE;QAC3B,OAAO;IACT;IACA,IAAIC;IACJ,IAAI;QACFA,aAAa,IAAIC,IAAI,GAAGL,QAAQE,OAAO,CAACC,MAAM,EAAE,EAAEG,IAAI;IACxD,EAAE,OAAM;QACN,yCAAyC;QACzC,OAAO;IACT;IACA,MAAMC,eAAe,IAAIF,IAAIJ,eAAeK,IAAI;IAChD,OAAOF,eAAeG;AACxB"}

package/build/src/utils/tar.js

@@ -71,8 +71,8 @@ class ChecksumStream extends TransformStream {
         return this.hash.digest(encoding);
     }
 }
-async function extractStream(input, output, options = {}) {
-    output = _nodepath().default.resolve(output);
+async function extractStream(input, targetOutput, options = {}) {
+    const output = _nodepath().default.resolve(targetOutput) + _nodepath().default.sep;
     await _nodefs().default.promises.mkdir(output, {
         recursive: true
     });

package/build/src/utils/tar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utils/tar.ts"],"sourcesContent":["import { streamToAsyncIterable, TarTypeFlag, untar } from 'multitars';\nimport crypto from 'node:crypto';\nimport fs from 'node:fs';\nimport path from 'node:path';\nimport { Readable } from 'node:stream';\n\nconst debug = require('debug')('expo:utils:tar') as typeof console.log;\n\nclass ChecksumStream extends TransformStream {\n  hash: crypto.Hash;\n  constructor(algorithm: string) {\n    super({\n      transform: (chunk, controller) => {\n        this.hash.update(chunk);\n        controller.enqueue(chunk);\n      },\n    });\n    this.hash = crypto.createHash(algorithm);\n  }\n\n  digest(): Buffer;\n  digest(encoding: crypto.BinaryToTextEncoding): string;\n  digest(encoding?: crypto.BinaryToTextEncoding): string | Buffer {\n    return this.hash.digest(encoding!);\n  }\n}\n\nexport interface ExtractOptions {\n  strip?: number;\n  filter?(name: string, type: TarTypeFlag): boolean | null | undefined;\n  rename?(name: string, type: TarTypeFlag): string | null | undefined;\n  checksumAlgorithm?: string;\n}\n\nexport async function extractStream(\n  input: ReadableStream,\n  output: string,\n  options: ExtractOptions = {}\n): Promise<string> {\n  output = path.resolve(output);\n  await fs.promises.mkdir(output, { recursive: true });\n\n  const { checksumAlgorithm, strip = 0, rename, filter } = options;\n\n  const checksumStream = new ChecksumStream(checksumAlgorithm || 'md5');\n  const decompressionStream = new DecompressionStream('gzip');\n\n  const body = input.pipeThrough(checksumStream).pipeThrough(decompressionStream);\n\n  for await (const file of untar(body)) {\n    let name = path.normalize(file.name);\n    if (filter && !filter(name, file.typeflag)) {\n      debug(`filtered: ${path.resolve(output, name)}`);\n      continue;\n    } else if (rename) {\n      name = rename(name, file.typeflag) ?? name;\n    }\n\n    for (let idx = 0; idx < strip; idx++) {\n      const sepIdx = name.indexOf(path.sep);\n      if (sepIdx > -1) {\n        name = name.slice(sepIdx + 1);\n      } else {\n        break;\n      }\n    }\n\n    const resolved = path.resolve(output, name);\n    if (!resolved.startsWith(output)) {\n      debug(`skip: ${resolved}`);\n      continue;\n    }\n\n    const parent = path.dirname(resolved);\n    if (parent !== output) {\n      let exists = false;\n      try {\n        const stat = await fs.promises.lstat(parent);\n        if (stat.isSymbolicLink() || (!stat.isDirectory() && !stat.isFile())) {\n          debug(`skip: ${resolved}`);\n          continue;\n        } else if (stat.isDirectory()) {\n          exists = true;\n        }\n      } catch {}\n\n      if (!exists) {\n        debug(`mkdir(p): ${parent}`);\n        await fs.promises.mkdir(parent, { recursive: true });\n      }\n    }\n\n    switch (file.typeflag) {\n      case TarTypeFlag.FILE:\n        debug(`write(${file.mode.toString(8)}): ${resolved}`);\n        await fs.promises.writeFile(resolved, streamToAsyncIterable(file.stream()), {\n          mode: file.mode,\n        });\n        break;\n      case TarTypeFlag.DIRECTORY:\n        debug(`mkdir(${file.mode.toString(8)}): ${resolved}`);\n        try {\n          await fs.promises.mkdir(resolved, { mode: file.mode });\n        } catch (error: any) {\n          if (error.code !== 'EEXIST') {\n            throw error;\n          }\n        }\n        break;\n      case TarTypeFlag.SYMLINK:\n      case TarTypeFlag.LINK: {\n        const target = path.resolve(parent, file.linkname ?? '');\n        if (!target.startsWith(output) || target === parent) {\n          debug(`skip: ${resolved} -> ${target}`);\n          continue;\n        }\n\n        if (file.typeflag === TarTypeFlag.LINK) {\n          debug(`link: ${resolved} -> ${target}`);\n          await fs.promises.link(target, resolved);\n        } else {\n          const stat = await fs.promises.lstat(target).catch(() => null);\n          const type = stat?.isDirectory() ? 'dir' : 'file';\n          debug(`symlink(${type}): ${resolved} -> ${target}`);\n          await fs.promises.symlink(target, resolved, type);\n        }\n        break;\n      }\n    }\n  }\n\n  return checksumStream.digest('hex');\n}\n\n/** Extract a tar using built-in tools if available and falling back on Node.js. */\nexport async function extractAsync(\n  input: string,\n  output: string,\n  options?: ExtractOptions\n): Promise<void> {\n  await extractStream(\n    Readable.toWeb(fs.createReadStream(input)) as ReadableStream,\n    output,\n    options\n  );\n}\n"],"names":["extractAsync","extractStream","debug","require","ChecksumStream","TransformStream","algorithm","transform","chunk","controller","hash","update","enqueue","crypto","createHash","digest","encoding","input","output","options","path","resolve","fs","promises","mkdir","recursive","checksumAlgorithm","strip","rename","filter","checksumStream","decompressionStream","DecompressionStream","body","pipeThrough","file","untar","name","normalize","typeflag","idx","sepIdx","indexOf","sep","slice","resolved","startsWith","parent","dirname","exists","stat","lstat","isSymbolicLink","isDirectory","isFile","TarTypeFlag","FILE","mode","toString","writeFile","streamToAsyncIterable","stream","DIRECTORY","error","code","SYMLINK","LINK","target","linkname","link","catch","type","symlink","Readable","toWeb","createReadStream"],"mappings":"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"}
+{"version":3,"sources":["../../../src/utils/tar.ts"],"sourcesContent":["import { streamToAsyncIterable, TarTypeFlag, untar } from 'multitars';\nimport crypto from 'node:crypto';\nimport fs from 'node:fs';\nimport path from 'node:path';\nimport { Readable } from 'node:stream';\n\nconst debug = require('debug')('expo:utils:tar') as typeof console.log;\n\nclass ChecksumStream extends TransformStream {\n  hash: crypto.Hash;\n  constructor(algorithm: string) {\n    super({\n      transform: (chunk, controller) => {\n        this.hash.update(chunk);\n        controller.enqueue(chunk);\n      },\n    });\n    this.hash = crypto.createHash(algorithm);\n  }\n\n  digest(): Buffer;\n  digest(encoding: crypto.BinaryToTextEncoding): string;\n  digest(encoding?: crypto.BinaryToTextEncoding): string | Buffer {\n    return this.hash.digest(encoding!);\n  }\n}\n\nexport interface ExtractOptions {\n  strip?: number;\n  filter?(name: string, type: TarTypeFlag): boolean | null | undefined;\n  rename?(name: string, type: TarTypeFlag): string | null | undefined;\n  checksumAlgorithm?: string;\n}\n\nexport async function extractStream(\n  input: ReadableStream,\n  targetOutput: string,\n  options: ExtractOptions = {}\n): Promise<string> {\n  const output = path.resolve(targetOutput) + path.sep;\n  await fs.promises.mkdir(output, { recursive: true });\n\n  const { checksumAlgorithm, strip = 0, rename, filter } = options;\n\n  const checksumStream = new ChecksumStream(checksumAlgorithm || 'md5');\n  const decompressionStream = new DecompressionStream('gzip');\n\n  const body = input.pipeThrough(checksumStream).pipeThrough(decompressionStream);\n\n  for await (const file of untar(body)) {\n    let name = path.normalize(file.name);\n    if (filter && !filter(name, file.typeflag)) {\n      debug(`filtered: ${path.resolve(output, name)}`);\n      continue;\n    } else if (rename) {\n      name = rename(name, file.typeflag) ?? name;\n    }\n\n    for (let idx = 0; idx < strip; idx++) {\n      const sepIdx = name.indexOf(path.sep);\n      if (sepIdx > -1) {\n        name = name.slice(sepIdx + 1);\n      } else {\n        break;\n      }\n    }\n\n    const resolved = path.resolve(output, name);\n    if (!resolved.startsWith(output)) {\n      debug(`skip: ${resolved}`);\n      continue;\n    }\n\n    const parent = path.dirname(resolved);\n    if (parent !== output) {\n      let exists = false;\n      try {\n        const stat = await fs.promises.lstat(parent);\n        if (stat.isSymbolicLink() || (!stat.isDirectory() && !stat.isFile())) {\n          debug(`skip: ${resolved}`);\n          continue;\n        } else if (stat.isDirectory()) {\n          exists = true;\n        }\n      } catch {}\n\n      if (!exists) {\n        debug(`mkdir(p): ${parent}`);\n        await fs.promises.mkdir(parent, { recursive: true });\n      }\n    }\n\n    switch (file.typeflag) {\n      case TarTypeFlag.FILE:\n        debug(`write(${file.mode.toString(8)}): ${resolved}`);\n        await fs.promises.writeFile(resolved, streamToAsyncIterable(file.stream()), {\n          mode: file.mode,\n        });\n        break;\n      case TarTypeFlag.DIRECTORY:\n        debug(`mkdir(${file.mode.toString(8)}): ${resolved}`);\n        try {\n          await fs.promises.mkdir(resolved, { mode: file.mode });\n        } catch (error: any) {\n          if (error.code !== 'EEXIST') {\n            throw error;\n          }\n        }\n        break;\n      case TarTypeFlag.SYMLINK:\n      case TarTypeFlag.LINK: {\n        const target = path.resolve(parent, file.linkname ?? '');\n        if (!target.startsWith(output) || target === parent) {\n          debug(`skip: ${resolved} -> ${target}`);\n          continue;\n        }\n\n        if (file.typeflag === TarTypeFlag.LINK) {\n          debug(`link: ${resolved} -> ${target}`);\n          await fs.promises.link(target, resolved);\n        } else {\n          const stat = await fs.promises.lstat(target).catch(() => null);\n          const type = stat?.isDirectory() ? 'dir' : 'file';\n          debug(`symlink(${type}): ${resolved} -> ${target}`);\n          await fs.promises.symlink(target, resolved, type);\n        }\n        break;\n      }\n    }\n  }\n\n  return checksumStream.digest('hex');\n}\n\n/** Extract a tar using built-in tools if available and falling back on Node.js. */\nexport async function extractAsync(\n  input: string,\n  output: string,\n  options?: ExtractOptions\n): Promise<void> {\n  await extractStream(\n    Readable.toWeb(fs.createReadStream(input)) as ReadableStream,\n    output,\n    options\n  );\n}\n"],"names":["extractAsync","extractStream","debug","require","ChecksumStream","TransformStream","algorithm","transform","chunk","controller","hash","update","enqueue","crypto","createHash","digest","encoding","input","targetOutput","options","output","path","resolve","sep","fs","promises","mkdir","recursive","checksumAlgorithm","strip","rename","filter","checksumStream","decompressionStream","DecompressionStream","body","pipeThrough","file","untar","name","normalize","typeflag","idx","sepIdx","indexOf","slice","resolved","startsWith","parent","dirname","exists","stat","lstat","isSymbolicLink","isDirectory","isFile","TarTypeFlag","FILE","mode","toString","writeFile","streamToAsyncIterable","stream","DIRECTORY","error","code","SYMLINK","LINK","target","linkname","link","catch","type","symlink","Readable","toWeb","createReadStream"],"mappings":"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"}

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

@@ -26,7 +26,7 @@ class FetchClient {
         this.headers = {
             accept: 'application/json',
             'content-type': 'application/json',
-            'user-agent': `expo-cli/${"56.1.5"}`,
+            'user-agent': `expo-cli/${"56.1.6"}`,
             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: "56.1.5"
+            version: "56.1.6"
         },
         ci: _ciinfo().isCI ? {
             name: _ciinfo().name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/cli",
-  "version": "56.1.5",
+  "version": "56.1.6",
   "description": "The Expo CLI",
   "main": "main.js",
   "bin": {
@@ -39,23 +39,23 @@
   "homepage": "https://github.com/expo/expo/tree/main/packages/@expo/cli",
   "dependencies": {
     "@expo/code-signing-certificates": "^0.0.6",
-    "@expo/config": "~56.0.6",
-    "@expo/config-plugins": "~56.0.5",
+    "@expo/config": "~56.0.7",
+    "@expo/config-plugins": "~56.0.6",
     "@expo/devcert": "^1.2.1",
     "@expo/env": "~2.2.0",
     "@expo/image-utils": "^0.9.3",
-    "@expo/inline-modules": "^0.0.7",
+    "@expo/inline-modules": "^0.0.8",
     "@expo/json-file": "^10.1.0",
-    "@expo/log-box": "^56.0.10",
+    "@expo/log-box": "^56.0.11",
     "@expo/metro": "~56.0.0",
-    "@expo/metro-config": "~56.0.9",
+    "@expo/metro-config": "~56.0.10",
     "@expo/metro-file-map": "^56.0.3",
     "@expo/osascript": "^2.5.0",
     "@expo/package-manager": "^1.11.0",
     "@expo/plist": "^0.6.0",
-    "@expo/prebuild-config": "^56.0.8",
+    "@expo/prebuild-config": "^56.0.9",
     "@expo/require-utils": "^56.1.1",
-    "@expo/router-server": "^56.0.8",
+    "@expo/router-server": "^56.0.9",
     "@expo/schema-utils": "^56.0.0",
     "@expo/spawn-async": "^1.7.2",
     "@expo/ws-tunnel": "^1.0.1",
@@ -71,7 +71,7 @@
     "connect": "^3.7.0",
     "debug": "^4.3.4",
     "dnssd-advertise": "^1.1.4",
-    "expo-server": "^56.0.2",
+    "expo-server": "^56.0.3",
     "fetch-nodeshim": "^0.4.10",
     "getenv": "^2.0.0",
     "glob": "^13.0.0",
@@ -156,13 +156,13 @@
     "playwright": "^1.59.0",
     "taskr": "^1.1.0",
     "tree-kill": "^1.2.2",
-    "expo": "56.0.0-preview.12",
-    "expo-modules-autolinking": "56.0.7",
+    "@expo/fingerprint": "0.18.3",
+    "expo": "56.0.0-preview.13",
+    "expo-router": "56.2.2",
     "expo-module-scripts": "56.0.2",
-    "expo-router": "56.2.1",
-    "@expo/fingerprint": "0.18.2"
+    "expo-modules-autolinking": "56.0.8"
   },
-  "gitHead": "f26be3dd9396bf7c399a1d607865d0fabdbc0d64",
+  "gitHead": "290368bc41026449a05a4ebf991b85c3a2fb0e3a",
   "scripts": {
     "build": "taskr",
     "clean": "expo-module clean",