metro 0.72.1 → 0.72.3

package/src/ModuleGraph/node-haste/node-haste.js.flow

@@ -9,6 +9,7 @@
  */
 
 import type {Moduleish} from '../../node-haste/DependencyGraph/ModuleResolution';
+import type {ResolverInputOptions} from '../../shared/types.flow';
 import type {ResolveFn, TransformedCodeFile} from '../types.flow';
 import type {Path} from './node-haste.flow';
 import type {ModuleMapData, ModuleMapItem} from 'metro-file-map';
@@ -26,13 +27,7 @@ const ModuleCache = require('./ModuleCache');
 const defaults = require('metro-config/src/defaults/defaults');
 const path = require('path');
 
-type ResolveOptions = {
-  /**
-   * (Used by the resolver) The extensions tried (in order) to implicitly
-   * locate a source file.
-   */
-  sourceExts: $ReadOnlyArray<string>,
-
+type ResolveOptions = $ReadOnly<{
   /**
    * The additional extensions to include in the file map as source files that
    * can be explicitly imported.
@@ -41,16 +36,24 @@ type ResolveOptions = {
 
   assetExts: $ReadOnlyArray<string>,
   assetResolutions: $ReadOnlyArray<string>,
-  +disableHierarchicalLookup: boolean,
-  +emptyModulePath: string,
+  disableHierarchicalLookup: boolean,
+  emptyModulePath: string,
   extraNodeModules: {[id: string]: string, ...},
   mainFields: $ReadOnlyArray<string>,
   nodeModulesPaths: $ReadOnlyArray<string>,
-  +platform: string,
+  platform: string,
   platforms?: $ReadOnlyArray<string>,
   resolveRequest?: ?CustomResolver,
+  resolverOptions: ResolverInputOptions,
+
+  /**
+   * (Used by the resolver) The extensions tried (in order) to implicitly
+   * locate a source file.
+   */
+  sourceExts: $ReadOnlyArray<string>,
+
   transformedFiles: {[path: Path]: TransformedCodeFile, ...},
-};
+}>;
 
 const NATIVE_PLATFORM = 'native';
 const GENERIC_PLATFORM = 'g';
