metro 0.65.2 → 0.67.0

package/src/DeltaBundler/Worker.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -9,14 +9,14 @@
  */
 "use strict";
 
+const traverse = require("@babel/traverse").default;
+
 const crypto = require("crypto");
 
 const fs = require("fs");
 
 const path = require("path");
 
-const traverse = require("@babel/traverse").default;
-
 async function transform(
   filename,
   transformOptions,
@@ -31,13 +31,10 @@ async function transform(
     action_phase: "start",
     file_name: filename,
     log_entry_label: "Transforming file",
-    start_timestamp: process.hrtime()
+    start_timestamp: process.hrtime(),
   };
   const data = fs.readFileSync(path.resolve(projectRoot, filename));
-  const sha1 = crypto
-    .createHash("sha1")
-    .update(data)
-    .digest("hex");
+  const sha1 = crypto.createHash("sha1").update(data).digest("hex");
   const result = await Transformer.transform(
     transformerConfig.transformerConfig,
     projectRoot,
@@ -60,7 +57,7 @@ async function transform(
     result,
     sha1,
     transformFileStartLogEntry,
-    transformFileEndLogEntry
+    transformFileEndLogEntry,
   };
 }
 
@@ -72,10 +69,10 @@ function getEndLogEntry(startLogEntry, filename) {
     action_phase: "end",
     file_name: filename,
     duration_ms,
-    log_entry_label: "Transforming file"
+    log_entry_label: "Transforming file",
   };
 }
 
 module.exports = {
-  transform
+  transform,
 };

package/src/DeltaBundler/Worker.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,18 +10,18 @@
 
 'use strict';
 
-const crypto = require('crypto');
-const fs = require('fs');
-const path = require('path');
-const traverse = require('@babel/traverse').default;
-
 import type {TransformResult} from './types.flow';
 import type {LogEntry} from 'metro-core/src/Logger';
 import type {
-  JsTransformOptions,
   JsTransformerConfig,
+  JsTransformOptions,
 } from 'metro-transform-worker';
 
