metro 0.82.1 → 0.82.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.82.1",
+  "version": "0.82.2",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -36,24 +36,24 @@
     "error-stack-parser": "^2.0.6",
     "flow-enums-runtime": "^0.0.6",
     "graceful-fs": "^4.2.4",
-    "hermes-parser": "0.25.1",
+    "hermes-parser": "0.28.1",
     "image-size": "^1.0.2",
     "invariant": "^2.2.4",
     "jest-worker": "^29.7.0",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.82.1",
-    "metro-cache": "0.82.1",
-    "metro-cache-key": "0.82.1",
-    "metro-config": "0.82.1",
-    "metro-core": "0.82.1",
-    "metro-file-map": "0.82.1",
-    "metro-resolver": "0.82.1",
-    "metro-runtime": "0.82.1",
-    "metro-source-map": "0.82.1",
-    "metro-symbolicate": "0.82.1",
-    "metro-transform-plugins": "0.82.1",
-    "metro-transform-worker": "0.82.1",
+    "metro-babel-transformer": "0.82.2",
+    "metro-cache": "0.82.2",
+    "metro-cache-key": "0.82.2",
+    "metro-config": "0.82.2",
+    "metro-core": "0.82.2",
+    "metro-file-map": "0.82.2",
+    "metro-resolver": "0.82.2",
+    "metro-runtime": "0.82.2",
+    "metro-source-map": "0.82.2",
+    "metro-symbolicate": "0.82.2",
+    "metro-transform-plugins": "0.82.2",
+    "metro-transform-worker": "0.82.2",
     "mime-types": "^2.1.27",
     "nullthrows": "^1.1.1",
     "serialize-error": "^2.1.0",
@@ -71,8 +71,8 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^29.7.0",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.82.1",
-    "metro-memory-fs": "0.82.1",
+    "metro-babel-register": "0.82.2",
+    "metro-memory-fs": "0.82.2",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"

package/src/DeltaBundler/Worker.flow.js

@@ -11,6 +11,9 @@ function asDeserializedBuffer(value) {
   if (value && value.type === "Buffer") {
     return Buffer.from(value.data);
   }
+  if (ArrayBuffer.isView(value)) {
+    return Buffer.from(value.buffer, value.byteOffset, value.byteLength);
+  }
   return null;
 }
 async function transform(

package/src/DeltaBundler/Worker.flow.js.flow

@@ -66,6 +66,9 @@ function asDeserializedBuffer(value: any): Buffer | null {
   if (value && value.type === 'Buffer') {
     return Buffer.from(value.data);
   }
+  if (ArrayBuffer.isView(value)) {
+    return Buffer.from(value.buffer, value.byteOffset, value.byteLength);
+  }
   return null;
 }
 

package/src/DeltaBundler/WorkerFarm.js

@@ -73,6 +73,7 @@ class WorkerFarm {
         env,
       },
       numWorkers,
+      workerSchedulingPolicy: "in-order",
     });
   }
   _computeWorkerKey(method, filename) {

package/src/DeltaBundler/WorkerFarm.js.flow

@@ -128,6 +128,12 @@ class WorkerFarm {
       enableWorkerThreads: this._config.transformer.unstable_workerThreads,
       forkOptions: {env},
       numWorkers,
+      // Prefer using lower numbered available workers repeatedly rather than
+      // spreading jobs over the whole pool evenly (round-robin). This is more
+      // likely to use faster, hot workers earlier in graph traversal, when
+      // we want to be able to fan out as quickly as possible, and therefore
+      // gets us to full speed faster.
+      workerSchedulingPolicy: 'in-order',
     });
   }
 

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

@@ -89,13 +89,9 @@ export type ReadOnlyDependencies<T = MixedOutput> = $ReadOnlyMap<
   Module<T>,
 >;
 
-export type TransformInputOptions = $Diff<
+export type TransformInputOptions = Omit<
   JsTransformOptions,
