metro 0.65.2 → 0.67.0

package/src/Server.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,67 +9,71 @@
  */
 "use strict";
 
-const IncrementalBundler = require("./IncrementalBundler");
-
-const MultipartResponse = require("./Server/MultipartResponse");
-
-const ResourceNotFoundError = require("./IncrementalBundler/ResourceNotFoundError");
+const { getAsset } = require("./Assets");
 
 const baseBytecodeBundle = require("./DeltaBundler/Serializers/baseBytecodeBundle");
 
 const baseJSBundle = require("./DeltaBundler/Serializers/baseJSBundle");
 
-const bundleToBytecode = require("./lib/bundleToBytecode");
+const getAllFiles = require("./DeltaBundler/Serializers/getAllFiles");
 
-const bundleToString = require("./lib/bundleToString");
+const getAssets = require("./DeltaBundler/Serializers/getAssets");
 
-const { codeFrameColumns } = require("@babel/code-frame");
+const {
+  getExplodedSourceMap,
+} = require("./DeltaBundler/Serializers/getExplodedSourceMap");
 
-const debug = require("debug")("Metro:Server");
+const getRamBundleInfo = require("./DeltaBundler/Serializers/getRamBundleInfo");
 
-const formatBundlingError = require("./lib/formatBundlingError");
+const sourceMapString = require("./DeltaBundler/Serializers/sourceMapString");
 
-const fs = require("graceful-fs");
+const IncrementalBundler = require("./IncrementalBundler");
 
-const getAllFiles = require("./DeltaBundler/Serializers/getAllFiles");
+const ResourceNotFoundError = require("./IncrementalBundler/ResourceNotFoundError");
 
-const getAssets = require("./DeltaBundler/Serializers/getAssets");
+const bundleToBytecode = require("./lib/bundleToBytecode");
 
-const getGraphId = require("./lib/getGraphId");
+const bundleToString = require("./lib/bundleToString");
 
-const getRamBundleInfo = require("./DeltaBundler/Serializers/getRamBundleInfo");
+const formatBundlingError = require("./lib/formatBundlingError");
 
-const mime = require("mime-types");
+const getGraphId = require("./lib/getGraphId");
 
 const parseOptionsFromUrl = require("./lib/parseOptionsFromUrl");
 
-const parsePlatformFilePath = require("./node-haste/lib/parsePlatformFilePath");
+const splitBundleOptions = require("./lib/splitBundleOptions");
 
-const path = require("path");
+const transformHelpers = require("./lib/transformHelpers");
 
-const sourceMapString = require("./DeltaBundler/Serializers/sourceMapString");
+const parsePlatformFilePath = require("./node-haste/lib/parsePlatformFilePath");
 
-const splitBundleOptions = require("./lib/splitBundleOptions");
+const MultipartResponse = require("./Server/MultipartResponse");
 
 const symbolicate = require("./Server/symbolicate");
 
-const transformHelpers = require("./lib/transformHelpers");
-
-const url = require("url");
-
-const { VERSION: BYTECODE_VERSION } = require("metro-hermes-compiler");
+const { codeFrameColumns } = require("@babel/code-frame");
 
-const { getAsset } = require("./Assets");
+const debug = require("debug")("Metro:Server");
 
-const {
-  getExplodedSourceMap
-} = require("./DeltaBundler/Serializers/getExplodedSourceMap");
+const fs = require("graceful-fs");
 
 const {
   Logger,
-  Logger: { createActionStartEntry, createActionEndEntry, log }
+  Logger: { createActionStartEntry, createActionEndEntry, log },
 } = require("metro-core");
 
+const { VERSION: BYTECODE_VERSION } = require("metro-hermes-compiler");
+
+const mime = require("mime-types");
+
+const nullthrows = require("nullthrows");
+
+const path = require("path");
+
+const querystring = require("querystring");
+
+const url = require("url");
+
 const DELTA_ID_HEADER = "X-Metro-Delta-ID";
 const FILES_CHANGED_COUNT_HEADER = "X-Metro-Files-Changed-Count";
 
