metro 0.73.3 → 0.73.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.73.3",
+  "version": "0.73.5",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -15,11 +15,11 @@
   "dependencies": {
     "@babel/code-frame": "^7.0.0",
     "@babel/core": "^7.14.0",
-    "@babel/generator": "^7.14.0",
+    "@babel/generator": "^7.20.0",
     "@babel/parser": "^7.14.0",
     "@babel/template": "^7.0.0",
     "@babel/traverse": "^7.14.0",
-    "@babel/types": "^7.0.0",
+    "@babel/types": "^7.20.0",
     "absolute-path": "^0.0.0",
     "accepts": "^1.3.7",
     "async": "^3.2.2",
@@ -29,30 +29,29 @@
     "debug": "^2.2.0",
     "denodeify": "^1.2.1",
     "error-stack-parser": "^2.0.6",
-    "fs-extra": "^1.0.0",
     "graceful-fs": "^4.2.4",
     "hermes-parser": "0.8.0",
     "image-size": "^0.6.0",
     "invariant": "^2.2.4",
     "jest-worker": "^27.2.0",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.73.3",
-    "metro-cache": "0.73.3",
-    "metro-cache-key": "0.73.3",
-    "metro-config": "0.73.3",
-    "metro-core": "0.73.3",
-    "metro-file-map": "0.73.3",
-    "metro-hermes-compiler": "0.73.3",
-    "metro-inspector-proxy": "0.73.3",
-    "metro-minify-terser": "0.73.3",
-    "metro-minify-uglify": "0.73.3",
-    "metro-react-native-babel-preset": "0.73.3",
-    "metro-resolver": "0.73.3",
-    "metro-runtime": "0.73.3",
-    "metro-source-map": "0.73.3",
-    "metro-symbolicate": "0.73.3",
-    "metro-transform-plugins": "0.73.3",
-    "metro-transform-worker": "0.73.3",
+    "metro-babel-transformer": "0.73.5",
+    "metro-cache": "0.73.5",
+    "metro-cache-key": "0.73.5",
+    "metro-config": "0.73.5",
+    "metro-core": "0.73.5",
+    "metro-file-map": "0.73.5",
+    "metro-hermes-compiler": "0.73.5",
+    "metro-inspector-proxy": "0.73.5",
+    "metro-minify-terser": "0.73.5",
+    "metro-minify-uglify": "0.73.5",
+    "metro-react-native-babel-preset": "0.73.5",
+    "metro-resolver": "0.73.5",
+    "metro-runtime": "0.73.5",
+    "metro-source-map": "0.73.5",
+    "metro-symbolicate": "0.73.5",
+    "metro-transform-plugins": "0.73.5",
+    "metro-transform-worker": "0.73.5",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
@@ -70,10 +69,10 @@
     "babel-jest": "^29.2.1",
     "dedent": "^0.7.0",
     "jest-snapshot": "^26.5.2",
-    "metro-babel-register": "0.73.3",
-    "metro-memory-fs": "0.73.3",
-    "metro-react-native-babel-preset": "0.73.3",
-    "metro-react-native-babel-transformer": "0.73.3",
+    "metro-babel-register": "0.73.5",
+    "metro-memory-fs": "0.73.5",
+    "metro-react-native-babel-preset": "0.73.5",
+    "metro-react-native-babel-transformer": "0.73.5",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"

package/src/Assets.js

@@ -8,22 +8,16 @@
  * @format
  * @oncall react_native
  */
+
 "use strict";
 
 const { isAssetTypeAnImage } = require("./Bundler/util");
-
 const AssetPaths = require("./node-haste/lib/AssetPaths");
-
 const crypto = require("crypto");
-
 const denodeify = require("denodeify");
-
 const fs = require("fs");
-
 const imageSize = require("image-size");
-
 const path = require("path");
-
 const readDir = denodeify(fs.readdir);
 const readFile = denodeify(fs.readFile);
 const hashFiles = denodeify(function hashFilesCb(files, hash, callback) {
@@ -31,7 +25,6 @@ const hashFiles = denodeify(function hashFilesCb(files, hash, callback) {
     callback(null);
     return;
   }
-
   const file = files.shift();
   fs.readFile(file, (err, data) => {
     if (err) {
@@ -43,7 +36,6 @@ const hashFiles = denodeify(function hashFilesCb(files, hash, callback) {
     }
   });
 });
-
 function buildAssetMap(dir, files, platform) {
   const platforms = new Set(platform != null ? [platform] : []);
   const assets = files.map((file) => AssetPaths.tryParse(file, platforms));
@@ -52,11 +44,9 @@ function buildAssetMap(dir, files, platform) {
     if (asset == null) {
       return;
     }
-
     const file = files[i];
     const assetKey = getAssetKey(asset.assetName, asset.platform);
     let record = map.get(assetKey);
-
     if (!record) {
       record = {
         scales: [],
@@ -64,22 +54,18 @@ function buildAssetMap(dir, files, platform) {
       };
       map.set(assetKey, record);
     }
-
     let insertIndex;
     const length = record.scales.length;
-
     for (insertIndex = 0; insertIndex < length; insertIndex++) {
       if (asset.resolution < record.scales[insertIndex]) {
         break;
       }
     }
-
     record.scales.splice(insertIndex, 0, asset.resolution);
     record.files.splice(insertIndex, 0, path.join(dir, file));
   });
   return map;
 }
-
 function getAssetKey(assetName, platform) {
   if (platform != null) {
     return `${assetName} : ${platform}`;
@@ -87,7 +73,6 @@ function getAssetKey(assetName, platform) {
     return assetName;
   }
 }
-
 async function getAbsoluteAssetRecord(assetPath, platform = null) {
   const filename = path.basename(assetPath);
   const dir = path.dirname(assetPath);
@@ -98,7 +83,6 @@ async function getAbsoluteAssetRecord(assetPath, platform = null) {
   );
   const map = buildAssetMap(dir, files, platform);
   let record;
-
   if (platform != null) {
     record =
       map.get(getAssetKey(assetData.assetName, platform)) ||
@@ -106,7 +90,6 @@ async function getAbsoluteAssetRecord(assetPath, platform = null) {
   } else {
     record = map.get(assetData.assetName);
   }
-
   if (!record) {
     throw new Error(
       `Asset not found: ${assetPath} for platform: ${
@@ -114,10 +97,8 @@ async function getAbsoluteAssetRecord(assetPath, platform = null) {
       }`
     );
   }
-
   return record;
 }
-
 async function getAbsoluteAssetInfo(assetPath, platform = null) {
   const nameData = AssetPaths.parse(
     assetPath,
@@ -126,11 +107,9 @@ async function getAbsoluteAssetInfo(assetPath, platform = null) {
   const { name, type } = nameData;
   const { scales, files } = await getAbsoluteAssetRecord(assetPath, platform);
   const hasher = crypto.createHash("md5");
-
   if (files.length > 0) {
     await hashFiles(Array.from(files), hasher);
   }
-
   return {
     files,
     hash: hasher.digest("hex"),
@@ -139,7 +118,6 @@ async function getAbsoluteAssetInfo(assetPath, platform = null) {
     type,
   };
 }
-
 async function getAssetData(
   assetPath,
   localPath,
@@ -152,12 +130,12 @@ async function getAssetData(
   // case we just concatenate the publicPath with the relative path.
   let assetUrlPath = localPath.startsWith("..")
     ? publicPath.replace(/\/$/, "") + "/" + path.dirname(localPath)
-    : path.join(publicPath, path.dirname(localPath)); // On Windows, change backslashes to slashes to get proper URL path from file path.
+    : path.join(publicPath, path.dirname(localPath));
 
+  // On Windows, change backslashes to slashes to get proper URL path from file path.
   if (path.sep === "\\") {
     assetUrlPath = assetUrlPath.replace(/\\/g, "/");
   }
-
   const isImage = isAssetTypeAnImage(path.extname(assetPath).slice(1));
   const assetInfo = await getAbsoluteAssetInfo(assetPath, platform);
   const isImageInput = assetInfo.files[0].includes(".zip/")
@@ -179,27 +157,25 @@ async function getAssetData(
   };
   return await applyAssetDataPlugins(assetDataPlugins, assetData);
 }
-
 async function applyAssetDataPlugins(assetDataPlugins, assetData) {
   if (!assetDataPlugins.length) {
     return assetData;
   }
-
-  const [currentAssetPlugin, ...remainingAssetPlugins] = assetDataPlugins; // $FlowFixMe: impossible to type a dynamic require.
-
+  const [currentAssetPlugin, ...remainingAssetPlugins] = assetDataPlugins;
+  // $FlowFixMe: impossible to type a dynamic require.
   const assetPluginFunction = require(currentAssetPlugin);
-
   const resultAssetData = await assetPluginFunction(assetData);
   return await applyAssetDataPlugins(remainingAssetPlugins, resultAssetData);
 }
+
 /**
  * Returns all the associated files (for different resolutions) of an asset.
  **/
-
 async function getAssetFiles(assetPath, platform = null) {
   const assetData = await getAbsoluteAssetRecord(assetPath, platform);
   return assetData.files;
 }
+
 /**
  * Return a buffer with the actual image given a request for an image by path.
  * The relativePath can contain a resolution postfix, in this case we need to
@@ -211,7 +187,6 @@ async function getAssetFiles(assetPath, platform = null) {
  * 3. Then try to pick platform-specific asset records
  * 4. Then pick the closest resolution (rounding up) to the requested one
  */
-
 async function getAsset(
   relativePath,
   projectRoot,
@@ -224,40 +199,32 @@ async function getAsset(
     new Set(platform != null ? [platform] : [])
   );
   const absolutePath = path.resolve(projectRoot, relativePath);
-
   if (!assetExts.includes(assetData.type)) {
     throw new Error(
       `'${relativePath}' cannot be loaded as its extension is not registered in assetExts`
     );
   }
-
   if (!pathBelongsToRoots(absolutePath, [projectRoot, ...watchFolders])) {
     throw new Error(
       `'${relativePath}' could not be found, because it cannot be found in the project root or any watch folder`
     );
   }
-
   const record = await getAbsoluteAssetRecord(absolutePath, platform);
-
   for (let i = 0; i < record.scales.length; i++) {
     if (record.scales[i] >= assetData.resolution) {
       return readFile(record.files[i]);
     }
   }
-
   return readFile(record.files[record.files.length - 1]);
 }
-
 function pathBelongsToRoots(pathToCheck, roots) {
   for (const rootFolder of roots) {
     if (pathToCheck.startsWith(path.resolve(rootFolder))) {
       return true;
     }
   }
-
   return false;
 }
-
 module.exports = {
   getAsset,
   getAssetData,

package/src/Bundler/util.js

@@ -8,29 +8,30 @@
  * @format
  * @oncall react_native
  */
+
 "use strict";
 
 const babylon = require("@babel/parser");
-
 const template = require("@babel/template").default;
-
 const babelTypes = require("@babel/types");
+const nullthrows = require("nullthrows");
 
-const nullthrows = require("nullthrows"); // Structure of the object: dir.name.scale = asset
+// Structure of the object: dir.name.scale = asset
 
 const assetPropertyBlockList = new Set(["files", "fileSystemLocation", "path"]);
-
 function generateAssetCodeFileAst(assetRegistryPath, assetDescriptor) {
   const properDescriptor = filterObject(
     assetDescriptor,
     assetPropertyBlockList
-  ); // {...}
+  );
 
+  // {...}
   const descriptorAst = babylon.parseExpression(
     JSON.stringify(properDescriptor)
   );
-  const t = babelTypes; // require('AssetRegistry').registerAsset({...})
+  const t = babelTypes;
 
+  // require('AssetRegistry').registerAsset({...})
   const buildRequire = template.statement(`
     module.exports = require(ASSET_REGISTRY_PATH).registerAsset(DESCRIPTOR_AST)
   `);
@@ -43,12 +44,12 @@ function generateAssetCodeFileAst(assetRegistryPath, assetDescriptor) {
     ])
   );
 }
+
 /**
  * Generates the code involved in requiring an asset, but to be loaded remotely.
  * If the asset cannot be found within the map, then it falls back to the
  * standard asset.
  */
-
 function generateRemoteAssetCodeFileAst(
   assetUtilsPath,
   assetDescriptor,
@@ -59,19 +60,20 @@ function generateRemoteAssetCodeFileAst(
   const file = remoteFileMap[assetDescriptor.fileSystemLocation];
   const descriptor = file && file[assetDescriptor.name];
   const data = {};
-
   if (!descriptor) {
     return null;
   }
-
   for (const scale in descriptor) {
     data[+scale] = descriptor[+scale].handle;
-  } // {2: 'path/to/image@2x', 3: 'path/to/image@3x', ...}
+  }
 
-  const astData = babylon.parseExpression(JSON.stringify(data)); // URI to remote server
+  // {2: 'path/to/image@2x', 3: 'path/to/image@3x', ...}
+  const astData = babylon.parseExpression(JSON.stringify(data));
 
-  const URI = t.stringLiteral(remoteServer); // Size numbers.
+  // URI to remote server
+  const URI = t.stringLiteral(remoteServer);
 
+  // Size numbers.
   const WIDTH = t.numericLiteral(nullthrows(assetDescriptor.width));
   const HEIGHT = t.numericLiteral(nullthrows(assetDescriptor.height));
   const buildRequire = template.program(`
@@ -97,9 +99,10 @@ function generateRemoteAssetCodeFileAst(
       ),
     })
   );
-} // Test extension against all types supported by image-size module.
-// If it's not one of these, we won't treat it as an image.
+}
 
+// Test extension against all types supported by image-size module.
+// If it's not one of these, we won't treat it as an image.
 function isAssetTypeAnImage(type) {
   return (
     ["png", "jpg", "jpeg", "bmp", "gif", "webp", "psd", "svg", "tiff"].indexOf(
@@ -107,17 +110,16 @@ function isAssetTypeAnImage(type) {
     ) !== -1
   );
 }
-
 function filterObject(object, blockList) {
-  const copied = { ...object };
-
+  const copied = {
+    ...object,
+  };
   for (const key of blockList) {
+    // $FlowFixMe[prop-missing]
     delete copied[key];
   }
-
   return copied;
 }
-
 function createRamBundleGroups(ramGroups, groupableModules, subtree) {
   // build two maps that allow to lookup module data
   // by path or (numeric) module id;
@@ -126,35 +128,33 @@ function createRamBundleGroups(ramGroups, groupableModules, subtree) {
   groupableModules.forEach((m) => {
     byPath.set(m.sourcePath, m);
     byId.set(m.id, m.sourcePath);
-  }); // build a map of group root IDs to an array of module IDs in the group
+  });
 
+  // build a map of group root IDs to an array of module IDs in the group
   const result = new Map(
     ramGroups.map((modulePath) => {
       const root = byPath.get(modulePath);
-
       if (root == null) {
         throw Error(`Group root ${modulePath} is not part of the bundle`);
       }
-
       return [
-        root.id, // `subtree` yields the IDs of all transitive dependencies of a module
+        root.id,
+        // `subtree` yields the IDs of all transitive dependencies of a module
         new Set(subtree(root, byPath)),
       ];
     })
   );
-
   if (ramGroups.length > 1) {
     // build a map of all grouped module IDs to an array of group root IDs
     const all = new ArrayMap();
-
     for (const [parent, children] of result) {
       for (const module of children) {
         all.get(module).push(parent);
       }
-    } // find all module IDs that are part of more than one group
+    }
 
+    // find all module IDs that are part of more than one group
     const doubles = filter(all, ([, parents]) => parents.length > 1);
-
     for (const [moduleId, parents] of doubles) {
       // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       const parentNames = parents.map(byId.get, byId);
@@ -168,10 +168,8 @@ function createRamBundleGroups(ramGroups, groupableModules, subtree) {
       );
     }
   }
-
   return result;
 }
-
 function* filter(iterator, predicate) {
   for (const value of iterator) {
     if (predicate(value)) {
@@ -179,20 +177,16 @@ function* filter(iterator, predicate) {
     }
   }
 }
-
 class ArrayMap extends Map {
   get(key) {
     let array = super.get(key);
-
     if (!array) {
       array = [];
       this.set(key, array);
     }
-
     return array;
   }
 }
-
 module.exports = {
   createRamBundleGroups,
   generateAssetCodeFileAst,

package/src/Bundler/util.js.flow

@@ -158,6 +158,7 @@ function filterObject(
 ): AssetDataFiltered {
   const copied = {...object};
   for (const key of blockList) {
+    // $FlowFixMe[prop-missing]
     delete copied[key];
   }
   return copied;

package/src/Bundler.js

@@ -8,12 +8,11 @@
  * @format
  * @oncall react_native
  */
+
 "use strict";
 
 const Transformer = require("./DeltaBundler/Transformer");
-
 const DependencyGraph = require("./node-haste/DependencyGraph");
-
 class Bundler {
   constructor(config, options) {
     this._depGraph = new DependencyGraph(config, options);
@@ -38,28 +37,21 @@ class Bundler {
         });
       });
   }
-
   getWatcher() {
     return this._depGraph.getWatcher();
   }
-
   async end() {
     await this._depGraph.ready();
-
     this._transformer.end();
-
     this._depGraph.end();
   }
-
   async getDependencyGraph() {
     await this._depGraph.ready();
     return this._depGraph;
   }
-
   async transformFile(
     filePath,
-    transformOptions,
-    /** Optionally provide the file contents, this can be used to provide virtual contents for a file. */
+    transformOptions /** Optionally provide the file contents, this can be used to provide virtual contents for a file. */,
     fileBuffer
   ) {
     // We need to be sure that the DependencyGraph has been initialized.
@@ -70,11 +62,11 @@ class Bundler {
       transformOptions,
       fileBuffer
     );
-  } // Waits for the bundler to become ready.
+  }
 
+  // Waits for the bundler to become ready.
   async ready() {
     await this._readyPromise;
   }
 }
-
 module.exports = Bundler;