metro-transform-worker 0.75.1 → 0.76.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-transform-worker",
-  "version": "0.75.1",
+  "version": "0.76.1",
   "description": "🚇 Transform worker for Metro.",
   "main": "src/index.js",
   "repository": {
@@ -18,21 +18,20 @@
     "@babel/parser": "^7.20.0",
     "@babel/types": "^7.20.0",
     "babel-preset-fbjs": "^3.4.0",
-    "metro": "0.75.1",
-    "metro-babel-transformer": "0.75.1",
-    "metro-cache": "0.75.1",
-    "metro-cache-key": "0.75.1",
-    "metro-hermes-compiler": "0.75.1",
-    "metro-source-map": "0.75.1",
-    "metro-transform-plugins": "0.75.1",
+    "metro": "0.76.1",
+    "metro-babel-transformer": "0.76.1",
+    "metro-cache": "0.76.1",
+    "metro-cache-key": "0.76.1",
+    "metro-source-map": "0.76.1",
+    "metro-transform-plugins": "0.76.1",
     "nullthrows": "^1.1.1"
   },
   "devDependencies": {
-    "metro-memory-fs": "0.75.1",
-    "metro-minify-terser": "0.75.1",
-    "metro-react-native-babel-transformer": "0.75.1"
+    "metro-memory-fs": "0.76.1",
+    "metro-minify-terser": "0.76.1",
+    "metro-react-native-babel-transformer": "0.76.1"
   },
   "engines": {
-    "node": ">=14.17.0"
+    "node": ">=16"
   }
 }

package/src/index.d.ts

@@ -0,0 +1,120 @@
+/**
+ * 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.
+ *
+ * @format
+ * @oncall react_native
+ */
+
+import type {DynamicRequiresBehavior} from 'metro';
+import type {TransformResultDependency} from 'metro/DeltaBundler';
+import type {AllowOptionalDependencies} from 'metro/DeltaBundler/types';
+import type {
+  CustomTransformOptions,
+  TransformProfile,
+} from 'metro-babel-transformer';
+import type {
+  BasicSourceMap,
+  FBSourceFunctionMap,
+  MetroSourceMapSegmentTuple,
+} from 'metro-source-map';
+
+export type MinifierConfig = Readonly<Record<string, unknown>>;
+
+export interface MinifierOptions {
+  code: string;
+  map?: BasicSourceMap;
+  filename: string;
+  reserved: ReadonlyArray<string>;
+  config: MinifierConfig;
+}
+
+export interface MinifierResult {
+  code: string;
+  map?: BasicSourceMap;
+}
+
+export type Minifier = (
+  options: MinifierOptions,
+) => MinifierResult | Promise<MinifierResult>;
+
+export type Type = 'script' | 'module' | 'asset';
+
+export type JsTransformerConfig = Readonly<{
+  assetPlugins: ReadonlyArray<string>;
+  assetRegistryPath: string;
+  asyncRequireModulePath: string;
+  babelTransformerPath: string;
+  dynamicDepsInPackages: DynamicRequiresBehavior;
+  enableBabelRCLookup: boolean;
+  enableBabelRuntime: boolean;
+  globalPrefix: string;
+  hermesParser: boolean;
+  minifierConfig: MinifierConfig;
+  minifierPath: string;
+  optimizationSizeLimit: number;
+  publicPath: string;
+  allowOptionalDependencies: AllowOptionalDependencies;
+  unstable_collectDependenciesPath: string;
+  unstable_dependencyMapReservedName?: string;
+  unstable_disableModuleWrapping: boolean;
+  unstable_disableNormalizePseudoGlobals: boolean;
+  unstable_compactOutput: boolean;
+  /** Enable `require.context` statements which can be used to import multiple files in a directory. */
+  unstable_allowRequireContext: boolean;
+}>;
+
+export {CustomTransformOptions} from 'metro-babel-transformer';
+
+export type JsTransformOptions = Readonly<{
+  customTransformOptions?: CustomTransformOptions;
+  dev: boolean;
+  experimentalImportSupport?: boolean;
+  hot: boolean;
+  inlinePlatform: boolean;
+  inlineRequires: boolean;
+  minify: boolean;
+  nonInlinedRequires?: ReadonlyArray<string>;
+  platform?: string;
+  runtimeBytecodeVersion?: number;
+  type: Type;
+  unstable_disableES6Transforms?: boolean;
+  unstable_transformProfile: TransformProfile;
+}>;
+
+export type BytecodeFileType =
+  | 'bytecode/module'
+  | 'bytecode/module/asset'
+  | 'bytecode/script';
+
+export type JSFileType = 'js/script' | 'js/module' | 'js/module/asset';
+
+export type JsOutput = Readonly<{
+  data: Readonly<{
+    code: string;
+    lineCount: number;
+    map: MetroSourceMapSegmentTuple[];
+    functionMap: FBSourceFunctionMap | null;
+  }>;
+  type: JSFileType;
+}>;
+
+// Hermes byte-code output type
+export type BytecodeOutput = unknown;
+
+export type TransformResponse = Readonly<{
+  dependencies: ReadonlyArray<TransformResultDependency>;
+  output: ReadonlyArray<JsOutput | BytecodeOutput>;
+}>;
+
+export function transform(
+  config: JsTransformerConfig,
+  projectRoot: string,
+  filename: string,
+  data: Buffer,
+  options: JsTransformOptions,
+): Promise<TransformResponse>;
+
+export function getCacheKey(config: JsTransformerConfig): string;

