metro 0.83.0 → 0.83.2

package/src/DeltaBundler/Serializers/getRamBundleInfo.js

@@ -1,33 +1,47 @@
 "use strict";
 
-const { createRamBundleGroups } = require("../../Bundler/util");
-const getAppendScripts = require("../../lib/getAppendScripts");
-const getTransitiveDependencies = require("./helpers/getTransitiveDependencies");
-const { isJsModule, wrapModule } = require("./helpers/js");
-const { sourceMapObject } = require("./sourceMapObject");
-const nullthrows = require("nullthrows");
-const path = require("path");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = getRamBundleInfo;
+var _util = require("../../Bundler/util");
+var _getAppendScripts = _interopRequireDefault(
+  require("../../lib/getAppendScripts"),
+);
+var _getTransitiveDependencies = _interopRequireDefault(
+  require("./helpers/getTransitiveDependencies"),
+);
+var _js = require("./helpers/js");
+var _sourceMapObject = require("./sourceMapObject");
+var _nullthrows = _interopRequireDefault(require("nullthrows"));
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 async function getRamBundleInfo(entryPoint, pre, graph, options) {
   let modules = [...pre, ...graph.dependencies.values()];
-  modules = modules.concat(getAppendScripts(entryPoint, modules, options));
+  modules = modules.concat(
+    (0, _getAppendScripts.default)(entryPoint, modules, options),
+  );
   modules.forEach((module) => options.createModuleId(module.path));
   const ramModules = modules
-    .filter(isJsModule)
+    .filter(_js.isJsModule)
     .filter(options.processModuleFilter)
     .map((module) => ({
       id: options.createModuleId(module.path),
-      code: wrapModule(module, options),
-      map: sourceMapObject([module], {
+      code: (0, _js.wrapModule)(module, options),
+      map: (0, _sourceMapObject.sourceMapObject)([module], {
         excludeSource: options.excludeSource,
         processModuleFilter: options.processModuleFilter,
         shouldAddToIgnoreList: options.shouldAddToIgnoreList,
         getSourceUrl: options.getSourceUrl,
       }),
-      name: path.basename(module.path),
+      name: _path.default.basename(module.path),
       sourcePath: module.path,
       source: module.getSource().toString(),
-      type: nullthrows(module.output.find(({ type }) => type.startsWith("js")))
-        .type,
+      type: (0, _nullthrows.default)(
+        module.output.find(({ type }) => type.startsWith("js")),
+      ).type,
     }));
   const { preloadedModules, ramGroups } = await _getRamOptions(
     entryPoint,
@@ -35,8 +49,8 @@ async function getRamBundleInfo(entryPoint, pre, graph, options) {
       dev: options.dev,
       platform: options.platform,
     },
-    (filePath) => getTransitiveDependencies(filePath, graph),
-    options.getTransformOptions
+    (filePath) => (0, _getTransitiveDependencies.default)(filePath, graph),
+    options.getTransformOptions,
   );
   const startupModules = [];
   const lazyModules = [];
@@ -53,11 +67,14 @@ async function getRamBundleInfo(entryPoint, pre, graph, options) {
       lazyModules.push(module);
     }
   });
-  const groups = createRamBundleGroups(
+  const groups = (0, _util.createRamBundleGroups)(
     ramGroups,
     lazyModules,
     (module, dependenciesByPath) => {
-      const deps = getTransitiveDependencies(module.sourcePath, graph);
+      const deps = (0, _getTransitiveDependencies.default)(
+        module.sourcePath,
+        graph,
+      );
       const output = new Set();
       for (const dependency of deps) {
         const module = dependenciesByPath.get(dependency);
@@ -66,10 +83,11 @@ async function getRamBundleInfo(entryPoint, pre, graph, options) {
         }
       }
       return output;
-    }
+    },
   );
   return {
-    getDependencies: (filePath) => getTransitiveDependencies(filePath, graph),
+    getDependencies: (filePath) =>
+      (0, _getTransitiveDependencies.default)(filePath, graph),
     groups,
     lazyModules,
     startupModules,
@@ -79,7 +97,7 @@ async function _getRamOptions(
   entryFile,
   options,
   getDependencies,
-  getTransformOptions
+  getTransformOptions,
 ) {
   if (getTransformOptions == null) {
     return {
@@ -94,11 +112,10 @@ async function _getRamOptions(
       hot: true,
       platform: options.platform,
     },
-    async (x) => Array.from(getDependencies)
+    async (x) => Array.from(getDependencies),
   );
   return {
     preloadedModules: preloadedModules || {},
     ramGroups: ramGroups || [],
   };
 }
-module.exports = getRamBundleInfo;

package/src/DeltaBundler/Serializers/getRamBundleInfo.js.flow

@@ -9,23 +9,18 @@
  * @oncall react_native
  */
 
-'use strict';
-
-import type {
-  ModuleTransportLike,
-  RamModuleTransport,
-} from '../../shared/types.flow';
-import type {Module, ReadOnlyGraph, SerializerOptions} from '../types.flow';
+import type {ModuleTransportLike, RamModuleTransport} from '../../shared/types';
+import type {Module, ReadOnlyGraph, SerializerOptions} from '../types';
 import type {SourceMapGeneratorOptions} from './sourceMapGenerator';
 import type {GetTransformOptions} from 'metro-config';
 
-const {createRamBundleGroups} = require('../../Bundler/util');
-const getAppendScripts = require('../../lib/getAppendScripts');
-const getTransitiveDependencies = require('./helpers/getTransitiveDependencies');
-const {isJsModule, wrapModule} = require('./helpers/js');
-const {sourceMapObject} = require('./sourceMapObject');
-const nullthrows = require('nullthrows');
-const path = require('path');
+import {createRamBundleGroups} from '../../Bundler/util';
+import getAppendScripts from '../../lib/getAppendScripts';
+import getTransitiveDependencies from './helpers/getTransitiveDependencies';
+import {isJsModule, wrapModule} from './helpers/js';
+import {sourceMapObject} from './sourceMapObject';
+import nullthrows from 'nullthrows';
+import path from 'path';
 
 type Options = $ReadOnly<{
   ...SerializerOptions,
@@ -41,7 +36,7 @@ export type RamBundleInfo = {
   groups: Map<number, Set<number>>,
 };
 
-async function getRamBundleInfo(
+export default async function getRamBundleInfo(
   entryPoint: string,
   pre: $ReadOnlyArray<Module<>>,
   graph: ReadOnlyGraph<>,
@@ -162,7 +157,7 @@ async function _getRamOptions(
   const {preloadedModules, ramGroups} = await getTransformOptions(
     [entryFile],
     {dev: options.dev, hot: true, platform: options.platform},
-    /* $FlowFixMe(>=0.99.0 site=react_native_fb) This comment suppresses an
+    /* $FlowFixMe[incompatible-type](>=0.99.0 site=react_native_fb) This comment suppresses an
      * error found when Flow v0.99 was deployed. To see the error, delete this
      * comment and run Flow. */
     async (x: string) => Array.from(getDependencies),
@@ -174,5 +169,3 @@ async function _getRamOptions(
     ramGroups: ramGroups || [],
   };
 }
-
-module.exports = getRamBundleInfo;

package/src/DeltaBundler/Serializers/helpers/getInlineSourceMappingURL.js

@@ -1,7 +1,10 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = getInlineSourceMappingURL;
 function getInlineSourceMappingURL(sourceMap) {
   const base64 = Buffer.from(sourceMap).toString("base64");
   return `data:application/json;charset=utf-8;base64,${base64}`;
 }
-module.exports = getInlineSourceMappingURL;

package/src/DeltaBundler/Serializers/helpers/getInlineSourceMappingURL.js.flow

@@ -9,11 +9,7 @@
  * @oncall react_native
  */
 
-'use strict';
-
-function getInlineSourceMappingURL(sourceMap: string): string {
+export default function getInlineSourceMappingURL(sourceMap: string): string {
   const base64 = Buffer.from(sourceMap).toString('base64');
   return `data:application/json;charset=utf-8;base64,${base64}`;
 }
-
-module.exports = getInlineSourceMappingURL;

package/src/DeltaBundler/Serializers/helpers/getSourceMapInfo.js

@@ -1,18 +1,21 @@
 "use strict";
 
-const { getJsOutput } = require("./js");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = getSourceMapInfo;
+var _js = require("./js");
 function getSourceMapInfo(module, options) {
   return {
-    ...getJsOutput(module).data,
+    ...(0, _js.getJsOutput)(module).data,
     isIgnored: options.shouldAddToIgnoreList(module),
     path: options?.getSourceUrl?.(module) ?? module.path,
     source: options.excludeSource ? "" : getModuleSource(module),
   };
 }
 function getModuleSource(module) {
-  if (getJsOutput(module).type === "js/module/asset") {
+  if ((0, _js.getJsOutput)(module).type === "js/module/asset") {
     return "";
   }
   return module.getSource().toString();
 }
-module.exports = getSourceMapInfo;

package/src/DeltaBundler/Serializers/helpers/getSourceMapInfo.js.flow

@@ -9,17 +9,15 @@
  * @oncall react_native
  */
 
-'use strict';
-
-import type {Module} from '../../types.flow';
+import type {Module} from '../../types';
 import type {
   FBSourceFunctionMap,
   MetroSourceMapSegmentTuple,
 } from 'metro-source-map';
 
-const {getJsOutput} = require('./js');
+import {getJsOutput} from './js';
 
-function getSourceMapInfo(
+export default function getSourceMapInfo(
   module: Module<>,
   options: {
     +excludeSource: boolean,
@@ -50,5 +48,3 @@ function getModuleSource(module: Module<>): string {
 
   return module.getSource().toString();
 }
-
-module.exports = getSourceMapInfo;

package/src/DeltaBundler/Serializers/helpers/getTransitiveDependencies.js

@@ -1,5 +1,9 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = getTransitiveDependencies;
 var _isResolvedDependency = require("../../../lib/isResolvedDependency");
 function getTransitiveDependencies(path, graph) {
   const dependencies = _getDeps(path, graph, new Set());
@@ -22,4 +26,3 @@ function _getDeps(path, graph, deps) {
   }
   return deps;
 }
-module.exports = getTransitiveDependencies;

package/src/DeltaBundler/Serializers/helpers/getTransitiveDependencies.js.flow

@@ -9,13 +9,11 @@
  * @oncall react_native
  */
 
-'use strict';
-
-import type {ReadOnlyGraph} from '../../types.flow';
+import type {ReadOnlyGraph} from '../../types';
 
 import {isResolvedDependency} from '../../../lib/isResolvedDependency';
 
-function getTransitiveDependencies<T>(
+export default function getTransitiveDependencies<T>(
   path: string,
   graph: ReadOnlyGraph<T>,
 ): Set<string> {
@@ -53,5 +51,3 @@ function _getDeps<T>(
 
   return deps;
 }
-
-module.exports = getTransitiveDependencies;

package/src/DeltaBundler/Serializers/helpers/js.js

@@ -1,17 +1,54 @@
 "use strict";
 
-const { isResolvedDependency } = require("../../../lib/isResolvedDependency");
-const invariant = require("invariant");
-const jscSafeUrl = require("jsc-safe-url");
-const { addParamsToDefineCall } = require("metro-transform-plugins");
-const path = require("path");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.getJsOutput = getJsOutput;
+exports.getModuleParams = getModuleParams;
+exports.isJsModule = isJsModule;
+exports.wrapModule = wrapModule;
+var _isResolvedDependency = require("../../../lib/isResolvedDependency");
+var _pathUtils = require("../../../lib/pathUtils");
+var _invariant = _interopRequireDefault(require("invariant"));
+var jscSafeUrl = _interopRequireWildcard(require("jsc-safe-url"));
+var _metroTransformPlugins = require("metro-transform-plugins");
+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 wrapModule(module, options) {
   const output = getJsOutput(module);
   if (output.type.startsWith("js/script")) {
     return output.data.code;
   }
   const params = getModuleParams(module, options);
-  return addParamsToDefineCall(output.data.code, ...params);
+  return (0, _metroTransformPlugins.addParamsToDefineCall)(
+    output.data.code,
+    ...params,
+  );
 }
 function getModuleParams(module, options) {
   const moduleId = options.createModuleId(module.path);
@@ -19,36 +56,39 @@ function getModuleParams(module, options) {
   let hasPaths = false;
   const dependencyMapArray = Array.from(module.dependencies.values()).map(
     (dependency) => {
-      if (!isResolvedDependency(dependency)) {
+      if (!(0, _isResolvedDependency.isResolvedDependency)(dependency)) {
         return null;
       }
       const id = options.createModuleId(dependency.absolutePath);
       if (options.includeAsyncPaths && dependency.data.data.asyncType != null) {
         hasPaths = true;
-        invariant(
+        (0, _invariant.default)(
           options.sourceUrl != null,
-          "sourceUrl is required when includeAsyncPaths is true"
+          "sourceUrl is required when includeAsyncPaths is true",
         );
         const { searchParams } = new URL(
-          jscSafeUrl.toNormalUrl(options.sourceUrl)
+          jscSafeUrl.toNormalUrl(options.sourceUrl),
         );
         searchParams.set("modulesOnly", "true");
         searchParams.set("runModule", "false");
-        const bundlePath = path.relative(
+        const bundlePath = _path.default.relative(
           options.serverRoot,
-          dependency.absolutePath
+          dependency.absolutePath,
         );
         paths[id] =
           "/" +
-          path.join(
-            path.dirname(bundlePath),
-            path.basename(bundlePath, path.extname(bundlePath))
+          _path.default.join(
+            _path.default.dirname(bundlePath),
+            _path.default.basename(
+              bundlePath,
+              _path.default.extname(bundlePath),
+            ),
           ) +
           ".bundle?" +
           searchParams.toString();
       }
       return id;
-    }
+    },
   );
   const params = [
     moduleId,
@@ -60,24 +100,24 @@ function getModuleParams(module, options) {
       : dependencyMapArray,
   ];
   if (options.dev) {
-    params.push(path.relative(options.projectRoot, module.path));
+    params.push(
+      (0, _pathUtils.normalizePathSeparatorsToPosix)(
+        _path.default.relative(options.projectRoot, module.path),
+      ),
+    );
   }
   return params;
 }
 function getJsOutput(module) {
   const jsModules = module.output.filter(({ type }) => type.startsWith("js/"));
-  invariant(
+  (0, _invariant.default)(
     jsModules.length === 1,
-    `Modules must have exactly one JS output, but ${
-      module.path ?? "unknown module"
-    } has ${jsModules.length} JS outputs.`
+    `Modules must have exactly one JS output, but ${module.path ?? "unknown module"} has ${jsModules.length} JS outputs.`,
   );
   const jsOutput = jsModules[0];
-  invariant(
+  (0, _invariant.default)(
     Number.isFinite(jsOutput.data.lineCount),
-    `JS output must populate lineCount, but ${
-      module.path ?? "unknown module"
-    } has ${jsOutput.type} output with lineCount '${jsOutput.data.lineCount}'`
+    `JS output must populate lineCount, but ${module.path ?? "unknown module"} has ${jsOutput.type} output with lineCount '${jsOutput.data.lineCount}'`,
   );
   return jsOutput;
 }
@@ -87,9 +127,3 @@ function isJsModule(module) {
 function isJsOutput(output) {
   return output.type.startsWith("js/");
 }
-module.exports = {
-  getJsOutput,
-  getModuleParams,
-  isJsModule,
-  wrapModule,
-};

package/src/DeltaBundler/Serializers/helpers/js.js.flow

@@ -9,16 +9,15 @@
  * @oncall react_native
  */
 
-'use strict';
-
-import type {MixedOutput, Module} from '../../types.flow';
+import type {MixedOutput, Module} from '../../types';
 import type {JsOutput} from 'metro-transform-worker';
 
-const {isResolvedDependency} = require('../../../lib/isResolvedDependency');
-const invariant = require('invariant');
-const jscSafeUrl = require('jsc-safe-url');
-const {addParamsToDefineCall} = require('metro-transform-plugins');
-const path = require('path');
+import {isResolvedDependency} from '../../../lib/isResolvedDependency';
+import {normalizePathSeparatorsToPosix} from '../../../lib/pathUtils';
+import invariant from 'invariant';
+import * as jscSafeUrl from 'jsc-safe-url';
+import {addParamsToDefineCall} from 'metro-transform-plugins';
+import path from 'path';
 
 export type Options = $ReadOnly<{
   createModuleId: string => number | string,
@@ -30,7 +29,7 @@ export type Options = $ReadOnly<{
   ...
 }>;
 
-function wrapModule(module: Module<>, options: Options): string {
+export function wrapModule(module: Module<>, options: Options): string {
   const output = getJsOutput(module);
 
   if (output.type.startsWith('js/script')) {
@@ -41,7 +40,10 @@ function wrapModule(module: Module<>, options: Options): string {
   return addParamsToDefineCall(output.data.code, ...params);
 }
 
-function getModuleParams(module: Module<>, options: Options): Array<mixed> {
+export function getModuleParams(
+  module: Module<>,
+  options: Options,
+): Array<mixed> {
   const moduleId = options.createModuleId(module.path);
 
   const paths: {[moduleID: number | string]: mixed} = {};
@@ -79,6 +81,7 @@ function getModuleParams(module: Module<>, options: Options): Array<mixed> {
         paths[id] =
           '/' +
           path.join(
+            // TODO: This is not the proper Metro URL encoding of a file path
             path.dirname(bundlePath),
             // Strip the file extension
             path.basename(bundlePath, path.extname(bundlePath)),
@@ -94,7 +97,7 @@ function getModuleParams(module: Module<>, options: Options): Array<mixed> {
     moduleId,
     hasPaths
       ? {
-          // $FlowIgnore[not-an-object] Intentionally spreading an array into an object
+          // $FlowFixMe[not-an-object] Intentionally spreading an array into an object
           ...dependencyMapArray,
           paths,
         }
@@ -104,13 +107,17 @@ function getModuleParams(module: Module<>, options: Options): Array<mixed> {
   if (options.dev) {
     // Add the relative path of the module to make debugging easier.
     // This is mapped to `module.verboseName` in `require.js`.
-    params.push(path.relative(options.projectRoot, module.path));
+    params.push(
+      normalizePathSeparatorsToPosix(
+        path.relative(options.projectRoot, module.path),
+      ),
+    );
   }
 
   return params;
 }
 
-function getJsOutput(
+export function getJsOutput(
   module: $ReadOnly<{
     output: $ReadOnlyArray<MixedOutput>,
     path?: string,
@@ -138,17 +145,10 @@ function getJsOutput(
   return jsOutput;
 }
 
-function isJsModule(module: Module<>): boolean {
+export function isJsModule(module: Module<>): boolean {
   return module.output.filter(isJsOutput).length > 0;
 }
 
 function isJsOutput(output: MixedOutput): boolean {
   return output.type.startsWith('js/');
 }
-
-module.exports = {
-  getJsOutput,
-  getModuleParams,
-  isJsModule,
-  wrapModule,
-};

package/src/DeltaBundler/Serializers/helpers/processModules.js

@@ -1,6 +1,10 @@
 "use strict";
 
-const { isJsModule, wrapModule } = require("./js");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = processModules;
+var _js = require("./js");
 function processModules(
   modules,
   {
@@ -11,14 +15,14 @@ function processModules(
     projectRoot,
     serverRoot,
     sourceUrl,
-  }
+  },
 ) {
   return [...modules]
-    .filter(isJsModule)
+    .filter(_js.isJsModule)
     .filter(filter)
     .map((module) => [
       module,
-      wrapModule(module, {
+      (0, _js.wrapModule)(module, {
         createModuleId,
         dev,
         includeAsyncPaths,
@@ -28,4 +32,3 @@ function processModules(
       }),
     ]);
 }
-module.exports = processModules;

package/src/DeltaBundler/Serializers/helpers/processModules.js.flow

@@ -9,13 +9,11 @@
  * @oncall react_native
  */
 
-'use strict';
+import type {Module} from '../../types';
 
-import type {Module} from '../../types.flow';
+import {isJsModule, wrapModule} from './js';
 
-const {isJsModule, wrapModule} = require('./js');
-
-function processModules(
+export default function processModules(
   modules: $ReadOnlyArray<Module<>>,
   {
     filter = () => true,
@@ -50,5 +48,3 @@ function processModules(
       }),
     ]);
 }
-
-module.exports = processModules;