-  {
-    inlinePlatform: boolean,
-    inlineRequires: boolean,
-    ...
-  },
+  'inlinePlatform' | 'inlineRequires',
 >;
 
 export type GraphInputOptions = $ReadOnly<{

package/src/Server.js

@@ -17,6 +17,7 @@ const ResourceNotFoundError = require("./IncrementalBundler/ResourceNotFoundErro
 const bundleToString = require("./lib/bundleToString");
 const formatBundlingError = require("./lib/formatBundlingError");
 const getGraphId = require("./lib/getGraphId");
+const parseJsonBody = require("./lib/parseJsonBody");
 const parseOptionsFromUrl = require("./lib/parseOptionsFromUrl");
 const splitBundleOptions = require("./lib/splitBundleOptions");
 const transformHelpers = require("./lib/transformHelpers");
@@ -933,10 +934,13 @@ class Server {
   });
   async _symbolicate(req, res) {
     const getCodeFrame = (urls, symbolicatedStack) => {
+      const allFramesCollapsed = symbolicatedStack.every(
+        ({ collapse }) => collapse
+      );
       for (let i = 0; i < symbolicatedStack.length; i++) {
         const { collapse, column, file, lineNumber } = symbolicatedStack[i];
         if (
-          collapse ||
+          (!allFramesCollapsed && collapse) ||
           lineNumber == null ||
           (file != null && urls.has(file))
         ) {
@@ -974,8 +978,13 @@ class Server {
         createActionStartEntry("Symbolicating")
       );
       debug("Start symbolication");
-      const body = await req.rawBody;
-      const parsedBody = JSON.parse(body);
+      let parsedBody;
+      if ("rawBody" in req) {
+        const body = await req.rawBody;
+        parsedBody = JSON.parse(body);
+      } else {
+        parsedBody = await parseJsonBody(req);
+      }
       const rewriteAndNormalizeStackFrame = (frame, lineNumber) => {
         invariant(
           frame != null && typeof frame === "object",

package/src/Server.js.flow

@@ -24,7 +24,7 @@ import type {
 import type {RevisionId} from './IncrementalBundler';
 import type {GraphId} from './lib/getGraphId';
 import type {Reporter} from './lib/reporting';
-import type {StackFrameOutput} from './Server/symbolicate';
+import type {StackFrameInput, StackFrameOutput} from './Server/symbolicate';
 import type {
   BundleOptions,
   GraphOptions,
@@ -38,7 +38,6 @@ import type {ConfigT, RootPerfLogger} from 'metro-config/src/configTypes.flow';
 import type {
   ActionLogEntryData,
   ActionStartLogEntry,
-  LogEntry,
 } from 'metro-core/src/Logger';
 import type {CustomResolverOptions} from 'metro-resolver/src/types';
 import type {CustomTransformOptions} from 'metro-transform-worker';
@@ -61,6 +60,7 @@ const ResourceNotFoundError = require('./IncrementalBundler/ResourceNotFoundErro
 const bundleToString = require('./lib/bundleToString');
 const formatBundlingError = require('./lib/formatBundlingError');
 const getGraphId = require('./lib/getGraphId');
+const parseJsonBody = require('./lib/parseJsonBody');
 const parseOptionsFromUrl = require('./lib/parseOptionsFromUrl');
 const splitBundleOptions = require('./lib/splitBundleOptions');
 const transformHelpers = require('./lib/transformHelpers');
@@ -661,7 +661,7 @@ class Server {
     +createStartEntry: (context: ProcessStartContext) => ActionLogEntryData,
     +createEndEntry: (
       context: ProcessEndContext<T>,
-    ) => $Rest<ActionStartLogEntry, LogEntry>,
+    ) => Partial<ActionStartLogEntry>,
     +build: (context: ProcessStartContext) => Promise<T>,
     +delete?: (context: ProcessDeleteContext) => Promise<void>,
     +finish: (context: ProcessEndContext<T>) => void,
@@ -1220,11 +1220,17 @@ class Server {
       urls: Set<string>,
       symbolicatedStack: $ReadOnlyArray<StackFrameOutput>,
     ) => {
+      const allFramesCollapsed = symbolicatedStack.every(
+        ({collapse}) => collapse,
+      );
+
       for (let i = 0; i < symbolicatedStack.length; i++) {
         const {collapse, column, file, lineNumber} = symbolicatedStack[i];
 
         if (
-          collapse ||
+          // If all the frames are collapsed then we should ignore the collapse flag
+          // and always show the first valid frame.
+          (!allFramesCollapsed && collapse) ||
           lineNumber == null ||
           (file != null && urls.has(file))
         ) {
@@ -1262,9 +1268,20 @@ class Server {
         createActionStartEntry('Symbolicating'),
       );
       debug('Start symbolication');
-      /* $FlowFixMe: where is `rawBody` defined? Is it added by the `connect` framework? */
-      const body = await req.rawBody;
-      const parsedBody = JSON.parse(body);
+
+      let parsedBody;
+      if ('rawBody' in req) {
+        // TODO: Remove this branch once we are no longer targeting React Native
+        // < 0.80 and Expo SDK < 53
+        // $FlowFixMe[prop-missing] - rawBody assigned by legacy CLI integrations
+        const body = await req.rawBody;
+        parsedBody = JSON.parse(body);
+      } else {
+        parsedBody = (await parseJsonBody(req)) as {
+          stack: $ReadOnlyArray<StackFrameInput>,
+          extraData: {[string]: mixed},
+        };
+      }
 
       const rewriteAndNormalizeStackFrame = <T>(
         frame: T,

package/src/lib/formatBundlingError.js

@@ -38,14 +38,17 @@ function formatBundlingError(error) {
     (error instanceof Error &&
       (error.type === "TransformError" || error.type === "NotFoundError"))
   ) {
-    error.errors = [
-      {
-        description: error.message,
-        filename: error.filename,
-        lineNumber: error.lineNumber,
-      },
-    ];
-    return serializeError(error);
+    return {
+      ...serializeError(error),
+      type: error.type,
+      errors: [
+        {
+          description: error.message,
+          filename: error.filename,
+          lineNumber: error.lineNumber,
+        },
+      ],
+    };
   } else if (error instanceof ResourceNotFoundError) {
     return {
       type: "ResourceNotFoundError",

package/src/lib/formatBundlingError.js.flow

@@ -62,15 +62,18 @@ function formatBundlingError(error: CustomError): FormattedError {
     (error instanceof Error &&
       (error.type === 'TransformError' || error.type === 'NotFoundError'))
   ) {
-    error.errors = [
-      {
-        description: error.message,
-        filename: error.filename,
-        lineNumber: error.lineNumber,
-      },
-    ];
-
-    return serializeError(error);
+    return {
+      ...serializeError(error),
+      // Ensure the type is passed to the client.
+      type: error.type,
+      errors: [
+        {
+          description: error.message,
+          filename: error.filename,
+          lineNumber: error.lineNumber,
+        },
+      ],
+    };
   } else if (error instanceof ResourceNotFoundError) {
     return {
       type: 'ResourceNotFoundError',

package/src/lib/parseJsonBody.js

@@ -0,0 +1,35 @@
+"use strict";
+
+const CONTENT_TYPE = "application/json";
+const SIZE_LIMIT = 100 * 1024 * 1024;
+function parseJsonBody(req, options = {}) {
+  const { strict = true } = options;
+  return new Promise((resolve, reject) => {
+    if (strict) {
+      const contentType = req.headers["content-type"] || "";
+      if (!contentType.includes(CONTENT_TYPE)) {
+        reject(new Error(`Invalid content type, expected ${CONTENT_TYPE}`));
+        return;
+      }
+    }
+    let size = 0;
+    let data = "";
+    req.on("data", (chunk) => {
+      size += Buffer.byteLength(chunk);
+      if (size > SIZE_LIMIT) {
+        req.destroy();
+        reject(new Error("Request body size exceeds size limit (100MB)"));
+        return;
+      }
+      data += chunk;
+    });
+    req.on("end", () => {
+      try {
+        resolve(JSON.parse(data));
+      } catch (e) {
+        reject(e);
+      }
+    });
+  });
+}
+module.exports = parseJsonBody;

package/src/lib/parseJsonBody.js.flow

@@ -0,0 +1,60 @@
+/**
+ * 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.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall react_native
+ */
+
+import type {IncomingMessage} from 'http';
+
+const CONTENT_TYPE = 'application/json';
+const SIZE_LIMIT = 100 * 1024 * 1024; // 100MB
+
+/**
+ * Attempt to parse a request body as JSON.
+ */
+function parseJsonBody(
+  req: IncomingMessage,
+  options: {strict?: boolean} = {},
+): Promise<$FlowFixMe> {
+  const {strict = true} = options;
+
+  return new Promise((resolve, reject) => {
+    if (strict) {
+      const contentType = req.headers['content-type'] || '';
+      if (!contentType.includes(CONTENT_TYPE)) {
+        reject(new Error(`Invalid content type, expected ${CONTENT_TYPE}`));
+        return;
+      }
+    }
+
+    let size = 0;
+    let data = '';
+
+    req.on('data', (chunk: string) => {
+      size += Buffer.byteLength(chunk);
+
+      if (size > SIZE_LIMIT) {
+        req.destroy();
+        reject(new Error('Request body size exceeds size limit (100MB)'));
+        return;
+      }
+
+      data += chunk;
+    });
+
+    req.on('end', () => {
+      try {
+        resolve(JSON.parse(data));
+      } catch (e) {
+        reject(e);
+      }
+    });
+  });
+}
+
+module.exports = parseJsonBody;