metro 0.83.2 → 0.83.4

package/src/lib/parseJsonBody.js.flow

@@ -14,13 +14,23 @@ import type {IncomingMessage} from 'http';
 const CONTENT_TYPE = 'application/json';
 const SIZE_LIMIT = 100 * 1024 * 1024; // 100MB
 
+export type JsonData =
+  | {
+      [string]: JsonData,
+    }
+  | Array<JsonData>
+  | string
+  | number
+  | boolean
+  | null;
+
 /**
  * Attempt to parse a request body as JSON.
  */
 export default function parseJsonBody(
   req: IncomingMessage,
   options: {strict?: boolean} = {},
-): Promise<$FlowFixMe> {
+): Promise<JsonData> {
   const {strict = true} = options;
 
   return new Promise((resolve, reject) => {

package/src/lib/pathUtils.js

@@ -5,28 +5,35 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.normalizePathSeparatorsToPosix = void 0;
 var path = _interopRequireWildcard(require("path"));
-function _getRequireWildcardCache(e) {
-  if ("function" != typeof WeakMap) return null;
-  var r = new WeakMap(),
-    t = new WeakMap();
-  return (_getRequireWildcardCache = function (e) {
-    return e ? t : r;
-  })(e);
-}
-function _interopRequireWildcard(e, r) {
-  if (!r && e && e.__esModule) return e;
-  if (null === e || ("object" != typeof e && "function" != typeof e))
-    return { default: e };
-  var t = _getRequireWildcardCache(r);
-  if (t && t.has(e)) return t.get(e);
-  var n = { __proto__: null },
-    a = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var u in e)
-    if ("default" !== u && {}.hasOwnProperty.call(e, u)) {
-      var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;
-      i && (i.get || i.set) ? Object.defineProperty(n, u, i) : (n[u] = e[u]);
+function _interopRequireWildcard(e, t) {
+  if ("function" == typeof WeakMap)
+    var r = new WeakMap(),
+      n = new WeakMap();
+  return (_interopRequireWildcard = function (e, t) {
+    if (!t && e && e.__esModule) return e;
+    var o,
+      i,
+      f = {
+        __proto__: null,
+        default: e,
+      };
+    if (null === e || ("object" != typeof e && "function" != typeof e))
+      return f;
+    if ((o = t ? n : r)) {
+      if (o.has(e)) return o.get(e);
+      o.set(e, f);
     }
-  return ((n.default = e), t && t.set(e, n), n);
+    for (const t in e)
+      "default" !== t &&
+        {}.hasOwnProperty.call(e, t) &&
+        ((i =
+          (o = Object.defineProperty) &&
+          Object.getOwnPropertyDescriptor(e, t)) &&
+        (i.get || i.set)
+          ? o(f, t, i)
+          : (f[t] = e[t]));
+    return f;
+  })(e, t);
 }
 const normalizePathSeparatorsToPosix = (exports.normalizePathSeparatorsToPosix =
   path.sep === "/"

package/src/lib/pathUtils.js.flow

@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow strict
+ * @format
  */
 
 import * as path from 'path';

package/src/lib/relativizeSourceMap.js

@@ -6,7 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = relativizeSourceMapInline;
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 function relativizeSourceMapInline(sourceMap, sourcesRoot) {
   if (sourceMap.mappings === undefined) {

package/src/lib/reporting.js

@@ -10,7 +10,11 @@ exports.nullReporter = void 0;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _util = _interopRequireDefault(require("util"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 function logWarning(terminal, format, ...args) {
   const str = _util.default.format(format, ...args);

package/src/lib/reporting.js.flow

@@ -126,7 +126,7 @@ export type ReportableEvent =
         | 'groupCollapsed'
         | 'groupEnd'
         | 'debug',
-      data: Array<mixed>,
+      data: Array<unknown>,
       ...
     }
   | {
@@ -187,7 +187,7 @@ export type Reporter = interface {update(event: ReportableEvent): void};
 export function logWarning(
   terminal: Terminal,
   format: string,
-  ...args: Array<mixed>
+  ...args: Array<unknown>
 ): void {
   const str = util.format(format, ...args);
   terminal.log('%s %s', chalk.yellow.inverse.bold(' WARN '), str);
@@ -199,7 +199,7 @@ export function logWarning(
 export function logError(
   terminal: Terminal,
   format: string,
-  ...args: Array<mixed>
+  ...args: Array<unknown>
 ): void {
   terminal.log(
     '%s %s',
@@ -221,7 +221,7 @@ export function logError(
 export function logInfo(
   terminal: Terminal,
   format: string,
-  ...args: Array<mixed>
+  ...args: Array<unknown>
 ): void {
   const str = util.format(format, ...args);
   terminal.log('%s %s', chalk.cyan.inverse.bold(' INFO '), str);

package/src/lib/transformHelpers.js

@@ -10,7 +10,11 @@ var _isAssetFile = _interopRequireDefault(
   require("metro-resolver/private/utils/isAssetFile"),
 );
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const baseIgnoredInlineRequires = [
   "React",
@@ -31,8 +35,8 @@ async function calcTransformerOptions(
   const baseOptions = {
     customTransformOptions: options.customTransformOptions,
     dev: options.dev,
-    inlineRequires: false,
     inlinePlatform: true,
+    inlineRequires: false,
     minify: options.minify,
     platform: options.platform,
     unstable_transformProfile: options.unstable_transformProfile,
@@ -45,11 +49,14 @@ async function calcTransformerOptions(
   }
   const getDependencies = async (path) => {
     const dependencies = await deltaBundler.getDependencies([path], {
+      lazy: false,
+      onProgress: null,
       resolve: await getResolveDependencyFn(
         bundler,
         options.platform,
         resolverOptions,
       ),
+      shallow: false,
       transform: await getTransformFn(
         [path],
         bundler,
@@ -62,13 +69,12 @@ async function calcTransformerOptions(
         resolverOptions,
       ),
       transformOptions: options,
-      onProgress: null,
-      lazy: false,
       unstable_allowRequireContext:
         config.transformer.unstable_allowRequireContext,
       unstable_enablePackageExports:
         config.resolver.unstable_enablePackageExports,
-      shallow: false,
+      unstable_incrementalResolution:
+        config.resolver.unstable_incrementalResolution,
     });
     return Array.from(dependencies.keys());
   };
@@ -83,15 +89,15 @@ async function calcTransformerOptions(
   );
   return {
     ...baseOptions,
-    inlineRequires: transform?.inlineRequires || false,
     experimentalImportSupport: transform?.experimentalImportSupport || false,
+    inlineRequires: transform?.inlineRequires || false,
+    nonInlinedRequires:
+      transform?.nonInlinedRequires || baseIgnoredInlineRequires,
+    type: "module",
     unstable_memoizeInlineRequires:
       transform?.unstable_memoizeInlineRequires || false,
     unstable_nonMemoizedInlineRequires:
       transform?.unstable_nonMemoizedInlineRequires || [],
-    nonInlinedRequires:
-      transform?.nonInlinedRequires || baseIgnoredInlineRequires,
-    type: "module",
   };
 }
 function removeInlineRequiresBlockListFromOptions(path, inlineRequires) {
@@ -138,11 +144,11 @@ async function getTransformFn(
       modulePath,
       {
         ...transformOptions,
-        type: getType(transformOptions.type, modulePath, assetExts),
         inlineRequires: removeInlineRequiresBlockListFromOptions(
           modulePath,
           inlineRequires,
         ),
+        type: getType(transformOptions.type, modulePath, assetExts),
       },
       templateBuffer,
     );

package/src/lib/transformHelpers.js.flow

@@ -10,7 +10,7 @@
  */
 
 import type Bundler from '../Bundler';
-import type DeltaBundler, {TransformFn} from '../DeltaBundler';
+import type {TransformFn, default as DeltaBundler} from '../DeltaBundler';
 import type {
   BundlerResolution,
   TransformInputOptions,
@@ -26,10 +26,10 @@ import {getContextModuleTemplate} from './contextModuleTemplates';
 import isAssetFile from 'metro-resolver/private/utils/isAssetFile';
 
 type InlineRequiresRaw =
-  | $ReadOnly<{blockList: $ReadOnly<{[string]: true, ...}>, ...}>
+  | Readonly<{blockList: Readonly<{[string]: true, ...}>, ...}>
   | boolean;
 
-type TransformOptionsWithRawInlines = $ReadOnly<{
+type TransformOptionsWithRawInlines = Readonly<{
   ...TransformOptions,
   inlineRequires: InlineRequiresRaw,
 }>;
@@ -44,7 +44,7 @@ const baseIgnoredInlineRequires = [
 ];
 
 async function calcTransformerOptions(
-  entryFiles: $ReadOnlyArray<string>,
+  entryFiles: ReadonlyArray<string>,
   bundler: Bundler,
   deltaBundler: DeltaBundler<>,
   config: ConfigT,
@@ -54,8 +54,8 @@ async function calcTransformerOptions(
   const baseOptions = {
     customTransformOptions: options.customTransformOptions,
     dev: options.dev,
-    inlineRequires: false,
     inlinePlatform: true,
+    inlineRequires: false,
     minify: options.minify,
     platform: options.platform,
     unstable_transformProfile: options.unstable_transformProfile,
@@ -73,11 +73,14 @@ async function calcTransformerOptions(
 
   const getDependencies = async (path: string) => {
     const dependencies = await deltaBundler.getDependencies([path], {
+      lazy: false,
+      onProgress: null,
       resolve: await getResolveDependencyFn(
         bundler,
         options.platform,
         resolverOptions,
       ),
+      shallow: false,
       transform: await getTransformFn(
         [path],
         bundler,
@@ -90,13 +93,12 @@ async function calcTransformerOptions(
         resolverOptions,
       ),
       transformOptions: options,
-      onProgress: null,
-      lazy: false,
       unstable_allowRequireContext:
         config.transformer.unstable_allowRequireContext,
       unstable_enablePackageExports:
         config.resolver.unstable_enablePackageExports,
-      shallow: false,
+      unstable_incrementalResolution:
+        config.resolver.unstable_incrementalResolution,
     });
 
     return Array.from(dependencies.keys());
@@ -110,15 +112,15 @@ async function calcTransformerOptions(
 
   return {
     ...baseOptions,
-    inlineRequires: transform?.inlineRequires || false,
     experimentalImportSupport: transform?.experimentalImportSupport || false,
+    inlineRequires: transform?.inlineRequires || false,
+    nonInlinedRequires:
+      transform?.nonInlinedRequires || baseIgnoredInlineRequires,
+    type: 'module',
     unstable_memoizeInlineRequires:
       transform?.unstable_memoizeInlineRequires || false,
     unstable_nonMemoizedInlineRequires:
       transform?.unstable_nonMemoizedInlineRequires || [],
-    nonInlinedRequires:
-      transform?.nonInlinedRequires || baseIgnoredInlineRequires,
-    type: 'module',
   };
 }
 
@@ -134,7 +136,7 @@ function removeInlineRequiresBlockListFromOptions(
 }
 
 export async function getTransformFn(
-  entryFiles: $ReadOnlyArray<string>,
+  entryFiles: ReadonlyArray<string>,
   bundler: Bundler,
   deltaBundler: DeltaBundler<>,
   config: ConfigT,
@@ -181,11 +183,11 @@ export async function getTransformFn(
       modulePath,
       {
         ...transformOptions,
-        type: getType(transformOptions.type, modulePath, assetExts),
         inlineRequires: removeInlineRequiresBlockListFromOptions(
           modulePath,
           inlineRequires,
         ),
+        type: getType(transformOptions.type, modulePath, assetExts),
       },
       templateBuffer,
     );
@@ -195,7 +197,7 @@ export async function getTransformFn(
 function getType(
   type: string,
   filePath: string,
-  assetExts: $ReadOnlySet<string>,
+  assetExts: ReadonlySet<string>,
 ): Type {
   if (type === 'script') {
     return type;

package/src/node-haste/DependencyGraph/ModuleResolution.js

@@ -13,31 +13,42 @@ var _createDefaultContext = _interopRequireDefault(
 );
 var _path = _interopRequireDefault(require("path"));
 var _util = _interopRequireDefault(require("util"));
-function _getRequireWildcardCache(e) {
-  if ("function" != typeof WeakMap) return null;
-  var r = new WeakMap(),
-    t = new WeakMap();
-  return (_getRequireWildcardCache = function (e) {
-    return e ? t : r;
-  })(e);
-}
-function _interopRequireWildcard(e, r) {
-  if (!r && e && e.__esModule) return e;
-  if (null === e || ("object" != typeof e && "function" != typeof e))
-    return { default: e };
-  var t = _getRequireWildcardCache(r);
-  if (t && t.has(e)) return t.get(e);
-  var n = { __proto__: null },
-    a = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var u in e)
-    if ("default" !== u && {}.hasOwnProperty.call(e, u)) {
-      var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;
-      i && (i.get || i.set) ? Object.defineProperty(n, u, i) : (n[u] = e[u]);
+function _interopRequireWildcard(e, t) {
+  if ("function" == typeof WeakMap)
+    var r = new WeakMap(),
+      n = new WeakMap();
+  return (_interopRequireWildcard = function (e, t) {
+    if (!t && e && e.__esModule) return e;
+    var o,
+      i,
+      f = {
+        __proto__: null,
+        default: e,
+      };
+    if (null === e || ("object" != typeof e && "function" != typeof e))
+      return f;
+    if ((o = t ? n : r)) {
+      if (o.has(e)) return o.get(e);
+      o.set(e, f);
     }
-  return ((n.default = e), t && t.set(e, n), n);
+    for (const t in e)
+      "default" !== t &&
+        {}.hasOwnProperty.call(e, t) &&
+        ((i =
+          (o = Object.defineProperty) &&
+          Object.getOwnPropertyDescriptor(e, t)) &&
+        (i.get || i.set)
+          ? o(f, t, i)
+          : (f[t] = e[t]));
+    return f;
+  })(e, t);
 }
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 class ModuleResolver {
   constructor(options) {
@@ -51,13 +62,13 @@ class ModuleResolver {
       emptyModule = this.resolveDependency(
         this._projectRootFakeModulePath,
         {
-          name: this._options.emptyModulePath,
           data: {
-            key: this._options.emptyModulePath,
             asyncType: null,
             isESMImport: false,
+            key: this._options.emptyModulePath,
             locs: [],
           },
+          name: this._options.emptyModulePath,
         },
         false,
         null,
@@ -91,6 +102,7 @@ class ModuleResolver {
       unstable_conditionNames,
       unstable_conditionsByPlatform,
       unstable_enablePackageExports,
+      unstable_incrementalResolution,
     } = this._options;
     try {
       const result = Resolver.resolve(
@@ -98,31 +110,32 @@ class ModuleResolver {
           {
             allowHaste,
             assetExts,
+            customResolverOptions: resolverOptions.customResolverOptions ?? {},
             dev: resolverOptions.dev,
             disableHierarchicalLookup,
             doesFileExist,
             extraNodeModules,
             fileSystemLookup,
+            getPackage: this._getPackage,
+            getPackageForModule: (absoluteModulePath) =>
+              this._getPackageForModule(absoluteModulePath),
             isESMImport: dependency.data.isESMImport,
             mainFields,
             nodeModulesPaths,
+            originModulePath,
             preferNativePlatform,
             resolveAsset,
+            resolveHasteModule: (name) =>
+              this._options.getHasteModulePath(name, platform),
+            resolveHastePackage: (name) =>
+              this._options.getHastePackagePath(name, platform),
             resolveRequest,
             sourceExts,
             unstable_conditionNames,
             unstable_conditionsByPlatform,
             unstable_enablePackageExports,
+            unstable_incrementalResolution,
             unstable_logWarning: this._logWarning,
-            customResolverOptions: resolverOptions.customResolverOptions ?? {},
-            originModulePath,
-            resolveHasteModule: (name) =>
-              this._options.getHasteModulePath(name, platform),
-            resolveHastePackage: (name) =>
-              this._options.getHastePackagePath(name, platform),
-            getPackage: this._getPackage,
-            getPackageForModule: (absoluteModulePath) =>
-              this._getPackageForModule(absoluteModulePath),
           },
           dependency,
         ),
@@ -198,9 +211,9 @@ class ModuleResolver {
     } catch (e) {}
     return result != null
       ? {
-          rootPath: _path.default.dirname(result.pkg.path),
           packageJson: result.pkg.read(),
           packageRelativePath: result.packageRelativePath,
+          rootPath: _path.default.dirname(result.pkg.path),
         }
       : null;
   };
@@ -212,8 +225,8 @@ class ModuleResolver {
         const arbitrary = getArrayLowestItem(resolution.filePaths);
         (0, _invariant.default)(arbitrary != null, "invalid asset resolution");
         return {
-          type: "sourceFile",
           filePath: arbitrary,
+          type: "sourceFile",
         };
       case "empty":
         return this._getEmptyModule();
@@ -224,8 +237,8 @@ class ModuleResolver {
   }
   _logWarning = (message) => {
     this._options.reporter.update({
-      type: "resolver_warning",
       message,
+      type: "resolver_warning",
     });
   };
   _removeRoot(candidates) {
@@ -313,8 +326,8 @@ function refineDependencyLocation(loc, fileContents, targetSpecifier) {
       if (isQuote(maybeQuoteBefore) && maybeQuoteBefore === maybeQuoteAfter) {
         return {
           start: {
-            line: line + 1,
             column: minColumn + offset + 1,
+            line: line + 1,
           },
         };
       }
@@ -322,20 +335,20 @@ function refineDependencyLocation(loc, fileContents, targetSpecifier) {
   }
   if (loc.start.line === loc.end.line) {
     return {
-      start: {
-        line: loc.start.line,
-        column: loc.start.column + 1,
-      },
       end: {
-        line: loc.end.line,
         column: loc.end.column + 1,
+        line: loc.end.line,
+      },
+      start: {
+        column: loc.start.column + 1,
+        line: loc.start.line,
       },
     };
   }
   return {
     start: {
-      line: loc.start.line,
       column: loc.start.column + 1,
+      line: loc.start.line,
     },
   };
 }