metro 0.65.2 → 0.67.0

package/src/lib/getPrependedScripts.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.
@@ -11,12 +11,12 @@
 
 const countLines = require("./countLines");
 
-const defaults = require("metro-config/src/defaults/defaults");
-
 const getPreludeCode = require("./getPreludeCode");
 
 const transformHelpers = require("./transformHelpers");
 
+const defaults = require("metro-config/src/defaults/defaults");
+
 const { compile } = require("metro-hermes-compiler");
 
 async function getPrependedScripts(config, options, bundler, deltaBundler) {
@@ -24,7 +24,7 @@ async function getPrependedScripts(config, options, bundler, deltaBundler) {
   // `getPolyfills()` method and the `polyfillModuleNames` variable).
   const polyfillModuleNames = config.serializer
     .getPolyfills({
-      platform: options.platform
+      platform: options.platform,
     })
     .concat(config.serializer.polyfillModuleNames);
   const transformOptions = { ...options, type: "script" };
@@ -42,25 +42,26 @@ async function getPrependedScripts(config, options, bundler, deltaBundler) {
         config,
         transformOptions
       ),
+      transformOptions,
       onProgress: null,
       experimentalImportBundleSupport:
         config.transformer.experimentalImportBundleSupport,
-      shallow: false
+      shallow: false,
     }
   );
   return [
     _getPrelude({
       dev: options.dev,
-      globalPrefix: config.transformer.globalPrefix
+      globalPrefix: config.transformer.globalPrefix,
     }),
-    ...dependencies.values()
+    ...dependencies.values(),
   ];
 }
 
 function _getPrelude({ dev, globalPrefix }) {
   const code = getPreludeCode({
     isDev: dev,
-    globalPrefix
+    globalPrefix,
   });
   const name = "__prelude__";
   return {
@@ -74,18 +75,18 @@ function _getPrelude({ dev, globalPrefix }) {
         data: {
           code,
           lineCount: countLines(code),
-          map: []
-        }
+          map: [],
+        },
       },
       {
         type: "bytecode/script/virtual",
         data: {
           bytecode: compile(code, {
-            sourceURL: "__prelude__.virtual.js"
-          }).bytecode
-        }
-      }
-    ]
+            sourceURL: "__prelude__.virtual.js",
+          }).bytecode,
+        },
+      },
+    ],
   };
 }
 

package/src/lib/getPrependedScripts.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,17 @@
 
 'use strict';
 
+import type Bundler from '../Bundler';
+import type DeltaBundler, {Module} from '../DeltaBundler';
+import type {TransformInputOptions} from '../DeltaBundler/types.flow';
+import type {ConfigT} from 'metro-config/src/configTypes.flow';
+
 const countLines = require('./countLines');
-const defaults = require('metro-config/src/defaults/defaults');
 const getPreludeCode = require('./getPreludeCode');
 const transformHelpers = require('./transformHelpers');
-
+const defaults = require('metro-config/src/defaults/defaults');
 const {compile} = require('metro-hermes-compiler');
 
