metro 0.80.4 → 0.80.6

package/src/node-haste/Module.js

@@ -1,14 +1,3 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
 var _path = _interopRequireDefault(require("path"));

package/src/node-haste/ModuleCache.js

@@ -1,23 +1,8 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
 const Module = require("./Module");
 const Package = require("./Package");
 class ModuleCache {
-  // Cache for "closest package.json" queries by module path.
-
-  // The inverse of _packagePathByModulePath.
-
   constructor(options) {
     this._getClosestPackage = options.getClosestPackage;
     this._moduleCache = Object.create(null);
@@ -68,11 +53,8 @@ class ModuleCache {
       delete this._packageCache[filePath];
     }
     if (this._packagePathByModulePath[filePath]) {
-      // filePath is a module inside a package.
       const packagePath = this._packagePathByModulePath[filePath];
       delete this._packagePathByModulePath[filePath];
-      // This change doesn't invalidate any cached "closest package.json"
-      // queries for the package's other modules. Clean up only this module.
       const modulePaths = this._modulePathsByPackagePath[packagePath];
       if (modulePaths) {
         modulePaths.delete(filePath);
@@ -82,8 +64,6 @@ class ModuleCache {
       }
     }
     if (this._modulePathsByPackagePath[filePath]) {
-      // filePath is a package. This change invalidates all cached "closest
-      // package.json" queries for modules inside this package.
       const modulePaths = this._modulePathsByPackagePath[filePath];
       for (const modulePath of modulePaths) {
         delete this._packagePathByModulePath[modulePath];

package/src/node-haste/Package.js

@@ -1,14 +1,3 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
 const fs = require("fs");

package/src/node-haste/lib/AssetPaths.js

@@ -1,14 +1,3 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
 const parsePlatformFilePath = require("./parsePlatformFilePath");
@@ -34,11 +23,6 @@ function parseBaseName(baseName) {
     resolution: 1,
   };
 }
-
-/**
- * Return `null` if the `filePath` doesn't have a valid extension, required
- * to describe the type of an asset.
- */
 function tryParse(filePath, platforms) {
   const result = parsePlatformFilePath(filePath, platforms);
   const { dirPath, baseName, platform, extension } = result;

package/src/node-haste/lib/parsePlatformFilePath.js

@@ -1,23 +1,7 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
 const path = require("path");
 const PATH_RE = /^(.+?)(\.([^.]+))?\.([^.]+)$/;
-
-/**
- * Extract the components of a file path that can have a platform specifier: Ex.
- * `index.ios.js` is specific to the `ios` platform and has the extension `js`.
- */
 function parsePlatformFilePath(filePath, platforms) {
   const dirPath = path.dirname(filePath);
   const fileName = path.basename(filePath);

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

@@ -1,14 +1,3 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
 const relativizeSourceMapInline = require("../../../lib/relativizeSourceMap");
@@ -19,17 +8,8 @@ const { joinModules } = require("./util");
 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";
-
-/**
- * Saves all JS modules of an app as single files
- * The startup code (prelude, polyfills etc.) are written to the file
- * designated by the `bundleOuput` option.
- * All other modules go into a 'js-modules' folder that in the same parent
- * directory as the startup file.
- */
 function saveAsAssets(bundle, options, log) {
   const {
     bundleOutput,
@@ -43,16 +23,13 @@ function saveAsAssets(bundle, options, log) {
   const startupCode = joinModules(startupModules);
   log("Writing bundle output to:", bundleOutput);
   const modulesDir = path.join(path.dirname(bundleOutput), MODULES_DIR);
-  const writeUnbundle = createDir(modulesDir).then(
-    // create the modules directory first
-    () =>
-      Promise.all([
-        writeModules(lazyModules, modulesDir, encoding),
-        writeFile(bundleOutput, startupCode, encoding),
-        writeMagicFlagFile(modulesDir),
-      ])
+  const writeUnbundle = createDir(modulesDir).then(() =>
+    Promise.all([
+      writeModules(lazyModules, modulesDir, encoding),
+      writeFile(bundleOutput, startupCode, encoding),
+      writeMagicFlagFile(modulesDir),
+    ])
   );
-  // $FlowFixMe[unused-promise]
   writeUnbundle.then(() => log("Done writing unbundle output"));
   if (sourcemapOutput) {
     const sourceMap = buildSourcemapWithMetadata({

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

@@ -1,14 +1,3 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
 const relativizeSourceMapInline = require("../../../lib/relativizeSourceMap");
@@ -18,14 +7,6 @@ const { joinModules } = require("./util");
 const writeSourceMap = require("./write-sourcemap");
 const fs = require("fs");
 const SIZEOF_UINT32 = 4;
-
-/**
- * Saves all JS modules of an app as a single file, separated with null bytes.
- * The file begins with an offset table that contains module ids and their
- * lengths/offsets.
- * The module id for the startup code (prelude, polyfills etc.) is the
- * empty string.
- */
 function saveAsIndexedFile(bundle, options, log) {
   const {
     bundleOutput,
@@ -84,41 +65,22 @@ function moduleToBuffer(id, code, encoding) {
   };
 }
 function entryOffset(n) {
-  // 2: num_entries + startup_code_len
-  // n * 2: each entry consists of two uint32s
   return (2 + n * 2) * SIZEOF_UINT32;
 }
 function buildModuleTable(startupCode, moduleBuffers, moduleGroups) {
-  // table format:
-  // - num_entries:      uint_32  number of entries
-  // - startup_code_len: uint_32  length of the startup section
-  // - entries:          entry...
-  //
-  // entry:
-  //  - module_offset:   uint_32  offset into the modules blob
-  //  - module_length:   uint_32  length of the module code in bytes
-
   const moduleIds = [...moduleGroups.modulesById.keys()];
   const maxId = moduleIds.reduce((max, id) => Math.max(max, id));
   const numEntries = maxId + 1;
   const table = Buffer.alloc(entryOffset(numEntries)).fill(0);
-
-  // num_entries
   table.writeUInt32LE(numEntries, 0);
-
-  // startup_code_len
   table.writeUInt32LE(startupCode.length, SIZEOF_UINT32);
-
-  // entries
   let codeOffset = startupCode.length;
   moduleBuffers.forEach(({ id, buffer }) => {
     const group = moduleGroups.groups.get(id);
     const idsInGroup = group ? [id].concat(Array.from(group)) : [id];
     idsInGroup.forEach((moduleId) => {
       const offset = entryOffset(moduleId);
-      // module_offset
       table.writeUInt32LE(codeOffset, offset);
-      // module_length
       table.writeUInt32LE(buffer.length, offset + SIZEOF_UINT32);
     });
     codeOffset += buffer.length;
@@ -153,12 +115,6 @@ function buildModuleBuffers(modules, moduleGroups, encoding) {
     );
 }
 function buildTableAndContents(startupCode, modules, moduleGroups, encoding) {
-  // file contents layout:
-  // - magic number      char[4]  0xE5 0xD1 0x0B 0xFB (0xFB0BD1E5 uint32 LE)
-  // - offset table      table    see `buildModuleTables`
-  // - code blob         char[]   null-terminated code strings, starting with
-  //                              the startup code
-
   const startupCodeBuffer = nullTerminatedBuffer(startupCode, encoding);
   const moduleBuffers = buildModuleBuffers(modules, moduleGroups, encoding);
   const table = buildModuleTable(

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

@@ -1,14 +1,3 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
 const {
@@ -33,8 +22,6 @@ module.exports = ({
     map: combineSourceMaps(startupModules, undefined, options),
     sourcePath: "",
   };
-
-  // Add map of module id -> source to sourcemap
   const module_paths = [];
   startupModules.forEach((m) => {
     module_paths[m.id] = m.sourcePath;

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

@@ -1,14 +1,3 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
 module.exports = 0xfb0bd1e5;

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

@@ -1,14 +1,3 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
 var _countLines = _interopRequireDefault(require("../../../lib/countLines"));
@@ -17,11 +6,7 @@ function _interopRequireDefault(obj) {
 }
 const invariant = require("invariant");
 function lineToLineSourceMap(source, filename = "") {
-  // The first line mapping in our package is the base64vlq code for zeros (A).
   const firstLine = "AAAA;";
-
-  // Most other lines in our mappings are all zeros (for module, column etc)
-  // except for the lineno mapping: curLineno - prevLineno = 1; Which is C.
   const line = "AACA;";
   return {
     file: filename,
@@ -76,7 +61,6 @@ function combineMaps(modules, offsets, moduleGroups, options) {
     let groupLines = 0;
     let { map } = moduleTransport;
     if (moduleGroups && moduleGroups.modulesInGroups.has(id)) {
-      // this is a module appended to another module
       return;
     }
     if (offsets != null) {
@@ -85,7 +69,7 @@ function combineMaps(modules, offsets, moduleGroups, options) {
         const { modulesById } = moduleGroups;
         const otherModules = Array.from(group || [])
           .map((moduleId) => modulesById.get(moduleId))
-          .filter(Boolean); // needed to appease flow
+          .filter(Boolean);
         otherModules.forEach((m) => {
           groupLines += (0, _countLines.default)(m.code);
         });

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

@@ -1,14 +1,3 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
 const writeFile = require("../writeFile");
@@ -18,7 +7,6 @@ function writeSourcemap(fileName, contents, log) {
   }
   log("Writing sourcemap output to:", fileName);
   const writeMap = writeFile(fileName, contents, null);
-  // $FlowFixMe[unused-promise]
   writeMap.then(() => log("Done writing sourcemap output"));
   return writeMap;
 }

package/src/shared/output/RamBundle.js

@@ -1,14 +1,3 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
 const Server = require("../../Server");
@@ -23,9 +12,6 @@ async function build(packagerClient, requestOptions) {
   return await packagerClient.getRamBundleInfo(options);
 }
 function save(bundle, options, log) {
-  // We fork here depending on the platform: while Android is pretty good at
-  // loading individual assets, iOS has a large overhead when reading hundreds
-  // of assets from disk.
   return options.platform === "android" && !(options.indexedRamBundle === true)
     ? asAssets(bundle, options, log)
     : asIndexedFile(bundle, options, log);

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

@@ -1,14 +1,3 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
 const relativizeSourceMapInline = require("../../lib/relativizeSourceMap");
@@ -52,8 +41,6 @@ async function saveBundleAndMap(bundle, options, log) {
       log("Done writing sourcemap output");
     });
   }
-
-  // Wait until everything is written to disk.
   await Promise.all(writeFns.map((cb) => cb()));
 }
 exports.build = buildBundle;

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

@@ -37,7 +37,7 @@ function relativateSerializedMap(
   map: string,
   sourceMapSourcesRoot: string,
 ): string {
-  const sourceMap = (JSON.parse(map): MixedSourceMap);
+  const sourceMap: MixedSourceMap = JSON.parse(map);
   relativizeSourceMapInline(sourceMap, sourceMapSourcesRoot);
   return JSON.stringify(sourceMap);
 }

package/src/shared/output/bundle.js

@@ -1,19 +1,5 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
-/*::
-export type * from './bundle.flow';
-*/
 try {
   require("metro-babel-register").unstable_registerForMetroMonorepo();
 } catch {}

package/src/shared/output/meta.js

@@ -1,14 +1,3 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
 const crypto = require("crypto");

package/src/shared/output/unbundle.js

@@ -1,16 +1,3 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
-/* This is for retro-compatibility of React Native with older versions of
- * Metro. Use the `RamBundle` module directly. */
 module.exports = require("./RamBundle");

package/src/shared/output/writeFile.js

@@ -1,14 +1,3 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";
 
 const denodeify = require("denodeify");

package/src/shared/types.flow.js

@@ -1,12 +1 @@
-/**
- * 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.
- *
- *
- * @format
- * @oncall react_native
- */
-
 "use strict";