metro 0.83.3 → 0.84.0

package/src/lib/getPrependedScripts.js

@@ -11,28 +11,32 @@ var transformHelpers = _interopRequireWildcard(require("./transformHelpers"));
 var defaults = _interopRequireWildcard(
   require("metro-config/private/defaults/defaults"),
 );
-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 };
@@ -76,6 +80,8 @@ async function getPrependedScripts(
       lazy: false,
       unstable_enablePackageExports:
         config.resolver.unstable_enablePackageExports,
+      unstable_incrementalResolution:
+        config.resolver.unstable_incrementalResolution,
       shallow: false,
     },
   );
@@ -84,15 +90,23 @@ async function getPrependedScripts(
       dev: options.dev,
       globalPrefix: config.transformer.globalPrefix,
       requireCycleIgnorePatterns: config.resolver.requireCycleIgnorePatterns,
+      unstable_forceFullRefreshPatterns:
+        config.resolver.unstable_forceFullRefreshPatterns,
     }),
     ...dependencies.values(),
   ];
 }
-function _getPrelude({ dev, globalPrefix, requireCycleIgnorePatterns }) {
+function _getPrelude({
+  dev,
+  globalPrefix,
+  requireCycleIgnorePatterns,
+  unstable_forceFullRefreshPatterns,
+}) {
   const code = (0, _getPreludeCode.default)({
     isDev: dev,
     globalPrefix,
     requireCycleIgnorePatterns,
+    unstable_forceFullRefreshPatterns,
   });
   const name = "__prelude__";
   return {

package/src/lib/getPrependedScripts.js.flow

@@ -10,7 +10,7 @@
  */
 
 import type Bundler from '../Bundler';
-import type DeltaBundler, {Module} from '../DeltaBundler';
+import type {Module, default as DeltaBundler} from '../DeltaBundler';
 import type {TransformInputOptions} from '../DeltaBundler/types';
 import type {ResolverInputOptions} from '../shared/types';
 import type {ConfigT} from 'metro-config';
@@ -27,7 +27,7 @@ export default async function getPrependedScripts(
   resolverOptions: ResolverInputOptions,
   bundler: Bundler,
   deltaBundler: DeltaBundler<>,
-): Promise<$ReadOnlyArray<Module<>>> {
+): Promise<ReadonlyArray<Module<>>> {
   // Get all the polyfills from the relevant option params (the
   // `getPolyfills()` method and the `polyfillModuleNames` variable).
   const polyfillModuleNames = config.serializer
@@ -64,6 +64,8 @@ export default async function getPrependedScripts(
       lazy: false,
       unstable_enablePackageExports:
         config.resolver.unstable_enablePackageExports,
+      unstable_incrementalResolution:
+        config.resolver.unstable_incrementalResolution,
       shallow: false,
     },
   );
@@ -73,6 +75,8 @@ export default async function getPrependedScripts(
       dev: options.dev,
       globalPrefix: config.transformer.globalPrefix,
       requireCycleIgnorePatterns: config.resolver.requireCycleIgnorePatterns,
+      unstable_forceFullRefreshPatterns:
+        config.resolver.unstable_forceFullRefreshPatterns,
     }),
     ...dependencies.values(),
   ];
@@ -82,16 +86,19 @@ function _getPrelude({
   dev,
   globalPrefix,
   requireCycleIgnorePatterns,
+  unstable_forceFullRefreshPatterns,
 }: {
   dev: boolean,
   globalPrefix: string,
-  requireCycleIgnorePatterns: $ReadOnlyArray<RegExp>,
+  requireCycleIgnorePatterns: ReadonlyArray<RegExp>,
+  unstable_forceFullRefreshPatterns: ReadonlyArray<RegExp>,
   ...
 }): Module<> {
   const code = getPreludeCode({
     isDev: dev,
     globalPrefix,
     requireCycleIgnorePatterns,
+    unstable_forceFullRefreshPatterns,
   });
   const name = '__prelude__';
 

package/src/lib/logToConsole.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-local
+ * @format
  */
 
 /* eslint-disable no-console */
@@ -18,7 +18,7 @@ import util from 'util';
 const groupStack = [];
 let collapsedGuardTimer;
 
-export default (terminal: Terminal, level: string, ...data: Array<mixed>) => {
+export default (terminal: Terminal, level: string, ...data: Array<unknown>) => {
   // $FlowFixMe[invalid-computed-prop]
   const logFunction = console[level] && level !== 'trace' ? level : 'log';
   const color =

package/src/lib/parseBundleOptionsFromBundleRequestUrl.js

@@ -16,28 +16,32 @@ var _parseCustomTransformOptions = _interopRequireDefault(
 );
 var jscSafeUrl = _interopRequireWildcard(require("jsc-safe-url"));
 var _path = _interopRequireDefault(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);
 }
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };

package/src/lib/parseCustomResolverOptions.js.flow

@@ -9,7 +9,7 @@
  * @oncall react_native
  */
 
-import type {CustomResolverOptions} from '../../../metro-resolver/src/types';
+import type {CustomResolverOptions} from 'metro-resolver';
 
 const PREFIX = 'resolver.';
 
@@ -18,7 +18,7 @@ export default function parseCustomResolverOptions(
 ): CustomResolverOptions {
   const customResolverOptions: {
     __proto__: null,
-    [string]: mixed,
+    [string]: unknown,
     ...
   } = Object.create(null);
 

package/src/lib/parseCustomTransformOptions.js.flow

@@ -18,7 +18,7 @@ export default function parseCustomTransformOptions(
 ): CustomTransformOptions {
   const customTransformOptions: {
     __proto__: null,
-    [string]: mixed,
+    [string]: unknown,
     ...
   } = Object.create(null);
 

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,32 @@ 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/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

@@ -31,8 +31,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 +45,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 +65,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 +85,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 +140,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;