metro 0.65.2 → 0.67.0

package/src/DeltaBundler/Serializers/helpers/js.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,10 +11,10 @@
 
 const invariant = require("invariant");
 
-const path = require("path");
-
 const { addParamsToDefineCall } = require("metro-transform-plugins");
 
+const path = require("path");
+
 function wrapModule(module, options) {
   const output = getJsOutput(module);
 
@@ -25,9 +25,9 @@ function wrapModule(module, options) {
   const moduleId = options.createModuleId(module.path);
   const params = [
     moduleId,
-    Array.from(module.dependencies.values()).map(dependency =>
+    Array.from(module.dependencies.values()).map((dependency) =>
       options.createModuleId(dependency.absolutePath)
-    )
+    ),
   ];
 
   if (options.dev) {
@@ -40,15 +40,25 @@ function wrapModule(module, options) {
 }
 
 function getJsOutput(module) {
+  var _module$path, _module$path2;
+
   const jsModules = module.output.filter(({ type }) => type.startsWith("js/"));
   invariant(
     jsModules.length === 1,
-    `Modules must have exactly one JS output, but ${module.path} has ${jsModules.length} JS outputs.`
+    `Modules must have exactly one JS output, but ${
+      (_module$path = module.path) !== null && _module$path !== void 0
+        ? _module$path
+        : "unknown module"
+    } has ${jsModules.length} JS outputs.`
   );
   const jsOutput = jsModules[0];
   invariant(
     Number.isFinite(jsOutput.data.lineCount),
-    `JS output must populate lineCount, but ${module.path} has ${jsOutput.type} output with lineCount '${jsOutput.data.lineCount}'`
+    `JS output must populate lineCount, but ${
+      (_module$path2 = module.path) !== null && _module$path2 !== void 0
+        ? _module$path2
+        : "unknown module"
+    } has ${jsOutput.type} output with lineCount '${jsOutput.data.lineCount}'`
   );
   return jsOutput;
 }
@@ -64,5 +74,5 @@ function isJsOutput(output) {
 module.exports = {
   getJsOutput,
   isJsModule,
-  wrapModule
+  wrapModule,
 };

package/src/DeltaBundler/Serializers/helpers/js.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 invariant = require('invariant');
-const path = require('path');
-
-const {addParamsToDefineCall} = require('metro-transform-plugins');
-
 import type {MixedOutput, Module} from '../../types.flow';
 import type {JsOutput} from 'metro-transform-worker';
 
+const invariant = require('invariant');
+const {addParamsToDefineCall} = require('metro-transform-plugins');
+const path = require('path');
+
 export type Options = {
   +createModuleId: string => number | string,
   +dev: boolean,
@@ -49,19 +48,29 @@ function wrapModule(module: Module<>, options: Options): string {
   return addParamsToDefineCall(output.data.code, ...params);
 }
 
-function getJsOutput(module: Module<>): JsOutput {
+function getJsOutput(
+  module: $ReadOnly<{
+    output: $ReadOnlyArray<MixedOutput>,
+    path?: string,
+    ...
+  }>,
+): JsOutput {
   const jsModules = module.output.filter(({type}) => type.startsWith('js/'));
 
   invariant(
     jsModules.length === 1,
-    `Modules must have exactly one JS output, but ${module.path} has ${jsModules.length} JS outputs.`,
+    `Modules must have exactly one JS output, but ${
+      module.path ?? 'unknown module'
+    } has ${jsModules.length} JS outputs.`,
   );
 
-  const jsOutput = (jsModules[0]: any);
+  const jsOutput: JsOutput = (jsModules[0]: any);
 
   invariant(
     Number.isFinite(jsOutput.data.lineCount),
-    `JS output must populate lineCount, but ${module.path} has ${jsOutput.type} output with lineCount '${jsOutput.data.lineCount}'`,
+    `JS output must populate lineCount, but ${
+      module.path ?? 'unknown module'
+    } has ${jsOutput.type} output with lineCount '${jsOutput.data.lineCount}'`,
   );
 
   return jsOutput;

package/src/DeltaBundler/Serializers/helpers/processBytecodeModules.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.
@@ -18,13 +18,13 @@ function processBytecodeModules(
   return [...modules]
     .filter(isBytecodeModule)
     .filter(filter)
-    .map(module => [
+    .map((module) => [
       module,
       wrapModule(module, {
         createModuleId,
         dev,
-        projectRoot
-      })
+        projectRoot,
+      }),
     ]);
 }
 

package/src/DeltaBundler/Serializers/helpers/processBytecodeModules.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 {isBytecodeModule, wrapModule} = require('./bytecode');
-
 import type {Module} from '../../types.flow';
 
+const {isBytecodeModule, wrapModule} = require('./bytecode');
+
 function processBytecodeModules(
   modules: $ReadOnlyArray<Module<>>,
   {

package/src/DeltaBundler/Serializers/helpers/processModules.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.
@@ -18,13 +18,13 @@ function processModules(
   return [...modules]
     .filter(isJsModule)
     .filter(filter)
-    .map(module => [
+    .map((module) => [
       module,
       wrapModule(module, {
         createModuleId,
         dev,
-        projectRoot
-      })
+        projectRoot,
+      }),
     ]);
 }
 

package/src/DeltaBundler/Serializers/helpers/processModules.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 {isJsModule, wrapModule} = require('./js');
-
 import type {Module} from '../../types.flow';
 
+const {isJsModule, wrapModule} = require('./js');
+
 function processModules(
   modules: $ReadOnlyArray<Module<>>,
   {

package/src/DeltaBundler/Serializers/hmrJSBundle.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,21 +9,21 @@
  */
 "use strict";
 
-const path = require("path");
-
-const url = require("url");
-
 const { isJsModule, wrapModule } = require("./helpers/js");
 
 const { addParamsToDefineCall } = require("metro-transform-plugins");
 
+const path = require("path");
+
+const url = require("url");
+
 function generateModules(sourceModules, graph, options) {
   const modules = [];
 
   for (const module of sourceModules) {
     if (isJsModule(module)) {
       // Construct a bundle URL for this specific module only
-      const getURL = extension => {
+      const getURL = (extension) => {
         options.clientUrl.pathname = path.relative(
           options.projectRoot,
           path.join(
@@ -45,7 +45,7 @@ function generateModules(sourceModules, graph, options) {
       modules.push({
         module: [options.createModuleId(module.path), code],
         sourceMappingURL,
-        sourceURL
+        sourceURL,
       });
     }
   }
@@ -58,7 +58,7 @@ function prepareModule(module, graph, options) {
   const inverseDependencies = getInverseDependencies(module.path, graph); // Transform the inverse dependency paths to ids.
 
   const inverseDependenciesById = Object.create(null);
-  Object.keys(inverseDependencies).forEach(path => {
+  Object.keys(inverseDependencies).forEach((path) => {
     inverseDependenciesById[options.createModuleId(path)] = inverseDependencies[
       path
     ].map(options.createModuleId);
@@ -98,7 +98,7 @@ function hmrJSBundle(delta, graph, options) {
   return {
     added: generateModules(delta.added.values(), graph, options),
     modified: generateModules(delta.modified.values(), graph, options),
-    deleted: [...delta.deleted].map(path => options.createModuleId(path))
+    deleted: [...delta.deleted].map((path) => options.createModuleId(path)),
   };
 }
 

package/src/DeltaBundler/Serializers/hmrJSBundle.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,16 +10,15 @@
 
 'use strict';
 
-const path = require('path');
-const url = require('url');
-
-const {isJsModule, wrapModule} = require('./helpers/js');
-const {addParamsToDefineCall} = require('metro-transform-plugins');
-
 import type {EntryPointURL} from '../../HmrServer';
 import type {DeltaResult, Graph, Module} from '../types.flow';
 import type {HmrModule} from 'metro-runtime/src/modules/types.flow';
 
+const {isJsModule, wrapModule} = require('./helpers/js');
+const {addParamsToDefineCall} = require('metro-transform-plugins');
+const path = require('path');
+const url = require('url');
+
 type Options = {
   +clientUrl: EntryPointURL,
   +createModuleId: string => number,
@@ -37,7 +36,9 @@ function generateModules(
   for (const module of sourceModules) {
     if (isJsModule(module)) {
       // Construct a bundle URL for this specific module only
-      const getURL = extension => {
+      const getURL = (
+        extension: $TEMPORARY$string<'bundle'> | $TEMPORARY$string<'map'>,
+      ) => {
         options.clientUrl.pathname = path.relative(
           options.projectRoot,
           path.join(

package/src/DeltaBundler/Serializers/sourceMapGenerator.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 @@ const { isJsModule } = require("./helpers/js");
 
 const {
   fromRawMappings,
-  fromRawMappingsNonBlocking
+  fromRawMappingsNonBlocking,
 } = require("metro-source-map");
 
 function getSourceMapInfosImpl(isBlocking, onDone, modules, options) {
@@ -31,7 +31,7 @@ function getSourceMapInfosImpl(isBlocking, onDone, modules, options) {
 
     const mod = modulesToProcess.shift();
     const info = getSourceMapInfo(mod, {
-      excludeSource: options.excludeSource
+      excludeSource: options.excludeSource,
     });
     sourceMapInfos.push(info);
     return false;
@@ -72,7 +72,7 @@ function sourceMapGenerator(modules, options) {
   let sourceMapInfos;
   getSourceMapInfosImpl(
     true,
-    infos => {
+    (infos) => {
       sourceMapInfos = infos;
     },
     modules,
@@ -89,7 +89,7 @@ function sourceMapGenerator(modules, options) {
 }
 
 async function sourceMapGeneratorNonBlocking(modules, options) {
-  const sourceMapInfos = await new Promise(resolve => {
+  const sourceMapInfos = await new Promise((resolve) => {
     getSourceMapInfosImpl(false, resolve, modules, options);
   });
   return fromRawMappingsNonBlocking(sourceMapInfos);
@@ -97,5 +97,5 @@ async function sourceMapGeneratorNonBlocking(modules, options) {
 
 module.exports = {
   sourceMapGenerator,
-  sourceMapGeneratorNonBlocking
+  sourceMapGeneratorNonBlocking,
 };

package/src/DeltaBundler/Serializers/sourceMapGenerator.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,16 +10,15 @@
 
 'use strict';
 
-const getSourceMapInfo = require('./helpers/getSourceMapInfo');
+import type {Module} from '../types.flow';
 
+const getSourceMapInfo = require('./helpers/getSourceMapInfo');
 const {isJsModule} = require('./helpers/js');
 const {
   fromRawMappings,
   fromRawMappingsNonBlocking,
 } = require('metro-source-map');
 
-import type {Module} from '../types.flow';
-
 type ReturnType<F> = $Call<<A, R>((...A) => R) => R, F>;
 
 function getSourceMapInfosImpl(

package/src/DeltaBundler/Serializers/sourceMapObject.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,24 +11,24 @@
 
 const {
   sourceMapGenerator,
-  sourceMapGeneratorNonBlocking
+  sourceMapGeneratorNonBlocking,
 } = require("./sourceMapGenerator");
 
 function sourceMapObject(modules, options) {
   const generator = sourceMapGenerator(modules, options);
   return generator.toMap(undefined, {
-    excludeSource: options.excludeSource
+    excludeSource: options.excludeSource,
   });
 }
 
 async function sourceMapObjectNonBlocking(modules, options) {
   const generator = await sourceMapGeneratorNonBlocking(modules, options);
   return generator.toMap(undefined, {
-    excludeSource: options.excludeSource
+    excludeSource: options.excludeSource,
   });
 }
 
 module.exports = {
   sourceMapObject,
-  sourceMapObjectNonBlocking
+  sourceMapObjectNonBlocking,
 };

package/src/DeltaBundler/Serializers/sourceMapObject.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,14 @@
 
 'use strict';
 
+import type {Module} from '../types.flow';
+import type {MixedSourceMap} from 'metro-source-map';
+
 const {
   sourceMapGenerator,
   sourceMapGeneratorNonBlocking,
 } = require('./sourceMapGenerator');
 
-import type {Module} from '../types.flow';
-import type {MixedSourceMap} from 'metro-source-map';
-
 function sourceMapObject(
   modules: $ReadOnlyArray<Module<>>,
   options: {|

package/src/DeltaBundler/Serializers/sourceMapString.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.
@@ -13,7 +13,7 @@ const { sourceMapGenerator } = require("./sourceMapGenerator");
 
 function sourceMapString(modules, options) {
   return sourceMapGenerator(modules, options).toString(undefined, {
-    excludeSource: options.excludeSource
+    excludeSource: options.excludeSource,
   });
 }
 

package/src/DeltaBundler/Serializers/sourceMapString.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 {sourceMapGenerator} = require('./sourceMapGenerator');
-
 import type {Module} from '../types.flow';
 
+const {sourceMapGenerator} = require('./sourceMapGenerator');
+
 function sourceMapString(
   modules: $ReadOnlyArray<Module<>>,
   options: {|

package/src/DeltaBundler/Transformer.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,18 +9,18 @@
  */
 "use strict";
 
+const getTransformCacheKey = require("./getTransformCacheKey");
+
 const WorkerFarm = require("./WorkerFarm");
 
 const assert = require("assert");
 
 const fs = require("fs");
 
-const getTransformCacheKey = require("./getTransformCacheKey");
+const { Cache, stableHash } = require("metro-cache");
 
 const path = require("path");
 
-const { Cache, stableHash } = require("metro-cache");
-
 class Transformer {
   constructor(config, getSha1Fn) {
     this._config = config;
@@ -34,21 +34,22 @@ class Transformer {
 
     const {
       getTransformOptions: _getTransformOptions,
-      postMinifyProcess: _postMinifyProcess,
       transformVariants: _transformVariants,
       workerPath: _workerPath,
       ...transformerConfig
     } = this._config.transformer;
     const transformerOptions = {
       transformerPath: this._config.transformerPath,
-      transformerConfig
+      transformerConfig,
     };
     this._workerFarm = new WorkerFarm(config, transformerOptions);
-    const globalCacheKey = getTransformCacheKey({
-      cacheVersion: this._config.cacheVersion,
-      projectRoot: this._config.projectRoot,
-      transformerConfig: transformerOptions
-    });
+    const globalCacheKey = this._cache.isDisabled
+      ? ""
+      : getTransformCacheKey({
+          cacheVersion: this._config.cacheVersion,
+          projectRoot: this._config.projectRoot,
+          transformerConfig: transformerOptions,
+        });
     this._baseHash = stableHash([globalCacheKey]).toString("binary");
   }
 
@@ -72,6 +73,7 @@ class Transformer {
     } = transformerOptions;
 
     for (const key in extra) {
+      // $FlowFixMe[cannot-resolve-name]
       if (hasOwnProperty.call(extra, key)) {
         throw new Error(
           "Extra keys detected: " + Object.keys(extra).join(", ")
@@ -96,7 +98,7 @@ class Transformer {
       runtimeBytecodeVersion,
       type,
       unstable_disableES6Transforms,
-      unstable_transformProfile
+      unstable_transformProfile,
     ]);
 
     const sha1 = this._getSha1(filePath);
@@ -108,7 +110,7 @@ class Transformer {
     const data = result
       ? {
           result,
-          sha1
+          sha1,
         }
       : await this._workerFarm.transform(localPath, transformerOptions); // Only re-compute the full key if the SHA-1 changed. This is because
     // references are used by the cache implementation in a weak map to keep
@@ -124,7 +126,7 @@ class Transformer {
 
       getSource() {
         return fs.readFileSync(filePath);
-      }
+      },
     };
   }
 

package/src/DeltaBundler/Transformer.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,16 @@
 
 'use strict';
 
-const WorkerFarm = require('./WorkerFarm');
+import type {TransformResult, TransformResultWithSource} from '../DeltaBundler';
+import type {TransformerConfig, TransformOptions} from './Worker';
+import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
+const getTransformCacheKey = require('./getTransformCacheKey');
+const WorkerFarm = require('./WorkerFarm');
 const assert = require('assert');
 const fs = require('fs');
-const getTransformCacheKey = require('./getTransformCacheKey');
-const path = require('path');
-
 const {Cache, stableHash} = require('metro-cache');
-
-import type {TransformResult, TransformResultWithSource} from '../DeltaBundler';
-import type {TransformOptions, TransformerConfig} from './Worker';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
+const path = require('path');
 
 class Transformer {
   _config: ConfigT;
@@ -42,7 +40,6 @@ class Transformer {
     // can treat the transformer config params as opaque.
     const {
       getTransformOptions: _getTransformOptions,
-      postMinifyProcess: _postMinifyProcess,
       transformVariants: _transformVariants,
       workerPath: _workerPath,
       ...transformerConfig
@@ -55,11 +52,13 @@ class Transformer {
 
     this._workerFarm = new WorkerFarm(config, transformerOptions);
 
-    const globalCacheKey = getTransformCacheKey({
-      cacheVersion: this._config.cacheVersion,
-      projectRoot: this._config.projectRoot,
-      transformerConfig: transformerOptions,
-    });
+    const globalCacheKey = this._cache.isDisabled
+      ? ''
+      : getTransformCacheKey({
+          cacheVersion: this._config.cacheVersion,
+          projectRoot: this._config.projectRoot,
+          transformerConfig: transformerOptions,
+        });
 
     this._baseHash = stableHash([globalCacheKey]).toString('binary');
   }
@@ -88,6 +87,7 @@ class Transformer {
     } = transformerOptions;
 
     for (const key in extra) {
+      // $FlowFixMe[cannot-resolve-name]
       if (hasOwnProperty.call(extra, key)) {
         throw new Error(
           'Extra keys detected: ' + Object.keys(extra).join(', '),