metro 0.70.3 → 0.70.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.70.3",
+  "version": "0.70.4",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -36,22 +36,23 @@
     "invariant": "^2.2.4",
     "jest-haste-map": "^27.3.1",
     "jest-worker": "^27.2.0",
+    "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.70.3",
-    "metro-cache": "0.70.3",
-    "metro-cache-key": "0.70.3",
-    "metro-config": "0.70.3",
-    "metro-core": "0.70.3",
-    "metro-hermes-compiler": "0.70.3",
-    "metro-inspector-proxy": "0.70.3",
-    "metro-minify-uglify": "0.70.3",
-    "metro-react-native-babel-preset": "0.70.3",
-    "metro-resolver": "0.70.3",
-    "metro-runtime": "0.70.3",
-    "metro-source-map": "0.70.3",
-    "metro-symbolicate": "0.70.3",
-    "metro-transform-plugins": "0.70.3",
-    "metro-transform-worker": "0.70.3",
+    "metro-babel-transformer": "0.70.4",
+    "metro-cache": "0.70.4",
+    "metro-cache-key": "0.70.4",
+    "metro-config": "0.70.4",
+    "metro-core": "0.70.4",
+    "metro-hermes-compiler": "0.70.4",
+    "metro-inspector-proxy": "0.70.4",
+    "metro-minify-uglify": "0.70.4",
+    "metro-react-native-babel-preset": "0.70.4",
+    "metro-resolver": "0.70.4",
+    "metro-runtime": "0.70.4",
+    "metro-source-map": "0.70.4",
+    "metro-symbolicate": "0.70.4",
+    "metro-transform-plugins": "0.70.4",
+    "metro-transform-worker": "0.70.4",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
@@ -70,9 +71,9 @@
     "babel-jest": "^26.6.3",
     "dedent": "^0.7.0",
     "jest-snapshot": "^26.5.2",
-    "metro-memory-fs": "0.70.3",
-    "metro-react-native-babel-preset": "0.70.3",
-    "metro-react-native-babel-transformer": "0.70.3",
+    "metro-memory-fs": "0.70.4",
+    "metro-react-native-babel-preset": "0.70.4",
+    "metro-react-native-babel-transformer": "0.70.4",
     "stack-trace": "^0.0.10"
   },
   "license": "MIT"

package/src/DeltaBundler/Serializers/hmrJSBundle.js

@@ -11,6 +11,8 @@
 
 const { isJsModule, wrapModule } = require("./helpers/js");
 
+const jscSafeUrl = require("jsc-safe-url");
+
 const { addParamsToDefineCall } = require("metro-transform-plugins");
 
 const path = require("path");
@@ -37,7 +39,7 @@ function generateModules(sourceModules, graph, options) {
       };
 
       const sourceMappingURL = getURL("map");
-      const sourceURL = getURL("bundle");
+      const sourceURL = jscSafeUrl.toJscSafeUrl(getURL("bundle"));
       const code =
         prepareModule(module, graph, options) +
         `\n//# sourceMappingURL=${sourceMappingURL}\n` +

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

@@ -15,6 +15,7 @@ import type {DeltaResult, Graph, Module} from '../types.flow';
 import type {HmrModule} from 'metro-runtime/src/modules/types.flow';
 
 const {isJsModule, wrapModule} = require('./helpers/js');
+const jscSafeUrl = require('jsc-safe-url');
 const {addParamsToDefineCall} = require('metro-transform-plugins');
 const path = require('path');
 const url = require('url');
@@ -52,7 +53,7 @@ function generateModules(
       };
 
       const sourceMappingURL = getURL('map');
-      const sourceURL = getURL('bundle');
+      const sourceURL = jscSafeUrl.toJscSafeUrl(getURL('bundle'));
       const code =
         prepareModule(module, graph, options) +
         `\n//# sourceMappingURL=${sourceMappingURL}\n` +

