metro 0.66.2 → 0.69.0

package/src/shared/output/RamBundle/as-assets.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,23 +9,22 @@
  */
 "use strict";
 
-const MAGIC_RAM_BUNDLE_NUMBER = require("./magic-number");
-
-const buildSourcemapWithMetadata = require("./buildSourcemapWithMetadata");
+const relativizeSourceMapInline = require("../../../lib/relativizeSourceMap");
 
-const mkdirp = require("mkdirp");
+const writeFile = require("../writeFile");
 
-const path = require("path");
+const buildSourcemapWithMetadata = require("./buildSourcemapWithMetadata");
 
-const relativizeSourceMapInline = require("../../../lib/relativizeSourceMap");
+const MAGIC_RAM_BUNDLE_NUMBER = require("./magic-number");
 
-const writeFile = require("../writeFile");
+const { joinModules } = require("./util");
 
 const writeSourceMap = require("./write-sourcemap");
 
-const { joinModules } = require("./util");
+const fsPromises = require("fs").promises;
+
+const path = require("path"); // must not start with a dot, as that won't go into the apk
 
-// must not start with a dot, as that won't go into the apk
 const MAGIC_RAM_BUNDLE_FILENAME = "UNBUNDLE";
 const MODULES_DIR = "js-modules";
 /**
@@ -41,7 +40,7 @@ function saveAsAssets(bundle, options, log) {
     bundleOutput,
     bundleEncoding: encoding,
     sourcemapOutput,
-    sourcemapSourcesRoot
+    sourcemapSourcesRoot,
   } = options;
   log("start");
   const { startupModules, lazyModules } = bundle;
@@ -55,7 +54,7 @@ function saveAsAssets(bundle, options, log) {
       Promise.all([
         writeModules(lazyModules, modulesDir, encoding),
         writeFile(bundleOutput, startupCode, encoding),
-        writeMagicFlagFile(modulesDir)
+        writeMagicFlagFile(modulesDir),
       ])
   );
   writeUnbundle.then(() => log("Done writing unbundle output"));
@@ -65,7 +64,7 @@ function saveAsAssets(bundle, options, log) {
       fixWrapperOffset: true,
       lazyModules: lazyModules.concat(),
       moduleGroups: null,
-      startupModules: startupModules.concat()
+      startupModules: startupModules.concat(),
     });
 
     if (sourcemapSourcesRoot !== undefined) {
@@ -84,9 +83,9 @@ function saveAsAssets(bundle, options, log) {
 }
 
 function createDir(dirName) {
-  return new Promise((resolve, reject) =>
-    mkdirp(dirName, error => (error ? reject(error) : resolve()))
-  );
+  return fsPromises.mkdir(dirName, {
+    recursive: true,
+  });
 }
 
 function writeModuleFile(module, modulesDir, encoding) {
@@ -95,7 +94,7 @@ function writeModuleFile(module, modulesDir, encoding) {
 }
 
 function writeModules(modules, modulesDir, encoding) {
-  const writeFiles = modules.map(module =>
+  const writeFiles = modules.map((module) =>
     writeModuleFile(module, modulesDir, encoding)
   );
   return Promise.all(writeFiles);

package/src/shared/output/RamBundle/as-assets.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,20 +10,18 @@
 
 'use strict';
 
-const MAGIC_RAM_BUNDLE_NUMBER = require('./magic-number');
+import type {RamBundleInfo} from '../../../DeltaBundler/Serializers/getRamBundleInfo';
+import type {ModuleTransportLike} from '../../../shared/types.flow';
+import type {OutputOptions} from '../../types.flow';
 
-const buildSourcemapWithMetadata = require('./buildSourcemapWithMetadata');
-const mkdirp = require('mkdirp');
-const path = require('path');
 const relativizeSourceMapInline = require('../../../lib/relativizeSourceMap');
 const writeFile = require('../writeFile');
-const writeSourceMap = require('./write-sourcemap');
-
+const buildSourcemapWithMetadata = require('./buildSourcemapWithMetadata');
+const MAGIC_RAM_BUNDLE_NUMBER = require('./magic-number');
 const {joinModules} = require('./util');
-
-import type {RamBundleInfo} from '../../../DeltaBundler/Serializers/getRamBundleInfo';
-import type {ModuleTransportLike} from '../../../shared/types.flow';
-import type {OutputOptions} from '../../types.flow';
+const writeSourceMap = require('./write-sourcemap');
+const fsPromises = require('fs').promises;
+const path = require('path');
 // must not start with a dot, as that won't go into the apk
 const MAGIC_RAM_BUNDLE_FILENAME = 'UNBUNDLE';
 const MODULES_DIR = 'js-modules';
@@ -87,10 +85,8 @@ function saveAsAssets(
   }
 }
 
-function createDir(dirName: string): Promise<empty> {
-  return new Promise((resolve: void => void, reject: mixed => mixed) =>
-    mkdirp(dirName, error => (error ? reject(error) : resolve())),
-  );
+function createDir(dirName: string): Promise<void> {
+  return fsPromises.mkdir(dirName, {recursive: true});
 }
 
 function writeModuleFile(

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,17 +9,17 @@
  */
 "use strict";
 
