metro 0.69.1 → 0.70.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.69.1",
+  "version": "0.70.2",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -22,7 +22,7 @@
     "@babel/types": "^7.0.0",
     "absolute-path": "^0.0.0",
     "accepts": "^1.3.7",
-    "async": "^2.4.0",
+    "async": "^3.2.2",
     "chalk": "^4.0.0",
     "ci-info": "^2.0.0",
     "connect": "^3.6.5",
@@ -30,28 +30,28 @@
     "denodeify": "^1.2.1",
     "error-stack-parser": "^2.0.6",
     "fs-extra": "^1.0.0",
-    "graceful-fs": "^4.1.3",
+    "graceful-fs": "^4.2.4",
     "hermes-parser": "0.6.0",
     "image-size": "^0.6.0",
     "invariant": "^2.2.4",
     "jest-haste-map": "^27.3.1",
-    "jest-worker": "^26.0.0",
+    "jest-worker": "^27.2.0",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.69.1",
-    "metro-cache": "0.69.1",
-    "metro-cache-key": "0.69.1",
-    "metro-config": "0.69.1",
-    "metro-core": "0.69.1",
-    "metro-hermes-compiler": "0.69.1",
-    "metro-inspector-proxy": "0.69.1",
-    "metro-minify-uglify": "0.69.1",
-    "metro-react-native-babel-preset": "0.69.1",
-    "metro-resolver": "0.69.1",
-    "metro-runtime": "0.69.1",
-    "metro-source-map": "0.69.1",
-    "metro-symbolicate": "0.69.1",
-    "metro-transform-plugins": "0.69.1",
-    "metro-transform-worker": "0.69.1",
+    "metro-babel-transformer": "0.70.2",
+    "metro-cache": "0.70.2",
+    "metro-cache-key": "0.70.2",
+    "metro-config": "0.70.2",
+    "metro-core": "0.70.2",
+    "metro-hermes-compiler": "0.70.2",
+    "metro-inspector-proxy": "0.70.2",
+    "metro-minify-uglify": "0.70.2",
+    "metro-react-native-babel-preset": "0.70.2",
+    "metro-resolver": "0.70.2",
+    "metro-runtime": "0.70.2",
+    "metro-source-map": "0.70.2",
+    "metro-symbolicate": "0.70.2",
+    "metro-transform-plugins": "0.70.2",
+    "metro-transform-worker": "0.70.2",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
@@ -70,9 +70,9 @@
     "babel-jest": "^26.6.3",
     "dedent": "^0.7.0",
     "jest-snapshot": "^26.5.2",
-    "metro-memory-fs": "0.69.1",
-    "metro-react-native-babel-preset": "0.69.1",
-    "metro-react-native-babel-transformer": "0.69.1",
+    "metro-memory-fs": "0.70.2",
+    "metro-react-native-babel-preset": "0.70.2",
+    "metro-react-native-babel-transformer": "0.70.2",
     "stack-trace": "^0.0.10"
   },
   "license": "MIT"

package/src/DeltaBundler/Serializers/baseBytecodeBundle.js

@@ -49,6 +49,7 @@ function baseBytecodeBundle(entryPoint, preModules, graph, options) {
         projectRoot: options.projectRoot,
         runBeforeMainModule: options.runBeforeMainModule,
         runModule: options.runModule,
+        serverRoot: options.serverRoot,
         sourceMapUrl: options.sourceMapUrl,
         sourceUrl: options.sourceUrl,
       }

package/src/DeltaBundler/Serializers/baseBytecodeBundle.js.flow

@@ -63,6 +63,7 @@ function baseBytecodeBundle(
         projectRoot: options.projectRoot,
         runBeforeMainModule: options.runBeforeMainModule,
         runModule: options.runModule,
+        serverRoot: options.serverRoot,
         sourceMapUrl: options.sourceMapUrl,
         sourceUrl: options.sourceUrl,
       },

package/src/DeltaBundler/Serializers/baseJSBundle.js

