metro 0.66.2 → 0.69.0

package/src/lib/formatBundlingError.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,26 +9,26 @@
  */
 "use strict";
 
-const ErrorStackParser = require("error-stack-parser");
-
 const GraphNotFoundError = require("../IncrementalBundler/GraphNotFoundError");
 
 const ResourceNotFoundError = require("../IncrementalBundler/ResourceNotFoundError");
 
 const RevisionNotFoundError = require("../IncrementalBundler/RevisionNotFoundError");
 
-const fs = require("fs");
-
-const serializeError = require("serialize-error");
-
 const {
-  UnableToResolveError
+  UnableToResolveError,
 } = require("../node-haste/DependencyGraph/ModuleResolution");
 
 const { codeFrameColumns } = require("@babel/code-frame");
 
+const ErrorStackParser = require("error-stack-parser");
+
+const fs = require("fs");
+
 const { AmbiguousModuleResolutionError } = require("metro-core");
 
+const serializeError = require("serialize-error");
+
 function formatBundlingError(error) {
   if (error instanceof AmbiguousModuleResolutionError) {
     const he = error.hasteError;
@@ -39,16 +39,16 @@ function formatBundlingError(error) {
       "fix them: \n\n" +
       Object.keys(he.duplicatesSet)
         .sort()
-        .map(dupFilePath => `${dupFilePath}`)
+        .map((dupFilePath) => `${dupFilePath}`)
         .join("\n\n");
     return {
       type: "AmbiguousModuleResolutionError",
       message,
       errors: [
         {
-          description: message
-        }
-      ]
+          description: message,
+        },
+      ],
     };
   }
 
@@ -61,27 +61,27 @@ function formatBundlingError(error) {
       {
         description: error.message,
         filename: error.filename,
-        lineNumber: error.lineNumber
-      }
+        lineNumber: error.lineNumber,
+      },
     ];
     return serializeError(error);
   } else if (error instanceof ResourceNotFoundError) {
     return {
       type: "ResourceNotFoundError",
       errors: [],
-      message: error.message
+      message: error.message,
     };
   } else if (error instanceof GraphNotFoundError) {
     return {
       type: "GraphNotFoundError",
       errors: [],
-      message: error.message
+      message: error.message,
     };
   } else if (error instanceof RevisionNotFoundError) {
     return {
       type: "RevisionNotFoundError",
       errors: [],
-      message: error.message
+      message: error.message,
     };
   } else {
     const stack = ErrorStackParser.parse(error);
@@ -97,11 +97,11 @@ function formatBundlingError(error) {
         {
           start: {
             column,
-            line
-          }
+            line,
+          },
         },
         {
-          forceColor: true
+          forceColor: true,
         }
       );
     } catch {}
@@ -109,7 +109,7 @@ function formatBundlingError(error) {
     return {
       type: "InternalError",
       errors: [],
-      message: `Metro has encountered an error: ${error.message}: ${fileName} (${line}:${column})\n\n${codeFrame}`
+      message: `Metro has encountered an error: ${error.message}: ${fileName} (${line}:${column})\n\n${codeFrame}`,
     };
   }
 }

package/src/lib/formatBundlingError.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,21 +10,19 @@
 
 'use strict';
 
-const ErrorStackParser = require('error-stack-parser');
+import type {FormattedError} from 'metro-runtime/src/modules/types.flow';
+
 const GraphNotFoundError = require('../IncrementalBundler/GraphNotFoundError');
 const ResourceNotFoundError = require('../IncrementalBundler/ResourceNotFoundError');
 const RevisionNotFoundError = require('../IncrementalBundler/RevisionNotFoundError');
-
-const fs = require('fs');
-const serializeError = require('serialize-error');
-
 const {
   UnableToResolveError,
 } = require('../node-haste/DependencyGraph/ModuleResolution');
 const {codeFrameColumns} = require('@babel/code-frame');
+const ErrorStackParser = require('error-stack-parser');
+const fs = require('fs');
 const {AmbiguousModuleResolutionError} = require('metro-core');