-import type Bundler from '../Bundler';
-import type DeltaBundler, {Module} from '../DeltaBundler';
-import type {TransformInputOptions} from '../lib/transformHelpers';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
-
 async function getPrependedScripts(
   config: ConfigT,
   options: $Diff<
@@ -58,6 +57,7 @@ async function getPrependedScripts(
         config,
         transformOptions,
       ),
+      transformOptions,
       onProgress: null,
       experimentalImportBundleSupport:
         config.transformer.experimentalImportBundleSupport,

package/src/lib/logToConsole.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.
@@ -13,10 +13,12 @@
 
 const chalk = require("chalk");
 
+const util = require("util");
+
 const groupStack = [];
 let collapsedGuardTimer;
 
-module.exports = (terminal, level, ...data) => {
+module.exports = (terminal, level, mode, ...data) => {
   const logFunction = console[level] && level !== "trace" ? level : "log";
   const color =
     level === "error"
@@ -59,10 +61,15 @@ module.exports = (terminal, level, ...data) => {
       data[data.length - 1] = lastItem.trimEnd();
     }
 
+    const modePrefix =
+      !mode || mode == "BRIDGE" ? "" : `(${mode.toUpperCase()}) `;
     terminal.log(
-      color.bold(` ${logFunction.toUpperCase()} `) +
-        "".padEnd(groupStack.length * 2, " "),
-      ...data
+      color.bold(` ${modePrefix}${logFunction.toUpperCase()} `) +
+        "".padEnd(groupStack.length * 2, " "), // `util.format` actually accepts any arguments.
+      // If the first argument is a string, it tries to format it.
+      // Otherwise, it just concatenates all arguments.
+      // $FlowIssue[incompatible-call] util.format expected the first argument to be a string
+      util.format(...data)
     );
   }
 };

package/src/lib/logToConsole.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.
@@ -12,14 +12,20 @@
 
 'use strict';
 
-const chalk = require('chalk');
-
 import type {Terminal} from 'metro-core';
 
+const chalk = require('chalk');
+const util = require('util');
+
 const groupStack = [];
 let collapsedGuardTimer;
 
-module.exports = (terminal: Terminal, level: string, ...data: Array<mixed>) => {
+module.exports = (
+  terminal: Terminal,
+  level: string,
+  mode: 'BRIDGE' | 'NOBRIDGE',
+  ...data: Array<mixed>
+) => {
   const logFunction = console[level] && level !== 'trace' ? level : 'log';
   const color =
     level === 'error'
@@ -58,10 +64,17 @@ module.exports = (terminal: Terminal, level: string, ...data: Array<mixed>) => {
     if (typeof lastItem === 'string') {
       data[data.length - 1] = lastItem.trimEnd();
     }
+
+    const modePrefix =
+      !mode || mode == 'BRIDGE' ? '' : `(${mode.toUpperCase()}) `;
     terminal.log(
-      color.bold(` ${logFunction.toUpperCase()} `) +
+      color.bold(` ${modePrefix}${logFunction.toUpperCase()} `) +
         ''.padEnd(groupStack.length * 2, ' '),
-      ...data,
+      // `util.format` actually accepts any arguments.
+      // If the first argument is a string, it tries to format it.
+      // Otherwise, it just concatenates all arguments.
+      // $FlowIssue[incompatible-call] util.format expected the first argument to be a string
+      util.format(...data),
     );
   }
 };

package/src/lib/parseCustomTransformOptions.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.
@@ -17,7 +17,7 @@ const PREFIX = "transform.";
 module.exports = function parseCustomTransformOptions(urlObj) {
   const customTransformOptions = Object.create(null);
   const query = nullthrows(urlObj.query);
-  Object.keys(query).forEach(key => {
+  Object.keys(query).forEach((key) => {
     if (key.startsWith(PREFIX)) {
       customTransformOptions[key.substr(PREFIX.length)] = query[key];
     }

package/src/lib/parseCustomTransformOptions.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,10 +11,10 @@
 
 'use strict';
 
-const nullthrows = require('nullthrows');
-
 import type {CustomTransformOptions} from 'metro-transform-worker';
 
+const nullthrows = require('nullthrows');
+
 const PREFIX = 'transform.';
 
 module.exports = function parseCustomTransformOptions(urlObj: {

package/src/lib/parseOptionsFromUrl.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,11 +9,11 @@
  */
 "use strict";
 
-const nullthrows = require("nullthrows");
+const parsePlatformFilePath = require("../node-haste/lib/parsePlatformFilePath");
 
 const parseCustomTransformOptions = require("./parseCustomTransformOptions");
 
-const parsePlatformFilePath = require("../node-haste/lib/parsePlatformFilePath");
+const nullthrows = require("nullthrows");
 
 const path = require("path");
 
@@ -29,10 +29,10 @@ const getNumber = (query, opt, defaultValue) => {
   return Number.isNaN(number) ? defaultValue : number;
 };
 
-const getBundleType = bundleType =>
+const getBundleType = (bundleType) =>
   bundleType === "map" ? bundleType : "bundle";
 
-const getTransformProfile = transformProfile =>
+const getTransformProfile = (transformProfile) =>
   transformProfile === "hermes-stable" || transformProfile === "hermes-canary"
     ? transformProfile
     : "default";
@@ -80,11 +80,11 @@ module.exports = function parseOptionsFromUrl(
       // when loading the bundle for either Android or iOS.
       protocol:
         platform != null && platform.match(/^(android|ios)$/) ? "http" : "",
-      pathname: pathname.replace(/\.(bundle|delta)$/, ".map")
+      pathname: pathname.replace(/\.(bundle|delta)$/, ".map"),
     }),
     sourceUrl: requestUrl,
     unstable_transformProfile: getTransformProfile(
       query.unstable_transformProfile
-    )
+    ),
   };
 };

package/src/lib/parseOptionsFromUrl.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,28 +10,48 @@
 
 'use strict';
 
-const nullthrows = require('nullthrows');
-const parseCustomTransformOptions = require('./parseCustomTransformOptions');
+import type {BundleOptions} from '../shared/types.flow';
+
 const parsePlatformFilePath = require('../node-haste/lib/parsePlatformFilePath');
+const parseCustomTransformOptions = require('./parseCustomTransformOptions');
+const nullthrows = require('nullthrows');
 const path = require('path');
 const url = require('url');
 
-import type {BundleOptions} from '../shared/types.flow';
-
-const getBoolean = (query, opt, defaultValue) =>
+const getBoolean = (
+  query: {[string]: string},
+  opt:
+    | $TEMPORARY$string<'dev'>
+    | $TEMPORARY$string<'excludeSource'>
+    | $TEMPORARY$string<'inlineSourceMap'>
+    | $TEMPORARY$string<'minify'>
+    | $TEMPORARY$string<'modulesOnly'>
+    | $TEMPORARY$string<'runModule'>
+    | $TEMPORARY$string<'shallow'>,
+  defaultValue: boolean,
+) =>
   query[opt] == null
     ? defaultValue
     : query[opt] === 'true' || query[opt] === '1';
 
-const getNumber = (query, opt, defaultValue) => {
+const getNumber = (
+  query: {[string]: string},
+  opt: $TEMPORARY$string<'runtimeBytecodeVersion'>,
+  defaultValue: null,
+) => {
   const number = parseInt(query[opt], 10);
   return Number.isNaN(number) ? defaultValue : number;
 };
 
-const getBundleType = bundleType =>
+const getBundleType = (bundleType: string | $TEMPORARY$string<'map'>) =>
   bundleType === 'map' ? bundleType : 'bundle';
 
-const getTransformProfile = transformProfile =>
+const getTransformProfile = (
+  transformProfile:
+    | string
+    | $TEMPORARY$string<'hermes-canary'>
+    | $TEMPORARY$string<'hermes-stable'>,
+) =>
   transformProfile === 'hermes-stable' || transformProfile === 'hermes-canary'
     ? transformProfile
     : 'default';

package/src/lib/relativizeSourceMap.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/lib/relativizeSourceMap.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,10 +10,10 @@
 
 'use strict';
 
-const path = require('path');
-
 import type {MixedSourceMap} from 'metro-source-map';
 
+const path = require('path');
+
 function relativizeSourceMapInline(
   sourceMap: MixedSourceMap,
   sourcesRoot: string,

package/src/lib/reporting.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.
@@ -11,12 +11,12 @@
 
 const chalk = require("chalk");
 
+const { Terminal } = require("metro-core");
+
 const stripAnsi = require("strip-ansi");
 
 const util = require("util");
 
-const { Terminal } = require("metro-core");
-
 /**
  * A standard way to log a warning to the terminal. This should not be called
  * from some arbitrary Metro logic, only from the reporters. Instead of
@@ -47,10 +47,10 @@ function logError(terminal, format, ...args) {
  */
 
 const nullReporter = {
-  update() {}
+  update() {},
 };
 module.exports = {
   logWarning,
   logError,
-  nullReporter
+  nullReporter,
 };

package/src/lib/reporting.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,11 +11,10 @@
 'use strict';
 
 const chalk = require('chalk');
+const {Terminal} = require('metro-core');
 const stripAnsi = require('strip-ansi');
 const util = require('util');
 
-const {Terminal} = require('metro-core');
-
 export type GlobalCacheDisabledReason = 'too_many_errors' | 'too_many_misses';
 
 export type BundleDetails = {
@@ -45,6 +44,10 @@ export type ReportableEvent =
       error: Error,
       ...
     }
+  | {
+      type: 'initialize_done',
+      port: number,
+    }
   | {
       buildID: string,
       type: 'bundle_build_done',
@@ -117,7 +120,18 @@ export type ReportableEvent =
         | 'groupEnd'
         | 'debug',
       data: Array<mixed>,
+      mode: 'BRIDGE' | 'NOBRIDGE',
       ...
+    }
+  | {
+      type: 'transformer_load_started',
+    }
+  | {
+      type: 'transformer_load_done',
+    }
+  | {
+      type: 'transformer_load_failed',
+      error: Error,
     };
 
 /**
@@ -138,7 +152,7 @@ export type ReportableEvent =
  * TerminalReporter, that should be the only place in the application should
  * access the `terminal` module (nor the `console`).
  */
-export type Reporter = {update(event: ReportableEvent): void, ...};
+export type Reporter = interface {update(event: ReportableEvent): void};
 
 /**
  * A standard way to log a warning to the terminal. This should not be called

package/src/lib/splitBundleOptions.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.
@@ -23,7 +23,7 @@ function splitBundleOptions(options) {
       platform: options.platform,
       runtimeBytecodeVersion: options.runtimeBytecodeVersion,
       type: "module",
-      unstable_transformProfile: options.unstable_transformProfile
+      unstable_transformProfile: options.unstable_transformProfile,
     },
     serializerOptions: {
       excludeSource: options.excludeSource,
@@ -31,12 +31,12 @@ function splitBundleOptions(options) {
       modulesOnly: options.modulesOnly,
       runModule: options.runModule,
       sourceMapUrl: options.sourceMapUrl,
-      sourceUrl: options.sourceUrl
+      sourceUrl: options.sourceUrl,
     },
     graphOptions: {
-      shallow: options.shallow
+      shallow: options.shallow,
     },
-    onProgress: options.onProgress
+    onProgress: options.onProgress,
   };
 }
 

package/src/lib/splitBundleOptions.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/lib/transformHelpers.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.
@@ -29,7 +29,7 @@ async function calcTransformerOptions(
     minify: options.minify,
     platform: options.platform,
     runtimeBytecodeVersion: options.runtimeBytecodeVersion,
-    unstable_transformProfile: options.unstable_transformProfile
+    unstable_transformProfile: options.unstable_transformProfile,
   }; // When we're processing scripts, we don't need to calculate any
   // inlineRequires information, since scripts by definition don't have
   // requires().
@@ -38,17 +38,18 @@ async function calcTransformerOptions(
     return { ...baseOptions, type: "script" };
   }
 
-  const getDependencies = async path => {
+  const getDependencies = async (path) => {
     const dependencies = await deltaBundler.getDependencies([path], {
       resolve: await getResolveDependencyFn(bundler, options.platform),
       transform: await getTransformFn([path], bundler, deltaBundler, config, {
         ...options,
-        minify: false
+        minify: false,
       }),
+      transformOptions: options,
       onProgress: null,
       experimentalImportBundleSupport:
         config.transformer.experimentalImportBundleSupport,
-      shallow: false
+      shallow: false,
     });
     return Array.from(dependencies.keys());
   };
@@ -58,7 +59,7 @@ async function calcTransformerOptions(
     {
       dev: options.dev,
       hot: options.hot,
-      platform: options.platform
+      platform: options.platform,
     },
     getDependencies
   );
@@ -70,7 +71,7 @@ async function calcTransformerOptions(
       transform.unstable_disableES6Transforms || false,
     nonInlinedRequires:
       transform.nonInlinedRequires || baseIgnoredInlineRequires,
-    type: "module"
+    type: "module",
   };
 }
 
@@ -96,14 +97,14 @@ async function getTransformFn(
     config,
     options
   );
-  return async path => {
+  return async (path) => {
     return await bundler.transformFile(path, {
       ...transformOptions,
       type: getType(transformOptions.type, path, config.resolver.assetExts),
       inlineRequires: removeInlineRequiresBlockListFromOptions(
         path,
         inlineRequires
-      )
+      ),
     });
   };
 }
@@ -130,5 +131,5 @@ async function getResolveDependencyFn(bundler, platform) {
 
 module.exports = {
   getTransformFn,
-  getResolveDependencyFn
+  getResolveDependencyFn,
 };

package/src/lib/transformHelpers.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,24 +10,16 @@
 
 'use strict';
 
-const path = require('path');
-
 import type Bundler from '../Bundler';
-import type {TransformOptions} from '../DeltaBundler/Worker';
 import type DeltaBundler, {TransformFn} from '../DeltaBundler';
+import type {TransformInputOptions} from '../DeltaBundler/types.flow';
+import type {TransformOptions} from '../DeltaBundler/Worker';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 import type {Type} from 'metro-transform-worker';
 
-type InlineRequiresRaw = {+blockList: {[string]: true, ...}, ...} | boolean;
+const path = require('path');
 
-export type TransformInputOptions = $Diff<
-  TransformOptions,
-  {
-    inlinePlatform: boolean,
-    inlineRequires: boolean,
-    ...
-  },
->;
+type InlineRequiresRaw = {+blockList: {[string]: true, ...}, ...} | boolean;
 
 type TransformOptionsWithRawInlines = {|
   ...TransformOptions,
@@ -72,6 +64,7 @@ async function calcTransformerOptions(
         ...options,
         minify: false,
       }),
+      transformOptions: options,
       onProgress: null,
       experimentalImportBundleSupport:
         config.transformer.experimentalImportBundleSupport,