+const traverse = require('@babel/traverse').default;
+const crypto = require('crypto');
+const fs = require('fs');
+const path = require('path');
+
 export type {JsTransformOptions as TransformOptions} from 'metro-transform-worker';
 
 export type Worker = {|
@@ -72,10 +72,7 @@ async function transform(
   };
 
   const data = fs.readFileSync(path.resolve(projectRoot, filename));
-  const sha1 = crypto
-    .createHash('sha1')
-    .update(data)
-    .digest('hex');
+  const sha1 = crypto.createHash('sha1').update(data).digest('hex');
 
   const result = await Transformer.transform(
     transformerConfig.transformerConfig,

package/src/DeltaBundler/WorkerFarm.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -9,10 +9,10 @@
  */
 "use strict";
 
-const { Logger } = require("metro-core");
-
 const JestWorker = require("jest-worker").default;
 
+const { Logger } = require("metro-core");
+
 class WorkerFarm {
   constructor(config, transformerConfig) {
     this._config = config;
@@ -25,16 +25,16 @@ class WorkerFarm {
         this._config.maxWorkers
       );
 
-      worker.getStdout().on("data", chunk => {
+      worker.getStdout().on("data", (chunk) => {
         this._config.reporter.update({
           type: "worker_stdout_chunk",
-          chunk: chunk.toString("utf8")
+          chunk: chunk.toString("utf8"),
         });
       });
-      worker.getStderr().on("data", chunk => {
+      worker.getStderr().on("data", (chunk) => {
         this._config.reporter.update({
           type: "worker_stderr_chunk",
-          chunk: chunk.toString("utf8")
+          chunk: chunk.toString("utf8"),
         });
       });
       this._worker = worker;
@@ -62,7 +62,7 @@ class WorkerFarm {
       Logger.log(data.transformFileEndLogEntry);
       return {
         result: data.result,
-        sha1: data.sha1
+        sha1: data.sha1,
       };
     } catch (err) {
       if (err.loc) {
@@ -77,17 +77,17 @@ class WorkerFarm {
     const env = {
       ...process.env,
       // Force color to print syntax highlighted code frames.
-      FORCE_COLOR: 1
+      FORCE_COLOR: 1,
     };
     return new JestWorker(workerPath, {
-      computeWorkerKey: this._config.stickyWorkers
+      computeWorkerKey: this._config.stickyWorkers // $FlowFixMe[method-unbinding] added when improving typing for this parameters
         ? this._computeWorkerKey
         : undefined,
       exposedMethods,
       forkOptions: {
-        env
+        env,
       },
-      numWorkers
+      numWorkers,
     });
   }
 
@@ -105,11 +105,8 @@ class WorkerFarm {
   _formatGenericError(err, filename) {
     const error = new TransformError(`${filename}: ${err.message}`);
     return Object.assign(error, {
-      stack: (err.stack || "")
-        .split("\n")
-        .slice(0, -1)
-        .join("\n"),
-      lineNumber: 0
+      stack: (err.stack || "").split("\n").slice(0, -1).join("\n"),
+      lineNumber: 0,
     });
   }
 
@@ -125,7 +122,7 @@ class WorkerFarm {
       snippet: err.codeFrame,
       lineNumber: err.loc.line,
       column: err.loc.column,
-      filename
+      filename,
     });
   }
 }

package/src/DeltaBundler/WorkerFarm.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,13 +10,13 @@
 
 'use strict';
 
-const {Logger} = require('metro-core');
-const JestWorker = require('jest-worker').default;
-
-import type {Readable} from 'stream';
 import type {TransformResult} from '../DeltaBundler';
-import type {TransformOptions, TransformerConfig, Worker} from './Worker';
+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 {Logger} = require('metro-core');
 
 type WorkerInterface = {|
   getStdout(): Readable,
@@ -116,7 +116,8 @@ class WorkerFarm {
 
     return new JestWorker(workerPath, {
       computeWorkerKey: this._config.stickyWorkers
-        ? this._computeWorkerKey
+        ? // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+          this._computeWorkerKey
         : undefined,
       exposedMethods,
       forkOptions: {env},
@@ -139,10 +140,7 @@ class WorkerFarm {
     const error = new TransformError(`${filename}: ${err.message}`);
 
     return Object.assign(error, {
-      stack: (err.stack || '')
-        .split('\n')
-        .slice(0, -1)
-        .join('\n'),
+      stack: (err.stack || '').split('\n').slice(0, -1).join('\n'),
       lineNumber: 0,
     });
   }

package/src/DeltaBundler/__fixtures__/hasteImpl.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -25,5 +25,5 @@ module.exports = {
     }
 
     return matches[1];
-  }
+  },
 };

package/src/DeltaBundler/computeDelta.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -35,7 +35,7 @@ function computeDelta(entries1, entries2) {
   return {
     added: [...added.entries()],
     modified: [...modified.entries()],
-    deleted: [...deleted]
+    deleted: [...deleted],
   };
 }
 

package/src/DeltaBundler/computeDelta.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -11,8 +11,8 @@
 'use strict';
 
 import type {
-  ModuleMap,
   DeltaBundle,
+  ModuleMap,
 } from 'metro-runtime/src/modules/types.flow';
 
 function computeDelta(entries1: ModuleMap, entries2: ModuleMap): DeltaBundle {

package/src/DeltaBundler/getTransformCacheKey.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -9,12 +9,12 @@
  */
 "use strict";
 
+const VERSION = require("../../package.json").version;
+
 const crypto = require("crypto");
 
 const getCacheKey = require("metro-cache-key");
 
-const VERSION = require("../../package.json").version;
-
 function getTransformCacheKey(opts) {
   const { transformerPath, transformerConfig } = opts.transformerConfig; // eslint-disable-next-line no-useless-call
 
@@ -32,7 +32,7 @@ function getTransformCacheKey(opts) {
         opts.cacheVersion,
         getCacheKey([require.resolve(transformerPath)]),
         transformerKey,
-        transformerConfig.globalPrefix
+        transformerConfig.globalPrefix,
       ].join("$")
     )
     .digest("hex");

package/src/DeltaBundler/getTransformCacheKey.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,14 +10,13 @@
 
 'use strict';
 
-const crypto = require('crypto');
-const getCacheKey = require('metro-cache-key');
-
-const VERSION = require('../../package.json').version;
-
 import type {TransformerConfig} from './Worker';
 import type {JsTransformerConfig} from 'metro-transform-worker';
 
+const VERSION = require('../../package.json').version;
+const crypto = require('crypto');
+const getCacheKey = require('metro-cache-key');
+
 type CacheKeyProvider = {
   getCacheKey?: JsTransformerConfig => string,
 };

package/src/DeltaBundler/mergeDeltas.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -63,7 +63,7 @@ function mergeDeltas(delta1, delta2) {
   return {
     added: [...added.entries()],
     modified: [...modified.entries()],
-    deleted: [...deleted]
+    deleted: [...deleted],
   };
 }
 

package/src/DeltaBundler/mergeDeltas.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.

package/src/DeltaBundler/traverseDependencies.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -16,7 +16,7 @@ function getInternalOptions({
   resolve,
   onProgress,
   experimentalImportBundleSupport,
-  shallow
+  shallow,
 }) {
   let numProcessed = 0;
   let total = 0;
@@ -26,7 +26,7 @@ function getInternalOptions({
     resolve,
     onDependencyAdd: () => onProgress && onProgress(numProcessed, ++total),
     onDependencyAdded: () => onProgress && onProgress(++numProcessed, total),
-    shallow
+    shallow,
   };
 }
 /**
@@ -46,7 +46,7 @@ async function traverseDependencies(paths, graph, options) {
     added: new Set(),
     modified: new Set(),
     deleted: new Set(),
-    inverseDependencies: new Map()
+    inverseDependencies: new Map(),
   };
   const internalOptions = getInternalOptions(options);
 
@@ -99,7 +99,7 @@ async function traverseDependencies(paths, graph, options) {
   return {
     added,
     modified,
-    deleted
+    deleted,
   };
 }
 
@@ -108,21 +108,21 @@ async function initialTraverseDependencies(graph, options) {
     added: new Set(),
     modified: new Set(),
     deleted: new Set(),
-    inverseDependencies: new Map()
+    inverseDependencies: new Map(),
   };
   const internalOptions = getInternalOptions(options);
   await Promise.all(
-    graph.entryPoints.map(path =>
+    graph.entryPoints.map((path) =>
       traverseDependenciesForSingleFile(path, graph, delta, internalOptions)
     )
   );
   reorderGraph(graph, {
-    shallow: options.shallow
+    shallow: options.shallow,
   });
   return {
     added: graph.dependencies,
     modified: new Map(),
-    deleted: new Set()
+    deleted: new Set(),
   };
 }
 
@@ -144,7 +144,7 @@ async function processModule(path, graph, delta, options) {
   );
   const previousModule = graph.dependencies.get(path) || {
     inverseDependencies: delta.inverseDependencies.get(path) || new Set(),
-    path
+    path,
   };
   const previousDependencies = previousModule.dependencies || new Map(); // Update the module information.
 
@@ -152,7 +152,7 @@ async function processModule(path, graph, delta, options) {
     ...previousModule,
     dependencies: new Map(),
     getSource: result.getSource,
-    output: result.output
+    output: result.output,
   };
   graph.dependencies.set(module.path, module);
 
@@ -255,7 +255,7 @@ function getAllTopLevelInverseDependencies(
   }
 
   return Array.from(inverseDependencies)
-    .filter(inverseDep => graph.dependencies.has(inverseDep))
+    .filter((inverseDep) => graph.dependencies.has(inverseDep))
     .reduce((acc, inverseDep) => {
       const mod = graph.dependencies.get(inverseDep);
 
@@ -268,7 +268,7 @@ function getAllTopLevelInverseDependencies(
         graph,
         inverseDep,
         visited
-      ).forEach(x => {
+      ).forEach((x) => {
         acc.add(x);
       });
       return acc;
@@ -305,7 +305,7 @@ function canSafelyRemoveFromParentModule(
 
   const undeletedInverseDependencies = Array.from(
     topInverseDependencies
-  ).filter(x => !delta.deleted.has(x));
+  ).filter((x) => !delta.deleted.has(x));
   /**
    * We can only mark the `visited` Set of modules to be safely removable if
    * 1. We do not have top a level module to compare with parentModule.
@@ -320,7 +320,7 @@ function canSafelyRemoveFromParentModule(
       undeletedInverseDependencies[0] === parentModule);
 
   if (canSafelyRemove) {
-    visited.forEach(mod => {
+    visited.forEach((mod) => {
       canBeRemovedSafely.add(mod);
     });
   }
@@ -368,11 +368,11 @@ function removeDependency(
 
   Array.from(module.dependencies.values())
     .filter(
-      dependency =>
+      (dependency) =>
         !delta.deleted.has(dependency.absolutePath) &&
         dependency.absolutePath !== parentModule.path
     )
-    .forEach(dependency =>
+    .forEach((dependency) =>
       removeDependency(
         module,
         dependency.absolutePath,
@@ -394,8 +394,8 @@ function resolveDependencies(parentPath, dependencies, options) {
         relativePath,
         {
           absolutePath: options.resolve(parentPath, relativePath),
-          data: result
-        }
+          data: result,
+        },
       ];
     } catch (error) {
       // Ignore unavailable optional dependencies. They are guarded
@@ -426,7 +426,7 @@ function resolveDependencies(parentPath, dependencies, options) {
 
 function reorderGraph(graph, options) {
   const orderedDependencies = new Map();
-  graph.entryPoints.forEach(entryPoint => {
+  graph.entryPoints.forEach((entryPoint) => {
     const mainModule = graph.dependencies.get(entryPoint);
 
     if (!mainModule) {
@@ -447,7 +447,7 @@ function reorderDependencies(graph, module, orderedDependencies, options) {
     orderedDependencies.set(module.path, module);
   }
 
-  module.dependencies.forEach(dependency => {
+  module.dependencies.forEach((dependency) => {
     const path = dependency.absolutePath;
     const childModule = graph.dependencies.get(path);
 
@@ -466,5 +466,5 @@ function reorderDependencies(graph, module, orderedDependencies, options) {
 module.exports = {
   initialTraverseDependencies,
   traverseDependencies,
-  reorderGraph
+  reorderGraph,
 };

package/src/DeltaBundler/traverseDependencies.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,8 +10,6 @@
 
 'use strict';
 
-const nullthrows = require('nullthrows');
-
 import type {
   Dependency,
   Graph,
@@ -20,6 +18,8 @@ import type {
   TransformResultDependency,
 } from './types.flow';
 
+const nullthrows = require('nullthrows');
+
 type Result<T> = {
   added: Map<string, Module<T>>,
   modified: Map<string, Module<T>>,

package/src/DeltaBundler/types.flow.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,6 +10,8 @@
 
 'use strict';
 
+import type {JsTransformOptions} from 'metro-transform-worker';
+
 export type MixedOutput = {|
   +data: mixed,
   +type: string,
@@ -63,10 +65,21 @@ export type Module<T = MixedOutput> = {|
 
 export type Dependencies<T = MixedOutput> = Map<string, Module<T>>;
 
+export type TransformInputOptions = $Diff<
+  JsTransformOptions,
+  {
+    inlinePlatform: boolean,
+    inlineRequires: boolean,
+    ...
+  },
+>;
+
 export type Graph<T = MixedOutput> = {|
   dependencies: Dependencies<T>,
   importBundleNames: Set<string>,
   +entryPoints: $ReadOnlyArray<string>,
+  // Unused in core but useful for custom serializers / experimentalSerializerHook
+  +transformOptions: TransformInputOptions,
 |};
 
 export type TransformResult<T = MixedOutput> = $ReadOnly<{|
@@ -92,6 +105,7 @@ export type AllowOptionalDependencies =
 export type Options<T = MixedOutput> = {|
   +resolve: (from: string, to: string) => string,
   +transform: TransformFn<T>,
+  +transformOptions: TransformInputOptions,
   +onProgress: ?(numProcessed: number, total: number) => mixed,
   +experimentalImportBundleSupport: boolean,
   +shallow: boolean,

package/src/DeltaBundler.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -25,7 +25,7 @@ class DeltaBundler {
   }
 
   end() {
-    this._deltaCalculators.forEach(deltaCalculator => deltaCalculator.end());
+    this._deltaCalculators.forEach((deltaCalculator) => deltaCalculator.end());
 
     this._deltaCalculators = new Map();
   }
@@ -35,7 +35,7 @@ class DeltaBundler {
     const deltaCalculator = new DeltaCalculator(entryPoints, depGraph, options);
     await deltaCalculator.getDelta({
       reset: true,
-      shallow: options.shallow
+      shallow: options.shallow,
     });
     const graph = deltaCalculator.getGraph();
     deltaCalculator.end();
@@ -49,7 +49,7 @@ class DeltaBundler {
     const deltaCalculator = new DeltaCalculator(entryPoints, depGraph, options);
     await deltaCalculator.getDelta({
       reset: true,
-      shallow: options.shallow
+      shallow: options.shallow,
     });
     const graph = deltaCalculator.getGraph();
 
@@ -67,7 +67,7 @@ class DeltaBundler {
 
     return await deltaCalculator.getDelta({
       reset,
-      shallow
+      shallow,
     });
   }