@expo/cli 0.7.3 → 0.9.0

package/build/src/start/server/metro/metroErrorInterface.js

@@ -0,0 +1,137 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.logMetroErrorWithStack = logMetroErrorWithStack;
+exports.logMetroError = logMetroError;
+exports.logFromError = logFromError;
+exports.logMetroErrorAsync = logMetroErrorAsync;
+exports.getErrorOverlayHtmlAsync = getErrorOverlayHtmlAsync;
+var _chalk = _interopRequireDefault(require("chalk"));
+var _resolveFrom = _interopRequireDefault(require("resolve-from"));
+var _terminalLink = _interopRequireDefault(require("terminal-link"));
+var _log = require("../../../log");
+var _getStaticRenderFunctions = require("../getStaticRenderFunctions");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+async function logMetroErrorWithStack(projectRoot, { stack , codeFrame , error  }) {
+    const { getStackFormattedLocation  } = require((0, _resolveFrom).default(projectRoot, "@expo/metro-runtime/symbolicate"));
+    _log.Log.log();
+    _log.Log.log(_chalk.default.red("Metro error: ") + error.message);
+    _log.Log.log();
+    if (codeFrame) {
+        _log.Log.log(codeFrame.content);
+    }
+    if (stack == null ? void 0 : stack.length) {
+        _log.Log.log();
+        _log.Log.log(_chalk.default.bold`Call Stack`);
+        const stackProps = stack.map((frame)=>{
+            return {
+                title: frame.methodName,
+                subtitle: getStackFormattedLocation(projectRoot, frame),
+                collapse: frame.collapse
+            };
+        });
+        stackProps.forEach((frame)=>{
+            const position = _terminalLink.default.isSupported ? (0, _terminalLink).default(frame.subtitle, frame.subtitle) : frame.subtitle;
+            let lineItem = _chalk.default.gray(`  ${frame.title} (${position})`);
+            if (frame.collapse) {
+                lineItem = _chalk.default.dim(lineItem);
+            }
+            _log.Log.log(lineItem);
+        });
+    } else {
+        _log.Log.log(_chalk.default.gray(`  ${error.stack}`));
+    }
+}
+async function logMetroError(projectRoot, { error  }) {
+    var ref, ref1;
+    const { LogBoxLog , parseErrorStack  } = require((0, _resolveFrom).default(projectRoot, "@expo/metro-runtime/symbolicate"));
+    const stack = parseErrorStack(error.stack);
+    const log = new LogBoxLog({
+        level: "static",
+        message: {
+            content: error.message,
+            substitutions: []
+        },
+        isComponentError: false,
+        stack,
+        category: "static",
+        componentStack: []
+    });
+    await new Promise((res)=>log.symbolicate("stack", res)
+    );
+    var ref2;
+    logMetroErrorWithStack(projectRoot, {
+        stack: (ref2 = (ref = log.symbolicated) == null ? void 0 : (ref1 = ref.stack) == null ? void 0 : ref1.stack) != null ? ref2 : [],
+        codeFrame: log.codeFrame,
+        error
+    });
+}
+function logFromError({ error , projectRoot  }) {
+    const { LogBoxLog , parseErrorStack  } = require((0, _resolveFrom).default(projectRoot, "@expo/metro-runtime/symbolicate"));
+    const stack = parseErrorStack(error.stack);
+    return new LogBoxLog({
+        level: "static",
+        message: {
+            content: error.message,
+            substitutions: []
+        },
+        isComponentError: false,
+        stack,
+        category: "static",
+        componentStack: []
+    });
+}
+async function logMetroErrorAsync({ error , projectRoot  }) {
+    var ref, ref3;
+    const log = logFromError({
+        projectRoot,
+        error
+    });
+    await new Promise((res)=>log.symbolicate("stack", res)
+    );
+    var ref4;
+    logMetroErrorWithStack(projectRoot, {
+        stack: (ref4 = (ref = log.symbolicated) == null ? void 0 : (ref3 = ref.stack) == null ? void 0 : ref3.stack) != null ? ref4 : [],
+        codeFrame: log.codeFrame,
+        error
+    });
+}
+async function getErrorOverlayHtmlAsync({ error , projectRoot  }) {
+    var ref, ref5;
+    const log = logFromError({
+        projectRoot,
+        error
+    });
+    await new Promise((res)=>log.symbolicate("stack", res)
+    );
+    var ref6;
+    logMetroErrorWithStack(projectRoot, {
+        stack: (ref6 = (ref = log.symbolicated) == null ? void 0 : (ref5 = ref.stack) == null ? void 0 : ref5.stack) != null ? ref6 : [],
+        codeFrame: log.codeFrame,
+        error
+    });
+    const logBoxContext = {
+        selectedLogIndex: 0,
+        isDisabled: false,
+        logs: [
+            log
+        ]
+    };
+    const html = `<html><head><style>#root,body,html{height:100%}body{overflow:hidden}#root{display:flex}</style></head><body><div id="root"></div><script id="_expo-static-error" type="application/json">${JSON.stringify(logBoxContext)}</script></body></html>`;
+    const errorOverlayEntry = await (0, _getStaticRenderFunctions).createMetroEndpointAsync(projectRoot, // Keep the URL relative
+    "", (0, _resolveFrom).default(projectRoot, "expo-router/_error"), {
+        dev: true,
+        platform: "web",
+        minify: false,
+        environment: "node"
+    });
+    const htmlWithJs = html.replace("</body>", `<script src=${errorOverlayEntry}></script></body>`);
+    return htmlWithJs;
+}
+
+//# sourceMappingURL=metroErrorInterface.js.map