package/src/index.js

@@ -28,6 +28,7 @@ const countLines = require("metro/src/lib/countLines");
 const {
   InvalidRequireCallError: InternalInvalidRequireCallError,
 } = require("metro/src/ModuleGraph/worker/collectDependencies");
+const collectDependencies = require("metro/src/ModuleGraph/worker/collectDependencies");
 const generateImportNames = require("metro/src/ModuleGraph/worker/generateImportNames");
 const JsFileWrapping = require("metro/src/ModuleGraph/worker/JsFileWrapping");
 const nullthrows = require("nullthrows");
@@ -87,22 +88,9 @@ const minifyCode = async (
     throw error;
   }
 };
-const compileToBytecode = (rawCode, type, options) => {
-  let code = rawCode;
-  if (type.startsWith("js/module")) {
-    const index = code.lastIndexOf(")");
-    code =
-      code.slice(0, index) +
-      ",$$METRO_D[0],$$METRO_D[1],$$METRO_D[2]" +
-      code.slice(index);
-  }
-  const HermesCompiler = require("metro-hermes-compiler");
-  return HermesCompiler.compile(code, options);
-};
 const disabledDependencyTransformer = {
   transformSyncRequire: () => void 0,
   transformImportCall: () => void 0,
-  transformJSResource: () => void 0,
   transformPrefetch: () => void 0,
   transformIllegalDynamicRequire: () => void 0,
 };
