metro 0.80.7 → 0.80.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.80.7",
+  "version": "0.80.9",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -34,18 +34,18 @@
     "jest-worker": "^29.6.3",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.80.7",
-    "metro-cache": "0.80.7",
-    "metro-cache-key": "0.80.7",
-    "metro-config": "0.80.7",
-    "metro-core": "0.80.7",
-    "metro-file-map": "0.80.7",
-    "metro-resolver": "0.80.7",
-    "metro-runtime": "0.80.7",
-    "metro-source-map": "0.80.7",
-    "metro-symbolicate": "0.80.7",
-    "metro-transform-plugins": "0.80.7",
-    "metro-transform-worker": "0.80.7",
+    "metro-babel-transformer": "0.80.9",
+    "metro-cache": "0.80.9",
+    "metro-cache-key": "0.80.9",
+    "metro-config": "0.80.9",
+    "metro-core": "0.80.9",
+    "metro-file-map": "0.80.9",
+    "metro-resolver": "0.80.9",
+    "metro-runtime": "0.80.9",
+    "metro-source-map": "0.80.9",
+    "metro-symbolicate": "0.80.9",
+    "metro-transform-plugins": "0.80.9",
+    "metro-transform-worker": "0.80.9",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
@@ -66,8 +66,8 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^29.6.3",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.80.7",
-    "metro-memory-fs": "0.80.7",
+    "metro-babel-register": "0.80.9",
+    "metro-memory-fs": "0.80.9",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"

package/src/DeltaBundler/Transformer.js

@@ -88,7 +88,16 @@ class Transformer {
       sha1 = this._getSha1(filePath);
     }
     let fullKey = Buffer.concat([partialKey, Buffer.from(sha1, "hex")]);
