@expo/cli 0.16.6 → 0.16.7

package/build/bin/cli

@@ -137,7 +137,7 @@ const args = (0, _arg).default({
 });
 if (args["--version"]) {
     // Version is added in the build script.
-    console.log("0.16.6");
+    console.log("0.16.7");
     process.exit(0);
 }
 if (args["--non-interactive"]) {
@@ -271,7 +271,7 @@ commands[command]().then((exec)=>{
         logEventAsync("action", {
             action: `expo ${command}`,
             source: "expo/cli",
-            source_version: "0.16.6"
+            source_version: "0.16.7"
         });
     }
 });

package/build/src/export/embed/exportEmbedAsync.js

@@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.exportEmbedAsync = exportEmbedAsync;
+exports.createMetroServerAndBundleRequestAsync = createMetroServerAndBundleRequestAsync;
+exports.exportEmbedBundleAndAssetsAsync = exportEmbedBundleAndAssetsAsync;
 exports.exportEmbedBundleAsync = exportEmbedBundleAsync;
+exports.exportEmbedAssetsAsync = exportEmbedAssetsAsync;
 var _config = require("@expo/config");
 var _fs = _interopRequireDefault(require("fs"));
 var _glob = require("glob");
@@ -56,7 +59,7 @@ async function exportEmbedAsync(projectRoot, options) {
             await (0, _dir).removeAsync(previousPath);
         }
     }
-    const { bundle , assets  } = await exportEmbedBundleAsync(projectRoot, options);
+    const { bundle , assets  } = await exportEmbedBundleAndAssetsAsync(projectRoot, options);
     _fs.default.mkdirSync(_path.default.dirname(options.bundleOutput), {
         recursive: true,
         mode: 493
@@ -73,7 +76,7 @@ async function exportEmbedAsync(projectRoot, options) {
         }) : null, 
     ]);
 }