package/build/src/start/server/metro/metroErrorInterface.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/start/server/metro/metroErrorInterface.ts"],"sourcesContent":["/**\n * Copyright © 2022 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 chalk from 'chalk';\nimport resolveFrom from 'resolve-from';\nimport { StackFrame } from 'stacktrace-parser';\nimport terminalLink from 'terminal-link';\n\nimport { Log } from '../../../log';\nimport { createMetroEndpointAsync } from '../getStaticRenderFunctions';\n// import type { CodeFrame, MetroStackFrame } from '@expo/metro-runtime/symbolicate';\n\ntype CodeFrame = {\n  content: string;\n  location?: {\n    row: number;\n    column: number;\n    [key: string]: any;\n  };\n  fileName: string;\n};\n\ntype MetroStackFrame = StackFrame & { collapse?: boolean };\n\nexport async function logMetroErrorWithStack(\n  projectRoot: string,\n  {\n    stack,\n    codeFrame,\n    error,\n  }: {\n    stack: MetroStackFrame[];\n    codeFrame: CodeFrame;\n    error: Error;\n  }\n) {\n  const { getStackFormattedLocation } = require(resolveFrom(\n    projectRoot,\n    '@expo/metro-runtime/symbolicate'\n  ));\n\n  Log.log();\n  Log.log(chalk.red('Metro error: ') + error.message);\n  Log.log();\n\n  if (codeFrame) {\n    Log.log(codeFrame.content);\n  }\n\n  if (stack?.length) {\n    Log.log();\n    Log.log(chalk.bold`Call Stack`);\n\n    const stackProps = stack.map((frame) => {\n      return {\n        title: frame.methodName,\n        subtitle: getStackFormattedLocation(projectRoot, frame),\n        collapse: frame.collapse,\n      };\n    });\n\n    stackProps.forEach((frame) => {\n      const position = terminalLink.isSupported\n        ? terminalLink(frame.subtitle, frame.subtitle)\n        : frame.subtitle;\n      let lineItem = chalk.gray(`  ${frame.title} (${position})`);\n      if (frame.collapse) {\n        lineItem = chalk.dim(lineItem);\n      }\n      Log.log(lineItem);\n    });\n  } else {\n    Log.log(chalk.gray(`  ${error.stack}`));\n  }\n}\n\nexport async function logMetroError(projectRoot: string, { error }: { error: Error }) {\n  const { LogBoxLog, parseErrorStack } = require(resolveFrom(\n    projectRoot,\n    '@expo/metro-runtime/symbolicate'\n  ));\n\n  const stack = parseErrorStack(error.stack);\n\n  const log = new LogBoxLog({\n    level: 'static',\n    message: {\n      content: error.message,\n      substitutions: [],\n    },\n    isComponentError: false,\n    stack,\n    category: 'static',\n    componentStack: [],\n  });\n\n  await new Promise((res) => log.symbolicate('stack', res));\n\n  logMetroErrorWithStack(projectRoot, {\n    stack: log.symbolicated?.stack?.stack ?? [],\n    codeFrame: log.codeFrame,\n    error,\n  });\n}\n\n/** @returns the html required to render the static metro error as an SPA. */\nexport function logFromError({ error, projectRoot }: { error: Error; projectRoot: string }): {\n  symbolicated: any;\n  symbolicate: (type: string, callback: () => void) => void;\n  codeFrame: CodeFrame;\n} {\n  const { LogBoxLog, parseErrorStack } = require(resolveFrom(\n    projectRoot,\n    '@expo/metro-runtime/symbolicate'\n  ));\n\n  const stack = parseErrorStack(error.stack);\n\n  return new LogBoxLog({\n    level: 'static',\n    message: {\n      content: error.message,\n      substitutions: [],\n    },\n    isComponentError: false,\n    stack,\n    category: 'static',\n    componentStack: [],\n  });\n}\n\n/** @returns the html required to render the static metro error as an SPA. */\nexport async function logMetroErrorAsync({\n  error,\n  projectRoot,\n}: {\n  error: Error;\n  projectRoot: string;\n}) {\n  const log = logFromError({ projectRoot, error });\n\n  await new Promise<void>((res) => log.symbolicate('stack', res));\n\n  logMetroErrorWithStack(projectRoot, {\n    stack: log.symbolicated?.stack?.stack ?? [],\n    codeFrame: log.codeFrame,\n    error,\n  });\n}\n\n/** @returns the html required to render the static metro error as an SPA. */\nexport async function getErrorOverlayHtmlAsync({\n  error,\n  projectRoot,\n}: {\n  error: Error;\n  projectRoot: string;\n}) {\n  const log = logFromError({ projectRoot, error });\n\n  await new Promise<void>((res) => log.symbolicate('stack', res));\n\n  logMetroErrorWithStack(projectRoot, {\n    stack: log.symbolicated?.stack?.stack ?? [],\n    codeFrame: log.codeFrame,\n    error,\n  });\n\n  const logBoxContext = {\n    selectedLogIndex: 0,\n    isDisabled: false,\n    logs: [log],\n  };\n  const html = `<html><head><style>#root,body,html{height:100%}body{overflow:hidden}#root{display:flex}</style></head><body><div id=\"root\"></div><script id=\"_expo-static-error\" type=\"application/json\">${JSON.stringify(\n    logBoxContext\n  )}</script></body></html>`;\n\n  const errorOverlayEntry = await createMetroEndpointAsync(\n    projectRoot,\n    // Keep the URL relative\n    '',\n    resolveFrom(projectRoot, 'expo-router/_error'),\n    {\n      dev: true,\n      platform: 'web',\n      minify: false,\n      environment: 'node',\n    }\n  );\n\n  const htmlWithJs = html.replace('</body>', `<script src=${errorOverlayEntry}></script></body>`);\n  return htmlWithJs;\n}\n"],"names":["logMetroErrorWithStack","logMetroError","logFromError","logMetroErrorAsync","getErrorOverlayHtmlAsync","projectRoot","stack","codeFrame","error","getStackFormattedLocation","require","resolveFrom","Log","log","chalk","red","message","content","length","bold","stackProps","map","frame","title","methodName","subtitle","collapse","forEach","position","terminalLink","isSupported","lineItem","gray","dim","LogBoxLog","parseErrorStack","level","substitutions","isComponentError","category","componentStack","Promise","res","symbolicate","symbolicated","logBoxContext","selectedLogIndex","isDisabled","logs","html","JSON","stringify","errorOverlayEntry","createMetroEndpointAsync","dev","platform","minify","environment","htmlWithJs","replace"],"mappings":"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"}

package/build/src/start/server/metro/metroWatchTypeScriptFiles.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.metroWatchTypeScriptFiles = metroWatchTypeScriptFiles;
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const debug = require("debug")("expo:start:server:metro:waitForTypescript");
+function metroWatchTypeScriptFiles({ metro , server , projectRoot , callback , tsconfig =false , throttle =false , eventTypes =[
+    "add",
+    "change",
+    "delete"
+]  }) {
+    const watcher = metro.getBundler().getBundler().getWatcher();
+    const tsconfigPath = _path.default.join(projectRoot, "tsconfig.json");
+    const listener = ({ eventsQueue  })=>{
+        for (const event of eventsQueue){
+            var ref;
+            if (eventTypes.includes(event.type) && ((ref = event.metadata) == null ? void 0 : ref.type) !== "d" && // We need to ignore node_modules because Metro will add all of the files in node_modules to the watcher.
+            !/node_modules/.test(event.filePath) && // Ignore declaration files
+            !/\.d\.ts$/.test(event.filePath)) {
+                const { filePath  } = event;
+                // Is TypeScript?
+                if (// If the user adds a TypeScript file to the observable files in their project.
+                /\.tsx?$/.test(filePath) || // Or if the user adds a tsconfig.json file to the project root.
+                (tsconfig && filePath === tsconfigPath)) {
+                    debug("Detected TypeScript file changed in the project: ", filePath);
+                    callback(event);
+                    if (throttle) {
+                        return;
+                    }
+                }
+            }
+        }
+    };
+    debug("Waiting for TypeScript files to be added to the project...");
+    watcher.addListener("change", listener);
+    watcher.addListener("add", listener);
+    const off = ()=>{
+        watcher.removeListener("change", listener);
+        watcher.removeListener("add", listener);
+    };
+    server.addListener == null ? void 0 : server.addListener("close", off);
+    return off;
+}
+
+//# sourceMappingURL=metroWatchTypeScriptFiles.js.map

package/build/src/start/server/metro/metroWatchTypeScriptFiles.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/start/server/metro/metroWatchTypeScriptFiles.ts"],"sourcesContent":["import path from 'path';\n\nimport type { ServerLike } from '../BundlerDevServer';\n\nconst debug = require('debug')('expo:start:server:metro:waitForTypescript') as typeof console.log;\n\nexport interface MetroWatchTypeScriptFilesOptions {\n  projectRoot: string;\n  metro: import('metro').Server;\n  server: ServerLike;\n  /* Include tsconfig.json in the watcher */\n  tsconfig?: boolean;\n  callback: (event: WatchEvent) => void;\n  /* Array of eventTypes to watch. Defaults to all events */\n  eventTypes?: string[];\n  /* Throlle the callback. When true and  a group of events are recieved, callback it will only be called with the\n   * first event */\n  throttle?: boolean;\n}\n\ninterface WatchEvent {\n  filePath: string;\n  metadata?: {\n    type: 'f' | 'd' | 'l'; // Regular file / Directory / Symlink\n  } | null;\n  type: string;\n}\n\n/**\n * Use the native file watcher / Metro ruleset to detect if a\n * TypeScript file is added to the project during development.\n */\nexport function metroWatchTypeScriptFiles({\n  metro,\n  server,\n  projectRoot,\n  callback,\n  tsconfig = false,\n  throttle = false,\n  eventTypes = ['add', 'change', 'delete'],\n}: MetroWatchTypeScriptFilesOptions): () => void {\n  const watcher = metro.getBundler().getBundler().getWatcher();\n\n  const tsconfigPath = path.join(projectRoot, 'tsconfig.json');\n\n  const listener = ({ eventsQueue }: { eventsQueue: WatchEvent[] }) => {\n    for (const event of eventsQueue) {\n      if (\n        eventTypes.includes(event.type) &&\n        event.metadata?.type !== 'd' &&\n        // We need to ignore node_modules because Metro will add all of the files in node_modules to the watcher.\n        !/node_modules/.test(event.filePath) &&\n        // Ignore declaration files\n        !/\\.d\\.ts$/.test(event.filePath)\n      ) {\n        const { filePath } = event;\n        // Is TypeScript?\n        if (\n          // If the user adds a TypeScript file to the observable files in their project.\n          /\\.tsx?$/.test(filePath) ||\n          // Or if the user adds a tsconfig.json file to the project root.\n          (tsconfig && filePath === tsconfigPath)\n        ) {\n          debug('Detected TypeScript file changed in the project: ', filePath);\n          callback(event);\n\n          if (throttle) {\n            return;\n          }\n        }\n      }\n    }\n  };\n\n  debug('Waiting for TypeScript files to be added to the project...');\n  watcher.addListener('change', listener);\n  watcher.addListener('add', listener);\n\n  const off = () => {\n    watcher.removeListener('change', listener);\n    watcher.removeListener('add', listener);\n  };\n\n  server.addListener?.('close', off);\n  return off;\n}\n"],"names":["metroWatchTypeScriptFiles","debug","require","metro","server","projectRoot","callback","tsconfig","throttle","eventTypes","watcher","getBundler","getWatcher","tsconfigPath","path","join","listener","eventsQueue","event","includes","type","metadata","test","filePath","addListener","off","removeListener"],"mappings":"AAAA;;;;QAgCgBA,yBAAyB,GAAzBA,yBAAyB;AAhCxB,IAAA,KAAM,kCAAN,MAAM,EAAA;;;;;;AAIvB,MAAMC,KAAK,GAAGC,OAAO,CAAC,OAAO,CAAC,CAAC,2CAA2C,CAAC,AAAsB,AAAC;AA4B3F,SAASF,yBAAyB,CAAC,EACxCG,KAAK,CAAA,EACLC,MAAM,CAAA,EACNC,WAAW,CAAA,EACXC,QAAQ,CAAA,EACRC,QAAQ,EAAG,KAAK,CAAA,EAChBC,QAAQ,EAAG,KAAK,CAAA,EAChBC,UAAU,EAAG;IAAC,KAAK;IAAE,QAAQ;IAAE,QAAQ;CAAC,CAAA,EACP,EAAc;IAC/C,MAAMC,OAAO,GAAGP,KAAK,CAACQ,UAAU,EAAE,CAACA,UAAU,EAAE,CAACC,UAAU,EAAE,AAAC;IAE7D,MAAMC,YAAY,GAAGC,KAAI,QAAA,CAACC,IAAI,CAACV,WAAW,EAAE,eAAe,CAAC,AAAC;IAE7D,MAAMW,QAAQ,GAAG,CAAC,EAAEC,WAAW,CAAA,EAAiC,GAAK;QACnE,KAAK,MAAMC,KAAK,IAAID,WAAW,CAAE;gBAG7BC,GAAc;YAFhB,IACET,UAAU,CAACU,QAAQ,CAACD,KAAK,CAACE,IAAI,CAAC,IAC/BF,CAAAA,CAAAA,GAAc,GAAdA,KAAK,CAACG,QAAQ,SAAM,GAApBH,KAAAA,CAAoB,GAApBA,GAAc,CAAEE,IAAI,CAAA,KAAK,GAAG,IAC5B,yGAAyG;YACzG,CAAC,eAAeE,IAAI,CAACJ,KAAK,CAACK,QAAQ,CAAC,IACpC,2BAA2B;YAC3B,CAAC,WAAWD,IAAI,CAACJ,KAAK,CAACK,QAAQ,CAAC,EAChC;gBACA,MAAM,EAAEA,QAAQ,CAAA,EAAE,GAAGL,KAAK,AAAC;gBAC3B,iBAAiB;gBACjB,IACE,+EAA+E;gBAC/E,UAAUI,IAAI,CAACC,QAAQ,CAAC,IACxB,gEAAgE;gBAChE,CAAChB,QAAQ,IAAIgB,QAAQ,KAAKV,YAAY,CAAC,EACvC;oBACAZ,KAAK,CAAC,mDAAmD,EAAEsB,QAAQ,CAAC,CAAC;oBACrEjB,QAAQ,CAACY,KAAK,CAAC,CAAC;oBAEhB,IAAIV,QAAQ,EAAE;wBACZ,OAAO;qBACR;iBACF;aACF;SACF;KACF,AAAC;IAEFP,KAAK,CAAC,4DAA4D,CAAC,CAAC;IACpES,OAAO,CAACc,WAAW,CAAC,QAAQ,EAAER,QAAQ,CAAC,CAAC;IACxCN,OAAO,CAACc,WAAW,CAAC,KAAK,EAAER,QAAQ,CAAC,CAAC;IAErC,MAAMS,GAAG,GAAG,IAAM;QAChBf,OAAO,CAACgB,cAAc,CAAC,QAAQ,EAAEV,QAAQ,CAAC,CAAC;QAC3CN,OAAO,CAACgB,cAAc,CAAC,KAAK,EAAEV,QAAQ,CAAC,CAAC;KACzC,AAAC;IAEFZ,MAAM,CAACoB,WAAW,QAAgB,GAAlCpB,KAAAA,CAAkC,GAAlCA,MAAM,CAACoB,WAAW,CAAG,OAAO,EAAEC,GAAG,CAAC,AAnFpC,CAmFqC;IACnC,OAAOA,GAAG,CAAC;CACZ"}

package/build/src/start/server/metro/resolveFromProject.js

@@ -3,11 +3,15 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.importMetroFromProject = importMetroFromProject;
-exports.importExpoMetroConfigFromProject = importExpoMetroConfigFromProject;
+exports.importMetroCreateWebsocketServerFromProject = importMetroCreateWebsocketServerFromProject;
+exports.importMetroHmrServerFromProject = importMetroHmrServerFromProject;
+exports.importExpoMetroConfig = importExpoMetroConfig;
+exports.importFromProjectOrFallback = importFromProjectOrFallback;
 exports.importMetroResolverFromProject = importMetroResolverFromProject;
 exports.importMetroInspectorProxyFromProject = importMetroInspectorProxyFromProject;
 exports.importMetroInspectorDeviceFromProject = importMetroInspectorDeviceFromProject;
 exports.importCliSaveAssetsFromProject = importCliSaveAssetsFromProject;
+exports.importCliBuildBundleWithConfigFromProject = importCliBuildBundleWithConfigFromProject;
 exports.resolveMetroVersionFromProject = resolveMetroVersionFromProject;
 var _resolveFrom = _interopRequireDefault(require("resolve-from"));
 function _interopRequireDefault(obj) {
@@ -15,6 +19,7 @@ function _interopRequireDefault(obj) {
         default: obj
     };
 }
+const debug = require("debug")("expo:metro:import");
 // These resolvers enable us to test the CLI in older projects.
 // We may be able to get rid of this in the future.
 // TODO: Maybe combine with AsyncResolver?
@@ -36,8 +41,23 @@ function importFromProject(projectRoot, moduleId) {
 function importMetroFromProject(projectRoot) {
     return importFromProject(projectRoot, "metro");
 }
-function importExpoMetroConfigFromProject(projectRoot) {
-    return importFromProject(projectRoot, "@expo/metro-config");
+function importMetroCreateWebsocketServerFromProject(projectRoot) {
+    return importFromProject(projectRoot, "metro/src/lib/createWebsocketServer");
+}
+function importMetroHmrServerFromProject(projectRoot) {
+    return importFromProject(projectRoot, "metro/src/HmrServer");
+}
+function importExpoMetroConfig(projectRoot) {
+    return importFromProjectOrFallback(projectRoot, "@expo/metro-config");
+}
+function importFromProjectOrFallback(projectRoot, moduleId) {
+    const resolvedPath = _resolveFrom.default.silent(projectRoot, moduleId);
+    if (!resolvedPath) {
+        debug(`requiring "${moduleId}" relative to the CLI`);
+        return require(require.resolve(moduleId));
+    }
+    debug(`requiring "${moduleId}" from the project:`, resolvedPath);
+    return require(resolvedPath);
 }
 function importMetroResolverFromProject(projectRoot) {
     return importFromProject(projectRoot, "metro-resolver");
@@ -51,6 +71,9 @@ function importMetroInspectorDeviceFromProject(projectRoot) {
 function importCliSaveAssetsFromProject(projectRoot) {
     return importFromProject(projectRoot, "@react-native-community/cli-plugin-metro/build/commands/bundle/saveAssets").default;
 }
+function importCliBuildBundleWithConfigFromProject(projectRoot) {
+    return importFromProject(projectRoot, "@react-native-community/cli-plugin-metro/build/commands/bundle/buildBundle").buildBundleWithConfig;
+}
 function resolveMetroVersionFromProject(projectRoot) {
     return importFromProject(projectRoot, "metro/package.json").version;
 }

package/build/src/start/server/metro/resolveFromProject.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/start/server/metro/resolveFromProject.ts"],"sourcesContent":["import resolveFrom from 'resolve-from';\n\n// These resolvers enable us to test the CLI in older projects.\n// We may be able to get rid of this in the future.\n// TODO: Maybe combine with AsyncResolver?\nclass MetroImportError extends Error {\n  constructor(projectRoot: string, moduleId: string) {\n    super(\n      `Missing package \"${moduleId}\" in the project at: ${projectRoot}\\n` +\n        'This usually means \"react-native\" is not installed. ' +\n        'Please verify that dependencies in package.json include \"react-native\" ' +\n        'and run `yarn` or `npm install`.'\n    );\n  }\n}\n\nfunction resolveFromProject(projectRoot: string, moduleId: string) {\n  const resolvedPath = resolveFrom.silent(projectRoot, moduleId);\n  if (!resolvedPath) {\n    throw new MetroImportError(projectRoot, moduleId);\n  }\n  return resolvedPath;\n}\n\nfunction importFromProject(projectRoot: string, moduleId: string) {\n  return require(resolveFromProject(projectRoot, moduleId));\n}\n\n/** Import `metro` from the project. */\nexport function importMetroFromProject(projectRoot: string): typeof import('metro') {\n  return importFromProject(projectRoot, 'metro');\n}\n\n/** Import `@expo/metro-config` from the project. */\nexport function importExpoMetroConfigFromProject(\n  projectRoot: string\n): typeof import('@expo/metro-config') {\n  return importFromProject(projectRoot, '@expo/metro-config');\n}\n\n/** Import `metro-resolver` from the project. */\nexport function importMetroResolverFromProject(\n  projectRoot: string\n): typeof import('metro-resolver') {\n  return importFromProject(projectRoot, 'metro-resolver');\n}\n\n/** Import `metro-inspector-proxy` from the project. */\nexport function importMetroInspectorProxyFromProject(\n  projectRoot: string\n): typeof import('metro-inspector-proxy') {\n  return importFromProject(projectRoot, 'metro-inspector-proxy');\n}\n\n/** Import `metro-inspector-proxy/src/Device` from the project. */\nexport function importMetroInspectorDeviceFromProject(\n  projectRoot: string\n): typeof import('metro-inspector-proxy/src/Device') {\n  return importFromProject(projectRoot, 'metro-inspector-proxy/src/Device');\n}\n\n/**\n * Import the internal `saveAssets()` function from `react-native` for the purpose\n * of saving production assets as-is instead of converting them to a hash.\n */\nexport function importCliSaveAssetsFromProject(\n  projectRoot: string\n): typeof import('@react-native-community/cli-plugin-metro/build/commands/bundle/saveAssets').default {\n  return importFromProject(\n    projectRoot,\n    '@react-native-community/cli-plugin-metro/build/commands/bundle/saveAssets'\n  ).default;\n}\n\n/** Resolve the installed Metro version from project */\nexport function resolveMetroVersionFromProject(projectRoot: string): string {\n  return importFromProject(projectRoot, 'metro/package.json').version;\n}\n"],"names":["importMetroFromProject","importExpoMetroConfigFromProject","importMetroResolverFromProject","importMetroInspectorProxyFromProject","importMetroInspectorDeviceFromProject","importCliSaveAssetsFromProject","resolveMetroVersionFromProject","MetroImportError","Error","constructor","projectRoot","moduleId","resolveFromProject","resolvedPath","resolveFrom","silent","importFromProject","require","default","version"],"mappings":"AAAA;;;;QA6BgBA,sBAAsB,GAAtBA,sBAAsB;QAKtBC,gCAAgC,GAAhCA,gCAAgC;QAOhCC,8BAA8B,GAA9BA,8BAA8B;QAO9BC,oCAAoC,GAApCA,oCAAoC;QAOpCC,qCAAqC,GAArCA,qCAAqC;QAUrCC,8BAA8B,GAA9BA,8BAA8B;QAU9BC,8BAA8B,GAA9BA,8BAA8B;AA3EtB,IAAA,YAAc,kCAAd,cAAc,EAAA;;;;;;AAEtC,+DAA+D;AAC/D,mDAAmD;AACnD,0CAA0C;AAC1C,MAAMC,gBAAgB,SAASC,KAAK;IAClCC,YAAYC,WAAmB,EAAEC,QAAgB,CAAE;QACjD,KAAK,CACH,CAAC,iBAAiB,EAAEA,QAAQ,CAAC,qBAAqB,EAAED,WAAW,CAAC,EAAE,CAAC,GACjE,sDAAsD,GACtD,yEAAyE,GACzE,kCAAkC,CACrC,CAAC;KACH;CACF;AAED,SAASE,kBAAkB,CAACF,WAAmB,EAAEC,QAAgB,EAAE;IACjE,MAAME,YAAY,GAAGC,YAAW,QAAA,CAACC,MAAM,CAACL,WAAW,EAAEC,QAAQ,CAAC,AAAC;IAC/D,IAAI,CAACE,YAAY,EAAE;QACjB,MAAM,IAAIN,gBAAgB,CAACG,WAAW,EAAEC,QAAQ,CAAC,CAAC;KACnD;IACD,OAAOE,YAAY,CAAC;CACrB;AAED,SAASG,iBAAiB,CAACN,WAAmB,EAAEC,QAAgB,EAAE;IAChE,OAAOM,OAAO,CAACL,kBAAkB,CAACF,WAAW,EAAEC,QAAQ,CAAC,CAAC,CAAC;CAC3D;AAGM,SAASX,sBAAsB,CAACU,WAAmB,EAA0B;IAClF,OAAOM,iBAAiB,CAACN,WAAW,EAAE,OAAO,CAAC,CAAC;CAChD;AAGM,SAAST,gCAAgC,CAC9CS,WAAmB,EACkB;IACrC,OAAOM,iBAAiB,CAACN,WAAW,EAAE,oBAAoB,CAAC,CAAC;CAC7D;AAGM,SAASR,8BAA8B,CAC5CQ,WAAmB,EACc;IACjC,OAAOM,iBAAiB,CAACN,WAAW,EAAE,gBAAgB,CAAC,CAAC;CACzD;AAGM,SAASP,oCAAoC,CAClDO,WAAmB,EACqB;IACxC,OAAOM,iBAAiB,CAACN,WAAW,EAAE,uBAAuB,CAAC,CAAC;CAChE;AAGM,SAASN,qCAAqC,CACnDM,WAAmB,EACgC;IACnD,OAAOM,iBAAiB,CAACN,WAAW,EAAE,kCAAkC,CAAC,CAAC;CAC3E;AAMM,SAASL,8BAA8B,CAC5CK,WAAmB,EACiF;IACpG,OAAOM,iBAAiB,CACtBN,WAAW,EACX,2EAA2E,CAC5E,CAACQ,OAAO,CAAC;CACX;AAGM,SAASZ,8BAA8B,CAACI,WAAmB,EAAU;IAC1E,OAAOM,iBAAiB,CAACN,WAAW,EAAE,oBAAoB,CAAC,CAACS,OAAO,CAAC;CACrE"}
+{"version":3,"sources":["../../../../../src/start/server/metro/resolveFromProject.ts"],"sourcesContent":["import resolveFrom from 'resolve-from';\n\nconst debug = require('debug')('expo:metro:import');\n\n// These resolvers enable us to test the CLI in older projects.\n// We may be able to get rid of this in the future.\n// TODO: Maybe combine with AsyncResolver?\nclass MetroImportError extends Error {\n  constructor(projectRoot: string, moduleId: string) {\n    super(\n      `Missing package \"${moduleId}\" in the project at: ${projectRoot}\\n` +\n        'This usually means \"react-native\" is not installed. ' +\n        'Please verify that dependencies in package.json include \"react-native\" ' +\n        'and run `yarn` or `npm install`.'\n    );\n  }\n}\n\nfunction resolveFromProject(projectRoot: string, moduleId: string) {\n  const resolvedPath = resolveFrom.silent(projectRoot, moduleId);\n  if (!resolvedPath) {\n    throw new MetroImportError(projectRoot, moduleId);\n  }\n  return resolvedPath;\n}\n\nfunction importFromProject(projectRoot: string, moduleId: string) {\n  return require(resolveFromProject(projectRoot, moduleId));\n}\n\n/** Import `metro` from the project. */\nexport function importMetroFromProject(projectRoot: string): typeof import('metro') {\n  return importFromProject(projectRoot, 'metro');\n}\nexport function importMetroCreateWebsocketServerFromProject(\n  projectRoot: string\n): typeof import('metro/src/lib/createWebsocketServer').createWebsocketServer {\n  return importFromProject(projectRoot, 'metro/src/lib/createWebsocketServer');\n}\nexport function importMetroHmrServerFromProject(\n  projectRoot: string\n): typeof import('metro/src/HmrServer').MetroHmrServer {\n  return importFromProject(projectRoot, 'metro/src/HmrServer');\n}\n\nexport function importExpoMetroConfig(projectRoot: string) {\n  return importFromProjectOrFallback<typeof import('@expo/metro-config')>(\n    projectRoot,\n    '@expo/metro-config'\n  );\n}\n\n/**\n * Attempt to use the local version of a module or fallback on the CLI version.\n * This should only ever happen when testing Expo CLI in development.\n */\nexport function importFromProjectOrFallback<TModule>(\n  projectRoot: string,\n  moduleId: string\n): TModule {\n  const resolvedPath = resolveFrom.silent(projectRoot, moduleId);\n  if (!resolvedPath) {\n    debug(`requiring \"${moduleId}\" relative to the CLI`);\n    return require(require.resolve(moduleId));\n  }\n  debug(`requiring \"${moduleId}\" from the project:`, resolvedPath);\n  return require(resolvedPath);\n}\n\n/** Import `metro-resolver` from the project. */\nexport function importMetroResolverFromProject(\n  projectRoot: string\n): typeof import('metro-resolver') {\n  return importFromProject(projectRoot, 'metro-resolver');\n}\n\n/** Import `metro-inspector-proxy` from the project. */\nexport function importMetroInspectorProxyFromProject(\n  projectRoot: string\n): typeof import('metro-inspector-proxy') {\n  return importFromProject(projectRoot, 'metro-inspector-proxy');\n}\n\n/** Import `metro-inspector-proxy/src/Device` from the project. */\nexport function importMetroInspectorDeviceFromProject(\n  projectRoot: string\n): typeof import('metro-inspector-proxy/src/Device') {\n  return importFromProject(projectRoot, 'metro-inspector-proxy/src/Device');\n}\n\n/**\n * Import the internal `saveAssets()` function from `react-native` for the purpose\n * of saving production assets as-is instead of converting them to a hash.\n */\nexport function importCliSaveAssetsFromProject(\n  projectRoot: string\n): typeof import('@react-native-community/cli-plugin-metro/build/commands/bundle/saveAssets').default {\n  return importFromProject(\n    projectRoot,\n    '@react-native-community/cli-plugin-metro/build/commands/bundle/saveAssets'\n  ).default;\n}\n\nexport function importCliBuildBundleWithConfigFromProject(\n  projectRoot: string\n): typeof import('@react-native-community/cli-plugin-metro/build/commands/bundle/buildBundle').buildBundleWithConfig {\n  return importFromProject(\n    projectRoot,\n    '@react-native-community/cli-plugin-metro/build/commands/bundle/buildBundle'\n  ).buildBundleWithConfig;\n}\n\n/** Resolve the installed Metro version from project */\nexport function resolveMetroVersionFromProject(projectRoot: string): string {\n  return importFromProject(projectRoot, 'metro/package.json').version;\n}\n"],"names":["importMetroFromProject","importMetroCreateWebsocketServerFromProject","importMetroHmrServerFromProject","importExpoMetroConfig","importFromProjectOrFallback","importMetroResolverFromProject","importMetroInspectorProxyFromProject","importMetroInspectorDeviceFromProject","importCliSaveAssetsFromProject","importCliBuildBundleWithConfigFromProject","resolveMetroVersionFromProject","debug","require","MetroImportError","Error","constructor","projectRoot","moduleId","resolveFromProject","resolvedPath","resolveFrom","silent","importFromProject","resolve","default","buildBundleWithConfig","version"],"mappings":"AAAA;;;;QA+BgBA,sBAAsB,GAAtBA,sBAAsB;QAGtBC,2CAA2C,GAA3CA,2CAA2C;QAK3CC,+BAA+B,GAA/BA,+BAA+B;QAM/BC,qBAAqB,GAArBA,qBAAqB;QAWrBC,2BAA2B,GAA3BA,2BAA2B;QAc3BC,8BAA8B,GAA9BA,8BAA8B;QAO9BC,oCAAoC,GAApCA,oCAAoC;QAOpCC,qCAAqC,GAArCA,qCAAqC;QAUrCC,8BAA8B,GAA9BA,8BAA8B;QAS9BC,yCAAyC,GAAzCA,yCAAyC;QAUzCC,8BAA8B,GAA9BA,8BAA8B;AAjHtB,IAAA,YAAc,kCAAd,cAAc,EAAA;;;;;;AAEtC,MAAMC,KAAK,GAAGC,OAAO,CAAC,OAAO,CAAC,CAAC,mBAAmB,CAAC,AAAC;AAEpD,+DAA+D;AAC/D,mDAAmD;AACnD,0CAA0C;AAC1C,MAAMC,gBAAgB,SAASC,KAAK;IAClCC,YAAYC,WAAmB,EAAEC,QAAgB,CAAE;QACjD,KAAK,CACH,CAAC,iBAAiB,EAAEA,QAAQ,CAAC,qBAAqB,EAAED,WAAW,CAAC,EAAE,CAAC,GACjE,sDAAsD,GACtD,yEAAyE,GACzE,kCAAkC,CACrC,CAAC;KACH;CACF;AAED,SAASE,kBAAkB,CAACF,WAAmB,EAAEC,QAAgB,EAAE;IACjE,MAAME,YAAY,GAAGC,YAAW,QAAA,CAACC,MAAM,CAACL,WAAW,EAAEC,QAAQ,CAAC,AAAC;IAC/D,IAAI,CAACE,YAAY,EAAE;QACjB,MAAM,IAAIN,gBAAgB,CAACG,WAAW,EAAEC,QAAQ,CAAC,CAAC;KACnD;IACD,OAAOE,YAAY,CAAC;CACrB;AAED,SAASG,iBAAiB,CAACN,WAAmB,EAAEC,QAAgB,EAAE;IAChE,OAAOL,OAAO,CAACM,kBAAkB,CAACF,WAAW,EAAEC,QAAQ,CAAC,CAAC,CAAC;CAC3D;AAGM,SAASjB,sBAAsB,CAACgB,WAAmB,EAA0B;IAClF,OAAOM,iBAAiB,CAACN,WAAW,EAAE,OAAO,CAAC,CAAC;CAChD;AACM,SAASf,2CAA2C,CACzDe,WAAmB,EACyD;IAC5E,OAAOM,iBAAiB,CAACN,WAAW,EAAE,qCAAqC,CAAC,CAAC;CAC9E;AACM,SAASd,+BAA+B,CAC7Cc,WAAmB,EACkC;IACrD,OAAOM,iBAAiB,CAACN,WAAW,EAAE,qBAAqB,CAAC,CAAC;CAC9D;AAEM,SAASb,qBAAqB,CAACa,WAAmB,EAAE;IACzD,OAAOZ,2BAA2B,CAChCY,WAAW,EACX,oBAAoB,CACrB,CAAC;CACH;AAMM,SAASZ,2BAA2B,CACzCY,WAAmB,EACnBC,QAAgB,EACP;IACT,MAAME,YAAY,GAAGC,YAAW,QAAA,CAACC,MAAM,CAACL,WAAW,EAAEC,QAAQ,CAAC,AAAC;IAC/D,IAAI,CAACE,YAAY,EAAE;QACjBR,KAAK,CAAC,CAAC,WAAW,EAAEM,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC;QACrD,OAAOL,OAAO,CAACA,OAAO,CAACW,OAAO,CAACN,QAAQ,CAAC,CAAC,CAAC;KAC3C;IACDN,KAAK,CAAC,CAAC,WAAW,EAAEM,QAAQ,CAAC,mBAAmB,CAAC,EAAEE,YAAY,CAAC,CAAC;IACjE,OAAOP,OAAO,CAACO,YAAY,CAAC,CAAC;CAC9B;AAGM,SAASd,8BAA8B,CAC5CW,WAAmB,EACc;IACjC,OAAOM,iBAAiB,CAACN,WAAW,EAAE,gBAAgB,CAAC,CAAC;CACzD;AAGM,SAASV,oCAAoC,CAClDU,WAAmB,EACqB;IACxC,OAAOM,iBAAiB,CAACN,WAAW,EAAE,uBAAuB,CAAC,CAAC;CAChE;AAGM,SAAST,qCAAqC,CACnDS,WAAmB,EACgC;IACnD,OAAOM,iBAAiB,CAACN,WAAW,EAAE,kCAAkC,CAAC,CAAC;CAC3E;AAMM,SAASR,8BAA8B,CAC5CQ,WAAmB,EACiF;IACpG,OAAOM,iBAAiB,CACtBN,WAAW,EACX,2EAA2E,CAC5E,CAACQ,OAAO,CAAC;CACX;AAEM,SAASf,yCAAyC,CACvDO,WAAmB,EACgG;IACnH,OAAOM,iBAAiB,CACtBN,WAAW,EACX,4EAA4E,CAC7E,CAACS,qBAAqB,CAAC;CACzB;AAGM,SAASf,8BAA8B,CAACM,WAAmB,EAAU;IAC1E,OAAOM,iBAAiB,CAACN,WAAW,EAAE,oBAAoB,CAAC,CAACU,OAAO,CAAC;CACrE"}

package/build/src/start/server/metro/router.js

@@ -3,15 +3,19 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.getAppRouterRelativeEntryPath = getAppRouterRelativeEntryPath;
+exports.getRouterDirectory = getRouterDirectory;
+var _chalk = _interopRequireDefault(require("chalk"));
 var _path = _interopRequireDefault(require("path"));
 var _resolveFrom = _interopRequireDefault(require("resolve-from"));
+var _log = require("../../../log");
+var _dir = require("../../../utils/dir");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 const debug = require("debug")("expo:start:server:metro:router");
-function getAppRouterRelativeEntryPath(projectRoot) {
+function getAppRouterRelativeEntryPath(projectRoot, routerDirectory = getRouterDirectory(projectRoot)) {
     var ref;
     // Auto pick App entry
     const routerEntry = (ref = _resolveFrom.default.silent(projectRoot, "expo-router/entry")) != null ? ref : getFallbackEntryRoot(projectRoot);
@@ -19,7 +23,7 @@ function getAppRouterRelativeEntryPath(projectRoot) {
         return undefined;
     }
     // It doesn't matter if the app folder exists.
-    const appFolder = _path.default.join(projectRoot, "app");
+    const appFolder = _path.default.join(projectRoot, routerDirectory);
     const appRoot = _path.default.relative(_path.default.dirname(routerEntry), appFolder);
     debug("routerEntry", routerEntry, appFolder, appRoot);
     return appRoot;
@@ -31,5 +35,14 @@ function getAppRouterRelativeEntryPath(projectRoot) {
     }
     return _path.default.join(projectRoot, "node_modules/expo-router/entry");
 }
+function getRouterDirectory(projectRoot) {
+    // more specific directories first
+    if ((0, _dir).directoryExistsSync(_path.default.join(projectRoot, "src/app"))) {
+        _log.Log.log(_chalk.default.gray("Using src/app as the root directory for Expo Router."));
+        return "src/app";
+    }
+    _log.Log.debug("Using app as the root directory for Expo Router.");
+    return "app";
+}
 
 //# sourceMappingURL=router.js.map

package/build/src/start/server/metro/router.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/start/server/metro/router.ts"],"sourcesContent":["import path from 'path';\nimport resolveFrom from 'resolve-from';\n\nconst debug = require('debug')('expo:start:server:metro:router') as typeof console.log;\n\n/**\n * Get the relative path for requiring the `/app` folder relative to the `expo-router/entry` file.\n * This mechanism does require the server to restart after the `expo-router` package is installed.\n */\nexport function getAppRouterRelativeEntryPath(projectRoot: string): string | undefined {\n  // Auto pick App entry\n  const routerEntry =\n    resolveFrom.silent(projectRoot, 'expo-router/entry') ?? getFallbackEntryRoot(projectRoot);\n  if (!routerEntry) {\n    return undefined;\n  }\n  // It doesn't matter if the app folder exists.\n  const appFolder = path.join(projectRoot, 'app');\n  const appRoot = path.relative(path.dirname(routerEntry), appFolder);\n  debug('routerEntry', routerEntry, appFolder, appRoot);\n  return appRoot;\n}\n\n/** If the `expo-router` package is not installed, then use the `expo` package to determine where the node modules are relative to the project. */\nfunction getFallbackEntryRoot(projectRoot: string): string {\n  const expoRoot = resolveFrom.silent(projectRoot, 'expo/package.json');\n  if (expoRoot) {\n    return path.join(path.dirname(path.dirname(expoRoot)), 'expo-router/entry');\n  }\n  return path.join(projectRoot, 'node_modules/expo-router/entry');\n}\n"],"names":["getAppRouterRelativeEntryPath","debug","require","projectRoot","resolveFrom","routerEntry","silent","getFallbackEntryRoot","undefined","appFolder","path","join","appRoot","relative","dirname","expoRoot"],"mappings":"AAAA;;;;QASgBA,6BAA6B,GAA7BA,6BAA6B;AAT5B,IAAA,KAAM,kCAAN,MAAM,EAAA;AACC,IAAA,YAAc,kCAAd,cAAc,EAAA;;;;;;AAEtC,MAAMC,KAAK,GAAGC,OAAO,CAAC,OAAO,CAAC,CAAC,gCAAgC,CAAC,AAAsB,AAAC;AAMhF,SAASF,6BAA6B,CAACG,WAAmB,EAAsB;QAGnFC,GAAoD;IAFtD,sBAAsB;IACtB,MAAMC,WAAW,GACfD,CAAAA,GAAoD,GAApDA,YAAW,QAAA,CAACE,MAAM,CAACH,WAAW,EAAE,mBAAmB,CAAC,YAApDC,GAAoD,GAAIG,oBAAoB,CAACJ,WAAW,CAAC,AAAC;IAC5F,IAAI,CAACE,WAAW,EAAE;QAChB,OAAOG,SAAS,CAAC;KAClB;IACD,8CAA8C;IAC9C,MAAMC,SAAS,GAAGC,KAAI,QAAA,CAACC,IAAI,CAACR,WAAW,EAAE,KAAK,CAAC,AAAC;IAChD,MAAMS,OAAO,GAAGF,KAAI,QAAA,CAACG,QAAQ,CAACH,KAAI,QAAA,CAACI,OAAO,CAACT,WAAW,CAAC,EAAEI,SAAS,CAAC,AAAC;IACpER,KAAK,CAAC,aAAa,EAAEI,WAAW,EAAEI,SAAS,EAAEG,OAAO,CAAC,CAAC;IACtD,OAAOA,OAAO,CAAC;CAChB;AAED,kJAAkJ,CAClJ,SAASL,oBAAoB,CAACJ,WAAmB,EAAU;IACzD,MAAMY,QAAQ,GAAGX,YAAW,QAAA,CAACE,MAAM,CAACH,WAAW,EAAE,mBAAmB,CAAC,AAAC;IACtE,IAAIY,QAAQ,EAAE;QACZ,OAAOL,KAAI,QAAA,CAACC,IAAI,CAACD,KAAI,QAAA,CAACI,OAAO,CAACJ,KAAI,QAAA,CAACI,OAAO,CAACC,QAAQ,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAC;KAC7E;IACD,OAAOL,KAAI,QAAA,CAACC,IAAI,CAACR,WAAW,EAAE,gCAAgC,CAAC,CAAC;CACjE"}
+{"version":3,"sources":["../../../../../src/start/server/metro/router.ts"],"sourcesContent":["import chalk from 'chalk';\nimport path from 'path';\nimport resolveFrom from 'resolve-from';\n\nimport { Log } from '../../../log';\nimport { directoryExistsSync } from '../../../utils/dir';\n\nconst debug = require('debug')('expo:start:server:metro:router') as typeof console.log;\n\n/**\n * Get the relative path for requiring the `/app` folder relative to the `expo-router/entry` file.\n * This mechanism does require the server to restart after the `expo-router` package is installed.\n */\nexport function getAppRouterRelativeEntryPath(\n  projectRoot: string,\n  routerDirectory: string = getRouterDirectory(projectRoot)\n): string | undefined {\n  // Auto pick App entry\n  const routerEntry =\n    resolveFrom.silent(projectRoot, 'expo-router/entry') ?? getFallbackEntryRoot(projectRoot);\n  if (!routerEntry) {\n    return undefined;\n  }\n  // It doesn't matter if the app folder exists.\n  const appFolder = path.join(projectRoot, routerDirectory);\n  const appRoot = path.relative(path.dirname(routerEntry), appFolder);\n  debug('routerEntry', routerEntry, appFolder, appRoot);\n  return appRoot;\n}\n\n/** If the `expo-router` package is not installed, then use the `expo` package to determine where the node modules are relative to the project. */\nfunction getFallbackEntryRoot(projectRoot: string): string {\n  const expoRoot = resolveFrom.silent(projectRoot, 'expo/package.json');\n  if (expoRoot) {\n    return path.join(path.dirname(path.dirname(expoRoot)), 'expo-router/entry');\n  }\n  return path.join(projectRoot, 'node_modules/expo-router/entry');\n}\n\nexport function getRouterDirectory(projectRoot: string): string {\n  // more specific directories first\n  if (directoryExistsSync(path.join(projectRoot, 'src/app'))) {\n    Log.log(chalk.gray('Using src/app as the root directory for Expo Router.'));\n    return 'src/app';\n  }\n\n  Log.debug('Using app as the root directory for Expo Router.');\n  return 'app';\n}\n"],"names":["getAppRouterRelativeEntryPath","getRouterDirectory","debug","require","projectRoot","routerDirectory","resolveFrom","routerEntry","silent","getFallbackEntryRoot","undefined","appFolder","path","join","appRoot","relative","dirname","expoRoot","directoryExistsSync","Log","log","chalk","gray"],"mappings":"AAAA;;;;QAagBA,6BAA6B,GAA7BA,6BAA6B;QA0B7BC,kBAAkB,GAAlBA,kBAAkB;AAvChB,IAAA,MAAO,kCAAP,OAAO,EAAA;AACR,IAAA,KAAM,kCAAN,MAAM,EAAA;AACC,IAAA,YAAc,kCAAd,cAAc,EAAA;AAElB,IAAA,IAAc,WAAd,cAAc,CAAA;AACE,IAAA,IAAoB,WAApB,oBAAoB,CAAA;;;;;;AAExD,MAAMC,KAAK,GAAGC,OAAO,CAAC,OAAO,CAAC,CAAC,gCAAgC,CAAC,AAAsB,AAAC;AAMhF,SAASH,6BAA6B,CAC3CI,WAAmB,EACnBC,eAAuB,GAAGJ,kBAAkB,CAACG,WAAW,CAAC,EACrC;QAGlBE,GAAoD;IAFtD,sBAAsB;IACtB,MAAMC,WAAW,GACfD,CAAAA,GAAoD,GAApDA,YAAW,QAAA,CAACE,MAAM,CAACJ,WAAW,EAAE,mBAAmB,CAAC,YAApDE,GAAoD,GAAIG,oBAAoB,CAACL,WAAW,CAAC,AAAC;IAC5F,IAAI,CAACG,WAAW,EAAE;QAChB,OAAOG,SAAS,CAAC;KAClB;IACD,8CAA8C;IAC9C,MAAMC,SAAS,GAAGC,KAAI,QAAA,CAACC,IAAI,CAACT,WAAW,EAAEC,eAAe,CAAC,AAAC;IAC1D,MAAMS,OAAO,GAAGF,KAAI,QAAA,CAACG,QAAQ,CAACH,KAAI,QAAA,CAACI,OAAO,CAACT,WAAW,CAAC,EAAEI,SAAS,CAAC,AAAC;IACpET,KAAK,CAAC,aAAa,EAAEK,WAAW,EAAEI,SAAS,EAAEG,OAAO,CAAC,CAAC;IACtD,OAAOA,OAAO,CAAC;CAChB;AAED,kJAAkJ,CAClJ,SAASL,oBAAoB,CAACL,WAAmB,EAAU;IACzD,MAAMa,QAAQ,GAAGX,YAAW,QAAA,CAACE,MAAM,CAACJ,WAAW,EAAE,mBAAmB,CAAC,AAAC;IACtE,IAAIa,QAAQ,EAAE;QACZ,OAAOL,KAAI,QAAA,CAACC,IAAI,CAACD,KAAI,QAAA,CAACI,OAAO,CAACJ,KAAI,QAAA,CAACI,OAAO,CAACC,QAAQ,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAC;KAC7E;IACD,OAAOL,KAAI,QAAA,CAACC,IAAI,CAACT,WAAW,EAAE,gCAAgC,CAAC,CAAC;CACjE;AAEM,SAASH,kBAAkB,CAACG,WAAmB,EAAU;IAC9D,kCAAkC;IAClC,IAAIc,CAAAA,GAAAA,IAAmB,AAAmC,CAAA,oBAAnC,CAACN,KAAI,QAAA,CAACC,IAAI,CAACT,WAAW,EAAE,SAAS,CAAC,CAAC,EAAE;QAC1De,IAAG,IAAA,CAACC,GAAG,CAACC,MAAK,QAAA,CAACC,IAAI,CAAC,sDAAsD,CAAC,CAAC,CAAC;QAC5E,OAAO,SAAS,CAAC;KAClB;IAEDH,IAAG,IAAA,CAACjB,KAAK,CAAC,kDAAkD,CAAC,CAAC;IAC9D,OAAO,KAAK,CAAC;CACd"}

package/build/src/start/server/metro/runServer-fork.js

@@ -0,0 +1,107 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.runServer = void 0;
+var _http = _interopRequireDefault(require("http"));
+var _https = _interopRequireDefault(require("https"));
+var _url = require("url");
+var _env = require("../../../utils/env");
+var _inspectorProxy = require("./inspector-proxy");
+var _resolveFromProject = require("./resolveFromProject");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const runServer = async (metroBundler, config, { hasReducedPerformance =false , host , onError , onReady , secureServerOptions , waitForBundler =false , websocketEndpoints ={} , watch  })=>{
+    const projectRoot = metroBundler.projectRoot;
+    const Metro = (0, _resolveFromProject).importMetroFromProject(projectRoot);
+    const createWebsocketServer = (0, _resolveFromProject).importMetroCreateWebsocketServerFromProject(projectRoot);
+    const { InspectorProxy  } = (0, _resolveFromProject).importMetroInspectorProxyFromProject(projectRoot);
+    const MetroHmrServer = (0, _resolveFromProject).importMetroHmrServerFromProject(projectRoot);
+    // await earlyPortCheck(host, config.server.port);
+    // if (secure != null || secureCert != null || secureKey != null) {
+    //   // eslint-disable-next-line no-console
+    //   console.warn(
+    //     chalk.inverse.yellow.bold(' DEPRECATED '),
+    //     'The `secure`, `secureCert`, and `secureKey` options are now deprecated. ' +
+    //       'Please use the `secureServerOptions` object instead to pass options to ' +
+    //       "Metro's https development server.",
+    //   );
+    // }
+    // Lazy require
+    const connect = require("connect");
+    const serverApp = connect();
+    const { middleware , end , metroServer  } = await Metro.createConnectMiddleware(config, {
+        hasReducedPerformance,
+        waitForBundler,
+        watch
+    });
+    serverApp.use(middleware);
+    let inspectorProxy = null;
+    if (config.server.runInspectorProxy && _env.env.EXPO_USE_CUSTOM_INSPECTOR_PROXY) {
+        inspectorProxy = (0, _inspectorProxy).createInspectorProxy(metroBundler, config.projectRoot);
+    } else if (config.server.runInspectorProxy) {
+        inspectorProxy = new InspectorProxy(config.projectRoot);
+    }
+    let httpServer;
+    if (secureServerOptions != null) {
+        httpServer = _https.default.createServer(secureServerOptions, serverApp);
+    } else {
+        httpServer = _http.default.createServer(serverApp);
+    }
+    return new Promise((resolve, reject)=>{
+        httpServer.on("error", (error)=>{
+            if (onError) {
+                onError(error);
+            }
+            reject(error);
+            end();
+        });
+        httpServer.listen(config.server.port, host, ()=>{
+            if (onReady) {
+                onReady(httpServer);
+            }
+            Object.assign(websocketEndpoints, {
+                ...inspectorProxy ? {
+                    ...inspectorProxy.createWebSocketListeners(httpServer)
+                } : {},
+                "/hot": createWebsocketServer({
+                    websocketServer: new MetroHmrServer(metroServer.getBundler(), metroServer.getCreateModuleId(), config)
+                })
+            });
+            httpServer.on("upgrade", (request, socket, head)=>{
+                const { pathname  } = (0, _url).parse(request.url);
+                if (pathname != null && websocketEndpoints[pathname]) {
+                    websocketEndpoints[pathname].handleUpgrade(request, socket, head, (ws)=>{
+                        websocketEndpoints[pathname].emit("connection", ws, request);
+                    });
+                } else {
+                    socket.destroy();
+                }
+            });
+            if (inspectorProxy) {
+                // TODO(hypuk): Refactor inspectorProxy.processRequest into separate request handlers
+                // so that we could provide routes (/json/list and /json/version) here.
+                // Currently this causes Metro to give warning about T31407894.
+                // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+                serverApp.use(inspectorProxy.processRequest.bind(inspectorProxy));
+            }
+            resolve({
+                server: httpServer,
+                metro: metroServer
+            });
+        });
+        // Disable any kind of automatic timeout behavior for incoming
+        // requests in case it takes the packager more than the default
+        // timeout of 120 seconds to respond to a request.
+        httpServer.timeout = 0;
+        httpServer.on("close", ()=>{
+            end();
+        });
+    });
+};
+exports.runServer = runServer;
+
+//# sourceMappingURL=runServer-fork.js.map

package/build/src/start/server/metro/runServer-fork.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/start/server/metro/runServer-fork.ts"],"sourcesContent":["// Copyright © 2023 650 Industries.\n// Copyright (c) Meta Platforms, Inc. and affiliates.\n//\n// Forks https://github.com/facebook/metro/blob/b80d9a0f638ee9fb82ff69cd3c8d9f4309ca1da2/packages/metro/src/index.flow.js#L57\n// and adds the ability to access the bundler instance.\nimport http from 'http';\nimport https from 'https';\nimport { RunServerOptions, Server } from 'metro';\nimport { ConfigT } from 'metro-config';\nimport { InspectorProxy } from 'metro-inspector-proxy';\nimport { parse } from 'url';\n\nimport { env } from '../../../utils/env';\nimport { MetroBundlerDevServer } from './MetroBundlerDevServer';\nimport { createInspectorProxy, ExpoInspectorProxy } from './inspector-proxy';\nimport {\n  importMetroCreateWebsocketServerFromProject,\n  importMetroFromProject,\n  importMetroHmrServerFromProject,\n  importMetroInspectorProxyFromProject,\n} from './resolveFromProject';\n\nexport const runServer = async (\n  metroBundler: MetroBundlerDevServer,\n  config: ConfigT,\n  {\n    hasReducedPerformance = false,\n    host,\n    onError,\n    onReady,\n    secureServerOptions,\n    waitForBundler = false,\n    websocketEndpoints = {},\n    watch,\n  }: RunServerOptions\n): Promise<{ server: http.Server | https.Server; metro: Server }> => {\n  const projectRoot = metroBundler.projectRoot;\n\n  const Metro = importMetroFromProject(projectRoot);\n\n  const createWebsocketServer = importMetroCreateWebsocketServerFromProject(projectRoot);\n\n  const { InspectorProxy } = importMetroInspectorProxyFromProject(projectRoot);\n\n  const MetroHmrServer = importMetroHmrServerFromProject(projectRoot);\n\n  // await earlyPortCheck(host, config.server.port);\n\n  // if (secure != null || secureCert != null || secureKey != null) {\n  //   // eslint-disable-next-line no-console\n  //   console.warn(\n  //     chalk.inverse.yellow.bold(' DEPRECATED '),\n  //     'The `secure`, `secureCert`, and `secureKey` options are now deprecated. ' +\n  //       'Please use the `secureServerOptions` object instead to pass options to ' +\n  //       \"Metro's https development server.\",\n  //   );\n  // }\n  // Lazy require\n  const connect = require('connect');\n\n  const serverApp = connect();\n\n  const { middleware, end, metroServer } = await Metro.createConnectMiddleware(config, {\n    hasReducedPerformance,\n    waitForBundler,\n    watch,\n  });\n\n  serverApp.use(middleware);\n\n  let inspectorProxy: InspectorProxy | ExpoInspectorProxy | null = null;\n  if (config.server.runInspectorProxy && env.EXPO_USE_CUSTOM_INSPECTOR_PROXY) {\n    inspectorProxy = createInspectorProxy(metroBundler, config.projectRoot);\n  } else if (config.server.runInspectorProxy) {\n    inspectorProxy = new InspectorProxy(config.projectRoot);\n  }\n\n  let httpServer: http.Server | https.Server;\n\n  if (secureServerOptions != null) {\n    httpServer = https.createServer(secureServerOptions, serverApp);\n  } else {\n    httpServer = http.createServer(serverApp);\n  }\n  return new Promise<{ server: http.Server | https.Server; metro: Server }>((resolve, reject) => {\n    httpServer.on('error', (error) => {\n      if (onError) {\n        onError(error);\n      }\n      reject(error);\n      end();\n    });\n\n    httpServer.listen(config.server.port, host, () => {\n      if (onReady) {\n        onReady(httpServer);\n      }\n\n      Object.assign(websocketEndpoints, {\n        ...(inspectorProxy ? { ...inspectorProxy.createWebSocketListeners(httpServer) } : {}),\n        '/hot': createWebsocketServer({\n          websocketServer: new MetroHmrServer(\n            metroServer.getBundler(),\n            metroServer.getCreateModuleId(),\n            config\n          ),\n        }),\n      });\n\n      httpServer.on('upgrade', (request, socket, head) => {\n        const { pathname } = parse(request.url!);\n        if (pathname != null && websocketEndpoints[pathname]) {\n          websocketEndpoints[pathname].handleUpgrade(request, socket, head, (ws) => {\n            websocketEndpoints[pathname].emit('connection', ws, request);\n          });\n        } else {\n          socket.destroy();\n        }\n      });\n\n      if (inspectorProxy) {\n        // TODO(hypuk): Refactor inspectorProxy.processRequest into separate request handlers\n        // so that we could provide routes (/json/list and /json/version) here.\n        // Currently this causes Metro to give warning about T31407894.\n        // $FlowFixMe[method-unbinding] added when improving typing for this parameters\n        serverApp.use(inspectorProxy.processRequest.bind(inspectorProxy));\n      }\n\n      resolve({ server: httpServer, metro: metroServer });\n    });\n\n    // Disable any kind of automatic timeout behavior for incoming\n    // requests in case it takes the packager more than the default\n    // timeout of 120 seconds to respond to a request.\n    httpServer.timeout = 0;\n\n    httpServer.on('close', () => {\n      end();\n    });\n  });\n};\n"],"names":["runServer","metroBundler","config","hasReducedPerformance","host","onError","onReady","secureServerOptions","waitForBundler","websocketEndpoints","watch","projectRoot","Metro","importMetroFromProject","createWebsocketServer","importMetroCreateWebsocketServerFromProject","InspectorProxy","importMetroInspectorProxyFromProject","MetroHmrServer","importMetroHmrServerFromProject","connect","require","serverApp","middleware","end","metroServer","createConnectMiddleware","use","inspectorProxy","server","runInspectorProxy","env","EXPO_USE_CUSTOM_INSPECTOR_PROXY","createInspectorProxy","httpServer","https","createServer","http","Promise","resolve","reject","on","error","listen","port","Object","assign","createWebSocketListeners","websocketServer","getBundler","getCreateModuleId","request","socket","head","pathname","parse","url","handleUpgrade","ws","emit","destroy","processRequest","bind","metro","timeout"],"mappings":"AAKA;;;;;AAAiB,IAAA,KAAM,kCAAN,MAAM,EAAA;AACL,IAAA,MAAO,kCAAP,OAAO,EAAA;AAIH,IAAA,IAAK,WAAL,KAAK,CAAA;AAEP,IAAA,IAAoB,WAApB,oBAAoB,CAAA;AAEiB,IAAA,eAAmB,WAAnB,mBAAmB,CAAA;AAMrE,IAAA,mBAAsB,WAAtB,sBAAsB,CAAA;;;;;;AAEtB,MAAMA,SAAS,GAAG,OACvBC,YAAmC,EACnCC,MAAe,EACf,EACEC,qBAAqB,EAAG,KAAK,CAAA,EAC7BC,IAAI,CAAA,EACJC,OAAO,CAAA,EACPC,OAAO,CAAA,EACPC,mBAAmB,CAAA,EACnBC,cAAc,EAAG,KAAK,CAAA,EACtBC,kBAAkB,EAAG,EAAE,CAAA,EACvBC,KAAK,CAAA,EACY,GACgD;IACnE,MAAMC,WAAW,GAAGV,YAAY,CAACU,WAAW,AAAC;IAE7C,MAAMC,KAAK,GAAGC,CAAAA,GAAAA,mBAAsB,AAAa,CAAA,uBAAb,CAACF,WAAW,CAAC,AAAC;IAElD,MAAMG,qBAAqB,GAAGC,CAAAA,GAAAA,mBAA2C,AAAa,CAAA,4CAAb,CAACJ,WAAW,CAAC,AAAC;IAEvF,MAAM,EAAEK,cAAc,CAAA,EAAE,GAAGC,CAAAA,GAAAA,mBAAoC,AAAa,CAAA,qCAAb,CAACN,WAAW,CAAC,AAAC;IAE7E,MAAMO,cAAc,GAAGC,CAAAA,GAAAA,mBAA+B,AAAa,CAAA,gCAAb,CAACR,WAAW,CAAC,AAAC;IAEpE,kDAAkD;IAElD,mEAAmE;IACnE,2CAA2C;IAC3C,kBAAkB;IAClB,iDAAiD;IACjD,mFAAmF;IACnF,oFAAoF;IACpF,6CAA6C;IAC7C,OAAO;IACP,IAAI;IACJ,eAAe;IACf,MAAMS,OAAO,GAAGC,OAAO,CAAC,SAAS,CAAC,AAAC;IAEnC,MAAMC,SAAS,GAAGF,OAAO,EAAE,AAAC;IAE5B,MAAM,EAAEG,UAAU,CAAA,EAAEC,GAAG,CAAA,EAAEC,WAAW,CAAA,EAAE,GAAG,MAAMb,KAAK,CAACc,uBAAuB,CAACxB,MAAM,EAAE;QACnFC,qBAAqB;QACrBK,cAAc;QACdE,KAAK;KACN,CAAC,AAAC;IAEHY,SAAS,CAACK,GAAG,CAACJ,UAAU,CAAC,CAAC;IAE1B,IAAIK,cAAc,GAA+C,IAAI,AAAC;IACtE,IAAI1B,MAAM,CAAC2B,MAAM,CAACC,iBAAiB,IAAIC,IAAG,IAAA,CAACC,+BAA+B,EAAE;QAC1EJ,cAAc,GAAGK,CAAAA,GAAAA,eAAoB,AAAkC,CAAA,qBAAlC,CAAChC,YAAY,EAAEC,MAAM,CAACS,WAAW,CAAC,CAAC;KACzE,MAAM,IAAIT,MAAM,CAAC2B,MAAM,CAACC,iBAAiB,EAAE;QAC1CF,cAAc,GAAG,IAAIZ,cAAc,CAACd,MAAM,CAACS,WAAW,CAAC,CAAC;KACzD;IAED,IAAIuB,UAAU,AAA4B,AAAC;IAE3C,IAAI3B,mBAAmB,IAAI,IAAI,EAAE;QAC/B2B,UAAU,GAAGC,MAAK,QAAA,CAACC,YAAY,CAAC7B,mBAAmB,EAAEe,SAAS,CAAC,CAAC;KACjE,MAAM;QACLY,UAAU,GAAGG,KAAI,QAAA,CAACD,YAAY,CAACd,SAAS,CAAC,CAAC;KAC3C;IACD,OAAO,IAAIgB,OAAO,CAAwD,CAACC,OAAO,EAAEC,MAAM,GAAK;QAC7FN,UAAU,CAACO,EAAE,CAAC,OAAO,EAAE,CAACC,KAAK,GAAK;YAChC,IAAIrC,OAAO,EAAE;gBACXA,OAAO,CAACqC,KAAK,CAAC,CAAC;aAChB;YACDF,MAAM,CAACE,KAAK,CAAC,CAAC;YACdlB,GAAG,EAAE,CAAC;SACP,CAAC,CAAC;QAEHU,UAAU,CAACS,MAAM,CAACzC,MAAM,CAAC2B,MAAM,CAACe,IAAI,EAAExC,IAAI,EAAE,IAAM;YAChD,IAAIE,OAAO,EAAE;gBACXA,OAAO,CAAC4B,UAAU,CAAC,CAAC;aACrB;YAEDW,MAAM,CAACC,MAAM,CAACrC,kBAAkB,EAAE;gBAChC,GAAImB,cAAc,GAAG;oBAAE,GAAGA,cAAc,CAACmB,wBAAwB,CAACb,UAAU,CAAC;iBAAE,GAAG,EAAE;gBACpF,MAAM,EAAEpB,qBAAqB,CAAC;oBAC5BkC,eAAe,EAAE,IAAI9B,cAAc,CACjCO,WAAW,CAACwB,UAAU,EAAE,EACxBxB,WAAW,CAACyB,iBAAiB,EAAE,EAC/BhD,MAAM,CACP;iBACF,CAAC;aACH,CAAC,CAAC;YAEHgC,UAAU,CAACO,EAAE,CAAC,SAAS,EAAE,CAACU,OAAO,EAAEC,MAAM,EAAEC,IAAI,GAAK;gBAClD,MAAM,EAAEC,QAAQ,CAAA,EAAE,GAAGC,CAAAA,GAAAA,IAAK,AAAc,CAAA,MAAd,CAACJ,OAAO,CAACK,GAAG,CAAE,AAAC;gBACzC,IAAIF,QAAQ,IAAI,IAAI,IAAI7C,kBAAkB,CAAC6C,QAAQ,CAAC,EAAE;oBACpD7C,kBAAkB,CAAC6C,QAAQ,CAAC,CAACG,aAAa,CAACN,OAAO,EAAEC,MAAM,EAAEC,IAAI,EAAE,CAACK,EAAE,GAAK;wBACxEjD,kBAAkB,CAAC6C,QAAQ,CAAC,CAACK,IAAI,CAAC,YAAY,EAAED,EAAE,EAAEP,OAAO,CAAC,CAAC;qBAC9D,CAAC,CAAC;iBACJ,MAAM;oBACLC,MAAM,CAACQ,OAAO,EAAE,CAAC;iBAClB;aACF,CAAC,CAAC;YAEH,IAAIhC,cAAc,EAAE;gBAClB,qFAAqF;gBACrF,uEAAuE;gBACvE,+DAA+D;gBAC/D,+EAA+E;gBAC/EN,SAAS,CAACK,GAAG,CAACC,cAAc,CAACiC,cAAc,CAACC,IAAI,CAAClC,cAAc,CAAC,CAAC,CAAC;aACnE;YAEDW,OAAO,CAAC;gBAAEV,MAAM,EAAEK,UAAU;gBAAE6B,KAAK,EAAEtC,WAAW;aAAE,CAAC,CAAC;SACrD,CAAC,CAAC;QAEH,8DAA8D;QAC9D,+DAA+D;QAC/D,kDAAkD;QAClDS,UAAU,CAAC8B,OAAO,GAAG,CAAC,CAAC;QAEvB9B,UAAU,CAACO,EAAE,CAAC,OAAO,EAAE,IAAM;YAC3BjB,GAAG,EAAE,CAAC;SACP,CAAC,CAAC;KACJ,CAAC,CAAC;CACJ,AAAC;QAtHWxB,SAAS,GAATA,SAAS"}

package/build/src/start/server/metro/symbolicate.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+
+//# sourceMappingURL=symbolicate.js.map

package/build/src/start/server/metro/symbolicate.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/start/server/metro/symbolicate.ts"],"sourcesContent":["import { StackFrame } from 'stacktrace-parser';\n\nexport type CodeFrame = {\n  content: string;\n  location?: {\n    row: number;\n    column: number;\n    [key: string]: any;\n  };\n  fileName: string;\n};\n\nexport type MetroStackFrame = StackFrame & { collapse?: boolean };\nexport type Stack = StackFrame[];\n"],"names":[],"mappings":"AAAA"}

package/build/src/start/server/metro/waitForMetroToObserveTypeScriptFile.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.waitForMetroToObserveTypeScriptFile = waitForMetroToObserveTypeScriptFile;
+exports.observeFileChanges = observeFileChanges;
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const debug = require("debug")("expo:start:server:metro:waitForTypescript");
+function waitForMetroToObserveTypeScriptFile(projectRoot, runner, callback) {
+    const watcher = runner.metro.getBundler().getBundler().getWatcher();
+    const tsconfigPath = _path.default.join(projectRoot, "tsconfig.json");
+    const listener = ({ eventsQueue  })=>{
+        for (const event of eventsQueue){
+            var ref;
+            if (event.type === "add" && ((ref = event.metadata) == null ? void 0 : ref.type) !== "d" && // We need to ignore node_modules because Metro will add all of the files in node_modules to the watcher.
+            !/node_modules/.test(event.filePath)) {
+                const { filePath  } = event;
+                // Is TypeScript?
+                if (// If the user adds a TypeScript file to the observable files in their project.
+                /\.tsx?$/.test(filePath) || // Or if the user adds a tsconfig.json file to the project root.
+                filePath === tsconfigPath) {
+                    debug("Detected TypeScript file added to the project: ", filePath);
+                    callback();
+                    off();
+                    return;
+                }
+            }
+        }
+    };
+    debug("Waiting for TypeScript files to be added to the project...");
+    watcher.addListener("change", listener);
+    const off = ()=>{
+        watcher.removeListener("change", listener);
+    };
+    runner.server.addListener == null ? void 0 : runner.server.addListener("close", off);
+    return off;
+}
+function observeFileChanges(runner, files, callback) {
+    const watcher = runner.metro.getBundler().getBundler().getWatcher();
+    const listener = ({ eventsQueue  })=>{
+        for (const event of eventsQueue){
+            var // event.type === 'add' &&
+            ref;
+            if (((ref = event.metadata) == null ? void 0 : ref.type) !== "d" && // We need to ignore node_modules because Metro will add all of the files in node_modules to the watcher.
+            !/node_modules/.test(event.filePath)) {
+                const { filePath  } = event;
+                // Is TypeScript?
+                if (files.includes(filePath)) {
+                    debug("Observed change:", filePath);
+                    callback();
+                    return;
+                }
+            }
+        }
+    };
+    debug("Watching file changes:", files);
+    watcher.addListener("change", listener);
+    const off = ()=>{
+        watcher.removeListener("change", listener);
+    };
+    runner.server.addListener == null ? void 0 : runner.server.addListener("close", off);
+    return off;
+}
+
+//# sourceMappingURL=waitForMetroToObserveTypeScriptFile.js.map

package/build/src/start/server/metro/waitForMetroToObserveTypeScriptFile.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/start/server/metro/waitForMetroToObserveTypeScriptFile.ts"],"sourcesContent":["import path from 'path';\n\nimport type { ServerLike } from '../BundlerDevServer';\n\nconst debug = require('debug')('expo:start:server:metro:waitForTypescript') as typeof console.log;\n\n/**\n * Use the native file watcher / Metro ruleset to detect if a\n * TypeScript file is added to the project during development.\n */\nexport function waitForMetroToObserveTypeScriptFile(\n  projectRoot: string,\n  runner: {\n    metro: import('metro').Server;\n    server: ServerLike;\n  },\n  callback: () => Promise<void>\n): () => void {\n  const watcher = runner.metro.getBundler().getBundler().getWatcher();\n\n  const tsconfigPath = path.join(projectRoot, 'tsconfig.json');\n\n  const listener = ({\n    eventsQueue,\n  }: {\n    eventsQueue: {\n      filePath: string;\n      metadata?: {\n        type: 'f' | 'd' | 'l'; // Regular file / Directory / Symlink\n      } | null;\n      type: string;\n    }[];\n  }) => {\n    for (const event of eventsQueue) {\n      if (\n        event.type === 'add' &&\n        event.metadata?.type !== 'd' &&\n        // We need to ignore node_modules because Metro will add all of the files in node_modules to the watcher.\n        !/node_modules/.test(event.filePath)\n      ) {\n        const { filePath } = event;\n        // Is TypeScript?\n        if (\n          // If the user adds a TypeScript file to the observable files in their project.\n          /\\.tsx?$/.test(filePath) ||\n          // Or if the user adds a tsconfig.json file to the project root.\n          filePath === tsconfigPath\n        ) {\n          debug('Detected TypeScript file added to the project: ', filePath);\n          callback();\n          off();\n          return;\n        }\n      }\n    }\n  };\n\n  debug('Waiting for TypeScript files to be added to the project...');\n  watcher.addListener('change', listener);\n\n  const off = () => {\n    watcher.removeListener('change', listener);\n  };\n\n  runner.server.addListener?.('close', off);\n  return off;\n}\n\nexport function observeFileChanges(\n  runner: {\n    metro: import('metro').Server;\n    server: ServerLike;\n  },\n  files: string[],\n  callback: () => void | Promise<void>\n): () => void {\n  const watcher = runner.metro.getBundler().getBundler().getWatcher();\n\n  const listener = ({\n    eventsQueue,\n  }: {\n    eventsQueue: {\n      filePath: string;\n      metadata?: {\n        type: 'f' | 'd' | 'l'; // Regular file / Directory / Symlink\n      } | null;\n      type: string;\n    }[];\n  }) => {\n    for (const event of eventsQueue) {\n      if (\n        // event.type === 'add' &&\n        event.metadata?.type !== 'd' &&\n        // We need to ignore node_modules because Metro will add all of the files in node_modules to the watcher.\n        !/node_modules/.test(event.filePath)\n      ) {\n        const { filePath } = event;\n        // Is TypeScript?\n        if (files.includes(filePath)) {\n          debug('Observed change:', filePath);\n          callback();\n          return;\n        }\n      }\n    }\n  };\n\n  debug('Watching file changes:', files);\n  watcher.addListener('change', listener);\n\n  const off = () => {\n    watcher.removeListener('change', listener);\n  };\n\n  runner.server.addListener?.('close', off);\n  return off;\n}\n"],"names":["waitForMetroToObserveTypeScriptFile","observeFileChanges","debug","require","projectRoot","runner","callback","watcher","metro","getBundler","getWatcher","tsconfigPath","path","join","listener","eventsQueue","event","type","metadata","test","filePath","off","addListener","removeListener","server","files","includes"],"mappings":"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"}