metro 0.83.0 → 0.83.2

package/src/IncrementalBundler.js

@@ -1,16 +1,52 @@
 "use strict";
 
-const Bundler = require("./Bundler");
-const DeltaBundler = require("./DeltaBundler");
-const ResourceNotFoundError = require("./IncrementalBundler/ResourceNotFoundError");
-const getGraphId = require("./lib/getGraphId");
-const getPrependedScripts = require("./lib/getPrependedScripts");
-const transformHelpers = require("./lib/transformHelpers");
-const crypto = require("crypto");
-const fs = require("fs");
-const path = require("path");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
+var _Bundler = _interopRequireDefault(require("./Bundler"));
+var _DeltaBundler = _interopRequireDefault(require("./DeltaBundler"));
+var _ResourceNotFoundError = _interopRequireDefault(
+  require("./IncrementalBundler/ResourceNotFoundError"),
+);
+var _getGraphId = _interopRequireDefault(require("./lib/getGraphId"));
+var _getPrependedScripts = _interopRequireDefault(
+  require("./lib/getPrependedScripts"),
+);
+var transformHelpers = _interopRequireWildcard(
+  require("./lib/transformHelpers"),
+);
+var _crypto = _interopRequireDefault(require("crypto"));
+var _fs = _interopRequireDefault(require("fs"));
+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]);
+    }
+  return ((n.default = e), t && t.set(e, n), n);
+}
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 function createRevisionId() {
-  return crypto.randomBytes(8).toString("hex");
+  return _crypto.default.randomBytes(8).toString("hex");
 }
 function revisionIdFromString(str) {
   return str;
@@ -21,8 +57,8 @@ class IncrementalBundler {
   static revisionIdFromString = revisionIdFromString;
   constructor(config, options) {
     this._config = config;
-    this._bundler = new Bundler(config, options);
-    this._deltaBundler = new DeltaBundler(this._bundler.getWatcher());
+    this._bundler = new _Bundler.default(config, options);
+    this._deltaBundler = new _DeltaBundler.default(this._bundler.getWatcher());
   }
   async end() {
     this._deltaBundler.end();
@@ -48,14 +84,14 @@ class IncrementalBundler {
       onProgress: null,
       shallow: false,
       lazy: false,
-    }
+    },
   ) {
     const absoluteEntryFiles = await this._getAbsoluteEntryFiles(entryFiles);
     const graph = await this._deltaBundler.buildGraph(absoluteEntryFiles, {
       resolve: await transformHelpers.getResolveDependencyFn(
         this._bundler,
         transformOptions.platform,
-        resolverOptions
+        resolverOptions,
       ),
       transform: await transformHelpers.getTransformFn(
         absoluteEntryFiles,
@@ -63,7 +99,7 @@ class IncrementalBundler {
         this._deltaBundler,
         this._config,
         transformOptions,
-        resolverOptions
+        resolverOptions,
       ),
       transformOptions,
       onProgress: otherOptions.onProgress,
@@ -90,7 +126,7 @@ class IncrementalBundler {
       onProgress: null,
       shallow: false,
       lazy: false,
-    }
+    },
   ) {
     const absoluteEntryFiles = await this._getAbsoluteEntryFiles(entryFiles);
     const dependencies = await this._deltaBundler.getDependencies(
@@ -99,7 +135,7 @@ class IncrementalBundler {
         resolve: await transformHelpers.getResolveDependencyFn(
           this._bundler,
           transformOptions.platform,
-          resolverOptions
+          resolverOptions,
         ),
         transform: await transformHelpers.getTransformFn(
           absoluteEntryFiles,
@@ -107,7 +143,7 @@ class IncrementalBundler {
           this._deltaBundler,
           this._config,
           transformOptions,
-          resolverOptions
+          resolverOptions,
         ),
         transformOptions,
         onProgress: otherOptions.onProgress,
@@ -117,7 +153,7 @@ class IncrementalBundler {
         unstable_enablePackageExports:
           this._config.resolver.unstable_enablePackageExports,
         shallow: otherOptions.shallow,
-      }
+      },
     );
     return dependencies;
   }
@@ -129,21 +165,21 @@ class IncrementalBundler {
       onProgress: null,
       shallow: false,
       lazy: false,
-    }
+    },
   ) {
     const graph = await this.buildGraphForEntries(
       [entryFile],
       transformOptions,
       resolverOptions,
-      otherOptions
+      otherOptions,
     );
     const { type: _, ...transformOptionsWithoutType } = transformOptions;
-    const prepend = await getPrependedScripts(
+    const prepend = await (0, _getPrependedScripts.default)(
       this._config,
       transformOptionsWithoutType,
       resolverOptions,
       this._bundler,
-      this._deltaBundler
+      this._deltaBundler,
     );
     return {
       prepend,
@@ -158,9 +194,9 @@ class IncrementalBundler {
       onProgress: null,
       shallow: false,
       lazy: false,
-    }
+    },
   ) {
-    const graphId = getGraphId(entryFile, transformOptions, {
+    const graphId = (0, _getGraphId.default)(entryFile, transformOptions, {
       resolverOptions,
       shallow: otherOptions.shallow,
       lazy: otherOptions.lazy,
@@ -173,7 +209,7 @@ class IncrementalBundler {
         entryFile,
         transformOptions,
         resolverOptions,
-        otherOptions
+        otherOptions,
       );
       return {
         id: revisionId,
@@ -217,7 +253,7 @@ class IncrementalBundler {
       this._revisionsById.delete(revision.id);
       revision = {
         ...revision,
-        id: crypto.randomBytes(8).toString("hex"),
+        id: _crypto.default.randomBytes(8).toString("hex"),
         date: new Date(),
       };
       const revisionPromise = Promise.resolve(revision);
@@ -241,24 +277,24 @@ class IncrementalBundler {
   }
   async _getAbsoluteEntryFiles(entryFiles) {
     const absoluteEntryFiles = entryFiles.map((entryFile) =>
-      path.resolve(
+      _path.default.resolve(
         this._config.server.unstable_serverRoot ?? this._config.projectRoot,
-        entryFile
-      )
+        entryFile,
+      ),
     );
     await Promise.all(
       absoluteEntryFiles.map(
         (entryFile) =>
           new Promise((resolve, reject) => {
-            fs.realpath(entryFile, (err) => {
+            _fs.default.realpath(entryFile, (err) => {
               if (err) {
-                reject(new ResourceNotFoundError(entryFile));
+                reject(new _ResourceNotFoundError.default(entryFile));
               } else {
                 resolve();
               }
             });
-          })
-      )
+          }),
+      ),
     );
     return absoluteEntryFiles;
   }
@@ -266,4 +302,4 @@ class IncrementalBundler {
     await this._bundler.ready();
   }
 }
-module.exports = IncrementalBundler;
+exports.default = IncrementalBundler;

package/src/IncrementalBundler.js.flow

@@ -9,27 +9,25 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type {DeltaResult, Graph, MixedOutput, Module} from './DeltaBundler';
 import type {
   Options as DeltaBundlerOptions,
   ReadOnlyDependencies,
   TransformInputOptions,
-} from './DeltaBundler/types.flow';
+} from './DeltaBundler/types';
 import type {GraphId} from './lib/getGraphId';
-import type {ResolverInputOptions} from './shared/types.flow';
+import type {ResolverInputOptions} from './shared/types';
 import type {ConfigT} from 'metro-config';
 
-const Bundler = require('./Bundler');
-const DeltaBundler = require('./DeltaBundler');
-const ResourceNotFoundError = require('./IncrementalBundler/ResourceNotFoundError');
-const getGraphId = require('./lib/getGraphId');
-const getPrependedScripts = require('./lib/getPrependedScripts');
-const transformHelpers = require('./lib/transformHelpers');
-const crypto = require('crypto');
-const fs = require('fs');
-const path = require('path');
+import Bundler from './Bundler';
+import DeltaBundler from './DeltaBundler';
+import ResourceNotFoundError from './IncrementalBundler/ResourceNotFoundError';
+import getGraphId from './lib/getGraphId';
+import getPrependedScripts from './lib/getPrependedScripts';
+import * as transformHelpers from './lib/transformHelpers';
+import crypto from 'crypto';
+import fs from 'fs';
+import path from 'path';
 
 export opaque type RevisionId: string = string;
 
@@ -63,7 +61,7 @@ function revisionIdFromString(str: string): RevisionId {
   return str;
 }
 
-class IncrementalBundler {
+export default class IncrementalBundler {
   _config: ConfigT;
   _bundler: Bundler;
   _deltaBundler: DeltaBundler<>;
@@ -366,5 +364,3 @@ class IncrementalBundler {
     await this._bundler.ready();
   }
 }
-
-module.exports = IncrementalBundler;

package/src/ModuleGraph/test-helpers.js

@@ -1,13 +1,24 @@
 "use strict";
 
-const generate = require("@babel/generator").default;
-const { toMatchSnapshot } = require("jest-snapshot");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.comparableCode = exports.codeFromAst = void 0;
+exports.toEqualComparableCode = toEqualComparableCode;
+exports.toMatchCodeFrameSnapshot = toMatchCodeFrameSnapshot;
+var _generator = _interopRequireDefault(require("@babel/generator"));
+var _jestSnapshot = require("jest-snapshot");
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 const generateOptions = {
   concise: true,
   sourceType: "module",
 };
-const codeFromAst = (ast) => generate(ast, generateOptions).code;
+const codeFromAst = (ast) => (0, _generator.default)(ast, generateOptions).code;
+exports.codeFromAst = codeFromAst;
 const comparableCode = (code) => code.trim().replace(/\s+/g, " ");
+exports.comparableCode = comparableCode;
 function toEqualComparableCode(received, expected) {
   const comparableExpected = comparableCode(expected);
   const pass = received === comparableExpected;
@@ -21,7 +32,7 @@ function toEqualComparableCode(received, expected) {
           "toEqualComparableCode",
           undefined,
           undefined,
-          options
+          options,
         ) +
         "\n\n" +
         `Expected: not ${this.utils.printExpected(comparableExpected)}\n` +
@@ -32,14 +43,14 @@ function toEqualComparableCode(received, expected) {
           received,
           "expected",
           "received",
-          this.expand
+          this.expand,
         );
         return (
           this.utils.matcherHint(
             "toEqualComparableCode",
             undefined,
             undefined,
-            options
+            options,
           ) +
           "\n\n" +
           diffString
@@ -56,15 +67,9 @@ function trimANSICodes(input) {
   return input.replace(ANSI_PATTERN, "");
 }
 function toMatchCodeFrameSnapshot(received) {
-  return toMatchSnapshot.call(
+  return _jestSnapshot.toMatchSnapshot.call(
     this,
     trimANSICodes(received),
-    "toMatchCodeFrameSnapshot"
+    "toMatchCodeFrameSnapshot",
   );
 }
-module.exports = {
-  codeFromAst,
-  comparableCode,
-  toEqualComparableCode,
-  toMatchCodeFrameSnapshot,
-};

package/src/ModuleGraph/worker/JsFileWrapping.js

@@ -1,5 +1,13 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.WRAP_NAME = void 0;
+exports.jsonToCommonJS = jsonToCommonJS;
+exports.wrapJson = wrapJson;
+exports.wrapModule = wrapModule;
+exports.wrapPolyfill = wrapPolyfill;
 var _template = _interopRequireDefault(require("@babel/template"));
 var _traverse = _interopRequireDefault(require("@babel/traverse"));
 var t = _interopRequireWildcard(require("@babel/types"));
@@ -15,32 +23,24 @@ function _getRequireWildcardCache(e) {
 function _interopRequireWildcard(e, r) {
   if (!r && e && e.__esModule) return e;
   if (null === e || ("object" != typeof e && "function" != typeof e))
-    return {
-      default: e,
-    };
+    return { default: e };
   var t = _getRequireWildcardCache(r);
   if (t && t.has(e)) return t.get(e);
-  var n = {
-      __proto__: null,
-    },
+  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;
+  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 WRAP_NAME = "$$_REQUIRE";
+const WRAP_NAME = (exports.WRAP_NAME = "$$_REQUIRE");
 const IIFE_PARAM = _template.default.expression(
-  "typeof globalThis !== 'undefined' ? globalThis : typeof global !== 'undefined' ? global : typeof window !== 'undefined' ? window : this"
+  "typeof globalThis !== 'undefined' ? globalThis : typeof global !== 'undefined' ? global : typeof window !== 'undefined' ? window : this",
 );
 function wrapModule(
   fileAst,
@@ -49,12 +49,12 @@ function wrapModule(
   dependencyMapName,
   globalPrefix,
   skipRequireRename,
-  { unstable_useStaticHermesModuleFactory = false } = {}
+  { unstable_useStaticHermesModuleFactory = false } = {},
 ) {
   const params = buildParameters(
     importDefaultName,
     importAllName,
-    dependencyMapName
+    dependencyMapName,
   );
   const factory = functionFromProgram(fileAst.program, params);
   const def = t.callExpression(t.identifier(`${globalPrefix}__d`), [
@@ -62,9 +62,9 @@ function wrapModule(
       ? t.callExpression(
           t.memberExpression(
             t.identifier("$SHBuiltin"),
-            t.identifier("moduleFactory")
+            t.identifier("moduleFactory"),
           ),
-          [t.identifier("_$$_METRO_MODULE_ID"), factory]
+          [t.identifier("_$$_METRO_MODULE_ID"), factory],
         )
       : factory,
   ]);
@@ -86,12 +86,12 @@ function jsonToCommonJS(source) {
 function wrapJson(
   source,
   globalPrefix,
-  unstable_useStaticHermesModuleFactory = false
+  unstable_useStaticHermesModuleFactory = false,
 ) {
   const moduleFactoryParameters = buildParameters(
     "_importDefaultUnused",
     "_importAllUnused",
-    "_dependencyMapUnused"
+    "_dependencyMapUnused",
   );
   const factory = [
     `function(${moduleFactoryParameters.join(", ")}) {`,
@@ -110,7 +110,7 @@ function functionFromProgram(program, parameters) {
   return t.functionExpression(
     undefined,
     parameters.map(makeIdentifier),
-    t.blockStatement(program.body, program.directives)
+    t.blockStatement(program.body, program.directives),
   );
 }
 function makeIdentifier(name) {
@@ -134,7 +134,7 @@ function renameRequires(ast) {
       const body = path.get("body.0.expression.arguments.0.body");
       (0, _invariant.default)(
         !Array.isArray(body),
-        "metro: Expected `body` to be a single path."
+        "metro: Expected `body` to be a single path.",
       );
       newRequireName = body.scope.generateUid(WRAP_NAME);
       body.scope.rename("require", newRequireName);
@@ -142,10 +142,3 @@ function renameRequires(ast) {
   });
   return newRequireName;
 }
-module.exports = {
-  WRAP_NAME,
-  wrapJson,
-  jsonToCommonJS,
-  wrapModule,
-  wrapPolyfill,
-};

package/src/ModuleGraph/worker/JsFileWrapping.js.flow

@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {FunctionExpression, Identifier, Program} from '@babel/types';
 
 import template from '@babel/template';
@@ -162,11 +160,4 @@ function renameRequires(ast: BabelNodeFile): string {
   return newRequireName;
 }
 
-module.exports = {
-  WRAP_NAME,
-
-  wrapJson,
-  jsonToCommonJS,
-  wrapModule,
-  wrapPolyfill,
-};
+export {WRAP_NAME, wrapJson, jsonToCommonJS, wrapModule, wrapPolyfill};