@@ -79,10 +83,10 @@ class Server {
     this._serverOptions = options;
 
     if (this._config.resetCache) {
-      this._config.cacheStores.forEach(store => store.clear());
+      this._config.cacheStores.forEach((store) => store.clear());
 
       this._config.reporter.update({
-        type: "transform_cache_reset"
+        type: "transform_cache_reset",
       });
     }
 
@@ -97,7 +101,7 @@ class Server {
     this._createModuleId = config.serializer.createModuleIdFactory();
     this._bundler = new IncrementalBundler(config, {
       hasReducedPerformance: options && options.hasReducedPerformance,
-      watch: options ? options.watch : undefined
+      watch: options ? options.watch : undefined,
     });
     this._nextBundleBuildID = 1;
   }
@@ -124,22 +128,25 @@ class Server {
       graphOptions,
       onProgress,
       serializerOptions,
-      transformOptions
+      transformOptions,
     } = splitBundleOptions(options);
     const { prepend, graph } = await this._bundler.buildGraph(
       entryFile,
       transformOptions,
       {
         onProgress,
-        shallow: graphOptions.shallow
+        shallow: graphOptions.shallow,
       }
     );
-    const entryPoint = path.resolve(this._config.projectRoot, entryFile);
+
+    const entryPoint = this._getEntryPointAbsolutePath(entryFile);
+
     const bundleOptions = {
       asyncRequireModulePath: await this._resolveRelativePath(
         this._config.transformer.asyncRequireModulePath,
         {
-          transformOptions
+          transformOptions,
+          relativeTo: "project",
         }
       ),
       processModuleFilter: this._config.serializer.processModuleFilter,
@@ -148,13 +155,14 @@ class Server {
       dev: transformOptions.dev,
       projectRoot: this._config.projectRoot,
       modulesOnly: serializerOptions.modulesOnly,
-      runBeforeMainModule: this._config.serializer.getModulesRunBeforeMainModule(
-        path.relative(this._config.projectRoot, entryPoint)
-      ),
+      runBeforeMainModule:
+        this._config.serializer.getModulesRunBeforeMainModule(
+          path.relative(this._config.projectRoot, entryPoint)
+        ),
       runModule: serializerOptions.runModule,
       sourceMapUrl: serializerOptions.sourceMapUrl,
       sourceUrl: serializerOptions.sourceUrl,
-      inlineSourceMap: serializerOptions.inlineSourceMap
+      inlineSourceMap: serializerOptions.inlineSourceMap,
     };
     let bundleCode = null;
     let bundleMap = null;
@@ -184,14 +192,14 @@ class Server {
         [...prepend, ...this._getSortedModules(graph)],
         {
           excludeSource: serializerOptions.excludeSource,
-          processModuleFilter: this._config.serializer.processModuleFilter
+          processModuleFilter: this._config.serializer.processModuleFilter,
         }
       );
     }
 
     return {
       code: bundleCode,
-      map: bundleMap
+      map: bundleMap,
     };
   }
 
@@ -201,22 +209,25 @@ class Server {
       graphOptions,
       onProgress,
       serializerOptions,
-      transformOptions
+      transformOptions,
     } = splitBundleOptions(options);
     const { prepend, graph } = await this._bundler.buildGraph(
       entryFile,
       transformOptions,
       {
         onProgress,
-        shallow: graphOptions.shallow
+        shallow: graphOptions.shallow,
       }
     );