-    const result = await cache.get(fullKey);
+    let result;
+    try {
+      result = await cache.get(fullKey);
+    } catch (error) {
+      this._config.reporter.update({
+        type: "cache_read_error",
+        error,
+      });
+      throw error;
+    }
     const data = result
       ? {
           result,
@@ -102,7 +111,12 @@ class Transformer {
     if (sha1 !== data.sha1) {
       fullKey = Buffer.concat([partialKey, Buffer.from(data.sha1, "hex")]);
     }
-    void cache.set(fullKey, data.result);
+    cache.set(fullKey, data.result).catch((error) => {
+      this._config.reporter.update({
+        type: "cache_write_error",
+        error,
+      });
+    });
     return {
       ...data.result,
       unstable_transformResultKey: fullKey.toString(),

package/src/DeltaBundler/Transformer.js.flow

@@ -131,7 +131,16 @@ class Transformer {
     }
 
     let fullKey = Buffer.concat([partialKey, Buffer.from(sha1, 'hex')]);
-    const result = await cache.get(fullKey);
+    let result;
+    try {
+      result = await cache.get(fullKey);
+    } catch (error) {
+      this._config.reporter.update({
+        type: 'cache_read_error',
+        error,
+      });
+      throw error;
+    }
 
     // A valid result from the cache is used directly; otherwise we call into
     // the transformer to computed the corresponding result.
@@ -154,7 +163,12 @@ class Transformer {
     }
 
     // Fire-and-forget cache set promise.
-    void cache.set(fullKey, data.result);
+    cache.set(fullKey, data.result).catch(error => {
+      this._config.reporter.update({
+        type: 'cache_write_error',
+        error,
+      });
+    });
 
     return {
       ...data.result,

package/src/ModuleGraph/worker/JsFileWrapping.js

@@ -56,7 +56,8 @@ function wrapModule(
   importDefaultName,
   importAllName,
   dependencyMapName,
-  globalPrefix
+  globalPrefix,
+  skipRequireRename
 ) {
   const params = buildParameters(
     importDefaultName,
@@ -66,7 +67,7 @@ function wrapModule(
   const factory = functionFromProgram(fileAst.program, params);
   const def = t.callExpression(t.identifier(`${globalPrefix}__d`), [factory]);
   const ast = t.file(t.program([t.expressionStatement(def)]));
-  const requireName = renameRequires(ast);
+  const requireName = skipRequireRename ? "require" : renameRequires(ast);
   return {
     ast,
     requireName,

package/src/ModuleGraph/worker/JsFileWrapping.js.flow

@@ -32,6 +32,7 @@ function wrapModule(
   importAllName: string,
   dependencyMapName: string,
   globalPrefix: string,
+  skipRequireRename: boolean,
 ): {
   ast: BabelNodeFile,
   requireName: string,
@@ -45,7 +46,9 @@ function wrapModule(
   const def = t.callExpression(t.identifier(`${globalPrefix}__d`), [factory]);
   const ast = t.file(t.program([t.expressionStatement(def)]));
 
-  const requireName = renameRequires(ast);
+  // `require` doesn't need to be scoped when Metro serializes to iife because the local function
+  // `require` will be used instead of the global one.
+  const requireName = skipRequireRename ? 'require' : renameRequires(ast);
 
   return {ast, requireName};
 }

package/src/Server.js.flow

@@ -465,6 +465,7 @@ class Server {
       );
       // Tell clients to cache this for 1 year.
       // This is safe as the asset url contains a hash of the asset.
+      // $FlowFixMe[incompatible-type]
       if (process.env.REACT_NATIVE_ENABLE_ASSET_CACHING === true) {
         res.setHeader('Cache-Control', 'max-age=31536000');
       }

package/src/lib/JsonReporter.js.flow

@@ -13,6 +13,18 @@
 
 import type {Writable} from 'stream';
 
+export type SerializedEvent<TEvent: {[string]: any, ...}> = TEvent extends {
+  error: Error,
+  ...
+}
+  ? {
+      ...Omit<TEvent, 'error'>,
+      message: string,
+      stack: string,
+      ...
+    }
+  : TEvent;
+
 class JsonReporter<TEvent: {[string]: any, ...}> {
   _stream: Writable;
 

package/src/lib/TerminalReporter.js

@@ -6,8 +6,6 @@ const chalk = require("chalk");
 const throttle = require("lodash.throttle");
 const { AmbiguousModuleResolutionError } = require("metro-core");
 const path = require("path");
-const GLOBAL_CACHE_DISABLED_MESSAGE_FORMAT =
-  "The global cache is now disabled because %s";
 const DARK_BLOCK_CHAR = "\u2593";
 const LIGHT_BLOCK_CHAR = "\u2591";
 const MAX_PROGRESS_BAR_CHAR_WIDTH = 16;
@@ -61,25 +59,6 @@ class TerminalReporter {
       "\n"
     );
   }
-  _logCacheDisabled(reason) {
-    const format = GLOBAL_CACHE_DISABLED_MESSAGE_FORMAT;
-    switch (reason) {
-      case "too_many_errors":
-        reporting.logWarning(
-          this.terminal,
-          format,
-          "it has been failing too many times."
-        );
-        break;
-      case "too_many_misses":
-        reporting.logWarning(
-          this.terminal,
-          format,
-          "it has been missing too many consecutive keys."
-        );
-        break;
-    }
-  }
   _logBundleBuildDone(buildID) {
     const progress = this._activeBundles.get(buildID);
     if (progress != null) {
@@ -163,9 +142,6 @@ class TerminalReporter {
       case "bundling_error":
         this._logBundlingError(event.error);
         break;
-      case "global_cache_disabled":
-        this._logCacheDisabled(event.reason);
-        break;
       case "resolver_warning":
         this._logWarning(event.message);
         break;

package/src/lib/TerminalReporter.js.flow

@@ -11,11 +11,7 @@
 
 'use strict';
 
-import type {
-  BundleDetails,
-  GlobalCacheDisabledReason,
-  ReportableEvent,
-} from './reporting';
+import type {BundleDetails, ReportableEvent} from './reporting';
 import type {Terminal} from 'metro-core';
 import type {HealthCheckResult, WatcherStatus} from 'metro-file-map';
 
@@ -53,9 +49,6 @@ type SnippetError = ErrnoError &
     snippet?: string,
   };
 
-const GLOBAL_CACHE_DISABLED_MESSAGE_FORMAT =
-  'The global cache is now disabled because %s';
-
 const DARK_BLOCK_CHAR = '\u2593';
 const LIGHT_BLOCK_CHAR = '\u2591';
 const MAX_PROGRESS_BAR_CHAR_WIDTH = 16;
@@ -141,26 +134,6 @@ class TerminalReporter {
     );
   }
 
-  _logCacheDisabled(reason: GlobalCacheDisabledReason): void {
-    const format = GLOBAL_CACHE_DISABLED_MESSAGE_FORMAT;
-    switch (reason) {
-      case 'too_many_errors':
-        reporting.logWarning(
-          this.terminal,
-          format,
-          'it has been failing too many times.',
-        );
-        break;
-      case 'too_many_misses':
-        reporting.logWarning(
-          this.terminal,
-          format,
-          'it has been missing too many consecutive keys.',
-        );
-        break;
-    }
-  }
-
   _logBundleBuildDone(buildID: string): void {
     const progress = this._activeBundles.get(buildID);
     if (progress != null) {
@@ -253,9 +226,6 @@ class TerminalReporter {
       case 'bundling_error':
         this._logBundlingError(event.error);
         break;
-      case 'global_cache_disabled':
-        this._logCacheDisabled(event.reason);
-        break;
       case 'resolver_warning':
         this._logWarning(event.message);
         break;

package/src/lib/logToConsole.js.flow

@@ -26,6 +26,7 @@ module.exports = (
   mode: 'BRIDGE' | 'NOBRIDGE',
   ...data: Array<mixed>
 ) => {
+  // $FlowFixMe[invalid-computed-prop]
   const logFunction = console[level] && level !== 'trace' ? level : 'log';
   const color =
     level === 'error'

package/src/lib/reporting.d.ts

@@ -10,8 +10,6 @@
 
 import type {HealthCheckResult, WatcherStatus} from 'metro-file-map';
 
-export type GlobalCacheDisabledReason = 'too_many_errors' | 'too_many_misses';
-
 export interface BundleDetails {
   bundleType: string;
   dev: boolean;
@@ -65,12 +63,12 @@ export type ReportableEvent =
       totalFileCount: number;
     }
   | {
-      type: 'global_cache_error';
+      type: 'cache_read_error';
       error: Error;
     }
   | {
-      type: 'global_cache_disabled';
-      reason: GlobalCacheDisabledReason;
+      type: 'cache_write_error';
+      error: Error;
     }
   | {type: 'transform_cache_reset'}
   | {

package/src/lib/reporting.js.flow

@@ -20,8 +20,6 @@ const chalk = require('chalk');
 const stripAnsi = require('strip-ansi');
 const util = require('util');
 
-export type GlobalCacheDisabledReason = 'too_many_errors' | 'too_many_misses';
-
 export type BundleDetails = {
   bundleType: string,
   customResolverOptions: CustomResolverOptions,
@@ -90,13 +88,13 @@ export type ReportableEvent =
       ...
     }
   | {
-      type: 'global_cache_error',
+      type: 'cache_read_error',
       error: Error,
       ...
     }
   | {
-      type: 'global_cache_disabled',
-      reason: GlobalCacheDisabledReason,
+      type: 'cache_write_error',
+      error: Error,
       ...
     }
   | {type: 'transform_cache_reset', ...}

package/src/node-haste/lib/AssetPaths.js

@@ -41,7 +41,7 @@ function tryParse(filePath, platforms) {
 function parse(filePath, platforms) {
   const result = tryParse(filePath, platforms);
   if (result == null) {
-    throw new Error("invalid asset file path: `${filePath}");
+    throw new Error(`invalid asset file path: ${filePath}`);
   }
   return result;
 }

package/src/node-haste/lib/AssetPaths.js.flow

@@ -69,7 +69,7 @@ function tryParse(
 function parse(filePath: string, platforms: $ReadOnlySet<string>): AssetPath {
   const result = tryParse(filePath, platforms);
   if (result == null) {
-    throw new Error('invalid asset file path: `${filePath}');
+    throw new Error(`invalid asset file path: ${filePath}`);
   }
   return result;
 }