-async function exportEmbedBundleAsync(projectRoot, options) {
+async function createMetroServerAndBundleRequestAsync(projectRoot, options) {
     const exp = (0, _config).getConfig(projectRoot, {
         skipSDKVersionRequirement: true
     }).exp;
@@ -107,20 +110,51 @@ async function exportEmbedBundleAsync(projectRoot, options) {
     const server = new _server.default(config, {
         watch: false
     });
+    return {
+        server,
+        bundleRequest
+    };
+}
+async function exportEmbedBundleAndAssetsAsync(projectRoot, options) {
+    const { server , bundleRequest  } = await createMetroServerAndBundleRequestAsync(projectRoot, options);
+    try {
+        const bundle = await exportEmbedBundleAsync(server, bundleRequest, projectRoot, options);
+        const assets = await exportEmbedAssetsAsync(server, bundleRequest, projectRoot, options);
+        return {
+            bundle,
+            assets
+        };
+    } finally{
+        server.end();
+    }
+}
+async function exportEmbedBundleAsync(server, bundleRequest, projectRoot, options) {
     try {
-        const bundle = await (0, _profile).profile(server.build.bind(server), "metro-bundle")({
+        return await (0, _profile).profile(server.build.bind(server), "metro-bundle")({
             ...bundleRequest,
             bundleType: "bundle"
         });
-        // Save the assets of the bundle
-        const outputAssets = await (0, _forkBundleAsync).getAssets(server, {
+    } catch (error) {
+        if (isError(error)) {
+            // Log using Xcode error format so the errors are picked up by xcodebuild.
+            // https://developer.apple.com/documentation/xcode/running-custom-scripts-during-a-build#Log-errors-and-warnings-from-your-script
+            if (options.platform === "ios") {
+                // If the error is about to be presented in Xcode, strip the ansi characters from the message.
+                if ("message" in error && (0, _xcodeCompilerLogger).isExecutingFromXcodebuild()) {
+                    error.message = (0, _ansi).stripAnsi(error.message);
+                }
+                (0, _xcodeCompilerLogger).logMetroErrorInXcode(projectRoot, error);
+            }
+        }
+        throw error;
+    }
+}
+async function exportEmbedAssetsAsync(server, bundleRequest, projectRoot, options) {
+    try {
+        return await (0, _forkBundleAsync).getAssets(server, {
             ...bundleRequest,
             bundleType: "todo"
         });
-        return {
-            bundle,
-            assets: outputAssets
-        };
     } catch (error) {
         if (isError(error)) {
             // Log using Xcode error format so the errors are picked up by xcodebuild.
@@ -134,8 +168,6 @@ async function exportEmbedBundleAsync(projectRoot, options) {
             }
         }
         throw error;
-    } finally{
-        server.end();
     }
 }
 function isError(error) {

package/build/src/export/embed/exportEmbedAsync.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/export/embed/exportEmbedAsync.ts"],"sourcesContent":["/**\n * Copyright © 2023 650 Industries.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n */\nimport { getConfig } from '@expo/config';\nimport fs from 'fs';\nimport { sync as globSync } from 'glob';\nimport Server from 'metro/src/Server';\nimport output from 'metro/src/shared/output/bundle';\nimport type { BundleOptions } from 'metro/src/shared/types';\nimport path from 'path';\n\nimport { Options } from './resolveOptions';\nimport { isExecutingFromXcodebuild, logMetroErrorInXcode } from './xcodeCompilerLogger';\nimport { Log } from '../../log';\nimport { loadMetroConfigAsync } from '../../start/server/metro/instantiateMetro';\nimport { getMetroDirectBundleOptionsForExpoConfig } from '../../start/server/middleware/metroOptions';\nimport { stripAnsi } from '../../utils/ansi';\nimport { removeAsync } from '../../utils/dir';\nimport { setNodeEnv } from '../../utils/nodeEnv';\nimport { profile } from '../../utils/profile';\nimport { isEnableHermesManaged } from '../exportHermes';\nimport { getAssets } from '../fork-bundleAsync';\nimport { persistMetroAssetsAsync } from '../persistMetroAssets';\n\nconst debug = require('debug')('expo:export:embed');\n\nfunction guessCopiedAppleBundlePath(bundleOutput: string) {\n  // Ensure the path is familiar before guessing.\n  if (!bundleOutput.match(/\\/Xcode\\/DerivedData\\/.*\\/Build\\/Products\\//)) {\n    debug('Bundling to non-standard location:', bundleOutput);\n    return false;\n  }\n  const bundleName = path.basename(bundleOutput);\n  const bundleParent = path.dirname(bundleOutput);\n  const possiblePath = globSync(path.join(bundleParent, `*.app/${bundleName}`), {\n    // bundle identifiers can start with dots.\n    dot: true,\n  })[0];\n  debug('Possible path for previous bundle:', possiblePath);\n  return possiblePath;\n}\n\nexport async function exportEmbedAsync(projectRoot: string, options: Options) {\n  setNodeEnv(options.dev ? 'development' : 'production');\n  require('@expo/env').load(projectRoot);\n\n  // Ensure we delete the old bundle to trigger a failure if the bundle cannot be created.\n  await removeAsync(options.bundleOutput);\n\n  // The iOS bundle is copied in to the Xcode project, so we need to remove the old one\n  // to prevent Xcode from loading the old one after a build failure.\n  if (options.platform === 'ios') {\n    const previousPath = guessCopiedAppleBundlePath(options.bundleOutput);\n    if (previousPath && fs.existsSync(previousPath)) {\n      debug('Removing previous iOS bundle:', previousPath);\n      await removeAsync(previousPath);\n    }\n  }\n\n  const { bundle, assets } = await exportEmbedBundleAsync(projectRoot, options);\n\n  fs.mkdirSync(path.dirname(options.bundleOutput), { recursive: true, mode: 0o755 });\n\n  // Persist bundle and source maps.\n  await Promise.all([\n    output.save(bundle, options, Log.log),\n    // NOTE(EvanBacon): This may need to be adjusted in the future if want to support baseUrl on native\n    // platforms when doing production embeds (unlikely).\n    options.assetsDest\n      ? persistMetroAssetsAsync(assets, {\n          platform: options.platform,\n          outputDirectory: options.assetsDest,\n          iosAssetCatalogDirectory: options.assetCatalogDest,\n        })\n      : null,\n  ]);\n}\n\nexport async function exportEmbedBundleAsync(projectRoot: string, options: Options) {\n  const exp = getConfig(projectRoot, { skipSDKVersionRequirement: true }).exp;\n\n  // TODO: This is slow ~40ms\n  const { config } = await loadMetroConfigAsync(\n    projectRoot,\n    {\n      maxWorkers: options.maxWorkers,\n      resetCache: false, //options.resetCache,\n      config: options.config,\n    },\n    {\n      exp,\n      isExporting: true,\n    }\n  );\n\n  const isHermes = isEnableHermesManaged(exp, options.platform);\n\n  let sourceMapUrl = options.sourcemapOutput;\n  if (sourceMapUrl && !options.sourcemapUseAbsolutePath) {\n    sourceMapUrl = path.basename(sourceMapUrl);\n  }\n\n  const bundleRequest = {\n    ...Server.DEFAULT_BUNDLE_OPTIONS,\n    ...getMetroDirectBundleOptionsForExpoConfig(projectRoot, exp, {\n      mainModuleName: options.entryFile,\n      platform: options.platform,\n      minify: options.minify,\n      mode: options.dev ? 'development' : 'production',\n      engine: isHermes ? 'hermes' : undefined,\n      isExporting: true,\n    }),\n    sourceMapUrl,\n    unstable_transformProfile: (options.unstableTransformProfile ||\n      (isHermes ? 'hermes-stable' : 'default')) as BundleOptions['unstable_transformProfile'],\n  };\n\n  const server = new Server(config, {\n    watch: false,\n  });\n\n  try {\n    const bundle = await profile(\n      server.build.bind(server),\n      'metro-bundle'\n    )({\n      ...bundleRequest,\n      bundleType: 'bundle',\n    });\n\n    // Save the assets of the bundle\n    const outputAssets = await getAssets(server, {\n      ...bundleRequest,\n      bundleType: 'todo',\n    });\n\n    return {\n      bundle,\n      assets: outputAssets,\n    };\n  } catch (error: any) {\n    if (isError(error)) {\n      // Log using Xcode error format so the errors are picked up by xcodebuild.\n      // https://developer.apple.com/documentation/xcode/running-custom-scripts-during-a-build#Log-errors-and-warnings-from-your-script\n      if (options.platform === 'ios') {\n        // If the error is about to be presented in Xcode, strip the ansi characters from the message.\n        if ('message' in error && isExecutingFromXcodebuild()) {\n          error.message = stripAnsi(error.message) as string;\n        }\n        logMetroErrorInXcode(projectRoot, error);\n      }\n    }\n    throw error;\n  } finally {\n    server.end();\n  }\n}\n\nfunction isError(error: any): error is Error {\n  return error instanceof Error;\n}\n"],"names":["exportEmbedAsync","exportEmbedBundleAsync","debug","require","guessCopiedAppleBundlePath","bundleOutput","match","bundleName","path","basename","bundleParent","dirname","possiblePath","globSync","join","dot","projectRoot","options","setNodeEnv","dev","load","removeAsync","platform","previousPath","fs","existsSync","bundle","assets","mkdirSync","recursive","mode","Promise","all","output","save","Log","log","assetsDest","persistMetroAssetsAsync","outputDirectory","iosAssetCatalogDirectory","assetCatalogDest","exp","getConfig","skipSDKVersionRequirement","config","loadMetroConfigAsync","maxWorkers","resetCache","isExporting","isHermes","isEnableHermesManaged","sourceMapUrl","sourcemapOutput","sourcemapUseAbsolutePath","bundleRequest","Server","DEFAULT_BUNDLE_OPTIONS","getMetroDirectBundleOptionsForExpoConfig","mainModuleName","entryFile","minify","engine","undefined","unstable_transformProfile","unstableTransformProfile","server","watch","profile","build","bind","bundleType","outputAssets","getAssets","error","isError","isExecutingFromXcodebuild","message","stripAnsi","logMetroErrorInXcode","end","Error"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/export/embed/exportEmbedAsync.ts"],"sourcesContent":["/**\n * Copyright © 2023 650 Industries.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n */\nimport { getConfig } from '@expo/config';\nimport fs from 'fs';\nimport { sync as globSync } from 'glob';\nimport Server from 'metro/src/Server';\nimport output from 'metro/src/shared/output/bundle';\nimport type { BundleOptions } from 'metro/src/shared/types';\nimport path from 'path';\n\nimport { Options } from './resolveOptions';\nimport { isExecutingFromXcodebuild, logMetroErrorInXcode } from './xcodeCompilerLogger';\nimport { Log } from '../../log';\nimport { loadMetroConfigAsync } from '../../start/server/metro/instantiateMetro';\nimport { getMetroDirectBundleOptionsForExpoConfig } from '../../start/server/middleware/metroOptions';\nimport { stripAnsi } from '../../utils/ansi';\nimport { removeAsync } from '../../utils/dir';\nimport { setNodeEnv } from '../../utils/nodeEnv';\nimport { profile } from '../../utils/profile';\nimport { isEnableHermesManaged } from '../exportHermes';\nimport { getAssets } from '../fork-bundleAsync';\nimport { persistMetroAssetsAsync } from '../persistMetroAssets';\n\nconst debug = require('debug')('expo:export:embed');\n\nfunction guessCopiedAppleBundlePath(bundleOutput: string) {\n  // Ensure the path is familiar before guessing.\n  if (!bundleOutput.match(/\\/Xcode\\/DerivedData\\/.*\\/Build\\/Products\\//)) {\n    debug('Bundling to non-standard location:', bundleOutput);\n    return false;\n  }\n  const bundleName = path.basename(bundleOutput);\n  const bundleParent = path.dirname(bundleOutput);\n  const possiblePath = globSync(path.join(bundleParent, `*.app/${bundleName}`), {\n    // bundle identifiers can start with dots.\n    dot: true,\n  })[0];\n  debug('Possible path for previous bundle:', possiblePath);\n  return possiblePath;\n}\n\nexport async function exportEmbedAsync(projectRoot: string, options: Options) {\n  setNodeEnv(options.dev ? 'development' : 'production');\n  require('@expo/env').load(projectRoot);\n\n  // Ensure we delete the old bundle to trigger a failure if the bundle cannot be created.\n  await removeAsync(options.bundleOutput);\n\n  // The iOS bundle is copied in to the Xcode project, so we need to remove the old one\n  // to prevent Xcode from loading the old one after a build failure.\n  if (options.platform === 'ios') {\n    const previousPath = guessCopiedAppleBundlePath(options.bundleOutput);\n    if (previousPath && fs.existsSync(previousPath)) {\n      debug('Removing previous iOS bundle:', previousPath);\n      await removeAsync(previousPath);\n    }\n  }\n\n  const { bundle, assets } = await exportEmbedBundleAndAssetsAsync(projectRoot, options);\n\n  fs.mkdirSync(path.dirname(options.bundleOutput), { recursive: true, mode: 0o755 });\n\n  // Persist bundle and source maps.\n  await Promise.all([\n    output.save(bundle, options, Log.log),\n    // NOTE(EvanBacon): This may need to be adjusted in the future if want to support baseUrl on native\n    // platforms when doing production embeds (unlikely).\n    options.assetsDest\n      ? persistMetroAssetsAsync(assets, {\n          platform: options.platform,\n          outputDirectory: options.assetsDest,\n          iosAssetCatalogDirectory: options.assetCatalogDest,\n        })\n      : null,\n  ]);\n}\n\nexport async function createMetroServerAndBundleRequestAsync(\n  projectRoot: string,\n  options: Pick<\n    Options,\n    | 'maxWorkers'\n    | 'config'\n    | 'platform'\n    | 'sourcemapOutput'\n    | 'sourcemapUseAbsolutePath'\n    | 'entryFile'\n    | 'minify'\n    | 'dev'\n    | 'unstableTransformProfile'\n  >\n): Promise<{ server: Server; bundleRequest: BundleOptions }> {\n  const exp = getConfig(projectRoot, { skipSDKVersionRequirement: true }).exp;\n\n  // TODO: This is slow ~40ms\n  const { config } = await loadMetroConfigAsync(\n    projectRoot,\n    {\n      maxWorkers: options.maxWorkers,\n      resetCache: false, //options.resetCache,\n      config: options.config,\n    },\n    {\n      exp,\n      isExporting: true,\n    }\n  );\n\n  const isHermes = isEnableHermesManaged(exp, options.platform);\n\n  let sourceMapUrl = options.sourcemapOutput;\n  if (sourceMapUrl && !options.sourcemapUseAbsolutePath) {\n    sourceMapUrl = path.basename(sourceMapUrl);\n  }\n\n  const bundleRequest = {\n    ...Server.DEFAULT_BUNDLE_OPTIONS,\n    ...getMetroDirectBundleOptionsForExpoConfig(projectRoot, exp, {\n      mainModuleName: options.entryFile,\n      platform: options.platform,\n      minify: options.minify,\n      mode: options.dev ? 'development' : 'production',\n      engine: isHermes ? 'hermes' : undefined,\n      isExporting: true,\n    }),\n    sourceMapUrl,\n    unstable_transformProfile: (options.unstableTransformProfile ||\n      (isHermes ? 'hermes-stable' : 'default')) as BundleOptions['unstable_transformProfile'],\n  };\n\n  const server = new Server(config, {\n    watch: false,\n  });\n\n  return { server, bundleRequest };\n}\n\nexport async function exportEmbedBundleAndAssetsAsync(\n  projectRoot: string,\n  options: Options\n): Promise<{\n  bundle: Awaited<ReturnType<Server['build']>>;\n  assets: Awaited<ReturnType<typeof getAssets>>;\n}> {\n  const { server, bundleRequest } = await createMetroServerAndBundleRequestAsync(\n    projectRoot,\n    options\n  );\n\n  try {\n    const bundle = await exportEmbedBundleAsync(server, bundleRequest, projectRoot, options);\n    const assets = await exportEmbedAssetsAsync(server, bundleRequest, projectRoot, options);\n    return { bundle, assets };\n  } finally {\n    server.end();\n  }\n}\n\nexport async function exportEmbedBundleAsync(\n  server: Server,\n  bundleRequest: BundleOptions,\n  projectRoot: string,\n  options: Pick<Options, 'platform'>\n) {\n  try {\n    return await profile(\n      server.build.bind(server),\n      'metro-bundle'\n    )({\n      ...bundleRequest,\n      bundleType: 'bundle',\n    });\n  } catch (error: any) {\n    if (isError(error)) {\n      // Log using Xcode error format so the errors are picked up by xcodebuild.\n      // https://developer.apple.com/documentation/xcode/running-custom-scripts-during-a-build#Log-errors-and-warnings-from-your-script\n      if (options.platform === 'ios') {\n        // If the error is about to be presented in Xcode, strip the ansi characters from the message.\n        if ('message' in error && isExecutingFromXcodebuild()) {\n          error.message = stripAnsi(error.message) as string;\n        }\n        logMetroErrorInXcode(projectRoot, error);\n      }\n    }\n    throw error;\n  }\n}\n\nexport async function exportEmbedAssetsAsync(\n  server: Server,\n  bundleRequest: BundleOptions,\n  projectRoot: string,\n  options: Pick<Options, 'platform'>\n) {\n  try {\n    return await getAssets(server, {\n      ...bundleRequest,\n      bundleType: 'todo',\n    });\n  } catch (error: any) {\n    if (isError(error)) {\n      // Log using Xcode error format so the errors are picked up by xcodebuild.\n      // https://developer.apple.com/documentation/xcode/running-custom-scripts-during-a-build#Log-errors-and-warnings-from-your-script\n      if (options.platform === 'ios') {\n        // If the error is about to be presented in Xcode, strip the ansi characters from the message.\n        if ('message' in error && isExecutingFromXcodebuild()) {\n          error.message = stripAnsi(error.message) as string;\n        }\n        logMetroErrorInXcode(projectRoot, error);\n      }\n    }\n    throw error;\n  }\n}\n\nfunction isError(error: any): error is Error {\n  return error instanceof Error;\n}\n"],"names":["exportEmbedAsync","createMetroServerAndBundleRequestAsync","exportEmbedBundleAndAssetsAsync","exportEmbedBundleAsync","exportEmbedAssetsAsync","debug","require","guessCopiedAppleBundlePath","bundleOutput","match","bundleName","path","basename","bundleParent","dirname","possiblePath","globSync","join","dot","projectRoot","options","setNodeEnv","dev","load","removeAsync","platform","previousPath","fs","existsSync","bundle","assets","mkdirSync","recursive","mode","Promise","all","output","save","Log","log","assetsDest","persistMetroAssetsAsync","outputDirectory","iosAssetCatalogDirectory","assetCatalogDest","exp","getConfig","skipSDKVersionRequirement","config","loadMetroConfigAsync","maxWorkers","resetCache","isExporting","isHermes","isEnableHermesManaged","sourceMapUrl","sourcemapOutput","sourcemapUseAbsolutePath","bundleRequest","Server","DEFAULT_BUNDLE_OPTIONS","getMetroDirectBundleOptionsForExpoConfig","mainModuleName","entryFile","minify","engine","undefined","unstable_transformProfile","unstableTransformProfile","server","watch","end","profile","build","bind","bundleType","error","isError","isExecutingFromXcodebuild","message","stripAnsi","logMetroErrorInXcode","getAssets","Error"],"mappings":"AAMA;;;;QAuCsBA,gBAAgB,GAAhBA,gBAAgB;QAoChBC,sCAAsC,GAAtCA,sCAAsC;QA4DtCC,+BAA+B,GAA/BA,+BAA+B;QAqB/BC,sBAAsB,GAAtBA,sBAAsB;QA8BtBC,sBAAsB,GAAtBA,sBAAsB;AA1LlB,IAAA,OAAc,WAAd,cAAc,CAAA;AACzB,IAAA,GAAI,kCAAJ,IAAI,EAAA;AACc,IAAA,KAAM,WAAN,MAAM,CAAA;AACpB,IAAA,OAAkB,kCAAlB,kBAAkB,EAAA;AAClB,IAAA,OAAgC,kCAAhC,gCAAgC,EAAA;AAElC,IAAA,KAAM,kCAAN,MAAM,EAAA;AAGyC,IAAA,oBAAuB,WAAvB,uBAAuB,CAAA;AACnE,IAAA,IAAW,WAAX,WAAW,CAAA;AACM,IAAA,iBAA2C,WAA3C,2CAA2C,CAAA;AACvB,IAAA,aAA4C,WAA5C,4CAA4C,CAAA;AAC3E,IAAA,KAAkB,WAAlB,kBAAkB,CAAA;AAChB,IAAA,IAAiB,WAAjB,iBAAiB,CAAA;AAClB,IAAA,QAAqB,WAArB,qBAAqB,CAAA;AACxB,IAAA,QAAqB,WAArB,qBAAqB,CAAA;AACP,IAAA,aAAiB,WAAjB,iBAAiB,CAAA;AAC7B,IAAA,gBAAqB,WAArB,qBAAqB,CAAA;AACP,IAAA,mBAAuB,WAAvB,uBAAuB,CAAA;;;;;;AAE/D,MAAMC,KAAK,GAAGC,OAAO,CAAC,OAAO,CAAC,CAAC,mBAAmB,CAAC,AAAC;AAEpD,SAASC,0BAA0B,CAACC,YAAoB,EAAE;IACxD,+CAA+C;IAC/C,IAAI,CAACA,YAAY,CAACC,KAAK,+CAA+C,EAAE;QACtEJ,KAAK,CAAC,oCAAoC,EAAEG,YAAY,CAAC,CAAC;QAC1D,OAAO,KAAK,CAAC;KACd;IACD,MAAME,UAAU,GAAGC,KAAI,QAAA,CAACC,QAAQ,CAACJ,YAAY,CAAC,AAAC;IAC/C,MAAMK,YAAY,GAAGF,KAAI,QAAA,CAACG,OAAO,CAACN,YAAY,CAAC,AAAC;IAChD,MAAMO,YAAY,GAAGC,CAAAA,GAAAA,KAAQ,AAG3B,CAAA,KAH2B,CAACL,KAAI,QAAA,CAACM,IAAI,CAACJ,YAAY,EAAE,CAAC,MAAM,EAAEH,UAAU,CAAC,CAAC,CAAC,EAAE;QAC5E,0CAA0C;QAC1CQ,GAAG,EAAE,IAAI;KACV,CAAC,CAAC,CAAC,CAAC,AAAC;IACNb,KAAK,CAAC,oCAAoC,EAAEU,YAAY,CAAC,CAAC;IAC1D,OAAOA,YAAY,CAAC;CACrB;AAEM,eAAef,gBAAgB,CAACmB,WAAmB,EAAEC,OAAgB,EAAE;IAC5EC,CAAAA,GAAAA,QAAU,AAA4C,CAAA,WAA5C,CAACD,OAAO,CAACE,GAAG,GAAG,aAAa,GAAG,YAAY,CAAC,CAAC;IACvDhB,OAAO,CAAC,WAAW,CAAC,CAACiB,IAAI,CAACJ,WAAW,CAAC,CAAC;IAEvC,wFAAwF;IACxF,MAAMK,CAAAA,GAAAA,IAAW,AAAsB,CAAA,YAAtB,CAACJ,OAAO,CAACZ,YAAY,CAAC,CAAC;IAExC,qFAAqF;IACrF,mEAAmE;IACnE,IAAIY,OAAO,CAACK,QAAQ,KAAK,KAAK,EAAE;QAC9B,MAAMC,YAAY,GAAGnB,0BAA0B,CAACa,OAAO,CAACZ,YAAY,CAAC,AAAC;QACtE,IAAIkB,YAAY,IAAIC,GAAE,QAAA,CAACC,UAAU,CAACF,YAAY,CAAC,EAAE;YAC/CrB,KAAK,CAAC,+BAA+B,EAAEqB,YAAY,CAAC,CAAC;YACrD,MAAMF,CAAAA,GAAAA,IAAW,AAAc,CAAA,YAAd,CAACE,YAAY,CAAC,CAAC;SACjC;KACF;IAED,MAAM,EAAEG,MAAM,CAAA,EAAEC,MAAM,CAAA,EAAE,GAAG,MAAM5B,+BAA+B,CAACiB,WAAW,EAAEC,OAAO,CAAC,AAAC;IAEvFO,GAAE,QAAA,CAACI,SAAS,CAACpB,KAAI,QAAA,CAACG,OAAO,CAACM,OAAO,CAACZ,YAAY,CAAC,EAAE;QAAEwB,SAAS,EAAE,IAAI;QAAEC,IAAI,EAAE,GAAK;KAAE,CAAC,CAAC;IAEnF,kCAAkC;IAClC,MAAMC,OAAO,CAACC,GAAG,CAAC;QAChBC,OAAM,QAAA,CAACC,IAAI,CAACR,MAAM,EAAET,OAAO,EAAEkB,IAAG,IAAA,CAACC,GAAG,CAAC;QACrC,mGAAmG;QACnG,qDAAqD;QACrDnB,OAAO,CAACoB,UAAU,GACdC,CAAAA,GAAAA,mBAAuB,AAIrB,CAAA,wBAJqB,CAACX,MAAM,EAAE;YAC9BL,QAAQ,EAAEL,OAAO,CAACK,QAAQ;YAC1BiB,eAAe,EAAEtB,OAAO,CAACoB,UAAU;YACnCG,wBAAwB,EAAEvB,OAAO,CAACwB,gBAAgB;SACnD,CAAC,GACF,IAAI;KACT,CAAC,CAAC;CACJ;AAEM,eAAe3C,sCAAsC,CAC1DkB,WAAmB,EACnBC,OAWC,EAC0D;IAC3D,MAAMyB,GAAG,GAAGC,CAAAA,GAAAA,OAAS,AAAkD,CAAA,UAAlD,CAAC3B,WAAW,EAAE;QAAE4B,yBAAyB,EAAE,IAAI;KAAE,CAAC,CAACF,GAAG,AAAC;IAE5E,2BAA2B;IAC3B,MAAM,EAAEG,MAAM,CAAA,EAAE,GAAG,MAAMC,CAAAA,GAAAA,iBAAoB,AAW5C,CAAA,qBAX4C,CAC3C9B,WAAW,EACX;QACE+B,UAAU,EAAE9B,OAAO,CAAC8B,UAAU;QAC9BC,UAAU,EAAE,KAAK;QACjBH,MAAM,EAAE5B,OAAO,CAAC4B,MAAM;KACvB,EACD;QACEH,GAAG;QACHO,WAAW,EAAE,IAAI;KAClB,CACF,AAAC;IAEF,MAAMC,QAAQ,GAAGC,CAAAA,GAAAA,aAAqB,AAAuB,CAAA,sBAAvB,CAACT,GAAG,EAAEzB,OAAO,CAACK,QAAQ,CAAC,AAAC;IAE9D,IAAI8B,YAAY,GAAGnC,OAAO,CAACoC,eAAe,AAAC;IAC3C,IAAID,YAAY,IAAI,CAACnC,OAAO,CAACqC,wBAAwB,EAAE;QACrDF,YAAY,GAAG5C,KAAI,QAAA,CAACC,QAAQ,CAAC2C,YAAY,CAAC,CAAC;KAC5C;IAED,MAAMG,aAAa,GAAG;QACpB,GAAGC,OAAM,QAAA,CAACC,sBAAsB;QAChC,GAAGC,CAAAA,GAAAA,aAAwC,AAOzC,CAAA,yCAPyC,CAAC1C,WAAW,EAAE0B,GAAG,EAAE;YAC5DiB,cAAc,EAAE1C,OAAO,CAAC2C,SAAS;YACjCtC,QAAQ,EAAEL,OAAO,CAACK,QAAQ;YAC1BuC,MAAM,EAAE5C,OAAO,CAAC4C,MAAM;YACtB/B,IAAI,EAAEb,OAAO,CAACE,GAAG,GAAG,aAAa,GAAG,YAAY;YAChD2C,MAAM,EAAEZ,QAAQ,GAAG,QAAQ,GAAGa,SAAS;YACvCd,WAAW,EAAE,IAAI;SAClB,CAAC;QACFG,YAAY;QACZY,yBAAyB,EAAG/C,OAAO,CAACgD,wBAAwB,IAC1D,CAACf,QAAQ,GAAG,eAAe,GAAG,SAAS,CAAC;KAC3C,AAAC;IAEF,MAAMgB,MAAM,GAAG,IAAIV,OAAM,QAAA,CAACX,MAAM,EAAE;QAChCsB,KAAK,EAAE,KAAK;KACb,CAAC,AAAC;IAEH,OAAO;QAAED,MAAM;QAAEX,aAAa;KAAE,CAAC;CAClC;AAEM,eAAexD,+BAA+B,CACnDiB,WAAmB,EACnBC,OAAgB,EAIf;IACD,MAAM,EAAEiD,MAAM,CAAA,EAAEX,aAAa,CAAA,EAAE,GAAG,MAAMzD,sCAAsC,CAC5EkB,WAAW,EACXC,OAAO,CACR,AAAC;IAEF,IAAI;QACF,MAAMS,MAAM,GAAG,MAAM1B,sBAAsB,CAACkE,MAAM,EAAEX,aAAa,EAAEvC,WAAW,EAAEC,OAAO,CAAC,AAAC;QACzF,MAAMU,MAAM,GAAG,MAAM1B,sBAAsB,CAACiE,MAAM,EAAEX,aAAa,EAAEvC,WAAW,EAAEC,OAAO,CAAC,AAAC;QACzF,OAAO;YAAES,MAAM;YAAEC,MAAM;SAAE,CAAC;KAC3B,QAAS;QACRuC,MAAM,CAACE,GAAG,EAAE,CAAC;KACd;CACF;AAEM,eAAepE,sBAAsB,CAC1CkE,MAAc,EACdX,aAA4B,EAC5BvC,WAAmB,EACnBC,OAAkC,EAClC;IACA,IAAI;QACF,OAAO,MAAMoD,CAAAA,GAAAA,QAAO,AAGnB,CAAA,QAHmB,CAClBH,MAAM,CAACI,KAAK,CAACC,IAAI,CAACL,MAAM,CAAC,EACzB,cAAc,CACf,CAAC;YACA,GAAGX,aAAa;YAChBiB,UAAU,EAAE,QAAQ;SACrB,CAAC,CAAC;KACJ,CAAC,OAAOC,KAAK,EAAO;QACnB,IAAIC,OAAO,CAACD,KAAK,CAAC,EAAE;YAClB,0EAA0E;YAC1E,iIAAiI;YACjI,IAAIxD,OAAO,CAACK,QAAQ,KAAK,KAAK,EAAE;gBAC9B,8FAA8F;gBAC9F,IAAI,SAAS,IAAImD,KAAK,IAAIE,CAAAA,GAAAA,oBAAyB,AAAE,CAAA,0BAAF,EAAE,EAAE;oBACrDF,KAAK,CAACG,OAAO,GAAGC,CAAAA,GAAAA,KAAS,AAAe,CAAA,UAAf,CAACJ,KAAK,CAACG,OAAO,CAAC,AAAU,CAAC;iBACpD;gBACDE,CAAAA,GAAAA,oBAAoB,AAAoB,CAAA,qBAApB,CAAC9D,WAAW,EAAEyD,KAAK,CAAC,CAAC;aAC1C;SACF;QACD,MAAMA,KAAK,CAAC;KACb;CACF;AAEM,eAAexE,sBAAsB,CAC1CiE,MAAc,EACdX,aAA4B,EAC5BvC,WAAmB,EACnBC,OAAkC,EAClC;IACA,IAAI;QACF,OAAO,MAAM8D,CAAAA,GAAAA,gBAAS,AAGpB,CAAA,UAHoB,CAACb,MAAM,EAAE;YAC7B,GAAGX,aAAa;YAChBiB,UAAU,EAAE,MAAM;SACnB,CAAC,CAAC;KACJ,CAAC,OAAOC,KAAK,EAAO;QACnB,IAAIC,OAAO,CAACD,KAAK,CAAC,EAAE;YAClB,0EAA0E;YAC1E,iIAAiI;YACjI,IAAIxD,OAAO,CAACK,QAAQ,KAAK,KAAK,EAAE;gBAC9B,8FAA8F;gBAC9F,IAAI,SAAS,IAAImD,KAAK,IAAIE,CAAAA,GAAAA,oBAAyB,AAAE,CAAA,0BAAF,EAAE,EAAE;oBACrDF,KAAK,CAACG,OAAO,GAAGC,CAAAA,GAAAA,KAAS,AAAe,CAAA,UAAf,CAACJ,KAAK,CAACG,OAAO,CAAC,AAAU,CAAC;iBACpD;gBACDE,CAAAA,GAAAA,oBAAoB,AAAoB,CAAA,qBAApB,CAAC9D,WAAW,EAAEyD,KAAK,CAAC,CAAC;aAC1C;SACF;QACD,MAAMA,KAAK,CAAC;KACb;CACF;AAED,SAASC,OAAO,CAACD,KAAU,EAAkB;IAC3C,OAAOA,KAAK,YAAYO,KAAK,CAAC;CAC/B"}

package/build/src/start/server/type-generation/__typetests__/fixtures/basic.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../src/start/server/type-generation/__typetests__/fixtures/basic.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-unused-vars */\n/* eslint-disable import/export */\n/* eslint-disable @typescript-eslint/ban-types */\n\nimport type { LinkProps as OriginalLinkProps } from 'expo-router/build/link/Link';\nimport type { Router as OriginalRouter } from 'expo-router/src/types';\nexport * from 'expo-router/build';\n\n// prettier-ignore\ntype StaticRoutes = `/apple` | `/banana`;\n// prettier-ignore\ntype DynamicRoutes<T extends string> = `/colors/${SingleRoutePart<T>}` | `/animals/${CatchAllRoutePart<T>}` | `/mix/${SingleRoutePart<T>}/${SingleRoutePart<T>}/${CatchAllRoutePart<T>}`;\n// prettier-ignore\ntype DynamicRouteTemplate = `/colors/[color]` | `/animals/[...animal]` | `/mix/[fruit]/[color]/[...animals]`;\n\ntype RelativePathString = `./${string}` | `../${string}` | '..';\ntype AbsoluteRoute = DynamicRouteTemplate | StaticRoutes;\ntype ExternalPathString = `${string}:${string}`;\n\ntype ExpoRouterRoutes = DynamicRouteTemplate | StaticRoutes | RelativePathString;\ntype AllRoutes = ExpoRouterRoutes | ExternalPathString;\n\n/****************\n * Route Utils  *\n ****************/\n\ntype SearchOrHash = `?${string}` | `#${string}`;\ntype UnknownInputParams = Record<string, string | number | (string | number)[]>;\ntype UnknownOutputParams = Record<string, string | string[]>;\n\n/**\n * Return only the RoutePart of a string. If the string has multiple parts return never\n *\n * string   | type\n * ---------|------\n * 123      | 123\n * /123/abc | never\n * 123?abc  | never\n * ./123    | never\n * /123     | never\n * 123/../  | never\n */\ntype SingleRoutePart<S extends string> = S extends `${string}/${string}`\n  ? never\n  : S extends `${string}${SearchOrHash}`\n  ? never\n  : S extends ''\n  ? never\n  : S extends `(${string})`\n  ? never\n  : S extends `[${string}]`\n  ? never\n  : S;\n\n/**\n * Return only the CatchAll router part. If the string has search parameters or a hash return never\n */\ntype CatchAllRoutePart<S extends string> = S extends `${string}${SearchOrHash}`\n  ? never\n  : S extends ''\n  ? never\n  : S extends `${string}(${string})${string}`\n  ? never\n  : S extends `${string}[${string}]${string}`\n  ? never\n  : S;\n\n// type OptionalCatchAllRoutePart<S extends string> = S extends `${string}${SearchOrHash}` ? never : S\n\n/**\n * Return the name of a route parameter\n * '[test]'    -> 'test'\n * 'test'      -> never\n * '[...test]' -> '...test'\n */\ntype IsParameter<Part> = Part extends `[${infer ParamName}]` ? ParamName : never;\n\n/**\n * Return a union of all parameter names. If there are no names return never\n *\n * /[test]         -> 'test'\n * /[abc]/[...def] -> 'abc'|'...def'\n */\ntype ParameterNames<Path> = Path extends `${infer PartA}/${infer PartB}`\n  ? IsParameter<PartA> | ParameterNames<PartB>\n  : IsParameter<Path>;\n\n/**\n * Returns all segements of a route.\n *\n * /(group)/123/abc/[id]/[...rest] -> ['(group)', '123', 'abc', '[id]', '[...rest]'\n */\ntype RouteSegments<Path> = Path extends `${infer PartA}/${infer PartB}`\n  ? PartA extends '' | '.'\n    ? [...RouteSegments<PartB>]\n    : [PartA, ...RouteSegments<PartB>]\n  : Path extends ''\n  ? []\n  : [Path];\n\n/**\n * Returns a Record of the routes parameters as strings and CatchAll parameters\n *\n * There are two versions, input and output, as you can input 'string | number' but\n *  the output will always be 'string'\n *\n * /[id]/[...rest] -> { id: string, rest: string[] }\n * /no-params      -> {}\n */\ntype InputRouteParams<Path> = {\n  [Key in ParameterNames<Path> as Key extends `...${infer Name}`\n    ? Name\n    : Key]: Key extends `...${string}` ? (string | number)[] : string | number;\n} & UnknownInputParams;\n\ntype OutputRouteParams<Path> = {\n  [Key in ParameterNames<Path> as Key extends `...${infer Name}`\n    ? Name\n    : Key]: Key extends `...${string}` ? string[] : string;\n} & UnknownOutputParams;\n\n/**\n * Returns the search parameters for a route.\n */\nexport type SearchParams<T extends AllRoutes> = T extends DynamicRouteTemplate\n  ? OutputRouteParams<T>\n  : T extends StaticRoutes\n  ? never\n  : UnknownOutputParams;\n\n/**\n * Route is mostly used as part of Href to ensure that a valid route is provided\n *\n * Given a dynamic route, this will return never. This is helpful for conditional logic\n *\n * /test         -> /test, /test2, etc\n * /test/[abc]   -> never\n * /test/resolve -> /test, /test2, etc\n *\n * Note that if we provide a value for [abc] then the route is allowed\n *\n * This is named Route to prevent confusion, as users they will often see it in tooltips\n */\nexport type Route<T> = T extends string\n  ? T extends DynamicRouteTemplate\n    ? never\n    :\n        | StaticRoutes\n        | RelativePathString\n        | ExternalPathString\n        | (T extends `${infer P}${SearchOrHash}`\n            ? P extends DynamicRoutes<infer _>\n              ? T\n              : never\n            : T extends DynamicRoutes<infer _>\n            ? T\n            : never)\n  : never;\n\n/*********\n * Href  *\n *********/\n\nexport type Href<T> = T extends Record<'pathname', string> ? HrefObject<T> : Route<T>;\n\nexport type HrefObject<\n  R extends Record<'pathname', string>,\n  P = R['pathname'],\n> = P extends DynamicRouteTemplate\n  ? { pathname: P; params: InputRouteParams<P> }\n  : P extends Route<P>\n  ? { pathname: Route<P> | DynamicRouteTemplate; params?: never | InputRouteParams<never> }\n  : never;\n\n/***********************\n * Expo Router Exports *\n ***********************/\n\nexport type Router = Omit<OriginalRouter, 'push' | 'replace' | 'setParams'> & {\n  /** Navigate to the provided href. */\n  push: <T>(href: Href<T>) => void;\n  /** Navigate to route without appending to the history. */\n  replace: <T>(href: Href<T>) => void;\n  /** Update the current route query params. */\n  setParams: <T = ''>(params?: T extends '' ? Record<string, string> : InputRouteParams<T>) => void;\n};\n\n/** The imperative router. */\nexport declare const router: Router;\n\n/************\n * <Link /> *\n ************/\nexport interface LinkProps<T> extends OriginalLinkProps {\n  href: Href<T>;\n}\n\nexport interface LinkComponent {\n  <T>(props: React.PropsWithChildren<LinkProps<T>>): JSX.Element;\n  /** Helper method to resolve an Href object into a string. */\n  resolveHref: <T>(href: Href<T>) => string;\n}\n\n/**\n * Component to render link to another route using a path.\n * Uses an anchor tag on the web.\n *\n * @param props.href Absolute path to route (e.g. `/feeds/hot`).\n * @param props.replace Should replace the current route without adding to the history.\n * @param props.asChild Forward props to child component. Useful for custom buttons.\n * @param props.children Child elements to render the content.\n * @param props.className On web, this sets the HTML `class` directly. On native, this can be used with CSS interop tools like Nativewind.\n */\nexport declare const Link: LinkComponent;\n\n/** Redirects to the href as soon as the component is mounted. */\nexport declare const Redirect: <T>(\n  props: React.PropsWithChildren<{ href: Href<T> }>\n) => JSX.Element;\n\n/************\n * Hooks *\n ************/\nexport declare function useRouter(): Router;\n\nexport declare function useLocalSearchParams<\n  T extends AllRoutes | UnknownOutputParams = UnknownOutputParams,\n>(): T extends AllRoutes ? SearchParams<T> : T;\n\n/** @deprecated renamed to `useGlobalSearchParams` */\nexport declare function useSearchParams<\n  T extends AllRoutes | UnknownOutputParams = UnknownOutputParams,\n>(): T extends AllRoutes ? SearchParams<T> : T;\n\nexport declare function useGlobalSearchParams<\n  T extends AllRoutes | UnknownOutputParams = UnknownOutputParams,\n>(): T extends AllRoutes ? SearchParams<T> : T;\n\nexport declare function useSegments<\n  T extends AbsoluteRoute | RouteSegments<AbsoluteRoute> | RelativePathString,\n>(): T extends AbsoluteRoute ? RouteSegments<T> : T extends string ? string[] : T;\n"],"names":[],"mappings":"AAIA;;;;6CAEc,mBAAmB;AAAjC,YAAA,MAAkC;;2CAAlC,MAAkC;;;;mBAAlC,MAAkC;;;EAAA"}
+{"version":3,"sources":["../../../../../../../src/start/server/type-generation/__typetests__/fixtures/basic.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-unused-vars */\n/* eslint-disable import/export */\n/* eslint-disable @typescript-eslint/ban-types */\n\nimport type { LinkProps as OriginalLinkProps } from 'expo-router/build/link/Link';\nimport type { Router as OriginalRouter } from 'expo-router/build/types';\nexport * from 'expo-router/build';\n\n// prettier-ignore\ntype StaticRoutes = `/apple` | `/banana`;\n// prettier-ignore\ntype DynamicRoutes<T extends string> = `/colors/${SingleRoutePart<T>}` | `/animals/${CatchAllRoutePart<T>}` | `/mix/${SingleRoutePart<T>}/${SingleRoutePart<T>}/${CatchAllRoutePart<T>}`;\n// prettier-ignore\ntype DynamicRouteTemplate = `/colors/[color]` | `/animals/[...animal]` | `/mix/[fruit]/[color]/[...animals]`;\n\ntype RelativePathString = `./${string}` | `../${string}` | '..';\ntype AbsoluteRoute = DynamicRouteTemplate | StaticRoutes;\ntype ExternalPathString = `${string}:${string}`;\n\ntype ExpoRouterRoutes = DynamicRouteTemplate | StaticRoutes | RelativePathString;\ntype AllRoutes = ExpoRouterRoutes | ExternalPathString;\n\n/****************\n * Route Utils  *\n ****************/\n\ntype SearchOrHash = `?${string}` | `#${string}`;\ntype UnknownInputParams = Record<string, string | number | (string | number)[]>;\ntype UnknownOutputParams = Record<string, string | string[]>;\n\n/**\n * Return only the RoutePart of a string. If the string has multiple parts return never\n *\n * string   | type\n * ---------|------\n * 123      | 123\n * /123/abc | never\n * 123?abc  | never\n * ./123    | never\n * /123     | never\n * 123/../  | never\n */\ntype SingleRoutePart<S extends string> = S extends `${string}/${string}`\n  ? never\n  : S extends `${string}${SearchOrHash}`\n  ? never\n  : S extends ''\n  ? never\n  : S extends `(${string})`\n  ? never\n  : S extends `[${string}]`\n  ? never\n  : S;\n\n/**\n * Return only the CatchAll router part. If the string has search parameters or a hash return never\n */\ntype CatchAllRoutePart<S extends string> = S extends `${string}${SearchOrHash}`\n  ? never\n  : S extends ''\n  ? never\n  : S extends `${string}(${string})${string}`\n  ? never\n  : S extends `${string}[${string}]${string}`\n  ? never\n  : S;\n\n// type OptionalCatchAllRoutePart<S extends string> = S extends `${string}${SearchOrHash}` ? never : S\n\n/**\n * Return the name of a route parameter\n * '[test]'    -> 'test'\n * 'test'      -> never\n * '[...test]' -> '...test'\n */\ntype IsParameter<Part> = Part extends `[${infer ParamName}]` ? ParamName : never;\n\n/**\n * Return a union of all parameter names. If there are no names return never\n *\n * /[test]         -> 'test'\n * /[abc]/[...def] -> 'abc'|'...def'\n */\ntype ParameterNames<Path> = Path extends `${infer PartA}/${infer PartB}`\n  ? IsParameter<PartA> | ParameterNames<PartB>\n  : IsParameter<Path>;\n\n/**\n * Returns all segements of a route.\n *\n * /(group)/123/abc/[id]/[...rest] -> ['(group)', '123', 'abc', '[id]', '[...rest]'\n */\ntype RouteSegments<Path> = Path extends `${infer PartA}/${infer PartB}`\n  ? PartA extends '' | '.'\n    ? [...RouteSegments<PartB>]\n    : [PartA, ...RouteSegments<PartB>]\n  : Path extends ''\n  ? []\n  : [Path];\n\n/**\n * Returns a Record of the routes parameters as strings and CatchAll parameters\n *\n * There are two versions, input and output, as you can input 'string | number' but\n *  the output will always be 'string'\n *\n * /[id]/[...rest] -> { id: string, rest: string[] }\n * /no-params      -> {}\n */\ntype InputRouteParams<Path> = {\n  [Key in ParameterNames<Path> as Key extends `...${infer Name}`\n    ? Name\n    : Key]: Key extends `...${string}` ? (string | number)[] : string | number;\n} & UnknownInputParams;\n\ntype OutputRouteParams<Path> = {\n  [Key in ParameterNames<Path> as Key extends `...${infer Name}`\n    ? Name\n    : Key]: Key extends `...${string}` ? string[] : string;\n} & UnknownOutputParams;\n\n/**\n * Returns the search parameters for a route.\n */\nexport type SearchParams<T extends AllRoutes> = T extends DynamicRouteTemplate\n  ? OutputRouteParams<T>\n  : T extends StaticRoutes\n  ? never\n  : UnknownOutputParams;\n\n/**\n * Route is mostly used as part of Href to ensure that a valid route is provided\n *\n * Given a dynamic route, this will return never. This is helpful for conditional logic\n *\n * /test         -> /test, /test2, etc\n * /test/[abc]   -> never\n * /test/resolve -> /test, /test2, etc\n *\n * Note that if we provide a value for [abc] then the route is allowed\n *\n * This is named Route to prevent confusion, as users they will often see it in tooltips\n */\nexport type Route<T> = T extends string\n  ? T extends DynamicRouteTemplate\n    ? never\n    :\n        | StaticRoutes\n        | RelativePathString\n        | ExternalPathString\n        | (T extends `${infer P}${SearchOrHash}`\n            ? P extends DynamicRoutes<infer _>\n              ? T\n              : never\n            : T extends DynamicRoutes<infer _>\n            ? T\n            : never)\n  : never;\n\n/*********\n * Href  *\n *********/\n\nexport type Href<T> = T extends Record<'pathname', string> ? HrefObject<T> : Route<T>;\n\nexport type HrefObject<\n  R extends Record<'pathname', string>,\n  P = R['pathname'],\n> = P extends DynamicRouteTemplate\n  ? { pathname: P; params: InputRouteParams<P> }\n  : P extends Route<P>\n  ? { pathname: Route<P> | DynamicRouteTemplate; params?: never | InputRouteParams<never> }\n  : never;\n\n/***********************\n * Expo Router Exports *\n ***********************/\n\nexport type Router = Omit<OriginalRouter, 'push' | 'replace' | 'setParams'> & {\n  /** Navigate to the provided href. */\n  push: <T>(href: Href<T>) => void;\n  /** Navigate to route without appending to the history. */\n  replace: <T>(href: Href<T>) => void;\n  /** Update the current route query params. */\n  setParams: <T = ''>(params?: T extends '' ? Record<string, string> : InputRouteParams<T>) => void;\n};\n\n/** The imperative router. */\nexport declare const router: Router;\n\n/************\n * <Link /> *\n ************/\nexport interface LinkProps<T> extends OriginalLinkProps {\n  href: Href<T>;\n}\n\nexport interface LinkComponent {\n  <T>(props: React.PropsWithChildren<LinkProps<T>>): JSX.Element;\n  /** Helper method to resolve an Href object into a string. */\n  resolveHref: <T>(href: Href<T>) => string;\n}\n\n/**\n * Component to render link to another route using a path.\n * Uses an anchor tag on the web.\n *\n * @param props.href Absolute path to route (e.g. `/feeds/hot`).\n * @param props.replace Should replace the current route without adding to the history.\n * @param props.asChild Forward props to child component. Useful for custom buttons.\n * @param props.children Child elements to render the content.\n * @param props.className On web, this sets the HTML `class` directly. On native, this can be used with CSS interop tools like Nativewind.\n */\nexport declare const Link: LinkComponent;\n\n/** Redirects to the href as soon as the component is mounted. */\nexport declare const Redirect: <T>(\n  props: React.PropsWithChildren<{ href: Href<T> }>\n) => JSX.Element;\n\n/************\n * Hooks *\n ************/\nexport declare function useRouter(): Router;\n\nexport declare function useLocalSearchParams<\n  T extends AllRoutes | UnknownOutputParams = UnknownOutputParams,\n>(): T extends AllRoutes ? SearchParams<T> : T;\n\n/** @deprecated renamed to `useGlobalSearchParams` */\nexport declare function useSearchParams<\n  T extends AllRoutes | UnknownOutputParams = UnknownOutputParams,\n>(): T extends AllRoutes ? SearchParams<T> : T;\n\nexport declare function useGlobalSearchParams<\n  T extends AllRoutes | UnknownOutputParams = UnknownOutputParams,\n>(): T extends AllRoutes ? SearchParams<T> : T;\n\nexport declare function useSegments<\n  T extends AbsoluteRoute | RouteSegments<AbsoluteRoute> | RelativePathString,\n>(): T extends AbsoluteRoute ? RouteSegments<T> : T extends string ? string[] : T;\n"],"names":[],"mappings":"AAIA;;;;6CAEc,mBAAmB;AAAjC,YAAA,MAAkC;;2CAAlC,MAAkC;;;;mBAAlC,MAAkC;;;EAAA"}

package/build/src/utils/analytics/rudderstackClient.js

@@ -94,7 +94,7 @@ async function logEventAsync(event, properties = {}) {
     }
     const { userId , deviceId  } = identifyData;
     const commonEventProperties = {
-        source_version: "0.16.6",
+        source_version: "0.16.7",
         source: "expo"
     };
     const identity = {
@@ -135,7 +135,7 @@ function getContext() {
         },
         app: {
             name: "expo",
-            version: "0.16.6"
+            version: "0.16.7"
         },
         ci: ciInfo.isCI ? {
             name: ciInfo.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/cli",
-  "version": "0.16.6",
+  "version": "0.16.7",
   "description": "The Expo CLI",
   "main": "build/bin/cli",
   "bin": {
@@ -164,5 +164,5 @@
     "tree-kill": "^1.2.2",
     "tsd": "^0.28.1"
   },
-  "gitHead": "b5a3db3c8993f3b22e8cba1e2c6005fee57988c2"
+  "gitHead": "ca014bf2516c7644ef303f4c21fdd68de4d99f76"
 }