@@ -48,6 +48,7 @@ function baseJSBundle(entryPoint, preModules, graph, options) {
         projectRoot: options.projectRoot,
         runBeforeMainModule: options.runBeforeMainModule,
         runModule: options.runModule,
+        serverRoot: options.serverRoot,
         sourceMapUrl: options.sourceMapUrl,
         sourceUrl: options.sourceUrl,
       }

package/src/DeltaBundler/Serializers/baseJSBundle.js.flow

@@ -65,6 +65,7 @@ function baseJSBundle(
         projectRoot: options.projectRoot,
         runBeforeMainModule: options.runBeforeMainModule,
         runModule: options.runModule,
+        serverRoot: options.serverRoot,
         sourceMapUrl: options.sourceMapUrl,
         sourceUrl: options.sourceUrl,
       },

package/src/DeltaBundler/WorkerFarm.js

@@ -9,7 +9,7 @@
  */
 "use strict";
 
-const JestWorker = require("jest-worker").default;
+const { Worker: JestWorker } = require("jest-worker");
 
 const { Logger } = require("metro-core");
 

package/src/DeltaBundler/WorkerFarm.js.flow

@@ -15,7 +15,7 @@ import type {TransformerConfig, TransformOptions, Worker} from './Worker';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 import type {Readable} from 'stream';
 
-const JestWorker = require('jest-worker').default;
+const {Worker: JestWorker} = require('jest-worker');
 const {Logger} = require('metro-core');
 
 type WorkerInterface = {|

package/src/DeltaBundler/types.flow.js.flow

@@ -129,6 +129,7 @@ export type SerializerOptions = {|
   +projectRoot: string,
   +runBeforeMainModule: $ReadOnlyArray<string>,
   +runModule: boolean,
+  +serverRoot: string,
   +sourceMapUrl: ?string,
   +sourceUrl: ?string,
 |};

package/src/Server.js

@@ -123,6 +123,8 @@ class Server {
   }
 
   async build(options) {
+    var _this$_config$server$;
+
     const {
       entryFile,
       graphOptions,
@@ -163,6 +165,11 @@ class Server {
       sourceMapUrl: serializerOptions.sourceMapUrl,
       sourceUrl: serializerOptions.sourceUrl,
       inlineSourceMap: serializerOptions.inlineSourceMap,
+      serverRoot:
+        (_this$_config$server$ = this._config.server.unstable_serverRoot) !==
+          null && _this$_config$server$ !== void 0
+          ? _this$_config$server$
+          : this._config.projectRoot,
     };
     let bundleCode = null;
     let bundleMap = null;
@@ -204,6 +211,8 @@ class Server {
   }
 
   async getRamBundleInfo(options) {
+    var _this$_config$server$2;
+
     const {
       entryFile,
       graphOptions,
@@ -247,6 +256,11 @@ class Server {
       sourceMapUrl: serializerOptions.sourceMapUrl,
       sourceUrl: serializerOptions.sourceUrl,
       inlineSourceMap: serializerOptions.inlineSourceMap,
+      serverRoot:
+        (_this$_config$server$2 = this._config.server.unstable_serverRoot) !==
+          null && _this$_config$server$2 !== void 0
+          ? _this$_config$server$2
+          : this._config.projectRoot,
     });
   }
 
@@ -633,6 +647,8 @@ class Server {
       serializerOptions,
       transformOptions,
     }) => {
+      var _this$_config$server$3;
+
       const revPromise = this._bundler.getRevisionByGraphId(graphId);
 
       const { delta, revision } = await (revPromise != null
@@ -672,6 +688,12 @@ class Server {
           sourceMapUrl: serializerOptions.sourceMapUrl,
           sourceUrl: serializerOptions.sourceUrl,
           inlineSourceMap: serializerOptions.inlineSourceMap,
+          serverRoot:
+            (_this$_config$server$3 =
+              this._config.server.unstable_serverRoot) !== null &&
+            _this$_config$server$3 !== void 0
+              ? _this$_config$server$3
+              : this._config.projectRoot,
         }
       );
       const bundleCode = typeof bundle === "string" ? bundle : bundle.code;
@@ -745,6 +767,8 @@ class Server {
       serializerOptions,
       transformOptions,
     }) => {
+      var _this$_config$server$4;
+
       const revPromise = this._bundler.getRevisionByGraphId(graphId);
 
       const { delta, revision } = await (revPromise != null
@@ -776,6 +800,12 @@ class Server {
           sourceMapUrl: serializerOptions.sourceMapUrl,
           sourceUrl: serializerOptions.sourceUrl,
           inlineSourceMap: serializerOptions.inlineSourceMap,
+          serverRoot:
+            (_this$_config$server$4 =
+              this._config.server.unstable_serverRoot) !== null &&
+            _this$_config$server$4 !== void 0
+              ? _this$_config$server$4
+              : this._config.projectRoot,
         })
       );
       return {
@@ -1140,11 +1170,12 @@ class Server {
   };
 
   _getServerRootDir() {
-    var _this$_config$server$;
+    var _this$_config$server$5;
 
-    return (_this$_config$server$ = this._config.server.unstable_serverRoot) !==
-      null && _this$_config$server$ !== void 0
-      ? _this$_config$server$
+    return (_this$_config$server$5 =
+      this._config.server.unstable_serverRoot) !== null &&
+      _this$_config$server$5 !== void 0
+      ? _this$_config$server$5
       : this._config.projectRoot;
   }
 

package/src/Server.js.flow

@@ -210,6 +210,8 @@ class Server {
       sourceMapUrl: serializerOptions.sourceMapUrl,
       sourceUrl: serializerOptions.sourceUrl,
       inlineSourceMap: serializerOptions.inlineSourceMap,
+      serverRoot:
+        this._config.server.unstable_serverRoot ?? this._config.projectRoot,
     };
     let bundleCode = null;
     let bundleMap = null;
@@ -285,6 +287,8 @@ class Server {
       sourceMapUrl: serializerOptions.sourceMapUrl,
       sourceUrl: serializerOptions.sourceUrl,
       inlineSourceMap: serializerOptions.inlineSourceMap,
+      serverRoot:
+        this._config.server.unstable_serverRoot ?? this._config.projectRoot,
     });
   }
 
@@ -754,6 +758,8 @@ class Server {
           sourceMapUrl: serializerOptions.sourceMapUrl,
           sourceUrl: serializerOptions.sourceUrl,
           inlineSourceMap: serializerOptions.inlineSourceMap,
+          serverRoot:
+            this._config.server.unstable_serverRoot ?? this._config.projectRoot,
         },
       );
 
