metro 0.72.0 → 0.72.1

package/src/lib/parseOptionsFromUrl.js.flow

@@ -11,6 +11,7 @@
 'use strict';
 
 import type {BundleOptions} from '../shared/types.flow';
+import type {TransformProfile} from 'metro-babel-transformer';
 
 const parsePlatformFilePath = require('../node-haste/lib/parsePlatformFilePath');
 const parseCustomTransformOptions = require('./parseCustomTransformOptions');
@@ -19,15 +20,8 @@ const path = require('path');
 const url = require('url');
 
 const getBoolean = (
-  query: {[string]: string},
-  opt:
-    | $TEMPORARY$string<'dev'>
-    | $TEMPORARY$string<'excludeSource'>
-    | $TEMPORARY$string<'inlineSourceMap'>
-    | $TEMPORARY$string<'minify'>
-    | $TEMPORARY$string<'modulesOnly'>
-    | $TEMPORARY$string<'runModule'>
-    | $TEMPORARY$string<'shallow'>,
+  query: $ReadOnly<{[opt: string]: string}>,
+  opt: string,
   defaultValue: boolean,
 ) =>
   query[opt] == null
@@ -35,23 +29,18 @@ const getBoolean = (
     : query[opt] === 'true' || query[opt] === '1';
 
 const getNumber = (
-  query: {[string]: string},
-  opt: $TEMPORARY$string<'runtimeBytecodeVersion'>,
+  query: $ReadOnly<{[opt: string]: string}>,
+  opt: string,
   defaultValue: null,
 ) => {
   const number = parseInt(query[opt], 10);
   return Number.isNaN(number) ? defaultValue : number;
 };
 
-const getBundleType = (bundleType: string | $TEMPORARY$string<'map'>) =>
+const getBundleType = (bundleType: string): 'map' | 'bundle' =>
   bundleType === 'map' ? bundleType : 'bundle';
 
-const getTransformProfile = (
-  transformProfile:
-    | string
-    | $TEMPORARY$string<'hermes-canary'>
-    | $TEMPORARY$string<'hermes-stable'>,
-) =>
+const getTransformProfile = (transformProfile: string): TransformProfile =>
   transformProfile === 'hermes-stable' || transformProfile === 'hermes-canary'
     ? transformProfile
     : 'default';

package/src/lib/transformHelpers.js

@@ -9,6 +9,8 @@
  */
 "use strict";
 
+var _contextModuleTemplates = require("./contextModuleTemplates");
+
 const path = require("path");
 
 const baseIgnoredInlineRequires = ["React", "react", "react-native"];
@@ -49,6 +51,8 @@ async function calcTransformerOptions(
       onProgress: null,
       experimentalImportBundleSupport:
         config.transformer.experimentalImportBundleSupport,
+      unstable_allowRequireContext:
+        config.transformer.unstable_allowRequireContext,
       shallow: false,
     });
     return Array.from(dependencies.keys());
@@ -97,15 +101,43 @@ async function getTransformFn(
     config,
     options
   );
-  return async (path) => {
-    return await bundler.transformFile(path, {
-      ...transformOptions,
-      type: getType(transformOptions.type, path, config.resolver.assetExts),
-      inlineRequires: removeInlineRequiresBlockListFromOptions(
-        path,
-        inlineRequires
-      ),
-    });
+  return async (modulePath, requireContext) => {
+    let templateBuffer;
+
+    if (requireContext) {
+      const graph = await bundler.getDependencyGraph(); // TODO: Check delta changes to avoid having to look over all files each time
+      // this is a massive performance boost.
+      // Search against all files, this is very expensive.
+      // TODO: Maybe we could let the user specify which root to check against.
+
+      const files = graph.matchFilesWithContext(requireContext.from, {
+        filter: requireContext.filter,
+        recursive: requireContext.recursive,
+      });
+      const template = (0, _contextModuleTemplates.getContextModuleTemplate)(
+        requireContext.mode,
+        requireContext.from,
+        files
+      );
+      templateBuffer = Buffer.from(template);
+    }
+
+    return await bundler.transformFile(
+      modulePath,
+      {
+        ...transformOptions,
+        type: getType(
+          transformOptions.type,
+          modulePath,
+          config.resolver.assetExts
+        ),
+        inlineRequires: removeInlineRequiresBlockListFromOptions(
+          modulePath,
+          inlineRequires
+        ),
+      },
+      templateBuffer
+    );
   };
 }
 

package/src/lib/transformHelpers.js.flow

@@ -16,6 +16,9 @@ import type {TransformInputOptions} from '../DeltaBundler/types.flow';
 import type {TransformOptions} from '../DeltaBundler/Worker';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 import type {Type} from 'metro-transform-worker';