-    const entryPoint = path.resolve(this._config.projectRoot, entryFile);
+
+    const entryPoint = this._getEntryPointAbsolutePath(entryFile);
+
     return await getRamBundleInfo(entryPoint, prepend, graph, {
       asyncRequireModulePath: await this._resolveRelativePath(
         this._config.transformer.asyncRequireModulePath,
         {
-          transformOptions
+          transformOptions,
+          relativeTo: "project",
         }
       ),
       processModuleFilter: this._config.serializer.processModuleFilter,
@@ -228,34 +239,34 @@ class Server {
       platform: transformOptions.platform,
       projectRoot: this._config.projectRoot,
       modulesOnly: serializerOptions.modulesOnly,
-      runBeforeMainModule: this._config.serializer.getModulesRunBeforeMainModule(
-        path.relative(this._config.projectRoot, entryPoint)
-      ),
+      runBeforeMainModule:
+        this._config.serializer.getModulesRunBeforeMainModule(
+          path.relative(this._config.projectRoot, entryPoint)
+        ),
       runModule: serializerOptions.runModule,
       sourceMapUrl: serializerOptions.sourceMapUrl,
       sourceUrl: serializerOptions.sourceUrl,
-      inlineSourceMap: serializerOptions.inlineSourceMap
+      inlineSourceMap: serializerOptions.inlineSourceMap,
     });
   }
 
   async getAssets(options) {
-    const { entryFile, transformOptions, onProgress } = splitBundleOptions(
-      options
-    );
+    const { entryFile, transformOptions, onProgress } =
+      splitBundleOptions(options);
     const dependencies = await this._bundler.getDependencies(
       [entryFile],
       transformOptions,
       {
         onProgress,
-        shallow: false
+        shallow: false,
       }
     );
     return await getAssets(dependencies, {
       processModuleFilter: this._config.serializer.processModuleFilter,
       assetPlugins: this._config.transformer.assetPlugins,
       platform: transformOptions.platform,
-      projectRoot: this._config.projectRoot,
-      publicPath: this._config.transformer.publicPath
+      projectRoot: this._getServerRootDir(),
+      publicPath: this._config.transformer.publicPath,
     });
   }
 
@@ -266,14 +277,14 @@ class Server {
     const { entryFile, transformOptions, onProgress } = splitBundleOptions({
       ...Server.DEFAULT_BUNDLE_OPTIONS,
       ...options,
-      bundleType: "bundle"
+      bundleType: "bundle",
     });
     const { prepend, graph } = await this._bundler.buildGraph(
       entryFile,
       transformOptions,
       {
         onProgress,
-        shallow: false
+        shallow: false,
       }
     );
     const platform =
@@ -282,7 +293,7 @@ class Server {
 
     return await getAllFiles(prepend, graph, {
       platform,
-      processModuleFilter: this._config.serializer.processModuleFilter
+      processModuleFilter: this._config.serializer.processModuleFilter,
     });
   }
 
@@ -298,7 +309,7 @@ class Server {
         "Accept-Ranges": "bytes",
         "Content-Length": chunksize.toString(),
         "Content-Range": `bytes ${dataStart}-${dataEnd}/${data.length}`,
-        "Content-Type": mime.lookup(path.basename(assetPath))
+        "Content-Type": mime.lookup(path.basename(assetPath)),
       });
       return data.slice(dataStart, dataEnd + 1);
     }