-const MAGIC_UNBUNDLE_FILE_HEADER = require("./magic-number");
+const relativizeSourceMapInline = require("../../../lib/relativizeSourceMap");
 
 const buildSourcemapWithMetadata = require("./buildSourcemapWithMetadata");
 
-const fs = require("fs");
+const MAGIC_UNBUNDLE_FILE_HEADER = require("./magic-number");
 
-const relativizeSourceMapInline = require("../../../lib/relativizeSourceMap");
+const { joinModules } = require("./util");
 
 const writeSourceMap = require("./write-sourcemap");
 
-const { joinModules } = require("./util");
+const fs = require("fs");
 
 const SIZEOF_UINT32 = 4;
 /**
@@ -35,7 +35,7 @@ function saveAsIndexedFile(bundle, options, log) {
     bundleOutput,
     bundleEncoding: encoding,
     sourcemapOutput,
-    sourcemapSourcesRoot
+    sourcemapSourcesRoot,
   } = options;
   log("start");
   const { startupModules, lazyModules, groups } = bundle;
@@ -53,7 +53,7 @@ function saveAsIndexedFile(bundle, options, log) {
       startupModules: startupModules.concat(),
       lazyModules: lazyModules.concat(),
       moduleGroups,
-      fixWrapperOffset: true
+      fixWrapperOffset: true,
     });
 
     if (sourcemapSourcesRoot !== undefined) {
@@ -70,14 +70,13 @@ function saveAsIndexedFile(bundle, options, log) {
     return writeUnbundle;
   }
 }
-/* global Buffer: true */
 
 const fileHeader = Buffer.alloc(4);
 fileHeader.writeUInt32LE(MAGIC_UNBUNDLE_FILE_HEADER, 0);
 const nullByteBuffer = Buffer.alloc(1).fill(0);
 
 function writeBuffers(stream, buffers) {
-  buffers.forEach(buffer => stream.write(buffer));
+  buffers.forEach((buffer) => stream.write(buffer));
   return new Promise((resolve, reject) => {
     stream.on("error", reject);
     stream.on("finish", () => resolve());
@@ -92,7 +91,7 @@ function nullTerminatedBuffer(contents, encoding) {
 function moduleToBuffer(id, code, encoding) {
   return {
     id,
-    buffer: nullTerminatedBuffer(code, encoding)
+    buffer: nullTerminatedBuffer(code, encoding),
   };
 }
 
@@ -124,7 +123,7 @@ function buildModuleTable(startupCode, moduleBuffers, moduleGroups) {
   moduleBuffers.forEach(({ id, buffer }) => {
     const group = moduleGroups.groups.get(id);
     const idsInGroup = group ? [id].concat(Array.from(group)) : [id];
-    idsInGroup.forEach(moduleId => {
+    idsInGroup.forEach((moduleId) => {
       const offset = entryOffset(moduleId); // module_offset
 
       table.writeUInt32LE(codeOffset, offset); // module_length
@@ -147,7 +146,7 @@ function groupCode(rootCode, moduleGroup, modulesById) {
     code.push(
       (
         modulesById.get(id) || {
-          code: ""
+          code: "",
         }
       ).code
     );
@@ -158,7 +157,7 @@ function groupCode(rootCode, moduleGroup, modulesById) {
 
 function buildModuleBuffers(modules, moduleGroups, encoding) {
   return modules
-    .filter(m => !moduleGroups.modulesInGroups.has(m.id))
+    .filter((m) => !moduleGroups.modulesInGroups.has(m.id))
     .map(({ id, code }) =>
       moduleToBuffer(
         id,
@@ -189,8 +188,8 @@ function buildTableAndContents(startupCode, modules, moduleGroups, encoding) {
 function createModuleGroups(groups, modules) {
   return {
     groups,
-    modulesById: new Map(modules.map(m => [m.id, m])),
-    modulesInGroups: new Set(concat(groups.values()))
+    modulesById: new Map(modules.map((m) => [m.id, m])),
+    modulesInGroups: new Set(concat(groups.values())),
   };
 }
 

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,15 +10,6 @@
 
 'use strict';
 
-const MAGIC_UNBUNDLE_FILE_HEADER = require('./magic-number');
-
-const buildSourcemapWithMetadata = require('./buildSourcemapWithMetadata');
-const fs = require('fs');
-const relativizeSourceMapInline = require('../../../lib/relativizeSourceMap');
-const writeSourceMap = require('./write-sourcemap');
-
-const {joinModules} = require('./util');
-
 import type {RamBundleInfo} from '../../../DeltaBundler/Serializers/getRamBundleInfo';
 import type {
   ModuleGroups,
@@ -27,6 +18,13 @@ import type {
 } from '../../types.flow';
 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');
+
 const SIZEOF_UINT32 = 4;
 
 /**
@@ -84,8 +82,6 @@ function saveAsIndexedFile(
   }
 }
 
-/* global Buffer: true */
-
 const fileHeader = Buffer.alloc(4);
 fileHeader.writeUInt32LE(MAGIC_UNBUNDLE_FILE_HEADER, 0);
 const nullByteBuffer: Buffer = Buffer.alloc(1).fill(0);

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,32 +12,32 @@
 const {
   combineSourceMaps,
   combineSourceMapsAddingOffsets,
-  joinModules
+  joinModules,
 } = require("./util");
 
 module.exports = ({
   fixWrapperOffset,
   lazyModules,
   moduleGroups,
-  startupModules
+  startupModules,
 }) => {
   const options = fixWrapperOffset
     ? {
-        fixWrapperOffset: true
+        fixWrapperOffset: true,
       }
     : undefined;
   const startupModule = {
     code: joinModules(startupModules),
     id: Number.MIN_SAFE_INTEGER,
     map: combineSourceMaps(startupModules, undefined, options),
-    sourcePath: ""
+    sourcePath: "",
   }; // Add map of module id -> source to sourcemap
 
   const module_paths = [];
-  startupModules.forEach(m => {
+  startupModules.forEach((m) => {
     module_paths[m.id] = m.sourcePath;
   });
-  lazyModules.forEach(m => {
+  lazyModules.forEach((m) => {
     module_paths[m.id] = m.sourcePath;
   });
   const map = combineSourceMapsAddingOffsets(

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,15 +10,15 @@
 
 'use strict';
 
+import type {ModuleGroups, ModuleTransportLike} from '../../types.flow';
+import type {IndexMap} from 'metro-source-map';
+
 const {
   combineSourceMaps,
   combineSourceMapsAddingOffsets,
   joinModules,
 } = require('./util');
 
-import type {ModuleGroups, ModuleTransportLike} from '../../types.flow';
-import type {IndexMap} from 'metro-source-map';
-
 type Params = {|
   fixWrapperOffset: boolean,
   lazyModules: $ReadOnlyArray<ModuleTransportLike>,

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,11 +9,13 @@
  */
 "use strict";
 
-const invariant = require("invariant");
+var _countLines = _interopRequireDefault(require("../../../lib/countLines"));
 
-const newline = /\r\n?|\n|\u2028|\u2029/g; // fastest implementation
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
 
-const countLines = string => (string.match(newline) || []).length + 1;
+const invariant = require("invariant");
 
 function lineToLineSourceMap(source, filename = "") {
   // The first line mapping in our package is the base64vlq code for zeros (A).
@@ -23,28 +25,28 @@ function lineToLineSourceMap(source, filename = "") {
   const line = "AACA;";
   return {
     file: filename,
-    mappings: firstLine + Array(countLines(source)).join(line),
+    mappings: firstLine + Array((0, _countLines.default)(source)).join(line),
     sources: [filename],
     names: [],
-    version: 3
+    version: 3,
   };
 }
 
-const wrapperEnd = wrappedCode => wrappedCode.indexOf("{") + 1;
+const wrapperEnd = (wrappedCode) => wrappedCode.indexOf("{") + 1;
 
 const Section = (line, column, map) => ({
   map,
   offset: {
     line,
-    column
-  }
+    column,
+  },
 });
 
 function combineSourceMaps(modules, moduleGroups, options) {
   const sections = combineMaps(modules, null, moduleGroups, options);
   return {
     sections,
-    version: 3
+    version: 3,
   };
 }
 
@@ -65,14 +67,14 @@ function combineSourceMapsAddingOffsets(
     sections,
     version: 3,
     x_facebook_offsets,
-    x_metro_module_paths
+    x_metro_module_paths,
   };
 }
 
 function combineMaps(modules, offsets, moduleGroups, options) {
   const sections = [];
   let line = 0;
-  modules.forEach(moduleTransport => {
+  modules.forEach((moduleTransport) => {
     const { code, id, name } = moduleTransport;
     let column = 0;
     let group;
@@ -90,11 +92,11 @@ function combineMaps(modules, offsets, moduleGroups, options) {
       if (group && moduleGroups) {
         const { modulesById } = moduleGroups;
         const otherModules = Array.from(group || [])
-          .map(moduleId => modulesById.get(moduleId))
+          .map((moduleId) => modulesById.get(moduleId))
           .filter(Boolean); // needed to appease flow
 
-        otherModules.forEach(m => {
-          groupLines += countLines(m.code);
+        otherModules.forEach((m) => {
+          groupLines += (0, _countLines.default)(m.code);
         });
         map = combineSourceMaps([moduleTransport].concat(otherModules));
       }
@@ -118,17 +120,17 @@ function combineMaps(modules, offsets, moduleGroups, options) {
       }
     }
 
-    line += countLines(code) + groupLines;
+    line += (0, _countLines.default)(code) + groupLines;
   });
   return sections;
 }
 
-const joinModules = modules => modules.map(m => m.code).join("\n");
+const joinModules = (modules) => modules.map((m) => m.code).join("\n");
 
 module.exports = {
   combineSourceMaps,
   combineSourceMapsAddingOffsets,
-  countLines,
+  countLines: _countLines.default,
   joinModules,
-  lineToLineSourceMap
+  lineToLineSourceMap,
 };

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,20 +10,17 @@
 
 'use strict';
 
-const invariant = require('invariant');
-
 import type {ModuleGroups, ModuleTransportLike} from '../../types.flow';
 import type {
+  BasicSourceMap,
   IndexMap,
   IndexMapSection,
   MixedSourceMap,
-  BasicSourceMap,
 } from 'metro-source-map';
 
-const newline = /\r\n?|\n|\u2028|\u2029/g;
-// fastest implementation
-const countLines = (string: string): number =>
-  (string.match(newline) || []).length + 1;
+import countLines from '../../../lib/countLines';
+
+const invariant = require('invariant');
 
 function lineToLineSourceMap(
   source: string,

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/src/shared/output/RamBundle.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -19,7 +19,7 @@ async function build(packagerClient, requestOptions) {
   const options = {
     ...Server.DEFAULT_BUNDLE_OPTIONS,
     ...requestOptions,
-    bundleType: "ram"
+    bundleType: "ram",
   };
   return await packagerClient.getRamBundleInfo(options);
 }

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,14 +10,13 @@
 
 'use strict';
 
-const Server = require('../../Server');
+import type {RamBundleInfo} from '../../DeltaBundler/Serializers/getRamBundleInfo';
+import type {OutputOptions, RequestOptions} from '../types.flow';
 
+const Server = require('../../Server');
 const asAssets = require('./RamBundle/as-assets');
 const asIndexedFile = require('./RamBundle/as-indexed-file').save;
 
-import type {OutputOptions, RequestOptions} from '../types.flow';
-import type {RamBundleInfo} from '../../DeltaBundler/Serializers/getRamBundleInfo';
-
 async function build(
   packagerClient: Server,
   requestOptions: RequestOptions,

package/src/shared/output/bundle.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,17 +9,17 @@
  */
 "use strict";
 
-const Server = require("../../Server");
-
 const relativizeSourceMapInline = require("../../lib/relativizeSourceMap");
 
+const Server = require("../../Server");
+
 const writeFile = require("./writeFile");
 
 function buildBundle(packagerClient, requestOptions) {
   return packagerClient.build({
     ...Server.DEFAULT_BUNDLE_OPTIONS,
     ...requestOptions,
-    bundleType: "bundle"
+    bundleType: "bundle",
   });
 }
 
@@ -34,7 +34,7 @@ async function saveBundleAndMap(bundle, options, log) {
     bundleOutput,
     bundleEncoding: encoding,
     sourcemapOutput,
-    sourcemapSourcesRoot
+    sourcemapSourcesRoot,
   } = options;
   const writeFns = [];
   writeFns.push(async () => {
@@ -59,7 +59,7 @@ async function saveBundleAndMap(bundle, options, log) {
     });
   } // Wait until everything is written to disk.
 
-  await Promise.all(writeFns.map(cb => cb()));
+  await Promise.all(writeFns.map((cb) => cb()));
 }
 
 exports.build = buildBundle;

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,14 +10,13 @@
 
 'use strict';
 
-const Server = require('../../Server');
+import type {OutputOptions, RequestOptions} from '../types.flow';
+import type {MixedSourceMap} from 'metro-source-map';
 
 const relativizeSourceMapInline = require('../../lib/relativizeSourceMap');
+const Server = require('../../Server');
 const writeFile = require('./writeFile');
 
-import type {OutputOptions, RequestOptions} from '../types.flow';
-import type {MixedSourceMap} from 'metro-source-map';
-
 function buildBundle(
   packagerClient: Server,
   requestOptions: RequestOptions,