metro 0.83.0 → 0.83.2

package/src/lib/formatBundlingError.js

@@ -1,18 +1,29 @@
 "use strict";
 
-const GraphNotFoundError = require("../IncrementalBundler/GraphNotFoundError");
-const ResourceNotFoundError = require("../IncrementalBundler/ResourceNotFoundError");
-const RevisionNotFoundError = require("../IncrementalBundler/RevisionNotFoundError");
-const {
-  UnableToResolveError,
-} = require("../node-haste/DependencyGraph/ModuleResolution");
-const { codeFrameColumns } = require("@babel/code-frame");
-const ErrorStackParser = require("error-stack-parser");
-const fs = require("fs");
-const { AmbiguousModuleResolutionError } = require("metro-core");
-const serializeError = require("serialize-error");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = formatBundlingError;
+var _GraphNotFoundError = _interopRequireDefault(
+  require("../IncrementalBundler/GraphNotFoundError"),
+);
+var _ResourceNotFoundError = _interopRequireDefault(
+  require("../IncrementalBundler/ResourceNotFoundError"),
+);
+var _RevisionNotFoundError = _interopRequireDefault(
+  require("../IncrementalBundler/RevisionNotFoundError"),
+);
+var _ModuleResolution = require("../node-haste/DependencyGraph/ModuleResolution");
+var _codeFrame = require("@babel/code-frame");
+var _errorStackParser = _interopRequireDefault(require("error-stack-parser"));
+var _fs = _interopRequireDefault(require("fs"));
+var _metroCore = require("metro-core");
+var _serializeError = _interopRequireDefault(require("serialize-error"));
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 function formatBundlingError(error) {
-  if (error instanceof AmbiguousModuleResolutionError) {
+  if (error instanceof _metroCore.AmbiguousModuleResolutionError) {
     const he = error.hasteError;
     const message =
       "Ambiguous resolution: module '" +
@@ -34,12 +45,12 @@ function formatBundlingError(error) {
     };
   }
   if (
-    error instanceof UnableToResolveError ||
+    error instanceof _ModuleResolution.UnableToResolveError ||
     (error instanceof Error &&
       (error.type === "TransformError" || error.type === "NotFoundError"))
   ) {
     return {
-      ...serializeError(error),
+      ...(0, _serializeError.default)(error),
       type: error.type,
       errors: [
         {
@@ -49,33 +60,33 @@ function formatBundlingError(error) {
         },
       ],
     };
-  } else if (error instanceof ResourceNotFoundError) {
+  } else if (error instanceof _ResourceNotFoundError.default) {
     return {
       type: "ResourceNotFoundError",
       errors: [],
       message: error.message,
     };
-  } else if (error instanceof GraphNotFoundError) {
+  } else if (error instanceof _GraphNotFoundError.default) {
     return {
       type: "GraphNotFoundError",
       errors: [],
       message: error.message,
     };
-  } else if (error instanceof RevisionNotFoundError) {
+  } else if (error instanceof _RevisionNotFoundError.default) {
     return {
       type: "RevisionNotFoundError",
       errors: [],
       message: error.message,
     };
   } else {
-    const stack = ErrorStackParser.parse(error);
+    const stack = _errorStackParser.default.parse(error);
     const fileName = stack[0].fileName;
     const column = stack[0].columnNumber;
     const line = stack[0].lineNumber;
     let codeFrame = "";
     try {
-      codeFrame = codeFrameColumns(
-        fs.readFileSync(fileName, "utf8"),
+      codeFrame = (0, _codeFrame.codeFrameColumns)(
+        _fs.default.readFileSync(fileName, "utf8"),
         {
           start: {
             column,
@@ -84,7 +95,7 @@ function formatBundlingError(error) {
         },
         {
           forceColor: true,
-        }
+        },
       );
     } catch {}
     return {
@@ -94,4 +105,3 @@ function formatBundlingError(error) {
     };
   }
 }
-module.exports = formatBundlingError;

package/src/lib/formatBundlingError.js.flow

@@ -8,21 +8,17 @@
  * @flow
  */
 
-'use strict';
+import type {FormattedError} from 'metro-runtime/src/modules/types';
 
-import type {FormattedError} from 'metro-runtime/src/modules/types.flow';
-
-const GraphNotFoundError = require('../IncrementalBundler/GraphNotFoundError');
-const ResourceNotFoundError = require('../IncrementalBundler/ResourceNotFoundError');
-const RevisionNotFoundError = require('../IncrementalBundler/RevisionNotFoundError');
-const {
-  UnableToResolveError,
-} = require('../node-haste/DependencyGraph/ModuleResolution');
-const {codeFrameColumns} = require('@babel/code-frame');
-const ErrorStackParser = require('error-stack-parser');
-const fs = require('fs');
-const {AmbiguousModuleResolutionError} = require('metro-core');
-const serializeError = require('serialize-error');
+import GraphNotFoundError from '../IncrementalBundler/GraphNotFoundError';
+import ResourceNotFoundError from '../IncrementalBundler/ResourceNotFoundError';
+import RevisionNotFoundError from '../IncrementalBundler/RevisionNotFoundError';
+import {UnableToResolveError} from '../node-haste/DependencyGraph/ModuleResolution';
+import {codeFrameColumns} from '@babel/code-frame';
+import ErrorStackParser from 'error-stack-parser';
+import fs from 'fs';
+import {AmbiguousModuleResolutionError} from 'metro-core';
+import serializeError from 'serialize-error';
 
 export type CustomError = Error &
   interface {
@@ -37,7 +33,9 @@ export type CustomError = Error &
     }>,
   };
 
-function formatBundlingError(error: CustomError): FormattedError {
+export default function formatBundlingError(
+  error: CustomError,
+): FormattedError {
   if (error instanceof AmbiguousModuleResolutionError) {
     const he = error.hasteError;
     const message =
@@ -60,6 +58,8 @@ function formatBundlingError(error: CustomError): FormattedError {
   if (
     error instanceof UnableToResolveError ||
     (error instanceof Error &&
+      /* $FlowFixMe[invalid-compare] Error discovered during Constant Condition
+       * roll out. See https://fburl.com/workplace/4oq3zi07. */
       (error.type === 'TransformError' || error.type === 'NotFoundError'))
   ) {
     return {
@@ -77,21 +77,21 @@ function formatBundlingError(error: CustomError): FormattedError {
   } else if (error instanceof ResourceNotFoundError) {
     return {
       type: 'ResourceNotFoundError',
-      // $FlowFixMe[incompatible-return]
+      // $FlowFixMe[incompatible-type]
       errors: [],
       message: error.message,
     };
   } else if (error instanceof GraphNotFoundError) {
     return {
       type: 'GraphNotFoundError',
-      // $FlowFixMe[incompatible-return]
+      // $FlowFixMe[incompatible-type]
       errors: [],
       message: error.message,
     };
   } else if (error instanceof RevisionNotFoundError) {
     return {
       type: 'RevisionNotFoundError',
-      // $FlowFixMe[incompatible-return]
+      // $FlowFixMe[incompatible-type]
       errors: [],
       message: error.message,
     };
@@ -120,5 +120,3 @@ function formatBundlingError(error: CustomError): FormattedError {
     };
   }
 }
-
-module.exports = formatBundlingError;

package/src/lib/getAppendScripts.js

@@ -1,19 +1,19 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = getAppendScripts;
+var _getInlineSourceMappingURL = _interopRequireDefault(
+  require("../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL"),
+);
+var _sourceMapString = require("../DeltaBundler/Serializers/sourceMapString");
 var _CountingSet = _interopRequireDefault(require("./CountingSet"));
+var _countLines = _interopRequireDefault(require("./countLines"));
+var _nullthrows = _interopRequireDefault(require("nullthrows"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
-const getInlineSourceMappingURL = require("../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL");
-const {
-  sourceMapString,
-} = require("../DeltaBundler/Serializers/sourceMapString");
-const countLines = require("./countLines");
-const nullthrows = require("nullthrows");
 function getAppendScripts(entryPoint, modules, options) {
   const output = [];
   if (options.runModule) {
@@ -21,7 +21,8 @@ function getAppendScripts(entryPoint, modules, options) {
     for (const path of paths) {
       if (modules.some((module) => module.path === path)) {
         const code = options.getRunModuleStatement(
-          options.createModuleId(path)
+          options.createModuleId(path),
+          options.globalPrefix,
         );
         output.push({
           path: `require-${path}`,
@@ -33,7 +34,7 @@ function getAppendScripts(entryPoint, modules, options) {
               type: "js/script/virtual",
               data: {
                 code,
-                lineCount: countLines(code),
+                lineCount: (0, _countLines.default)(code),
                 map: [],
               },
             },
@@ -44,15 +45,15 @@ function getAppendScripts(entryPoint, modules, options) {
   }
   if (options.inlineSourceMap || options.sourceMapUrl) {
     const sourceMappingURL = options.inlineSourceMap
-      ? getInlineSourceMappingURL(
-          sourceMapString(modules, {
+      ? (0, _getInlineSourceMappingURL.default)(
+          (0, _sourceMapString.sourceMapString)(modules, {
             processModuleFilter: () => true,
             excludeSource: false,
             shouldAddToIgnoreList: options.shouldAddToIgnoreList,
             getSourceUrl: options.getSourceUrl,
-          })
+          }),
         )
-      : nullthrows(options.sourceMapUrl);
+      : (0, _nullthrows.default)(options.sourceMapUrl);
     const code = `//# sourceMappingURL=${sourceMappingURL}`;
     output.push({
       path: "source-map",
@@ -64,7 +65,7 @@ function getAppendScripts(entryPoint, modules, options) {
           type: "js/script/virtual",
           data: {
             code,
-            lineCount: countLines(code),
+            lineCount: (0, _countLines.default)(code),
             map: [],
           },
         },
@@ -83,7 +84,7 @@ function getAppendScripts(entryPoint, modules, options) {
           type: "js/script/virtual",
           data: {
             code,
-            lineCount: countLines(code),
+            lineCount: (0, _countLines.default)(code),
             map: [],
           },
         },
@@ -92,4 +93,3 @@ function getAppendScripts(entryPoint, modules, options) {
   }
   return output;
 }
-module.exports = getAppendScripts;

package/src/lib/getAppendScripts.js.flow

@@ -9,23 +9,20 @@
  * @oncall react_native
  */
 
-'use strict';
 import type {Module} from '../DeltaBundler';
-import type {Dependency} from '../DeltaBundler/types.flow';
+import type {Dependency} from '../DeltaBundler/types';
 
+import getInlineSourceMappingURL from '../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL';
+import {sourceMapString} from '../DeltaBundler/Serializers/sourceMapString';
 import CountingSet from './CountingSet';
-
-const getInlineSourceMappingURL = require('../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL');
-const {
-  sourceMapString,
-} = require('../DeltaBundler/Serializers/sourceMapString');
-const countLines = require('./countLines');
-const nullthrows = require('nullthrows');
+import countLines from './countLines';
+import nullthrows from 'nullthrows';
 
 type Options<T: number | string> = $ReadOnly<{
   asyncRequireModulePath: string,
   createModuleId: string => T,
-  getRunModuleStatement: T => string,
+  getRunModuleStatement: (moduleId: T, globalPrefix: string) => string,
+  globalPrefix: string,
   inlineSourceMap: ?boolean,
   runBeforeMainModule: $ReadOnlyArray<string>,
   runModule: boolean,
@@ -36,7 +33,7 @@ type Options<T: number | string> = $ReadOnly<{
   ...
 }>;
 
-function getAppendScripts<T: number | string>(
+export default function getAppendScripts<T: number | string>(
   entryPoint: string,
   modules: $ReadOnlyArray<Module<>>,
   options: Options<T>,
@@ -50,6 +47,7 @@ function getAppendScripts<T: number | string>(
       if (modules.some((module: Module<>) => module.path === path)) {
         const code = options.getRunModuleStatement(
           options.createModuleId(path),
+          options.globalPrefix,
         );
         output.push({
           path: `require-${path}`,
@@ -124,5 +122,3 @@ function getAppendScripts<T: number | string>(
 
   return output;
 }
-
-module.exports = getAppendScripts;

package/src/lib/getGraphId.js

@@ -1,10 +1,19 @@
 "use strict";
 
-const canonicalize = require("metro-core/private/canonicalize");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = getGraphId;
+var _canonicalize = _interopRequireDefault(
+  require("metro-core/private/canonicalize"),
+);
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 function getGraphId(
   entryFile,
   options,
-  { shallow, lazy, unstable_allowRequireContext, resolverOptions }
+  { shallow, lazy, unstable_allowRequireContext, resolverOptions },
 ) {
   return JSON.stringify(
     {
@@ -14,9 +23,7 @@ function getGraphId(
         customTransformOptions: options.customTransformOptions ?? null,
         dev: options.dev,
         experimentalImportSupport: options.experimentalImportSupport || false,
-        hot: options.hot,
         minify: options.minify,
-        unstable_disableES6Transforms: options.unstable_disableES6Transforms,
         platform: options.platform != null ? options.platform : null,
         type: options.type,
         lazy,
@@ -26,7 +33,6 @@ function getGraphId(
           options.unstable_transformProfile || "default",
       },
     },
-    canonicalize
+    _canonicalize.default,
   );
 }
-module.exports = getGraphId;

package/src/lib/getGraphId.js.flow

@@ -9,16 +9,14 @@
  * @oncall react_native
  */
 
-'use strict';
+import type {TransformInputOptions} from '../DeltaBundler/types';
+import type {ResolverInputOptions} from '../shared/types';
 
-import type {TransformInputOptions} from '../DeltaBundler/types.flow';
-import type {ResolverInputOptions} from '../shared/types.flow';
-
-const canonicalize = require('metro-core/private/canonicalize');
+import canonicalize from 'metro-core/private/canonicalize';
 
 export opaque type GraphId: string = string;
 
-function getGraphId(
+export default function getGraphId(
   entryFile: string,
   options: TransformInputOptions,
   {
@@ -41,9 +39,7 @@ function getGraphId(
         customTransformOptions: options.customTransformOptions ?? null,
         dev: options.dev,
         experimentalImportSupport: options.experimentalImportSupport || false,
-        hot: options.hot,
         minify: options.minify,
-        unstable_disableES6Transforms: options.unstable_disableES6Transforms,
         platform: options.platform != null ? options.platform : null,
         type: options.type,
         lazy,
@@ -56,5 +52,3 @@ function getGraphId(
     canonicalize,
   );
 }
-
-module.exports = getGraphId;

package/src/lib/getPreludeCode.js

@@ -1,5 +1,9 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = getPreludeCode;
 function getPreludeCode({
   extraVars,
   isDev,
@@ -15,14 +19,10 @@ function getPreludeCode({
   ];
   if (isDev) {
     vars.push(
-      `${globalPrefix}__requireCycleIgnorePatterns=[${requireCycleIgnorePatterns
-        .map((regex) => regex.toString())
-        .join(",")}]`
+      `${globalPrefix}__requireCycleIgnorePatterns=[${requireCycleIgnorePatterns.map((regex) => regex.toString()).join(",")}]`,
     );
   }
-  return `var ${vars.join(",")};${processEnv(
-    isDev ? "development" : "production"
-  )}`;
+  return `var ${vars.join(",")};${processEnv(isDev ? "development" : "production")}`;
 }
 const excluded = new Set(["__BUNDLE_START_TIME__", "__DEV__", "process"]);
 function formatExtraVars(extraVars) {
@@ -35,8 +35,5 @@ function formatExtraVars(extraVars) {
   return assignments;
 }
 function processEnv(nodeEnv) {
-  return `process.env=process.env||{};process.env.NODE_ENV=process.env.NODE_ENV||${JSON.stringify(
-    nodeEnv
-  )};`;
+  return `process.env=process.env||{};process.env.NODE_ENV=process.env.NODE_ENV||${JSON.stringify(nodeEnv)};`;
 }
-module.exports = getPreludeCode;

package/src/lib/getPreludeCode.js.flow

@@ -9,9 +9,7 @@
  * @oncall react_native
  */
 
-'use strict';
-
-function getPreludeCode({
+export default function getPreludeCode({
   extraVars,
   isDev,
   globalPrefix,
@@ -54,7 +52,7 @@ function formatExtraVars(extraVars: ?{[string]: mixed, ...}): Array<string> {
 
   for (const key in extraVars) {
     if (extraVars.hasOwnProperty(key) && !excluded.has(key)) {
-      /* $FlowFixMe(>=0.95.0 site=react_native_fb) This comment suppresses an
+      /* $FlowFixMe[incompatible-type](>=0.95.0 site=react_native_fb) This comment suppresses an
        * error found when Flow v0.95 was deployed. To see the error, delete
        * this comment and run Flow. */
       assignments.push(`${key}=${JSON.stringify(extraVars[key])}`);
@@ -69,5 +67,3 @@ function processEnv(nodeEnv: string): string {
     nodeEnv,
   )};`;
 }
-
-module.exports = getPreludeCode;

package/src/lib/getPrependedScripts.js

@@ -1,23 +1,48 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = getPrependedScripts;
 var _CountingSet = _interopRequireDefault(require("./CountingSet"));
+var _countLines = _interopRequireDefault(require("./countLines"));
+var _getPreludeCode = _interopRequireDefault(require("./getPreludeCode"));
+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]);
+    }
+  return ((n.default = e), t && t.set(e, n), n);
+}
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
-const countLines = require("./countLines");
-const getPreludeCode = require("./getPreludeCode");
-const transformHelpers = require("./transformHelpers");
-const defaults = require("metro-config/private/defaults/defaults");
 async function getPrependedScripts(
   config,
   options,
   resolverOptions,
   bundler,
-  deltaBundler
+  deltaBundler,
 ) {
   const polyfillModuleNames = config.serializer
     .getPolyfills({
@@ -34,7 +59,7 @@ async function getPrependedScripts(
       resolve: await transformHelpers.getResolveDependencyFn(
         bundler,
         options.platform,
-        resolverOptions
+        resolverOptions,
       ),
       transform: await transformHelpers.getTransformFn(
         [defaults.moduleSystem, ...polyfillModuleNames],
@@ -42,7 +67,7 @@ async function getPrependedScripts(
         deltaBundler,
         config,
         transformOptions,
-        resolverOptions
+        resolverOptions,
       ),
       unstable_allowRequireContext:
         config.transformer.unstable_allowRequireContext,
@@ -52,7 +77,7 @@ async function getPrependedScripts(
       unstable_enablePackageExports:
         config.resolver.unstable_enablePackageExports,
       shallow: false,
-    }
+    },
   );
   return [
     _getPrelude({
@@ -64,7 +89,7 @@ async function getPrependedScripts(
   ];
 }
 function _getPrelude({ dev, globalPrefix, requireCycleIgnorePatterns }) {
-  const code = getPreludeCode({
+  const code = (0, _getPreludeCode.default)({
     isDev: dev,
     globalPrefix,
     requireCycleIgnorePatterns,
@@ -80,11 +105,10 @@ function _getPrelude({ dev, globalPrefix, requireCycleIgnorePatterns }) {
         type: "js/script/virtual",
         data: {
           code,
-          lineCount: countLines(code),
+          lineCount: (0, _countLines.default)(code),
           map: [],
         },
       },
     ],
   };
 }
-module.exports = getPrependedScripts;

package/src/lib/getPrependedScripts.js.flow

@@ -9,22 +9,19 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type Bundler from '../Bundler';
 import type DeltaBundler, {Module} from '../DeltaBundler';
-import type {TransformInputOptions} from '../DeltaBundler/types.flow';
-import type {ResolverInputOptions} from '../shared/types.flow';
-import type {ConfigT} from 'metro-config/private/configTypes.flow';
+import type {TransformInputOptions} from '../DeltaBundler/types';
+import type {ResolverInputOptions} from '../shared/types';
+import type {ConfigT} from 'metro-config';
 
 import CountingSet from './CountingSet';
+import countLines from './countLines';
+import getPreludeCode from './getPreludeCode';
+import * as transformHelpers from './transformHelpers';
+import * as defaults from 'metro-config/private/defaults/defaults';
 
-const countLines = require('./countLines');
-const getPreludeCode = require('./getPreludeCode');
-const transformHelpers = require('./transformHelpers');
-const defaults = require('metro-config/private/defaults/defaults');
-
-async function getPrependedScripts(
+export default async function getPrependedScripts(
   config: ConfigT,
   options: Omit<TransformInputOptions, 'type'>,
   resolverOptions: ResolverInputOptions,
@@ -115,5 +112,3 @@ function _getPrelude({
     ],
   };
 }
-
-module.exports = getPrependedScripts;

package/src/lib/isResolvedDependency.js.flow

@@ -9,7 +9,7 @@
  * @oncall react_native
  */
 
-import type {Dependency, ResolvedDependency} from '../DeltaBundler/types.flow';
+import type {Dependency, ResolvedDependency} from '../DeltaBundler/types';
 
 export function isResolvedDependency(
   dep: Dependency,