+import type {RequireContext} from './contextModule';
+
+import {getContextModuleTemplate} from './contextModuleTemplates';
 
 const path = require('path');
 
@@ -68,6 +71,8 @@ async function calcTransformerOptions(
       onProgress: null,
       experimentalImportBundleSupport:
         config.transformer.experimentalImportBundleSupport,
+      unstable_allowRequireContext:
+        config.transformer.unstable_allowRequireContext,
       shallow: false,
     });
 
@@ -118,15 +123,47 @@ async function getTransformFn(
     options,
   );
 
-  return async (path: string) => {
-    return await bundler.transformFile(path, {
-      ...transformOptions,
-      type: getType(transformOptions.type, path, config.resolver.assetExts),
-      inlineRequires: removeInlineRequiresBlockListFromOptions(
-        path,
-        inlineRequires,
-      ),
-    });
+  return async (modulePath: string, requireContext: ?RequireContext) => {
+    let templateBuffer: Buffer;
+
+    if (requireContext) {
+      const graph = await bundler.getDependencyGraph();
+
+      // TODO: Check delta changes to avoid having to look over all files each time
+      // this is a massive performance boost.
+
+      // Search against all files, this is very expensive.
+      // TODO: Maybe we could let the user specify which root to check against.
+      const files = graph.matchFilesWithContext(requireContext.from, {
+        filter: requireContext.filter,
+        recursive: requireContext.recursive,
+      });
+
+      const template = getContextModuleTemplate(
+        requireContext.mode,
+        requireContext.from,
+        files,
+      );
+
+      templateBuffer = Buffer.from(template);
+    }
+
+    return await bundler.transformFile(
+      modulePath,
+      {
+        ...transformOptions,
+        type: getType(
+          transformOptions.type,
+          modulePath,
+          config.resolver.assetExts,
+        ),
+        inlineRequires: removeInlineRequiresBlockListFromOptions(
+          modulePath,
+          inlineRequires,
+        ),
+      },
+      templateBuffer,
+    );
   };
 }
 

package/src/node-haste/DependencyGraph/ModuleResolution.js

@@ -199,6 +199,7 @@ class ModuleResolver {
         return this._options.moduleCache.getModule(arbitrary);
 
       case "empty":
+        // $FlowFixMe[incompatible-return]
         return this._getEmptyModule();
 
       default:

package/src/node-haste/DependencyGraph/ModuleResolution.js.flow

@@ -94,7 +94,7 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
     };
   }
 
-  _getEmptyModule() {
+  _getEmptyModule(): TModule | Moduleish {
     let emptyModule = this._cachedEmptyModule;
     if (!emptyModule) {
       emptyModule = this.resolveDependency(
@@ -252,6 +252,7 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
         invariant(arbitrary != null, 'invalid asset resolution');
         return this._options.moduleCache.getModule(arbitrary);
       case 'empty':
+        // $FlowFixMe[incompatible-return]
         return this._getEmptyModule();
       default:
         (resolution.type: empty);
@@ -259,7 +260,7 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
     }
   }
 
-  _removeRoot(candidates: FileCandidates) {
+  _removeRoot(candidates: FileCandidates): FileCandidates {
     if (candidates.filePathPrefix) {
       candidates.filePathPrefix = path.relative(
         this._options.projectRoot,

package/src/node-haste/DependencyGraph.js

@@ -208,6 +208,11 @@ class DependencyGraph extends EventEmitter {
   end() {
     this._haste.end();
   }
+  /** Given a search context, return a list of file paths matching the query. */
+
+  matchFilesWithContext(from, context) {
+    return this._hasteFS.matchFilesWithContext(from, context);
+  }
 
   resolveDependency(
     from,

package/src/node-haste/DependencyGraph.js.flow

@@ -179,7 +179,7 @@ class DependencyGraph extends EventEmitter {
     });
   }
 
-  _createModuleCache() {
+  _createModuleCache(): ModuleCache {
     return new ModuleCache({
       // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       getClosestPackage: this._getClosestPackage.bind(this),
@@ -225,6 +225,19 @@ class DependencyGraph extends EventEmitter {
     this._haste.end();
   }
 
+  /** Given a search context, return a list of file paths matching the query. */
+  matchFilesWithContext(
+    from: string,
+    context: $ReadOnly<{
+      /* Should search for files recursively. */
+      recursive: boolean,
+      /* Filter relative paths against a pattern. */
+      filter: RegExp,
+    }>,
+  ): string[] {
+    return this._hasteFS.matchFilesWithContext(from, context);
+  }
+
   resolveDependency(
     from: string,
     to: string,