@@ -173,7 +176,6 @@ exports.createResolveFn = function (options: ResolveOptions): ResolveFn {
     extraNodeModules,
     isAssetFile,
     mainFields: options.mainFields,
-    // $FlowFixMe -- error revealed by types-first codemod
     moduleCache,
     moduleMap: new ModuleMap({
       duplicates: new Map(),
@@ -213,7 +215,12 @@ exports.createResolveFn = function (options: ResolveOptions): ResolveFn {
       sourcePath != null
         ? new Module(sourcePath, moduleCache, getTransformedFile(sourcePath))
         : NULL_MODULE;
-    // $FlowFixMe -- error revealed by types-first codemod
-    return moduleResolver.resolveDependency(from, id, true, platform).path;
+    return moduleResolver.resolveDependency(
+      from,
+      id,
+      true,
+      platform,
+      options.resolverOptions,
+    ).path;
   };
 };

package/src/ModuleGraph/output/reverse-dependency-map-references.js

@@ -25,8 +25,7 @@ function reverseDependencyMapReferences({ types: t }) {
 
         if (node.callee.name === `${state.opts.globalPrefix}__d`) {
           // $FlowFixMe Flow error uncovered by typing Babel more strictly
-          const lastArg = node.arguments[0].params.slice(-1)[0]; // $FlowFixMe Flow error uncovered by typing Babel more strictly
-
+          const lastArg = node.arguments[0].params.slice(-1)[0];
           const depMapName = lastArg && lastArg.name;
 
           if (depMapName == null) {

package/src/ModuleGraph/output/reverse-dependency-map-references.js.flow

@@ -37,7 +37,6 @@ function reverseDependencyMapReferences({types: t}: {types: Types, ...}): {
         if (node.callee.name === `${state.opts.globalPrefix}__d`) {
           // $FlowFixMe Flow error uncovered by typing Babel more strictly
           const lastArg = node.arguments[0].params.slice(-1)[0];
-          // $FlowFixMe Flow error uncovered by typing Babel more strictly
           const depMapName: ?string = lastArg && lastArg.name;
 
           if (depMapName == null) {

package/src/ModuleGraph/output/util.js

@@ -17,9 +17,7 @@ const mergeSourceMaps = require("../worker/mergeSourceMaps");
 
 const reverseDependencyMapReferences = require("./reverse-dependency-map-references");
 
-const { parseSync, transformFromAstSync } = require("@babel/core");
-
-const HermesParser = require("hermes-parser"); // flowlint-next-line untyped-import:off
+const { parseSync, transformFromAstSync } = require("@babel/core"); // flowlint-next-line untyped-import:off
 
 const { passthroughSyntaxPlugins } = require("metro-react-native-babel-preset");
 
@@ -179,7 +177,7 @@ function inlineModuleIds(
   const sourceAst =
     isTypeScriptSource(path) || isTSXSource(path) || !hermesParser
       ? parseSync(code, babelConfig)
-      : HermesParser.parse(code, {
+      : require("hermes-parser").parse(code, {
           babel: true,
           // $FlowFixMe[prop-missing]
           sourceType: babelConfig.sourceType,

package/src/ModuleGraph/output/util.js.flow

@@ -18,7 +18,6 @@ const generate = require('../worker/generate');
 const mergeSourceMaps = require('../worker/mergeSourceMaps');
 const reverseDependencyMapReferences = require('./reverse-dependency-map-references');
 const {parseSync, transformFromAstSync} = require('@babel/core');
-const HermesParser = require('hermes-parser');
 // flowlint-next-line untyped-import:off
 const {passthroughSyntaxPlugins} = require('metro-react-native-babel-preset');
 const {addParamsToDefineCall} = require('metro-transform-plugins');
@@ -179,7 +178,7 @@ function inlineModuleIds(
   const sourceAst =
     isTypeScriptSource(path) || isTSXSource(path) || !hermesParser
       ? parseSync(code, babelConfig)
-      : HermesParser.parse(code, {
+      : require('hermes-parser').parse(code, {
           babel: true,
           // $FlowFixMe[prop-missing]
           sourceType: babelConfig.sourceType,

package/src/ModuleGraph/types.flow.js.flow

@@ -117,11 +117,15 @@ export type OutputResult<M: MixedSourceMap> = {
   map: M,
 };
 
+export type Replacements = $ReadOnly<{
+  [filename: string]: string | false,
+}>;
+
 export type PackageData = {
-  browser?: Object | string,
+  browser?: Replacements | string,
   main?: string,
   name?: string,
-  'react-native'?: Object | string,
+  'react-native'?: Replacements | string,
 };
 
 export type ResolveFn = (id: string, source: ?string) => string;
@@ -259,14 +263,27 @@ export type AssetContentsByPath = {
 };
 
 export type ResolvedCodeFile = {
-  +codeFile: TransformedCodeFile,
+  codeFile: TransformedCodeFile,
   /**
    * Imagine we have a source file that contains a `require('foo')`. The library
    * will resolve the path of the module `foo` and store it in this field along
    * all the other dependencies. For example, it could be
    * `{'foo': 'bar/foo.js', 'bar': 'node_modules/bar/index.js'}`.
    */
-  +filePathsByDependencyName: {[dependencyName: string]: string, ...},
+  filePathsByDependencyName: {
+    [dependencyName: string]:
+      | string
+
+      // requireCond
+      | {
+          type: string,
+          condition: string,
+          modules: {
+            [string]: string | null,
+          },
+        },
+    ...
+  },
 };
 
 export type LibraryBoundCodeFile = {
@@ -294,8 +311,13 @@ export type Library = {
  * path it resolves to, ex. `beep/glo/foo.js`.
  */
 export type ResolvedLibrary = {
-  +files: $ReadOnlyArray<ResolvedCodeFile>,
+  +files: $ReadOnlyArray<$DeepReadOnly<ResolvedCodeFile>>,
   /* cannot be a Map because it's JSONified later on */
   +assets: AssetContentsByPath,
-  +isPartiallyResolved?: boolean,
 };
+
+type DeepReadOnlyFn = (<T>(Array<T>) => $ReadOnlyArray<$DeepReadOnly<T>>) &
+  (<T: {}>(T) => $ReadOnly<$ObjMap<T, DeepReadOnlyFn>>) &
+  (<T>(T) => T);
+
+type $DeepReadOnly<T> = $Call<DeepReadOnlyFn, T>;

package/src/Server/MultipartResponse.js

@@ -4,6 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ *
  * @format
  */
 "use strict";
@@ -14,17 +15,20 @@ const CRLF = "\r\n";
 const BOUNDARY = "3beqjf3apnqeu3h5jqorms4i";
 
 class MultipartResponse {
-  static wrap(req, res) {
+  static wrapIfSupported(req, res) {
     if (accepts(req).types().includes("multipart/mixed")) {
       return new MultipartResponse(res);
-    } // Ugly hack, ideally wrap function should always return a proxy
-    // object with the same interface
-
-    res.writeChunk = () => {}; // noop
+    }
 
     return res;
   }
 
+  static serializeHeaders(headers) {
+    return Object.keys(headers)
+      .map((key) => `${key}: ${headers[key]}`)
+      .join(CRLF);
+  }
+
   constructor(res) {
     this.res = res;
     this.headers = {};
@@ -47,7 +51,7 @@ class MultipartResponse {
       this.res.write(MultipartResponse.serializeHeaders(headers) + CRLF + CRLF);
     }
 
-    if (data) {
+    if (data != null) {
       this.res.write(data);
     }
 
@@ -78,12 +82,6 @@ class MultipartResponse {
     this.writeChunk(this.headers, data, true);
     this.res.end();
   }
-
-  static serializeHeaders(headers) {
-    return Object.keys(headers)
-      .map((key) => `${key}: ${headers[key]}`)
-      .join(CRLF);
-  }
 }
 
 module.exports = MultipartResponse;

package/src/Server/MultipartResponse.js.flow

@@ -0,0 +1,97 @@
+/**
+ * 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.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+import type {IncomingMessage, ServerResponse} from 'http';
+const accepts = require('accepts');
+
+const CRLF = '\r\n';
+const BOUNDARY = '3beqjf3apnqeu3h5jqorms4i';
+type Data = string | Buffer | Uint8Array;
+type Headers = {[string]: string | number};
+
+class MultipartResponse {
+  static wrapIfSupported(
+    req: IncomingMessage,
+    res: ServerResponse,
+  ): MultipartResponse | ServerResponse {
+    if (accepts(req).types().includes('multipart/mixed')) {
+      return new MultipartResponse(res);
+    }
+
+    return res;
+  }
+
+  static serializeHeaders(headers: Headers): string {
+    return Object.keys(headers)
+      .map(key => `${key}: ${headers[key]}`)
+      .join(CRLF);
+  }
+
+  res: ServerResponse;
+  headers: Headers;
+
+  constructor(res: ServerResponse) {
+    this.res = res;
+    this.headers = {};
+    res.writeHead(200, {
+      'Content-Type': `multipart/mixed; boundary="${BOUNDARY}"`,
+    });
+    res.write(
+      'If you are seeing this, your client does not support multipart response',
+    );
+  }
+
+  writeChunk(
+    headers: Headers | null,
+    data?: Data,
+    isLast?: boolean = false,
+  ): void {
+    if (this.res.finished) {
+      return;
+    }
+
+    this.res.write(`${CRLF}--${BOUNDARY}${CRLF}`);
+    if (headers) {
+      this.res.write(MultipartResponse.serializeHeaders(headers) + CRLF + CRLF);
+    }
+
+    if (data != null) {
+      this.res.write(data);
+    }
+
+    if (isLast) {
+      this.res.write(`${CRLF}--${BOUNDARY}--${CRLF}`);
+    }
+  }
+
+  writeHead(status: number, headers?: Headers): void {
+    // We can't actually change the response HTTP status code
+    // because the headers have already been sent
+    this.setHeader('X-Http-Status', status);
+    if (!headers) {
+      return;
+    }
+    for (const key in headers) {
+      this.setHeader(key, headers[key]);
+    }
+  }
+
+  setHeader(name: string, value: string | number): void {
+    this.headers[name] = value;
+  }
+
+  end(data?: Data): void {
+    this.writeChunk(this.headers, data, true);
+    this.res.end();
+  }
+}
+
+module.exports = MultipartResponse;