metro 0.83.0 → 0.83.2

package/src/shared/output/RamBundle/as-indexed-file.js

@@ -1,13 +1,26 @@
 "use strict";
 
-const relativizeSourceMapInline = require("../../../lib/relativizeSourceMap");
-const buildSourcemapWithMetadata = require("./buildSourcemapWithMetadata");
-const MAGIC_UNBUNDLE_FILE_HEADER = require("./magic-number");
-const { joinModules } = require("./util");
-const writeSourceMap = require("./write-sourcemap");
-const fs = require("fs");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.buildTableAndContents = buildTableAndContents;
+exports.createModuleGroups = createModuleGroups;
+exports.save = save;
+var _relativizeSourceMap = _interopRequireDefault(
+  require("../../../lib/relativizeSourceMap"),
+);
+var _buildSourcemapWithMetadata = _interopRequireDefault(
+  require("./buildSourcemapWithMetadata"),
+);
+var _magicNumber = _interopRequireDefault(require("./magic-number"));
+var _util = require("./util");
+var _writeSourcemap = _interopRequireDefault(require("./write-sourcemap"));
+var _fs = _interopRequireDefault(require("fs"));
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 const SIZEOF_UINT32 = 4;
-function saveAsIndexedFile(bundle, options, log) {
+function save(bundle, options, log) {
   const {
     bundleOutput,
     bundleEncoding: encoding,
@@ -18,26 +31,26 @@ function saveAsIndexedFile(bundle, options, log) {
   const { startupModules, lazyModules, groups } = bundle;
   log("finish");
   const moduleGroups = createModuleGroups(groups, lazyModules);
-  const startupCode = joinModules(startupModules);
+  const startupCode = (0, _util.joinModules)(startupModules);
   log("Writing unbundle output to:", bundleOutput);
   const writeUnbundle = writeBuffers(
-    fs.createWriteStream(bundleOutput),
-    buildTableAndContents(startupCode, lazyModules, moduleGroups, encoding)
+    _fs.default.createWriteStream(bundleOutput),
+    buildTableAndContents(startupCode, lazyModules, moduleGroups, encoding),
   ).then(() => log("Done writing unbundle output"));
   if (sourcemapOutput) {
-    const sourceMap = buildSourcemapWithMetadata({
+    const sourceMap = (0, _buildSourcemapWithMetadata.default)({
       startupModules: startupModules.concat(),
       lazyModules: lazyModules.concat(),
       moduleGroups,
       fixWrapperOffset: true,
     });
     if (sourcemapSourcesRoot != null) {
-      relativizeSourceMapInline(sourceMap, sourcemapSourcesRoot);
+      (0, _relativizeSourceMap.default)(sourceMap, sourcemapSourcesRoot);
     }
-    const wroteSourceMap = writeSourceMap(
+    const wroteSourceMap = (0, _writeSourcemap.default)(
       sourcemapOutput,
       JSON.stringify(sourceMap),
-      log
+      log,
     );
     return Promise.all([writeUnbundle, wroteSourceMap]);
   } else {
@@ -45,7 +58,7 @@ function saveAsIndexedFile(bundle, options, log) {
   }
 }
 const fileHeader = Buffer.alloc(4);
-fileHeader.writeUInt32LE(MAGIC_UNBUNDLE_FILE_HEADER, 0);
+fileHeader.writeUInt32LE(_magicNumber.default, 0);
 const nullByteBuffer = Buffer.alloc(1).fill(0);
 function writeBuffers(stream, buffers) {
   buffers.forEach((buffer) => stream.write(buffer));
@@ -98,7 +111,7 @@ function groupCode(rootCode, moduleGroup, modulesById) {
         modulesById.get(id) || {
           code: "",
         }
-      ).code
+      ).code,
     );
   }
   return code.join("\n");
@@ -110,8 +123,8 @@ function buildModuleBuffers(modules, moduleGroups, encoding) {
       moduleToBuffer(
         id,
         groupCode(code, moduleGroups.groups.get(id), moduleGroups.modulesById),
-        encoding
-      )
+        encoding,
+      ),
     );
 }
 function buildTableAndContents(startupCode, modules, moduleGroups, encoding) {
@@ -120,10 +133,10 @@ function buildTableAndContents(startupCode, modules, moduleGroups, encoding) {
   const table = buildModuleTable(
     startupCodeBuffer,
     moduleBuffers,
-    moduleGroups
+    moduleGroups,
   );
   return [fileHeader, table, startupCodeBuffer].concat(
-    moduleBuffers.map(({ buffer }) => buffer)
+    moduleBuffers.map(({ buffer }) => buffer),
   );
 }
 function createModuleGroups(groups, modules) {
@@ -138,6 +151,3 @@ function* concat(iterators) {
     yield* it;
   }
 }
-exports.save = saveAsIndexedFile;
-exports.buildTableAndContents = buildTableAndContents;
-exports.createModuleGroups = createModuleGroups;

package/src/shared/output/RamBundle/as-indexed-file.js.flow

@@ -9,22 +9,20 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type {RamBundleInfo} from '../../../DeltaBundler/Serializers/getRamBundleInfo';
 import type {
   ModuleGroups,
   ModuleTransportLike,
   OutputOptions,
-} from '../../types.flow';
+} from '../../types';
 import type {WriteStream} from 'fs';
 
-const relativizeSourceMapInline = require('../../../lib/relativizeSourceMap');
-const buildSourcemapWithMetadata = require('./buildSourcemapWithMetadata');
-const MAGIC_UNBUNDLE_FILE_HEADER = require('./magic-number');
-const {joinModules} = require('./util');
-const writeSourceMap = require('./write-sourcemap');
-const fs = require('fs');
+import relativizeSourceMapInline from '../../../lib/relativizeSourceMap';
+import buildSourcemapWithMetadata from './buildSourcemapWithMetadata';
+import MAGIC_UNBUNDLE_FILE_HEADER from './magic-number';
+import {joinModules} from './util';
+import writeSourceMap from './write-sourcemap';
+import fs from 'fs';
 
 const SIZEOF_UINT32 = 4;
 
@@ -35,7 +33,7 @@ const SIZEOF_UINT32 = 4;
  * The module id for the startup code (prelude, polyfills etc.) is the
  * empty string.
  */
-function saveAsIndexedFile(
+export function save(
   bundle: RamBundleInfo,
   options: OutputOptions,
   log: (...args: Array<string>) => void,
@@ -217,7 +215,7 @@ function buildModuleBuffers(
     );
 }
 
-function buildTableAndContents(
+export function buildTableAndContents(
   startupCode: string,
   modules: $ReadOnlyArray<ModuleTransportLike>,
   moduleGroups: ModuleGroups,
@@ -242,7 +240,7 @@ function buildTableAndContents(
   );
 }
 
-function createModuleGroups(
+export function createModuleGroups(
   groups: Map<number, Set<number>>,
   modules: $ReadOnlyArray<ModuleTransportLike>,
 ): ModuleGroups {
@@ -260,7 +258,3 @@ function* concat(
     yield* it;
   }
 }
-
-exports.save = saveAsIndexedFile;
-exports.buildTableAndContents = buildTableAndContents;
-exports.createModuleGroups = createModuleGroups;

package/src/shared/output/RamBundle/buildSourcemapWithMetadata.js

@@ -1,11 +1,11 @@
 "use strict";
 
-const {
-  combineSourceMaps,
-  combineSourceMapsAddingOffsets,
-  joinModules,
-} = require("./util");
-module.exports = ({
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
+var _util = require("./util");
+var _default = ({
   fixWrapperOffset,
   lazyModules,
   moduleGroups,
@@ -17,9 +17,9 @@ module.exports = ({
       }
     : undefined;
   const startupModule = {
-    code: joinModules(startupModules),
+    code: (0, _util.joinModules)(startupModules),
     id: Number.MIN_SAFE_INTEGER,
-    map: combineSourceMaps(startupModules, undefined, options),
+    map: (0, _util.combineSourceMaps)(startupModules, undefined, options),
     sourcePath: "",
   };
   const module_paths = [];
@@ -29,14 +29,15 @@ module.exports = ({
   lazyModules.forEach((m) => {
     module_paths[m.id] = m.sourcePath;
   });
-  const map = combineSourceMapsAddingOffsets(
+  const map = (0, _util.combineSourceMapsAddingOffsets)(
     [startupModule].concat(lazyModules),
     module_paths,
     moduleGroups,
-    options
+    options,
   );
   if (map.x_facebook_offsets != null) {
     delete map.x_facebook_offsets[Number.MIN_SAFE_INTEGER];
   }
   return map;
 };
+exports.default = _default;

package/src/shared/output/RamBundle/buildSourcemapWithMetadata.js.flow

@@ -9,16 +9,14 @@
  * @oncall react_native
  */
 
-'use strict';
-
-import type {ModuleGroups, ModuleTransportLike} from '../../types.flow';
+import type {ModuleGroups, ModuleTransportLike} from '../../types';
 import type {IndexMap} from 'metro-source-map';
 
-const {
+import {
   combineSourceMaps,
   combineSourceMapsAddingOffsets,
   joinModules,
-} = require('./util');
+} from './util';
 
 type Params = {
   fixWrapperOffset: boolean,
@@ -27,7 +25,7 @@ type Params = {
   startupModules: $ReadOnlyArray<ModuleTransportLike>,
 };
 
-module.exports = (({
+export default (({
   fixWrapperOffset,
   lazyModules,
   moduleGroups,

package/src/shared/output/RamBundle/magic-number.js

@@ -1,3 +1,7 @@
 "use strict";
 
-module.exports = 0xfb0bd1e5;
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
+var _default = (exports.default = 0xfb0bd1e5);

package/src/shared/output/RamBundle/magic-number.js.flow

@@ -9,6 +9,4 @@
  * @oncall react_native
  */
 
-'use strict';
-
-module.exports = 0xfb0bd1e5;
+export default 0xfb0bd1e5;

package/src/shared/output/RamBundle/util.js

@@ -1,14 +1,23 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.combineSourceMaps = combineSourceMaps;
+exports.combineSourceMapsAddingOffsets = combineSourceMapsAddingOffsets;
+Object.defineProperty(exports, "countLines", {
+  enumerable: true,
+  get: function () {
+    return _countLines.default;
+  },
+});
+exports.joinModules = void 0;
+exports.lineToLineSourceMap = lineToLineSourceMap;
 var _countLines = _interopRequireDefault(require("../../../lib/countLines"));
+var _invariant = _interopRequireDefault(require("invariant"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
-const invariant = require("invariant");
 function lineToLineSourceMap(source, filename = "") {
   const firstLine = "AAAA;";
   const line = "AACA;";
@@ -39,14 +48,14 @@ function combineSourceMapsAddingOffsets(
   modules,
   x_metro_module_paths,
   moduleGroups,
-  options
+  options,
 ) {
   const x_facebook_offsets = [];
   const sections = combineMaps(
     modules,
     x_facebook_offsets,
     moduleGroups,
-    options
+    options,
   );
   return {
     sections,
@@ -81,12 +90,12 @@ function combineMaps(modules, offsets, moduleGroups, options) {
       }
       column = options && options.fixWrapperOffset ? wrapperEnd(code) : 0;
     }
-    invariant(
+    (0, _invariant.default)(
       !Array.isArray(map),
-      "Random Access Bundle source maps cannot be built from raw mappings"
+      "Random Access Bundle source maps cannot be built from raw mappings",
     );
     sections.push(
-      Section(line, column, map || lineToLineSourceMap(code, name))
+      Section(line, column, map || lineToLineSourceMap(code, name)),
     );
     if (offsets != null && id != null) {
       offsets[id] = line;
@@ -99,10 +108,4 @@ function combineMaps(modules, offsets, moduleGroups, options) {
   return sections;
 }
 const joinModules = (modules) => modules.map((m) => m.code).join("\n");
-module.exports = {
-  combineSourceMaps,
-  combineSourceMapsAddingOffsets,
-  countLines: _countLines.default,
-  joinModules,
-  lineToLineSourceMap,
-};
+exports.joinModules = joinModules;

package/src/shared/output/RamBundle/util.js.flow

@@ -9,9 +9,7 @@
  * @oncall react_native
  */
 
-'use strict';
-
-import type {ModuleGroups, ModuleTransportLike} from '../../types.flow';
+import type {ModuleGroups, ModuleTransportLike} from '../../types';
 import type {
   BasicSourceMap,
   IndexMap,
@@ -20,8 +18,7 @@ import type {
 } from 'metro-source-map';
 
 import countLines from '../../../lib/countLines';
-
-const invariant = require('invariant');
+import invariant from 'invariant';
 
 function lineToLineSourceMap(
   source: string,
@@ -123,6 +120,7 @@ function combineMaps(
     sections.push(
       /* $FlowFixMe[incompatible-exact] Natural Inference rollout. See
        * https://fburl.com/gdoc/y8dn025u */
+      // $FlowFixMe[incompatible-type]
       Section(line, column, map || lineToLineSourceMap(code, name)),
     );
     if (offsets != null && id != null) {
@@ -140,7 +138,7 @@ function combineMaps(
 const joinModules = (modules: $ReadOnlyArray<{+code: string, ...}>): string =>
   modules.map((m: {+code: string, ...}) => m.code).join('\n');
 
-module.exports = {
+export {
   combineSourceMaps,
   combineSourceMapsAddingOffsets,
   countLines,

package/src/shared/output/RamBundle/write-sourcemap.js

@@ -1,13 +1,19 @@
 "use strict";
 
-const writeFile = require("../writeFile");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = writeSourcemap;
+var _writeFile = _interopRequireDefault(require("../writeFile"));
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 function writeSourcemap(fileName, contents, log) {
   if (!fileName) {
     return Promise.resolve();
   }
   log("Writing sourcemap output to:", fileName);
-  const writeMap = writeFile(fileName, contents);
+  const writeMap = (0, _writeFile.default)(fileName, contents);
   writeMap.then(() => log("Done writing sourcemap output"));
   return writeMap;
 }
-module.exports = writeSourcemap;

package/src/shared/output/RamBundle/write-sourcemap.js.flow

@@ -9,11 +9,9 @@
  * @oncall react_native
  */
 
-'use strict';
+import writeFile from '../writeFile';
 
-const writeFile = require('../writeFile');
-
-function writeSourcemap(
+export default function writeSourcemap(
   fileName: string,
   contents: string,
   log: (...args: Array<string>) => void,
@@ -27,5 +25,3 @@ function writeSourcemap(
   writeMap.then(() => log('Done writing sourcemap output'));
   return writeMap;
 }
-
-module.exports = writeSourcemap;

package/src/shared/output/RamBundle.js

@@ -1,20 +1,27 @@
 "use strict";
 
-const Server = require("../../Server");
-const asAssets = require("./RamBundle/as-assets");
-const asIndexedFile = require("./RamBundle/as-indexed-file").save;
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.build = build;
+exports.formatName = void 0;
+exports.save = save;
+var _Server = _interopRequireDefault(require("../../Server"));
+var _asAssets = _interopRequireDefault(require("./RamBundle/as-assets"));
+var _asIndexedFile = require("./RamBundle/as-indexed-file");
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 async function build(packagerClient, requestOptions) {
   const options = {
-    ...Server.DEFAULT_BUNDLE_OPTIONS,
+    ..._Server.default.DEFAULT_BUNDLE_OPTIONS,
     ...requestOptions,
   };
   return await packagerClient.getRamBundleInfo(options);
 }
 function save(bundle, options, log) {
   return options.platform === "android" && !(options.indexedRamBundle === true)
-    ? asAssets(bundle, options, log)
-    : asIndexedFile(bundle, options, log);
+    ? (0, _asAssets.default)(bundle, options, log)
+    : (0, _asIndexedFile.save)(bundle, options, log);
 }
-exports.build = build;
-exports.save = save;
-exports.formatName = "bundle";
+const formatName = (exports.formatName = "bundle");

package/src/shared/output/RamBundle.js.flow

@@ -9,16 +9,14 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type {RamBundleInfo} from '../../DeltaBundler/Serializers/getRamBundleInfo';
-import type {OutputOptions, RequestOptions} from '../types.flow';
+import type {OutputOptions, RequestOptions} from '../types';
 
-const Server = require('../../Server');
-const asAssets = require('./RamBundle/as-assets');
-const asIndexedFile = require('./RamBundle/as-indexed-file').save;
+import Server from '../../Server';
+import asAssets from './RamBundle/as-assets';
+import {save as asIndexedFile} from './RamBundle/as-indexed-file';
 
-async function build(
+export async function build(
   packagerClient: Server,
   requestOptions: RequestOptions,
 ): Promise<RamBundleInfo> {
@@ -26,12 +24,12 @@ async function build(
     ...Server.DEFAULT_BUNDLE_OPTIONS,
     ...requestOptions,
   };
-  /* $FlowFixMe[incompatible-call] Natural Inference rollout. See
+  /* $FlowFixMe[incompatible-type] Natural Inference rollout. See
    * https://fburl.com/gdoc/y8dn025u */
   return await packagerClient.getRamBundleInfo(options);
 }
 
-function save(
+export function save(
   bundle: RamBundleInfo,
   options: OutputOptions,
   log: (x: string) => void,
@@ -44,6 +42,4 @@ function save(
     : asIndexedFile(bundle, options, log);
 }
 
-exports.build = build;
-exports.save = save;
-exports.formatName = 'bundle';
+export const formatName = 'bundle';

package/src/shared/output/bundle.flow.js

@@ -1,23 +1,49 @@
 "use strict";
 
-const relativizeSourceMapInline = require("../../lib/relativizeSourceMap");
-const Server = require("../../Server");
-const writeFile = require("./writeFile");
-function buildBundle(packagerClient, requestOptions, buildOptions = {}) {
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.build = build;
+exports.formatName = void 0;
+exports.save = save;
+var _relativizeSourceMap = _interopRequireDefault(
+  require("../../lib/relativizeSourceMap"),
+);
+var _Server = _interopRequireDefault(require("../../Server"));
+var _writeFile = _interopRequireDefault(require("./writeFile"));
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
+const DEFAULTS = _Server.default.DEFAULT_BUNDLE_OPTIONS;
+function build(packagerClient, requestOptions, buildOptions = {}) {
   return packagerClient.build(
     {
-      ...Server.DEFAULT_BUNDLE_OPTIONS,
+      ...DEFAULTS,
       ...requestOptions,
+      ...{
+        customResolverOptions:
+          requestOptions.customResolverOptions ??
+          DEFAULTS.customResolverOptions,
+        customTransformOptions:
+          requestOptions.customTransformOptions ??
+          DEFAULTS.customTransformOptions,
+        dev: requestOptions.dev ?? DEFAULTS.dev,
+        inlineSourceMap:
+          requestOptions.inlineSourceMap ?? DEFAULTS.inlineSourceMap,
+        unstable_transformProfile:
+          requestOptions.unstable_transformProfile ??
+          DEFAULTS.unstable_transformProfile,
+      },
     },
-    buildOptions
+    buildOptions,
   );
 }
 function relativateSerializedMap(map, sourceMapSourcesRoot) {
   const sourceMap = JSON.parse(map);
-  relativizeSourceMapInline(sourceMap, sourceMapSourcesRoot);
+  (0, _relativizeSourceMap.default)(sourceMap, sourceMapSourcesRoot);
   return JSON.stringify(sourceMap);
 }
-async function saveBundleAndMap(bundle, options, log) {
+async function save(bundle, options, log) {
   const {
     bundleOutput,
     bundleEncoding: encoding,
@@ -27,7 +53,7 @@ async function saveBundleAndMap(bundle, options, log) {
   const writeFns = [];
   writeFns.push(async () => {
     log(`Writing bundle output to: ${bundleOutput}`);
-    await writeFile(bundleOutput, bundle.code, encoding);
+    await (0, _writeFile.default)(bundleOutput, bundle.code, encoding);
     log("Done writing bundle output");
   });
   if (sourcemapOutput) {
@@ -39,12 +65,10 @@ async function saveBundleAndMap(bundle, options, log) {
     }
     writeFns.push(async () => {
       log(`Writing sourcemap output to: ${sourcemapOutput}`);
-      await writeFile(sourcemapOutput, map);
+      await (0, _writeFile.default)(sourcemapOutput, map);
       log("Done writing sourcemap output");
     });
   }
   await Promise.all(writeFns.map((cb) => cb()));
 }
-exports.build = buildBundle;
-exports.save = saveBundleAndMap;
-exports.formatName = "bundle";
+const formatName = (exports.formatName = "bundle");

package/src/shared/output/bundle.flow.js.flow

@@ -9,17 +9,17 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type {AssetData} from '../../Assets';
-import type {BuildOptions, OutputOptions, RequestOptions} from '../types.flow';
+import type {BuildOptions, OutputOptions, RequestOptions} from '../types';
 import type {MixedSourceMap} from 'metro-source-map';
 
-const relativizeSourceMapInline = require('../../lib/relativizeSourceMap');
-const Server = require('../../Server');
-const writeFile = require('./writeFile');
+import relativizeSourceMapInline from '../../lib/relativizeSourceMap';
+import Server from '../../Server';
+import writeFile from './writeFile';
+
+const DEFAULTS = Server.DEFAULT_BUNDLE_OPTIONS;
 
-function buildBundle(
+export function build(
   packagerClient: Server,
   requestOptions: RequestOptions,
   buildOptions?: BuildOptions = {},
@@ -31,8 +31,22 @@ function buildBundle(
 }> {
   return packagerClient.build(
     {
-      ...Server.DEFAULT_BUNDLE_OPTIONS,
+      ...DEFAULTS,
       ...requestOptions,
+      ...{
+        customResolverOptions:
+          requestOptions.customResolverOptions ??
+          DEFAULTS.customResolverOptions,
+        customTransformOptions:
+          requestOptions.customTransformOptions ??
+          DEFAULTS.customTransformOptions,
+        dev: requestOptions.dev ?? DEFAULTS.dev,
+        inlineSourceMap:
+          requestOptions.inlineSourceMap ?? DEFAULTS.inlineSourceMap,
+        unstable_transformProfile:
+          requestOptions.unstable_transformProfile ??
+          DEFAULTS.unstable_transformProfile,
+      },
     },
     buildOptions,
   );
@@ -47,7 +61,7 @@ function relativateSerializedMap(
   return JSON.stringify(sourceMap);
 }
 
-async function saveBundleAndMap(
+export async function save(
   bundle: {
     code: string,
     map: string,
@@ -90,6 +104,4 @@ async function saveBundleAndMap(
   await Promise.all(writeFns.map((cb: void => mixed) => cb()));
 }
 
-exports.build = buildBundle;
-exports.save = saveBundleAndMap;
-exports.formatName = 'bundle';
+export const formatName = 'bundle';

package/src/shared/output/bundle.js.flow

@@ -9,6 +9,8 @@
  * @oncall react_native
  */
 
+/* eslint-disable import/no-commonjs */
+
 'use strict';
 
 /*::