@@ -862,6 +868,8 @@ class Server {
           sourceMapUrl: serializerOptions.sourceMapUrl,
           sourceUrl: serializerOptions.sourceUrl,
           inlineSourceMap: serializerOptions.inlineSourceMap,
+          serverRoot:
+            this._config.server.unstable_serverRoot ?? this._config.projectRoot,
         }),
       );
 

package/src/lib/getAppendScripts.js

@@ -25,7 +25,7 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
   if (importBundleNames.size) {
     const importBundleNamesObject = Object.create(null);
     importBundleNames.forEach((absolutePath) => {
-      const bundlePath = path.relative(options.projectRoot, absolutePath);
+      const bundlePath = path.relative(options.serverRoot, absolutePath);
       importBundleNamesObject[options.createModuleId(absolutePath)] =
         bundlePath.slice(0, -path.extname(bundlePath).length);
     });

package/src/lib/getAppendScripts.js.flow

@@ -24,6 +24,7 @@ type Options<T: number | string> = {
   +getRunModuleStatement: T => string,
   +inlineSourceMap: ?boolean,
   +projectRoot: string,
+  +serverRoot: string,
   +runBeforeMainModule: $ReadOnlyArray<string>,
   +runModule: boolean,
   +sourceMapUrl: ?string,
@@ -42,7 +43,7 @@ function getAppendScripts<T: number | string>(
   if (importBundleNames.size) {
     const importBundleNamesObject = Object.create(null);
     importBundleNames.forEach(absolutePath => {
-      const bundlePath = path.relative(options.projectRoot, absolutePath);
+      const bundlePath = path.relative(options.serverRoot, absolutePath);
       importBundleNamesObject[options.createModuleId(absolutePath)] =
         bundlePath.slice(0, -path.extname(bundlePath).length);
     });