metro 0.82.0 → 0.82.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.82.0",
+  "version": "0.82.1",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -42,18 +42,18 @@
     "jest-worker": "^29.7.0",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.82.0",
-    "metro-cache": "0.82.0",
-    "metro-cache-key": "0.82.0",
-    "metro-config": "0.82.0",
-    "metro-core": "0.82.0",
-    "metro-file-map": "0.82.0",
-    "metro-resolver": "0.82.0",
-    "metro-runtime": "0.82.0",
-    "metro-source-map": "0.82.0",
-    "metro-symbolicate": "0.82.0",
-    "metro-transform-plugins": "0.82.0",
-    "metro-transform-worker": "0.82.0",
+    "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",
     "mime-types": "^2.1.27",
     "nullthrows": "^1.1.1",
     "serialize-error": "^2.1.0",
@@ -65,14 +65,14 @@
   "devDependencies": {
     "@babel/plugin-transform-flow-strip-types": "^7.25.2",
     "@babel/plugin-transform-modules-commonjs": "^7.24.8",
-    "@react-native/babel-preset": "0.73.16",
-    "@react-native/metro-babel-transformer": "0.73.11",
+    "@react-native/babel-preset": "0.78.0",
+    "@react-native/metro-babel-transformer": "0.78.0",
     "babel-jest": "^29.7.0",
     "dedent": "^0.7.0",
     "jest-snapshot": "^29.7.0",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.82.0",
-    "metro-memory-fs": "0.82.0",
+    "metro-babel-register": "0.82.1",
+    "metro-memory-fs": "0.82.1",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"

package/src/IncrementalBundler.js.flow

@@ -36,7 +36,7 @@ export opaque type RevisionId: string = string;
 export type OutputGraph = Graph<>;
 
 type OtherOptions = $ReadOnly<{
-  onProgress: $PropertyType<DeltaBundlerOptions<>, 'onProgress'>,
+  onProgress: DeltaBundlerOptions<>['onProgress'],
   shallow: boolean,
   lazy: boolean,
 }>;

package/src/Server/symbolicate.js.flow

@@ -38,7 +38,7 @@ export type StackFrameOutput = $ReadOnly<{
   ...IntermediateStackFrame,
   ...
 }>;
-type ExplodedSourceMapModule = $ElementType<ExplodedSourceMap, number>;
+type ExplodedSourceMapModule = ExplodedSourceMap[number];
 type Position = {+line1Based: number, column0Based: number};
 
 function createFunctionNameGetter(

package/src/lib/TerminalReporter.js

@@ -55,8 +55,7 @@ class TerminalReporter {
       chalk.reset.dim(` ${path.dirname(localPath)}/`) +
       chalk.bold(path.basename(localPath)) +
       " " +
-      progress +
-      "\n"
+      progress
     );
   }
   _logBundleBuildDone(buildID) {
@@ -241,9 +240,13 @@ class TerminalReporter {
     if (currentProgress == null) {
       return;
     }
-    const rawRatio = transformedFileCount / totalFileCount;
-    const conservativeRatio = Math.pow(rawRatio, 2);
-    const ratio = Math.max(conservativeRatio, currentProgress.ratio);
+    const ratio = Math.min(
+      Math.max(
+        Math.pow(transformedFileCount / Math.max(totalFileCount, 10), 2),
+        currentProgress.ratio
+      ),
+      0.999
+    );
     Object.assign(currentProgress, {
       ratio,
       transformedFileCount,

package/src/lib/TerminalReporter.js.flow

@@ -146,8 +146,7 @@ class TerminalReporter {
       chalk.reset.dim(` ${path.dirname(localPath)}/`) +
       chalk.bold(path.basename(localPath)) +
       ' ' +
-      progress +
-      '\n'
+      progress
     );
   }
 
@@ -355,9 +354,12 @@ class TerminalReporter {
   }
 
   /**
-   * We use Math.pow(ratio, 2) to as a conservative measure of progress because
-   * we know the `totalCount` is going to progressively increase as well. We
-   * also prevent the ratio from going backwards.
+   * Because we know the `totalFileCount` is going to progressively increase
+   * starting with 1:
+   * - We use Math.max(totalFileCount, 10) to prevent the ratio to raise too
+   *   quickly when the total file count is low. (e.g 1/2 5/6)
+   * - We prevent the ratio from going backwards.
+   * - Instead, we use Math.pow(ratio, 2) to as a conservative measure of progress.
    */
   _updateBundleProgress({
     buildID,
@@ -373,9 +375,15 @@ class TerminalReporter {
     if (currentProgress == null) {
       return;
     }
-    const rawRatio = transformedFileCount / totalFileCount;
-    const conservativeRatio = Math.pow(rawRatio, 2);
-    const ratio = Math.max(conservativeRatio, currentProgress.ratio);
+
+    const ratio = Math.min(
+      Math.max(
+        Math.pow(transformedFileCount / Math.max(totalFileCount, 10), 2),
+        currentProgress.ratio,
+      ),
+      0.999, // make sure not to go above 99.9% to not get rounded to 100%,
+    );
+
     Object.assign(currentProgress, {
       ratio,
       transformedFileCount,

package/src/lib/getPrependedScripts.js.flow

@@ -26,10 +26,7 @@ const defaults = require('metro-config/src/defaults/defaults');
 
 async function getPrependedScripts(
   config: ConfigT,
-  options: $Diff<
-    TransformInputOptions,
-    {type: $PropertyType<TransformInputOptions, 'type'>, ...},
-  >,
+  options: Omit<TransformInputOptions, 'type'>,
   resolverOptions: ResolverInputOptions,
   bundler: Bundler,
   deltaBundler: DeltaBundler<>,

package/src/shared/types.flow.js.flow

@@ -98,7 +98,7 @@ export type SplitBundleOptions = {
   +transformOptions: TransformInputOptions,
   +serializerOptions: SerializerOptions,
   +graphOptions: GraphOptions,
-  +onProgress: $PropertyType<DeltaBundlerOptions<>, 'onProgress'>,
+  +onProgress: DeltaBundlerOptions<>['onProgress'],
 };
 
 export type ModuleGroups = {