-
-import type {FormattedError} from 'metro-runtime/src/modules/types.flow';
+const serializeError = require('serialize-error');
 
 export type CustomError = Error &
   interface {

package/src/lib/getAppendScripts.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,26 +9,25 @@
  */
 "use strict";
 
-const countLines = require("./countLines");
-
 const getInlineSourceMappingURL = require("../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL");
 
+const sourceMapString = require("../DeltaBundler/Serializers/sourceMapString");
+
+const countLines = require("./countLines");
+
 const nullthrows = require("nullthrows");
 
 const path = require("path");
 
-const sourceMapString = require("../DeltaBundler/Serializers/sourceMapString");
-
 function getAppendScripts(entryPoint, modules, importBundleNames, options) {
   const output = [];
 
   if (importBundleNames.size) {
     const importBundleNamesObject = Object.create(null);
-    importBundleNames.forEach(absolutePath => {
+    importBundleNames.forEach((absolutePath) => {
       const bundlePath = path.relative(options.projectRoot, absolutePath);
-      importBundleNamesObject[
-        options.createModuleId(absolutePath)
-      ] = bundlePath.slice(0, -path.extname(bundlePath).length);
+      importBundleNamesObject[options.createModuleId(absolutePath)] =
+        bundlePath.slice(0, -path.extname(bundlePath).length);
     });
     const code = `(function(){var $$=${options.getRunModuleStatement(
       options.createModuleId(options.asyncRequireModulePath)
@@ -46,10 +45,10 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
           data: {
             code,
             lineCount: countLines(code),
-            map: []
-          }
-        }
-      ]
+            map: [],
+          },
+        },
+      ],
     });
   }
 
@@ -57,7 +56,7 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
     const paths = [...options.runBeforeMainModule, entryPoint];
 
     for (const path of paths) {
-      if (modules.some(module => module.path === path)) {
+      if (modules.some((module) => module.path === path)) {
         const code = options.getRunModuleStatement(
           options.createModuleId(path)
         );
@@ -72,10 +71,10 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
               data: {
                 code,
                 lineCount: countLines(code),
-                map: []
-              }
-            }
-          ]
+                map: [],
+              },
+            },
+          ],
         });
       }
     }
@@ -86,7 +85,7 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
       ? getInlineSourceMappingURL(
           sourceMapString(modules, {
             processModuleFilter: () => true,
-            excludeSource: false
+            excludeSource: false,
           })
         )
       : nullthrows(options.sourceMapUrl);
@@ -102,10 +101,10 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
           data: {
             code,
             lineCount: countLines(code),
-            map: []
-          }
-        }
-      ]
+            map: [],
+          },
+        },
+      ],
     });
   }
 
@@ -122,10 +121,10 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
           data: {
             code,
             lineCount: countLines(code),
-            map: []
-          }
-        }
-      ]
+            map: [],
+          },
+        },
+      ],
     });
   }
 

package/src/lib/getAppendScripts.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,13 +10,13 @@
 
 'use strict';
 
-const countLines = require('./countLines');
+import type {Module} from '../DeltaBundler';
+
 const getInlineSourceMappingURL = require('../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL');
+const sourceMapString = require('../DeltaBundler/Serializers/sourceMapString');
+const countLines = require('./countLines');
 const nullthrows = require('nullthrows');
 const path = require('path');
-const sourceMapString = require('../DeltaBundler/Serializers/sourceMapString');
-
-import type {Module} from '../DeltaBundler';
 
 type Options<T: number | string> = {
   +asyncRequireModulePath: string,
@@ -43,9 +43,8 @@ function getAppendScripts<T: number | string>(
     const importBundleNamesObject = Object.create(null);
     importBundleNames.forEach(absolutePath => {
       const bundlePath = path.relative(options.projectRoot, absolutePath);
-      importBundleNamesObject[
-        options.createModuleId(absolutePath)
-      ] = bundlePath.slice(0, -path.extname(bundlePath).length);
+      importBundleNamesObject[options.createModuleId(absolutePath)] =
+        bundlePath.slice(0, -path.extname(bundlePath).length);
     });
     const code = `(function(){var $$=${options.getRunModuleStatement(
       options.createModuleId(options.asyncRequireModulePath),

package/src/lib/getGraphId.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.
@@ -35,8 +35,8 @@ function getGraphId(
         experimentalImportBundleSupport,
         shallow,
         unstable_transformProfile:
-          options.unstable_transformProfile || "default"
-      }
+          options.unstable_transformProfile || "default",
+      },
     },
     canonicalize
   );

package/src/lib/getGraphId.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,10 +10,10 @@
 
 'use strict';
 
-const canonicalize = require('metro-core/src/canonicalize');
-
 import type {TransformInputOptions} from '../DeltaBundler/types.flow';
 
+const canonicalize = require('metro-core/src/canonicalize');
+
 export opaque type GraphId: string = string;
 
 function getGraphId(

package/src/lib/getMaxWorkers.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.
@@ -11,7 +11,7 @@
 
 const os = require("os");
 
-module.exports = workers => {
+module.exports = (workers) => {
   const cores = os.cpus().length;
   return typeof workers === "number" && Number.isInteger(workers)
     ? Math.min(cores, workers > 0 ? workers : 1)

package/src/lib/getMaxWorkers.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/lib/getPreludeCode.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.
@@ -15,7 +15,7 @@ function getPreludeCode({ extraVars, isDev, globalPrefix }) {
     `__DEV__=${String(isDev)}`,
     ...formatExtraVars(extraVars),
     "process=this.process||{}",
-    `__METRO_GLOBAL_PREFIX__='${globalPrefix}'`
+    `__METRO_GLOBAL_PREFIX__='${globalPrefix}'`,
   ];
   return `var ${vars.join(",")};${processEnv(
     isDev ? "development" : "production"

package/src/lib/getPreludeCode.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/lib/getPrependedScripts.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.
@@ -11,12 +11,12 @@
 
 const countLines = require("./countLines");
 
-const defaults = require("metro-config/src/defaults/defaults");
-
 const getPreludeCode = require("./getPreludeCode");
 
 const transformHelpers = require("./transformHelpers");
 
+const defaults = require("metro-config/src/defaults/defaults");
+
 const { compile } = require("metro-hermes-compiler");
 
 async function getPrependedScripts(config, options, bundler, deltaBundler) {
@@ -24,7 +24,7 @@ async function getPrependedScripts(config, options, bundler, deltaBundler) {
   // `getPolyfills()` method and the `polyfillModuleNames` variable).
   const polyfillModuleNames = config.serializer
     .getPolyfills({
-      platform: options.platform
+      platform: options.platform,
     })
     .concat(config.serializer.polyfillModuleNames);
   const transformOptions = { ...options, type: "script" };
@@ -46,22 +46,22 @@ async function getPrependedScripts(config, options, bundler, deltaBundler) {
       onProgress: null,
       experimentalImportBundleSupport:
         config.transformer.experimentalImportBundleSupport,
-      shallow: false
+      shallow: false,
     }
   );
   return [
     _getPrelude({
       dev: options.dev,
-      globalPrefix: config.transformer.globalPrefix
+      globalPrefix: config.transformer.globalPrefix,
     }),
-    ...dependencies.values()
+    ...dependencies.values(),
   ];
 }
 
 function _getPrelude({ dev, globalPrefix }) {
   const code = getPreludeCode({
     isDev: dev,
-    globalPrefix
+    globalPrefix,
   });
   const name = "__prelude__";
   return {
@@ -75,18 +75,18 @@ function _getPrelude({ dev, globalPrefix }) {
         data: {
           code,
           lineCount: countLines(code),
-          map: []
-        }
+          map: [],
+        },
       },
       {
         type: "bytecode/script/virtual",
         data: {
           bytecode: compile(code, {
-            sourceURL: "__prelude__.virtual.js"
-          }).bytecode
-        }
-      }
-    ]
+            sourceURL: "__prelude__.virtual.js",
+          }).bytecode,
+        },
+      },
+    ],
   };
 }
 

package/src/lib/getPrependedScripts.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,18 +10,17 @@
 
 'use strict';
 
+import type Bundler from '../Bundler';
+import type DeltaBundler, {Module} from '../DeltaBundler';
+import type {TransformInputOptions} from '../DeltaBundler/types.flow';
+import type {ConfigT} from 'metro-config/src/configTypes.flow';
+
 const countLines = require('./countLines');
-const defaults = require('metro-config/src/defaults/defaults');
 const getPreludeCode = require('./getPreludeCode');
 const transformHelpers = require('./transformHelpers');
-
+const defaults = require('metro-config/src/defaults/defaults');
 const {compile} = require('metro-hermes-compiler');
 
-import type Bundler from '../Bundler';
-import type {TransformInputOptions} from '../DeltaBundler/types.flow';
-import type DeltaBundler, {Module} from '../DeltaBundler';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
-
 async function getPrependedScripts(
   config: ConfigT,
   options: $Diff<

package/src/lib/logToConsole.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/lib/logToConsole.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.
@@ -12,11 +12,11 @@
 
 'use strict';
 
+import type {Terminal} from 'metro-core';
+
 const chalk = require('chalk');
 const util = require('util');
 
-import type {Terminal} from 'metro-core';
-
 const groupStack = [];
 let collapsedGuardTimer;
 

package/src/lib/parseCustomTransformOptions.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.
@@ -17,7 +17,7 @@ const PREFIX = "transform.";
 module.exports = function parseCustomTransformOptions(urlObj) {
   const customTransformOptions = Object.create(null);
   const query = nullthrows(urlObj.query);
-  Object.keys(query).forEach(key => {
+  Object.keys(query).forEach((key) => {
     if (key.startsWith(PREFIX)) {
       customTransformOptions[key.substr(PREFIX.length)] = query[key];
     }

package/src/lib/parseCustomTransformOptions.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.
@@ -11,10 +11,10 @@
 
 'use strict';
 
-const nullthrows = require('nullthrows');
-
 import type {CustomTransformOptions} from 'metro-transform-worker';
 
+const nullthrows = require('nullthrows');
+
 const PREFIX = 'transform.';
 
 module.exports = function parseCustomTransformOptions(urlObj: {

package/src/lib/parseOptionsFromUrl.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,11 @@
  */
 "use strict";
 
-const nullthrows = require("nullthrows");
+const parsePlatformFilePath = require("../node-haste/lib/parsePlatformFilePath");
 
 const parseCustomTransformOptions = require("./parseCustomTransformOptions");
 
-const parsePlatformFilePath = require("../node-haste/lib/parsePlatformFilePath");
+const nullthrows = require("nullthrows");
 
 const path = require("path");
 
@@ -29,10 +29,10 @@ const getNumber = (query, opt, defaultValue) => {
   return Number.isNaN(number) ? defaultValue : number;
 };
 
-const getBundleType = bundleType =>
+const getBundleType = (bundleType) =>
   bundleType === "map" ? bundleType : "bundle";
 
-const getTransformProfile = transformProfile =>
+const getTransformProfile = (transformProfile) =>
   transformProfile === "hermes-stable" || transformProfile === "hermes-canary"
     ? transformProfile
     : "default";
@@ -80,11 +80,11 @@ module.exports = function parseOptionsFromUrl(
       // when loading the bundle for either Android or iOS.
       protocol:
         platform != null && platform.match(/^(android|ios)$/) ? "http" : "",
-      pathname: pathname.replace(/\.(bundle|delta)$/, ".map")
+      pathname: pathname.replace(/\.(bundle|delta)$/, ".map"),
     }),
     sourceUrl: requestUrl,
     unstable_transformProfile: getTransformProfile(
       query.unstable_transformProfile
-    )
+    ),
   };
 };