package/src/Server.js

@@ -57,6 +57,10 @@ const debug = require("debug")("Metro:Server");
 
 const fs = require("graceful-fs");
 
+const invariant = require("invariant");
+
+const jscSafeUrl = require("jsc-safe-url");
+
 const {
   Logger,
   Logger: { createActionStartEntry, createActionEndEntry, log },
@@ -399,9 +403,15 @@ class Server {
     );
   }
 
+  _rewriteAndNormalizeUrl(requestUrl) {
+    return jscSafeUrl.toNormalUrl(
+      this._config.server.rewriteRequestUrl(jscSafeUrl.toNormalUrl(requestUrl))
+    );
+  }
+
   async _processRequest(req, res, next) {
     const originalUrl = req.url;
-    req.url = this._config.server.rewriteRequestUrl(req.url);
+    req.url = this._rewriteAndNormalizeUrl(req.url);
     const urlObj = url.parse(req.url, true);
     const { host } = req.headers;
     debug(
@@ -707,7 +717,7 @@ class Server {
       };
     },
 
-    finish({ req, mres, result }) {
+    finish({ req, mres, serializerOptions, result }) {
       if (
         // We avoid parsing the dates since the client should never send a more
         // recent date than the one returned by the Delta Bundler (if that's the
@@ -724,6 +734,15 @@ class Server {
           String(result.numModifiedFiles)
         );
         mres.setHeader(DELTA_ID_HEADER, String(result.nextRevId));
+
+        if (
+          (serializerOptions === null || serializerOptions === void 0
+            ? void 0
+            : serializerOptions.sourceUrl) != null
+        ) {
+          mres.setHeader("Content-Location", serializerOptions.sourceUrl);
+        }
+
         mres.setHeader("Content-Type", "application/javascript; charset=UTF-8");
         mres.setHeader("Last-Modified", result.lastModifiedDate.toUTCString());
         mres.setHeader(
@@ -1011,19 +1030,29 @@ 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) => {
-        if (frame.file && frame.file.includes("://")) {
-          return {
-            ...frame,
-            file: this._config.server.rewriteRequestUrl(frame.file),
-          };
+      const parsedBody = JSON.parse(body);
+
+      const rewriteAndNormalizeStackFrame = (frame, lineNumber) => {
+        invariant(
+          frame != null && typeof frame === "object",
+          "Bad stack frame at line %d, expected object, received: %s",
+          lineNumber,
+          typeof frame
+        );
+        const frameFile = frame.file;
+
+        if (typeof frameFile === "string" && frameFile.includes("://")) {
+          return { ...frame, file: this._rewriteAndNormalizeUrl(frameFile) };
         }
 
         return frame;
-      }); // In case of multiple bundles / HMR, some stack frames can have different URLs from others
+      };
+
+      const stack = parsedBody.stack.map(rewriteAndNormalizeStackFrame); // In case of multiple bundles / HMR, some stack frames can have different URLs from others
 
       const urls = new Set();
       stack.forEach((frame) => {
+        // These urls have been rewritten and normalized above.
         const sourceUrl = frame.file; // Skip `/debuggerWorker.js` which does not need symbolication.
 
         if (
@@ -1037,8 +1066,11 @@ 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)
+        Array.from(urls.values()).map((normalizedUrl) =>
+          this._explodedSourceMapForBundleOptions(
+            this._parseOptions(normalizedUrl)
+          )
+        )
       );
       debug("Performing fast symbolication");
       const symbolicatedStack = await await symbolicate(
@@ -1067,19 +1099,14 @@ class Server {
     }
   }
 
-  async _explodedSourceMapForURL(reqUrl) {
-    const options = parseOptionsFromUrl(
-      reqUrl,
-      new Set(this._config.resolver.platforms),
-      BYTECODE_VERSION
-    );
+  async _explodedSourceMapForBundleOptions(bundleOptions) {
     const {
       entryFile,
       transformOptions,
       serializerOptions,
       graphOptions,
       onProgress,
-    } = splitBundleOptions(options);
+    } = splitBundleOptions(bundleOptions);
     /**
      * `entryFile` is relative to projectRoot, we need to use resolution function
      * to find the appropriate file with supported extensions.

package/src/Server.js.flow

@@ -60,6 +60,8 @@ const symbolicate = require('./Server/symbolicate');
 const {codeFrameColumns} = require('@babel/code-frame');
 const debug = require('debug')('Metro:Server');
 const fs = require('graceful-fs');
+const invariant = require('invariant');
+const jscSafeUrl = require('jsc-safe-url');
 const {
   Logger,
   Logger: {createActionStartEntry, createActionEndEntry, log},
@@ -444,14 +446,19 @@ class Server {
     );
   }
 
+  _rewriteAndNormalizeUrl(requestUrl: string): string {
+    return jscSafeUrl.toNormalUrl(
+      this._config.server.rewriteRequestUrl(jscSafeUrl.toNormalUrl(requestUrl)),
+    );
+  }
+
   async _processRequest(
     req: IncomingMessage,
     res: ServerResponse,
     next: (?Error) => mixed,
   ) {
     const originalUrl = req.url;
-    req.url = this._config.server.rewriteRequestUrl(req.url);
-
+    req.url = this._rewriteAndNormalizeUrl(req.url);
     const urlObj = url.parse(req.url, true);
     const {host} = req.headers;
     debug(
@@ -774,7 +781,7 @@ class Server {
         bundle: bundleCode,
       };
     },
-    finish({req, mres, result}) {
+    finish({req, mres, serializerOptions, result}) {
       if (
         // We avoid parsing the dates since the client should never send a more
         // recent date than the one returned by the Delta Bundler (if that's the
@@ -791,6 +798,9 @@ class Server {
           String(result.numModifiedFiles),
         );
         mres.setHeader(DELTA_ID_HEADER, String(result.nextRevId));
+        if (serializerOptions?.sourceUrl != null) {
+          mres.setHeader('Content-Location', serializerOptions.sourceUrl);
+        }
         mres.setHeader('Content-Type', 'application/javascript; charset=UTF-8');
         mres.setHeader('Last-Modified', result.lastModifiedDate.toUTCString());
         mres.setHeader(
@@ -1051,19 +1061,34 @@ class Server {
       debug('Start symbolication');
       /* $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 => {
-        if (frame.file && frame.file.includes('://')) {
+      const parsedBody = JSON.parse(body);
+
+      const rewriteAndNormalizeStackFrame = <T>(
+        frame: T,
+        lineNumber: number,
+      ): T => {
+        invariant(
+          frame != null && typeof frame === 'object',
+          'Bad stack frame at line %d, expected object, received: %s',
+          lineNumber,
+          typeof frame,
+        );
+        const frameFile = frame.file;
+        if (typeof frameFile === 'string' && frameFile.includes('://')) {
           return {
             ...frame,
-            file: this._config.server.rewriteRequestUrl(frame.file),
+            file: this._rewriteAndNormalizeUrl(frameFile),
           };
         }
         return frame;
-      });
+      };
+
+      const stack = parsedBody.stack.map(rewriteAndNormalizeStackFrame);
       // In case of multiple bundles / HMR, some stack frames can have different URLs from others
       const urls = new Set();
 
       stack.forEach(frame => {
+        // These urls have been rewritten and normalized above.
         const sourceUrl = frame.file;
         // Skip `/debuggerWorker.js` which does not need symbolication.
         if (
@@ -1078,8 +1103,11 @@ 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),
+        Array.from(urls.values()).map(normalizedUrl =>
+          this._explodedSourceMapForBundleOptions(
+            this._parseOptions(normalizedUrl),
+          ),
+        ),
       );
 
       debug('Performing fast symbolication');
@@ -1106,20 +1134,16 @@ class Server {
     }
   }
 
-  async _explodedSourceMapForURL(reqUrl: string): Promise<ExplodedSourceMap> {
-    const options = parseOptionsFromUrl(
-      reqUrl,
-      new Set(this._config.resolver.platforms),
-      BYTECODE_VERSION,
-    );
-
+  async _explodedSourceMapForBundleOptions(
+    bundleOptions: BundleOptions,
+  ): Promise<ExplodedSourceMap> {
     const {
       entryFile,
       transformOptions,
       serializerOptions,
       graphOptions,
       onProgress,
-    } = splitBundleOptions(options);
+    } = splitBundleOptions(bundleOptions);
 
     /**
      * `entryFile` is relative to projectRoot, we need to use resolution function

package/src/lib/parseOptionsFromUrl.js

@@ -13,6 +13,8 @@ const parsePlatformFilePath = require("../node-haste/lib/parsePlatformFilePath")
 
 const parseCustomTransformOptions = require("./parseCustomTransformOptions");
 
+const jscSafeUrl = require("jsc-safe-url");
+
 const nullthrows = require("nullthrows");
 
 const path = require("path");
@@ -38,11 +40,11 @@ const getTransformProfile = (transformProfile) =>
     : "default";
 
 module.exports = function parseOptionsFromUrl(
-  requestUrl,
+  normalizedRequestUrl,
   platforms,
   bytecodeVersion
 ) {
-  const parsedURL = nullthrows(url.parse(requestUrl, true)); // `true` to parse the query param as an object.
+  const parsedURL = nullthrows(url.parse(normalizedRequestUrl, true)); // `true` to parse the query param as an object.
 
   const query = nullthrows(parsedURL.query);
   const pathname =
@@ -82,7 +84,7 @@ module.exports = function parseOptionsFromUrl(
         platform != null && platform.match(/^(android|ios)$/) ? "http" : "",
       pathname: pathname.replace(/\.(bundle|delta)$/, ".map"),
     }),
-    sourceUrl: requestUrl,
+    sourceUrl: jscSafeUrl.toJscSafeUrl(normalizedRequestUrl),
     unstable_transformProfile: getTransformProfile(
       query.unstable_transformProfile
     ),

package/src/lib/parseOptionsFromUrl.js.flow

@@ -14,6 +14,7 @@ import type {BundleOptions} from '../shared/types.flow';
 
 const parsePlatformFilePath = require('../node-haste/lib/parsePlatformFilePath');
 const parseCustomTransformOptions = require('./parseCustomTransformOptions');
+const jscSafeUrl = require('jsc-safe-url');
 const nullthrows = require('nullthrows');
 const path = require('path');
 const url = require('url');
@@ -57,11 +58,11 @@ const getTransformProfile = (
     : 'default';
 
 module.exports = function parseOptionsFromUrl(
-  requestUrl: string,
+  normalizedRequestUrl: string,
   platforms: Set<string>,
   bytecodeVersion: number,
 ): BundleOptions {
-  const parsedURL = nullthrows(url.parse(requestUrl, true)); // `true` to parse the query param as an object.
+  const parsedURL = nullthrows(url.parse(normalizedRequestUrl, true)); // `true` to parse the query param as an object.
   const query = nullthrows(parsedURL.query);
   const pathname =
     query.bundleEntry ||
@@ -101,7 +102,7 @@ module.exports = function parseOptionsFromUrl(
         platform != null && platform.match(/^(android|ios)$/) ? 'http' : '',
       pathname: pathname.replace(/\.(bundle|delta)$/, '.map'),
     }),
-    sourceUrl: requestUrl,
+    sourceUrl: jscSafeUrl.toJscSafeUrl(normalizedRequestUrl),
     unstable_transformProfile: getTransformProfile(
       query.unstable_transformProfile,
     ),