@@ -114,15 +102,13 @@ class InvalidRequireCallError extends Error {
   }
 }
 async function transformJS(file, { config, options, projectRoot }) {
-  var _file$ast;
   // Transformers can output null ASTs (if they ignore the file). In that case
   // we need to parse the module source code to get their AST.
   let ast =
-    (_file$ast = file.ast) !== null && _file$ast !== void 0
-      ? _file$ast
-      : babylon.parse(file.code, {
-          sourceType: "unambiguous",
-        });
+    file.ast ??
+    babylon.parse(file.code, {
+      sourceType: "unambiguous",
+    });
   const { importDefault, importAll } = generateImportNames(ast);
 
   // Add "use strict" if the file was parsed as a module, and the directive did
@@ -226,8 +212,6 @@ async function transformJS(file, { config, options, projectRoot }) {
         dependencyMapName: config.unstable_dependencyMapReservedName,
         unstable_allowRequireContext: config.unstable_allowRequireContext,
       };
-      // $FlowFixMe[unsupported-syntax] dynamic require
-      const collectDependencies = require(config.unstable_collectDependenciesPath);
       ({ ast, dependencies, dependencyMapName } = collectDependencies(
         ast,
         opts
@@ -305,23 +289,6 @@ async function transformJS(file, { config, options, projectRoot }) {
       type: file.type,
     },
   ];
-  if (options.runtimeBytecodeVersion != null) {
-    output.push({
-      data: compileToBytecode(code, file.type, {
-        sourceURL: file.filename,
-        sourceMap: fromRawMappings([
-          {
-            code,
-            source: file.code,
-            map,
-            functionMap: null,
-            path: file.filename,
-          },
-        ]).toString(),
-      }),
-      type: getBytecodeFileType(file.type),
-    });
-  }
   return {
     dependencies,
     output,
@@ -353,7 +320,6 @@ async function transformAsset(file, context) {
  * the generic JavaScript transformation.
  */
 async function transformJSWithBabel(file, context) {
-  var _transformResult$func;
   const { babelTransformerPath } = context.config;
   // $FlowFixMe[unsupported-syntax] dynamic require
   const transformer = require(babelTransformerPath);
@@ -363,11 +329,7 @@ async function transformJSWithBabel(file, context) {
   const jsFile = {
     ...file,
     ast: transformResult.ast,
-    functionMap:
-      (_transformResult$func = transformResult.functionMap) !== null &&
-      _transformResult$func !== void 0
-        ? _transformResult$func
-        : null,
+    functionMap: transformResult.functionMap ?? null,
   };
   return await transformJS(jsFile, context);
 }
@@ -412,43 +374,11 @@ async function transformJSON(file, { options, config, projectRoot }) {
       type: jsType,
     },
   ];
-  if (options.runtimeBytecodeVersion != null) {
-    output.push({
-      data: compileToBytecode(code, jsType, {
-        sourceURL: file.filename,
-        sourceMap: fromRawMappings([
-          {
-            code,
-            source: file.code,
-            map,
-            functionMap: null,
-            path: file.filename,
-          },
-        ]).toString(),
-      }),
-      type: getBytecodeFileType(jsType),
-    });
-  }
   return {
     dependencies: [],
     output,
   };
 }
-
-/**
- * Returns the bytecode type for a file type
- */
-function getBytecodeFileType(type) {
-  switch (type) {
-    case "js/module/asset":
-      return "bytecode/module/asset";
-    case "js/script":
-      return "bytecode/script";
-    default:
-      type;
-      return "bytecode/module";
-  }
-}
 function getBabelTransformArgs(file, { options, config, projectRoot }) {
   return {
     filename: file.filename,
@@ -518,18 +448,12 @@ module.exports = {
     return await transformJSWithBabel(file, context);
   },
   getCacheKey: (config) => {
-    const {
-      babelTransformerPath,
-      minifierPath,
-      unstable_collectDependenciesPath,
-      ...remainingConfig
-    } = config;
+    const { babelTransformerPath, minifierPath, ...remainingConfig } = config;
     const filesKey = getCacheKey([
       require.resolve(babelTransformerPath),
       require.resolve(minifierPath),
       require.resolve("./utils/getMinifier"),
       require.resolve("./utils/assetTransformer"),
-      require.resolve(unstable_collectDependenciesPath),
       require.resolve("metro/src/ModuleGraph/worker/generateImportNames"),
       require.resolve("metro/src/ModuleGraph/worker/JsFileWrapping"),
       ...metroTransformPlugins.getTransformPluginCacheKeyFiles(),

package/src/index.js.flow

@@ -18,10 +18,6 @@ import type {
   CustomTransformOptions,
   TransformProfile,
 } from 'metro-babel-transformer';
-import type {
-  HermesCompilerResult,
-  Options as HermesCompilerOptions,
-} from 'metro-hermes-compiler';
 import type {
   BasicSourceMap,
   FBSourceFunctionMap,
@@ -33,7 +29,6 @@ import type {
   DependencyTransformer,
   DynamicRequiresBehavior,
 } from 'metro/src/ModuleGraph/worker/collectDependencies';
-import typeof CollectDependenciesFn from 'metro/src/ModuleGraph/worker/collectDependencies';
 
 const getMinifier = require('./utils/getMinifier');
 const {transformFromAstSync} = require('@babel/core');
@@ -52,6 +47,7 @@ const countLines = require('metro/src/lib/countLines');
 const {
   InvalidRequireCallError: InternalInvalidRequireCallError,
 } = require('metro/src/ModuleGraph/worker/collectDependencies');
+const collectDependencies = require('metro/src/ModuleGraph/worker/collectDependencies');
 const generateImportNames = require('metro/src/ModuleGraph/worker/generateImportNames');
 const JsFileWrapping = require('metro/src/ModuleGraph/worker/JsFileWrapping');
 const nullthrows = require('nullthrows');
@@ -94,7 +90,6 @@ export type JsTransformerConfig = $ReadOnly<{
   optimizationSizeLimit: number,
   publicPath: string,
   allowOptionalDependencies: AllowOptionalDependencies,
-  unstable_collectDependenciesPath: string,
   unstable_dependencyMapReservedName: ?string,
   unstable_disableModuleWrapping: boolean,
   unstable_disableNormalizePseudoGlobals: boolean,
@@ -115,17 +110,11 @@ export type JsTransformOptions = $ReadOnly<{
   minify: boolean,
   nonInlinedRequires?: $ReadOnlyArray<string>,
   platform: ?string,
-  runtimeBytecodeVersion: ?number,
   type: Type,
   unstable_disableES6Transforms?: boolean,
   unstable_transformProfile: TransformProfile,
 }>;
 
-export type BytecodeFileType =
-  | 'bytecode/module'
-  | 'bytecode/module/asset'
-  | 'bytecode/script';
-
 opaque type Path = string;
 
 type BaseFile = $ReadOnly<{
@@ -169,19 +158,9 @@ export type JsOutput = $ReadOnly<{
   type: JSFileType,
 }>;
 
-export type BytecodeOutput = $ReadOnly<{
-  data: HermesCompilerResult,
-  type: BytecodeFileType,
-}>;
-
-type DependencySplitCondition = $PropertyType<
-  $PropertyType<TransformResultDependency, 'data'>,
-  'splitCondition',
->;
-
 type TransformResponse = $ReadOnly<{
   dependencies: $ReadOnlyArray<TransformResultDependency>,
-  output: $ReadOnlyArray<JsOutput | BytecodeOutput>,
+  output: $ReadOnlyArray<JsOutput>,
 }>;
 
 function getDynamicDepsBehavior(
@@ -247,27 +226,9 @@ const minifyCode = async (
   }
 };
 
-const compileToBytecode = (
-  rawCode: string,
-  type: string,
-  options: HermesCompilerOptions,
-): HermesCompilerResult => {
-  let code = rawCode;
-  if (type.startsWith('js/module')) {
-    const index = code.lastIndexOf(')');
-    code =
-      code.slice(0, index) +
-      ',$$METRO_D[0],$$METRO_D[1],$$METRO_D[2]' +
-      code.slice(index);
-  }
-  const HermesCompiler = require('metro-hermes-compiler');
-  return HermesCompiler.compile(code, options);
-};
-
-const disabledDependencyTransformer: DependencyTransformer<mixed> = {
+const disabledDependencyTransformer: DependencyTransformer = {
   transformSyncRequire: () => void 0,
   transformImportCall: () => void 0,
-  transformJSResource: () => void 0,
   transformPrefetch: () => void 0,
   transformIllegalDynamicRequire: () => void 0,
 };
@@ -401,8 +362,6 @@ async function transformJS(
         dependencyMapName: config.unstable_dependencyMapReservedName,
         unstable_allowRequireContext: config.unstable_allowRequireContext,
       };
-      // $FlowFixMe[unsupported-syntax] dynamic require
-      const collectDependencies: CollectDependenciesFn<DependencySplitCondition> = require(config.unstable_collectDependenciesPath);
       ({ast, dependencies, dependencyMapName} = collectDependencies(ast, opts));
     } catch (error) {
       if (error instanceof InternalInvalidRequireCallError) {
@@ -473,7 +432,7 @@ async function transformJS(
     ));
   }
 
-  const output: Array<JsOutput | BytecodeOutput> = [
+  const output: Array<JsOutput> = [
     {
       data: {
         code,
@@ -485,24 +444,6 @@ async function transformJS(
     },
   ];
 
-  if (options.runtimeBytecodeVersion != null) {
-    output.push({
-      data: (compileToBytecode(code, file.type, {
-        sourceURL: file.filename,
-        sourceMap: fromRawMappings([
-          {
-            code,
-            source: file.code,
-            map,
-            functionMap: null,
-            path: file.filename,
-          },
-        ]).toString(),
-      }): HermesCompilerResult),
-      type: getBytecodeFileType(file.type),
-    });
-  }
-
   return {
     dependencies,
     output,
@@ -597,52 +538,19 @@ async function transformJSON(
     jsType = 'js/module';
   }
 
-  const output: Array<JsOutput | BytecodeOutput> = [
+  const output: Array<JsOutput> = [
     {
       data: {code, lineCount: countLines(code), map, functionMap: null},
       type: jsType,
     },
   ];
 
-  if (options.runtimeBytecodeVersion != null) {
-    output.push({
-      data: (compileToBytecode(code, jsType, {
-        sourceURL: file.filename,
-        sourceMap: fromRawMappings([
-          {
-            code,
-            source: file.code,
-            map,
-            functionMap: null,
-            path: file.filename,
-          },
-        ]).toString(),
-      }): HermesCompilerResult),
-      type: getBytecodeFileType(jsType),
-    });
-  }
-
   return {
     dependencies: [],
     output,
   };
 }
 
-/**
- * Returns the bytecode type for a file type
- */
-function getBytecodeFileType(type: JSFileType): BytecodeFileType {
-  switch (type) {
-    case 'js/module/asset':
-      return 'bytecode/module/asset';
-    case 'js/script':
-      return 'bytecode/script';
-    default:
-      (type: 'js/module');
-      return 'bytecode/module';
-  }
-}
-
 function getBabelTransformArgs(
   file: $ReadOnly<{filename: Path, code: string, ...}>,
   {options, config, projectRoot}: TransformationContext,
@@ -730,19 +638,13 @@ module.exports = {
   },
 
   getCacheKey: (config: JsTransformerConfig): string => {
-    const {
-      babelTransformerPath,
-      minifierPath,
-      unstable_collectDependenciesPath,
-      ...remainingConfig
-    } = config;
+    const {babelTransformerPath, minifierPath, ...remainingConfig} = config;
 
     const filesKey = getCacheKey([
       require.resolve(babelTransformerPath),
       require.resolve(minifierPath),
       require.resolve('./utils/getMinifier'),
       require.resolve('./utils/assetTransformer'),
-      require.resolve(unstable_collectDependenciesPath),
       require.resolve('metro/src/ModuleGraph/worker/generateImportNames'),
       require.resolve('metro/src/ModuleGraph/worker/JsFileWrapping'),
       ...metroTransformPlugins.getTransformPluginCacheKeyFiles(),

package/types/index.d.ts

@@ -0,0 +1,120 @@
+/**
+ * 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.
+ *
+ * @format
+ * @oncall react_native
+ */
+
+import type {DynamicRequiresBehavior} from 'metro';
+import type {TransformResultDependency} from 'metro/DeltaBundler';
+import type {AllowOptionalDependencies} from 'metro/DeltaBundler/types';
+import type {
+  CustomTransformOptions,
+  TransformProfile,
+} from 'metro-babel-transformer';
+import type {
+  BasicSourceMap,
+  FBSourceFunctionMap,
+  MetroSourceMapSegmentTuple,
+} from 'metro-source-map';
+
+export type MinifierConfig = Readonly<Record<string, unknown>>;
+
+export interface MinifierOptions {
+  code: string;
+  map?: BasicSourceMap;
+  filename: string;
+  reserved: ReadonlyArray<string>;
+  config: MinifierConfig;
+}
+
+export interface MinifierResult {
+  code: string;
+  map?: BasicSourceMap;
+}
+
+export type Minifier = (
+  options: MinifierOptions,
+) => MinifierResult | Promise<MinifierResult>;
+
+export type Type = 'script' | 'module' | 'asset';
+
+export type JsTransformerConfig = Readonly<{
+  assetPlugins: ReadonlyArray<string>;
+  assetRegistryPath: string;
+  asyncRequireModulePath: string;
+  babelTransformerPath: string;
+  dynamicDepsInPackages: DynamicRequiresBehavior;
+  enableBabelRCLookup: boolean;
+  enableBabelRuntime: boolean;
+  globalPrefix: string;
+  hermesParser: boolean;
+  minifierConfig: MinifierConfig;
+  minifierPath: string;
+  optimizationSizeLimit: number;
+  publicPath: string;
+  allowOptionalDependencies: AllowOptionalDependencies;
+  unstable_collectDependenciesPath: string;
+  unstable_dependencyMapReservedName?: string;
+  unstable_disableModuleWrapping: boolean;
+  unstable_disableNormalizePseudoGlobals: boolean;
+  unstable_compactOutput: boolean;
+  /** Enable `require.context` statements which can be used to import multiple files in a directory. */
+  unstable_allowRequireContext: boolean;
+}>;
+
+export {CustomTransformOptions} from 'metro-babel-transformer';
+
+export type JsTransformOptions = Readonly<{
+  customTransformOptions?: CustomTransformOptions;
+  dev: boolean;
+  experimentalImportSupport?: boolean;
+  hot: boolean;
+  inlinePlatform: boolean;
+  inlineRequires: boolean;
+  minify: boolean;
+  nonInlinedRequires?: ReadonlyArray<string>;
+  platform?: string;
+  runtimeBytecodeVersion?: number;
+  type: Type;
+  unstable_disableES6Transforms?: boolean;
+  unstable_transformProfile: TransformProfile;
+}>;
+
+export type BytecodeFileType =
+  | 'bytecode/module'
+  | 'bytecode/module/asset'
+  | 'bytecode/script';
+
+export type JSFileType = 'js/script' | 'js/module' | 'js/module/asset';
+
+export type JsOutput = Readonly<{
+  data: Readonly<{
+    code: string;
+    lineCount: number;
+    map: MetroSourceMapSegmentTuple[];
+    functionMap: FBSourceFunctionMap | null;
+  }>;
+  type: JSFileType;
+}>;
+
+// Hermes byte-code output type
+export type BytecodeOutput = unknown;
+
+export type TransformResponse = Readonly<{
+  dependencies: ReadonlyArray<TransformResultDependency>;
+  output: ReadonlyArray<JsOutput | BytecodeOutput>;
+}>;
+
+export function transform(
+  config: JsTransformerConfig,
+  projectRoot: string,
+  filename: string,
+  data: Buffer,
+  options: JsTransformOptions,
+): Promise<TransformResponse>;
+
+export function getCacheKey(config: JsTransformerConfig): string;