@@ -308,8 +319,23 @@ class Server {
 
   async _processSingleAssetRequest(req, res) {
     const urlObj = url.parse(decodeURI(req.url), true);
-    const assetPath =
-      urlObj && urlObj.pathname && urlObj.pathname.match(/^\/assets\/(.+)$/);
+    let [, assetPath] =
+      (urlObj &&
+        urlObj.pathname &&
+        urlObj.pathname.match(/^\/assets\/(.+)$/)) ||
+      [];
+
+    if (!assetPath && urlObj && urlObj.query && urlObj.query.unstable_path) {
+      const [, actualPath, secondaryQuery] = nullthrows(
+        urlObj.query.unstable_path.match(/^([^?]*)\??(.*)$/)
+      );
+
+      if (secondaryQuery) {
+        Object.assign(urlObj.query, querystring.parse(secondaryQuery));
+      }
+
+      assetPath = actualPath;
+    }
 
     if (!assetPath) {
       throw new Error("Could not extract asset path from URL");
@@ -318,13 +344,13 @@ class Server {
     const processingAssetRequestLogEntry = log(
       createActionStartEntry({
         action_name: "Processing asset request",
-        asset: assetPath[1]
+        asset: assetPath[1],
       })
     );
 
     try {
       const data = await getAsset(
-        assetPath[1],
+        assetPath,
         this._config.projectRoot,
         this._config.watchFolders,
         urlObj.query.platform,
@@ -336,7 +362,7 @@ class Server {
         res.setHeader("Cache-Control", "max-age=31536000");
       }
 
-      res.end(this._rangeRequestMiddleware(req, res, data, assetPath[1]));
+      res.end(this._rangeRequestMiddleware(req, res, data, assetPath));
       process.nextTick(() => {
         log(createActionEndEntry(processingAssetRequestLogEntry));
       });
@@ -397,7 +423,7 @@ class Server {
         res,
         this._parseOptions(formattedUrl)
       );
-    } else if (pathname.startsWith("/assets/")) {
+    } else if (pathname.startsWith("/assets/") || pathname === "/assets") {
       await this._processSingleAssetRequest(req, res);
     } else if (pathname === "/symbolicate") {
       await this._symbolicate(req, res);
@@ -411,34 +437,31 @@ class Server {
     createEndEntry,
     build,
     delete: deleteFn,
-    finish
+    finish,
   }) {
     return async function requestProcessor(req, res, bundleOptions) {
-      const {
-        entryFile,
-        graphOptions,
-        transformOptions,
-        serializerOptions
-      } = splitBundleOptions(bundleOptions);
+      const { entryFile, graphOptions, transformOptions, serializerOptions } =
+        splitBundleOptions(bundleOptions);
       /**
        * `entryFile` is relative to projectRoot, we need to use resolution function
        * to find the appropriate file with supported extensions.
        */
 
       const resolvedEntryFilePath = await this._resolveRelativePath(entryFile, {
-        transformOptions
+        transformOptions,
+        relativeTo: "server",
       });
       const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
         shallow: graphOptions.shallow,
-        experimentalImportBundleSupport: this._config.transformer
-          .experimentalImportBundleSupport
+        experimentalImportBundleSupport:
+          this._config.transformer.experimentalImportBundleSupport,
       }); // For resources that support deletion, handle the DELETE method.
 
       if (deleteFn && req.method === "DELETE") {
         const deleteContext = {
           graphId,
           req,
-          res
+          res,
         };
 
         try {
@@ -447,7 +470,7 @@ class Server {
           const formattedError = formatBundlingError(error);
           const status = error instanceof ResourceNotFoundError ? 404 : 500;
           res.writeHead(status, {
-            "Content-Type": "application/json; charset=UTF-8"
+            "Content-Type": "application/json; charset=UTF-8",
           });
           res.end(JSON.stringify(formattedError));
         }
@@ -473,11 +496,11 @@ class Server {
           if (currentProgress > lastProgress || totalFileCount < 10) {
             mres.writeChunk(
               {
-                "Content-Type": "application/json"
+                "Content-Type": "application/json",
               },
               JSON.stringify({
                 done: transformedFileCount,
-                total: totalFileCount
+                total: totalFileCount,
               })
             ); // The `uncork` called internally in Node via `promise.nextTick()` may not fire
             // until all of the Promises are resolved because the microtask queue we're
@@ -485,6 +508,7 @@ class Server {
             // is not actually sent in the response until after bundling is complete. This
             // would defeat the purpose of sending progress, so we `uncork` the stream now
             // which will force the response to flush to the client immediately.
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
 
             if (res.socket != null && res.socket.uncork != null) {
               res.socket.uncork();
@@ -497,7 +521,7 @@ class Server {
             buildID,
             type: "bundle_transform_progressed",
             transformedFileCount,
-            totalFileCount
+            totalFileCount,
           });
         };
       }
@@ -510,9 +534,9 @@ class Server {
           entryFile: resolvedEntryFilePath,
           minify: transformOptions.minify,
           platform: transformOptions.platform,
-          runtimeBytecodeVersion: transformOptions.runtimeBytecodeVersion
+          runtimeBytecodeVersion: transformOptions.runtimeBytecodeVersion,
         },
-        type: "bundle_build_started"
+        type: "bundle_build_started",
       });
 
       const startContext = {
@@ -525,7 +549,7 @@ class Server {
         onProgress,
         req,
         serializerOptions,
-        transformOptions
+        transformOptions,
       };
       const logEntry = log(
         createActionStartEntry(createStartEntry(startContext))
@@ -538,19 +562,19 @@ class Server {
         const formattedError = formatBundlingError(error);
         const status = error instanceof ResourceNotFoundError ? 404 : 500;
         mres.writeHead(status, {
-          "Content-Type": "application/json; charset=UTF-8"
+          "Content-Type": "application/json; charset=UTF-8",
         });
         mres.end(JSON.stringify(formattedError));
 
         this._reporter.update({
           buildID,
           type: "bundle_build_failed",
-          bundleOptions
+          bundleOptions,
         });
 
         this._reporter.update({
           error,
-          type: "bundling_error"
+          type: "bundling_error",
         });
 
         log({
@@ -559,8 +583,9 @@ class Server {
           log_entry_label: "bundling_error",
           bundle_id: graphId,
           build_id: buildID,
-          stack: formattedError.message
+          stack: formattedError.message,
         });
+        debug("Bundling error", error);
         return;
       }
 
@@ -569,7 +594,7 @@ class Server {
 
       this._reporter.update({
         buildID,
-        type: "bundle_build_done"
+        type: "bundle_build_done",
       });
 
       log(
@@ -590,13 +615,13 @@ class Server {
         bundler: "delta",
         build_id: context.buildID,
         bundle_options: context.bundleOptions,
-        bundle_hash: context.graphId
+        bundle_hash: context.graphId,
       };
     },
 
     createEndEntry(context) {
       return {
-        outdated_modules: context.result.numModifiedFiles
+        outdated_modules: context.result.numModifiedFiles,
       };
     },
 
@@ -606,7 +631,7 @@ class Server {
       graphOptions,
       onProgress,
       serializerOptions,
-      transformOptions
+      transformOptions,
     }) => {
       const revPromise = this._bundler.getRevisionByGraphId(graphId);
 
@@ -614,7 +639,7 @@ class Server {
         ? this._bundler.updateGraph(await revPromise, false)
         : this._bundler.initializeGraph(entryFile, transformOptions, {
             onProgress,
-            shallow: graphOptions.shallow
+            shallow: graphOptions.shallow,
           }));
 
       const serializer =
@@ -629,7 +654,8 @@ class Server {
           asyncRequireModulePath: await this._resolveRelativePath(
             this._config.transformer.asyncRequireModulePath,
             {
-              transformOptions
+              transformOptions,
+              relativeTo: "project",
             }
           ),
           processModuleFilter: this._config.serializer.processModuleFilter,
@@ -638,13 +664,14 @@ class Server {
           dev: transformOptions.dev,
           projectRoot: this._config.projectRoot,
           modulesOnly: serializerOptions.modulesOnly,
-          runBeforeMainModule: this._config.serializer.getModulesRunBeforeMainModule(
-            path.relative(this._config.projectRoot, entryFile)
-          ),
+          runBeforeMainModule:
+            this._config.serializer.getModulesRunBeforeMainModule(
+              path.relative(this._config.projectRoot, entryFile)
+            ),
           runModule: serializerOptions.runModule,
           sourceMapUrl: serializerOptions.sourceMapUrl,
           sourceUrl: serializerOptions.sourceUrl,
-          inlineSourceMap: serializerOptions.inlineSourceMap
+          inlineSourceMap: serializerOptions.inlineSourceMap,
         }
       );
       const bundleCode = typeof bundle === "string" ? bundle : bundle.code;
@@ -654,7 +681,7 @@ class Server {
           : delta.added.size + delta.modified.size + delta.deleted.size,
         lastModifiedDate: revision.date,
         nextRevId: revision.id,
-        bundle: bundleCode
+        bundle: bundleCode,
       };
     },
 
@@ -675,7 +702,7 @@ class Server {
           String(result.numModifiedFiles)
         );
         mres.setHeader(DELTA_ID_HEADER, String(result.nextRevId));
-        mres.setHeader("Content-Type", "application/javascript");
+        mres.setHeader("Content-Type", "application/javascript; charset=UTF-8");
         mres.setHeader("Last-Modified", result.lastModifiedDate.toUTCString());
         mres.setHeader(
           "Content-Length",
@@ -689,7 +716,7 @@ class Server {
       await this._bundler.endGraph(graphId);
       res.statusCode = 204;
       res.end();
-    }
+    },
   });
   _processBytecodeBundleRequest = this._createRequestProcessor({
     createStartEntry(context) {
@@ -700,13 +727,13 @@ class Server {
         bundler: "delta",
         build_id: context.buildID,
         bundle_options: context.bundleOptions,
-        bundle_hash: context.graphId
+        bundle_hash: context.graphId,
       };
     },
 
     createEndEntry(context) {
       return {
-        outdated_modules: context.result.numModifiedFiles
+        outdated_modules: context.result.numModifiedFiles,
       };
     },
 
@@ -716,7 +743,7 @@ class Server {
       graphOptions,
       onProgress,
       serializerOptions,
-      transformOptions
+      transformOptions,
     }) => {
       const revPromise = this._bundler.getRevisionByGraphId(graphId);
 
@@ -724,14 +751,15 @@ class Server {
         ? this._bundler.updateGraph(await revPromise, false)
         : this._bundler.initializeGraph(entryFile, transformOptions, {
             onProgress,
-            shallow: graphOptions.shallow
+            shallow: graphOptions.shallow,
           }));
       const bundle = bundleToBytecode(
         baseBytecodeBundle(entryFile, revision.prepend, revision.graph, {
           asyncRequireModulePath: await this._resolveRelativePath(
             this._config.transformer.asyncRequireModulePath,
             {
-              transformOptions
+              transformOptions,
+              relativeTo: "project",
             }
           ),
           processModuleFilter: this._config.serializer.processModuleFilter,
@@ -740,13 +768,14 @@ class Server {
           dev: transformOptions.dev,
           projectRoot: this._config.projectRoot,
           modulesOnly: serializerOptions.modulesOnly,
-          runBeforeMainModule: this._config.serializer.getModulesRunBeforeMainModule(
-            path.relative(this._config.projectRoot, entryFile)
-          ),
+          runBeforeMainModule:
+            this._config.serializer.getModulesRunBeforeMainModule(
+              path.relative(this._config.projectRoot, entryFile)
+            ),
           runModule: serializerOptions.runModule,
           sourceMapUrl: serializerOptions.sourceMapUrl,
           sourceUrl: serializerOptions.sourceUrl,
-          inlineSourceMap: serializerOptions.inlineSourceMap
+          inlineSourceMap: serializerOptions.inlineSourceMap,
         })
       );
       return {
@@ -755,7 +784,7 @@ class Server {
           : delta.added.size + delta.modified.size + delta.deleted.size,
         lastModifiedDate: revision.date,
         nextRevId: revision.id,
-        bytecode: bundle.bytecode
+        bytecode: bundle.bytecode,
       };
     },
 
@@ -784,7 +813,7 @@ class Server {
         );
         mres.end(result.bytecode);
       }
-    }
+    },
   }); // This function ensures that modules in source maps are sorted in the same
   // order as in a plain JS bundle.
 
@@ -806,13 +835,13 @@ class Server {
         action_name: "Requesting sourcemap",
         bundle_url: context.req.url,
         entry_point: context.entryFile,
-        bundler: "delta"
+        bundler: "delta",
       };
     },
 
     createEndEntry(context) {
       return {
-        bundler: "delta"
+        bundler: "delta",
       };
     },
 
@@ -822,7 +851,7 @@ class Server {
       graphOptions,
       onProgress,
       serializerOptions,
-      transformOptions
+      transformOptions,
     }) => {
       let revision;
 
@@ -834,7 +863,7 @@ class Server {
           transformOptions,
           {
             onProgress,
-            shallow: graphOptions.shallow
+            shallow: graphOptions.shallow,
           }
         ));
       } else {
@@ -852,14 +881,14 @@ class Server {
 
       return sourceMapString([...prepend, ...this._getSortedModules(graph)], {
         excludeSource: serializerOptions.excludeSource,
-        processModuleFilter: this._config.serializer.processModuleFilter
+        processModuleFilter: this._config.serializer.processModuleFilter,
       });
     },
 
     finish({ mres, result }) {
       mres.setHeader("Content-Type", "application/json");
       mres.end(result.toString());
-    }
+    },
   });
   _processAssetsRequest = this._createRequestProcessor({
     createStartEntry(context) {
@@ -867,13 +896,13 @@ class Server {
         action_name: "Requesting assets",
         bundle_url: context.req.url,
         entry_point: context.entryFile,
-        bundler: "delta"
+        bundler: "delta",
       };
     },
 
     createEndEntry(context) {
       return {
-        bundler: "delta"
+        bundler: "delta",
       };
     },
 
@@ -883,7 +912,7 @@ class Server {
         transformOptions,
         {
           onProgress,
-          shallow: false
+          shallow: false,
         }
       );
       return await getAssets(dependencies, {
@@ -891,48 +920,50 @@ class Server {
         assetPlugins: this._config.transformer.assetPlugins,
         platform: transformOptions.platform,
         publicPath: this._config.transformer.publicPath,
-        projectRoot: this._config.projectRoot
+        projectRoot: this._config.projectRoot,
       });
     },
 
     finish({ mres, result }) {
       mres.setHeader("Content-Type", "application/json");
       mres.end(JSON.stringify(result));
-    }
+    },
   });
 
   async _symbolicate(req, res) {
     const getCodeFrame = (urls, symbolicatedStack) => {
       for (let i = 0; i < symbolicatedStack.length; i++) {
-        const { collapse, column, file, lineNumber } = symbolicatedStack[i]; // $FlowFixMe[incompatible-call]
-
-        const entryPoint = path.resolve(this._config.projectRoot, file);
+        const { collapse, column, file, lineNumber } = symbolicatedStack[i];
+        const fileAbsolute = path.resolve(
+          this._config.projectRoot,
+          file !== null && file !== void 0 ? file : ""
+        );
 
-        if (collapse || lineNumber == null || urls.has(entryPoint)) {
+        if (collapse || lineNumber == null || urls.has(fileAbsolute)) {
           continue;
         }
 
         try {
           return {
             content: codeFrameColumns(
-              fs.readFileSync(entryPoint, "utf8"),
+              fs.readFileSync(fileAbsolute, "utf8"),
               {
                 // Metro returns 0 based columns but codeFrameColumns expects 1-based columns
                 // $FlowFixMe[unsafe-addition]
                 start: {
                   column: column + 1,
-                  line: lineNumber
-                }
+                  line: lineNumber,
+                },
               },
               {
-                forceColor: true
+                forceColor: true,
               }
             ),
             location: {
               row: lineNumber,
-              column
+              column,
             },
-            fileName: file
+            fileName: file,
           };
         } catch (error) {
           console.error(error);
@@ -950,11 +981,11 @@ class Server {
       /* $FlowFixMe: where is `rawBody` defined? Is it added by the `connect` framework? */
 
       const body = await req.rawBody;
-      const stack = JSON.parse(body).stack.map(frame => {
+      const stack = JSON.parse(body).stack.map((frame) => {
         if (frame.file && frame.file.includes("://")) {
           return {
             ...frame,
-            file: this._config.server.rewriteRequestUrl(frame.file)
+            file: this._config.server.rewriteRequestUrl(frame.file),
           };
         }
 
@@ -962,7 +993,7 @@ class Server {
       }); // In case of multiple bundles / HMR, some stack frames can have different URLs from others
 
       const urls = new Set();
-      stack.forEach(frame => {
+      stack.forEach((frame) => {
         const sourceUrl = frame.file; // Skip `/debuggerWorker.js` which does not need symbolication.
 
         if (
@@ -976,6 +1007,7 @@ class Server {
       });
       debug("Getting source maps for symbolication");
       const sourceMaps = await Promise.all(
+        // $FlowFixMe[method-unbinding] added when improving typing for this parameters
         Array.from(urls.values()).map(this._explodedSourceMapForURL, this)
       );
       debug("Performing fast symbolication");
@@ -988,7 +1020,7 @@ class Server {
       res.end(
         JSON.stringify({
           codeFrame: getCodeFrame(urls, symbolicatedStack),
-          stack: symbolicatedStack
+          stack: symbolicatedStack,
         })
       );
       process.nextTick(() => {
@@ -999,7 +1031,7 @@ class Server {
       res.statusCode = 500;
       res.end(
         JSON.stringify({
-          error: error.message
+          error: error.message,
         })
       );
     }
@@ -1016,7 +1048,7 @@ class Server {
       transformOptions,
       serializerOptions,
       graphOptions,
-      onProgress
+      onProgress,
     } = splitBundleOptions(options);
     /**
      * `entryFile` is relative to projectRoot, we need to use resolution function
@@ -1024,12 +1056,13 @@ class Server {
      */
 
     const resolvedEntryFilePath = await this._resolveRelativePath(entryFile, {
-      transformOptions
+      transformOptions,
+      relativeTo: "server",
     });
     const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
       shallow: graphOptions.shallow,
-      experimentalImportBundleSupport: this._config.transformer
-        .experimentalImportBundleSupport
+      experimentalImportBundleSupport:
+        this._config.transformer.experimentalImportBundleSupport,
     });
     let revision;
 
@@ -1041,7 +1074,7 @@ class Server {
         transformOptions,
         {
           onProgress,
-          shallow: graphOptions.shallow
+          shallow: graphOptions.shallow,
         }
       ));
     } else {
@@ -1057,17 +1090,21 @@ class Server {
     return getExplodedSourceMap(
       [...prepend, ...this._getSortedModules(graph)],
       {
-        processModuleFilter: this._config.serializer.processModuleFilter
+        processModuleFilter: this._config.serializer.processModuleFilter,
       }
     );
   }
 
-  async _resolveRelativePath(filePath, { transformOptions }) {
+  async _resolveRelativePath(filePath, { transformOptions, relativeTo }) {
     const resolutionFn = await transformHelpers.getResolveDependencyFn(
       this._bundler.getBundler(),
       transformOptions.platform
     );
-    return resolutionFn(`${this._config.projectRoot}/.`, filePath);
+    const rootDir =
+      relativeTo === "server"
+        ? this._getServerRootDir()
+        : this._config.projectRoot;
+    return resolutionFn(`${rootDir}/.`, filePath);
   }
 
   getNewBuildID() {
@@ -1088,7 +1125,7 @@ class Server {
     hot: false,
     minify: false,
     runtimeBytecodeVersion: null,
-    unstable_transformProfile: "default"
+    unstable_transformProfile: "default",
   };
   static DEFAULT_BUNDLE_OPTIONS = {
     ...Server.DEFAULT_GRAPH_OPTIONS,
@@ -1099,8 +1136,25 @@ class Server {
     runModule: true,
     shallow: false,
     sourceMapUrl: null,
-    sourceUrl: null
+    sourceUrl: null,
   };
+
+  _getServerRootDir() {
+    var _this$_config$server$;
+
+    return (_this$_config$server$ = this._config.server.unstable_serverRoot) !==
+      null && _this$_config$server$ !== void 0
+      ? _this$_config$server$
+      : this._config.projectRoot;
+  }
+
+  _getEntryPointAbsolutePath(entryFile) {
+    return path.resolve(this._getServerRootDir(), entryFile);
+  } // Wait for the server to finish initializing.
+
+  async ready() {
+    await this._bundler.ready();
+  }
 }
 
 function* zip(xs, ys) {