metro 0.72.0 → 0.72.1

package/src/ModuleGraph/output/multiple-files-ram-bundle.js.flow

@@ -9,8 +9,6 @@
  */
 
 'use strict';
-import type {IdsForPathFn} from '../types.flow';
-
 import type {Module, OutputFn, OutputFnArg, OutputResult} from '../types.flow';
 import type {IndexMap} from 'metro-source-map';
 
@@ -30,18 +28,10 @@ function asMultipleFilesRamBundle({
   modules,
   requireCalls,
   preloadedModules,
-}: $TEMPORARY$object<{
-  dependencyMapReservedName?: ?string,
-  enableIDInlining: boolean,
-  filename: string,
-  globalPrefix: string,
-  idsForPath: IdsForPathFn,
-  modules: Iterable<Module>,
-  preloadedModules: Set<string>,
+}: $ReadOnly<{
+  ...OutputFnArg,
+  preloadedModules: $ReadOnlySet<string>,
   ramGroupHeads: ?$ReadOnlyArray<string>,
-  requireCalls: Iterable<Module>,
-  segmentID: number,
-  sourceMapPath?: ?string,
 }>): OutputResult<IndexMap> {
   const idForPath = (x: {path: string, ...}) => idsForPath(x).moduleId;
   const [startup, deferred] = partition(modules, preloadedModules);
@@ -96,7 +86,7 @@ function asMultipleFilesRamBundle({
 }
 
 function createBuilder(
-  preloadedModules: Set<string>,
+  preloadedModules: $ReadOnlySet<string>,
   ramGroupHeads: ?$ReadOnlyArray<string>,
 ): OutputFn<IndexMap> {
   return (x: OutputFnArg) =>

package/src/ModuleGraph/output/util.js.flow

@@ -318,7 +318,7 @@ exports.requireCallsTo = function* (
 // the ones loaded deferredly (lazy loaded).
 exports.partition = (
   modules: Iterable<Module>,
-  preloadedModules: Set<string>,
+  preloadedModules: $ReadOnlySet<string>,
 ): Array<Array<Module>> => {
   const startup = [];
   const deferred = [];

package/src/ModuleGraph/worker/collectDependencies.js.flow

@@ -39,7 +39,7 @@ export type Dependency<TSplitCondition> = $ReadOnly<{
 }>;
 
 // TODO: Convert to a Flow enum
-type ContextMode = 'sync' | 'eager' | 'lazy' | 'lazy-once';
+export type ContextMode = 'sync' | 'eager' | 'lazy' | 'lazy-once';
 
 type ContextFilter = {pattern: string, flags: string};
 

package/src/Server.js

@@ -471,6 +471,8 @@ class Server {
         shallow: graphOptions.shallow,
         experimentalImportBundleSupport:
           this._config.transformer.experimentalImportBundleSupport,
+        unstable_allowRequireContext:
+          this._config.transformer.unstable_allowRequireContext,
       }); // For resources that support deletion, handle the DELETE method.
 
       if (deleteFn && req.method === "DELETE") {
@@ -1097,6 +1099,8 @@ class Server {
       shallow: graphOptions.shallow,
       experimentalImportBundleSupport:
         this._config.transformer.experimentalImportBundleSupport,
+      unstable_allowRequireContext:
+        this._config.transformer.unstable_allowRequireContext,
     });
     let revision;
 

package/src/Server.js.flow

@@ -351,7 +351,7 @@ class Server {
     res: ServerResponse,
     data: string | Buffer,
     assetPath: string,
-  ) {
+  ): Buffer | string {
     if (req.headers && req.headers.range) {
       const [rangeStart, rangeEnd] = req.headers.range
         .replace(/bytes=/, '')
@@ -373,7 +373,10 @@ class Server {
     return data;
   }
 
-  async _processSingleAssetRequest(req: IncomingMessage, res: ServerResponse) {
+  async _processSingleAssetRequest(
+    req: IncomingMessage,
+    res: ServerResponse,
+  ): Promise<void> {
     const urlObj = url.parse(decodeURI(req.url), true);
     let [, assetPath] =
       (urlObj &&
@@ -514,7 +517,11 @@ class Server {
     +build: (context: ProcessStartContext) => Promise<T>,
     +delete?: (context: ProcessDeleteContext) => Promise<void>,
     +finish: (context: ProcessEndContext<T>) => void,
-  }) {
+  }): (
+    req: IncomingMessage,
+    res: ServerResponse,
+    bundleOptions: BundleOptions,
+  ) => Promise<void> {
     /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
      * Flow's LTI update could not be added via codemod */
     return async function requestProcessor(
@@ -537,6 +544,8 @@ class Server {
         shallow: graphOptions.shallow,
         experimentalImportBundleSupport:
           this._config.transformer.experimentalImportBundleSupport,
+        unstable_allowRequireContext:
+          this._config.transformer.unstable_allowRequireContext,
       });
 
       // For resources that support deletion, handle the DELETE method.
@@ -694,7 +703,11 @@ class Server {
     };
   }
 
-  _processBundleRequest = this._createRequestProcessor({
+  _processBundleRequest: (
+    req: IncomingMessage,
+    res: ServerResponse,
+    bundleOptions: BundleOptions,
+  ) => Promise<void> = this._createRequestProcessor({
     createStartEntry(context: ProcessStartContext) {
       return {
         action_name: 'Requesting bundle',
@@ -813,7 +826,11 @@ class Server {
     },
   });
 
-  _processBytecodeBundleRequest = this._createRequestProcessor({
+  _processBytecodeBundleRequest: (
+    req: IncomingMessage,
+    res: ServerResponse,
+    bundleOptions: BundleOptions,
+  ) => Promise<void> = this._createRequestProcessor({
     createStartEntry(context: ProcessStartContext) {
       return {
         action_name: 'Requesting bundle',
@@ -931,7 +948,11 @@ class Server {
     );
   }
 
-  _processSourceMapRequest = this._createRequestProcessor({
+  _processSourceMapRequest: (
+    req: IncomingMessage,
+    res: ServerResponse,
+    bundleOptions: BundleOptions,
+  ) => Promise<void> = this._createRequestProcessor({
     createStartEntry(context: ProcessStartContext) {
       return {
         action_name: 'Requesting sourcemap',
@@ -981,7 +1002,11 @@ class Server {
     },
   });
 
-  _processAssetsRequest = this._createRequestProcessor({
+  _processAssetsRequest: (
+    req: IncomingMessage,
+    res: ServerResponse,
+    bundleOptions: BundleOptions,
+  ) => Promise<void> = this._createRequestProcessor({
     createStartEntry(context: ProcessStartContext) {
       return {
         action_name: 'Requesting assets',
@@ -1143,6 +1168,8 @@ class Server {
       shallow: graphOptions.shallow,
       experimentalImportBundleSupport:
         this._config.transformer.experimentalImportBundleSupport,
+      unstable_allowRequireContext:
+        this._config.transformer.unstable_allowRequireContext,
     });
     let revision;
     const revPromise = this._bundler.getRevisionByGraphId(graphId);
@@ -1178,7 +1205,7 @@ class Server {
       transformOptions: TransformInputOptions,
       relativeTo: 'project' | 'server',
     }>,
-  ) {
+  ): Promise<string> {
     const resolutionFn = await transformHelpers.getResolveDependencyFn(
       this._bundler.getBundler(),
       transformOptions.platform,
@@ -1240,11 +1267,11 @@ class Server {
     sourceUrl: null,
   };
 
-  _getServerRootDir() {
+  _getServerRootDir(): string {
     return this._config.server.unstable_serverRoot ?? this._config.projectRoot;
   }
 
-  _getEntryPointAbsolutePath(entryFile: string) {
+  _getEntryPointAbsolutePath(entryFile: string): string {
     return path.resolve(this._getServerRootDir(), entryFile);
   }
 

package/src/integration_tests/basic_bundle/require-context/conflict.js

@@ -0,0 +1,25 @@
+"use strict";
+
+var _utils = require("./utils");
+
+/**
+ * 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
+ *
+ */
+const normalModule = require("./subdir-conflict");
+
+const contextModule = require.context("./subdir-conflict");
+
+function main() {
+  return {
+    normalModule,
+    contextModule: (0, _utils.copyContextToObject)(contextModule),
+  };
+}
+
+module.exports = main();

package/src/integration_tests/basic_bundle/require-context/conflict.js.flow

@@ -0,0 +1,27 @@
+/**
+ * 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
+ * @flow strict-local
+ */
+
+import type {RequireWithContext} from './utils';
+
+import {copyContextToObject} from './utils';
+
+declare var require: RequireWithContext;
+
+const normalModule = require('./subdir-conflict');
+const contextModule = require.context('./subdir-conflict');
+
+function main() {
+  return {
+    normalModule,
+    contextModule: copyContextToObject(contextModule),
+  };
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-context/empty.js

@@ -0,0 +1,29 @@
+"use strict";
+
+/**
+ * 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
+ *
+ */
+const empty = require.context("./no-such-dir");
+
+function main() {
+  try {
+    empty("./no-such-file.js");
+  } catch (e) {
+    return {
+      error: {
+        message: e.message,
+        code: e.code,
+      },
+    };
+  }
+
+  return null;
+}
+
+module.exports = main();

package/src/integration_tests/basic_bundle/require-context/empty.js.flow

@@ -0,0 +1,26 @@
+/**
+ * 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
+ * @flow strict-local
+ */
+
+import type {RequireWithContext} from './utils';
+
+declare var require: RequireWithContext;
+
+const empty = require.context('./no-such-dir');
+
+function main() {
+  try {
+    empty('./no-such-file.js');
+  } catch (e) {
+    return {error: {message: e.message, code: e.code}};
+  }
+  return null;
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-context/matching.js

@@ -0,0 +1,26 @@
+"use strict";
+
+/**
+ * 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
+ *
+ */
+const ab = require.context("./subdir", false, /\/(a|b)\.js$/);
+
+const abc = require.context("./subdir", false);
+
+const abcd = require.context("./subdir", true);
+
+function main() {
+  return {
+    ab: ab.keys(),
+    abc: abc.keys(),
+    abcd: abcd.keys(),
+  };
+}
+
+module.exports = main();

package/src/integration_tests/basic_bundle/require-context/matching.js.flow

@@ -0,0 +1,27 @@
+/**
+ * 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
+ * @flow strict-local
+ */
+
+import type {RequireWithContext} from './utils';
+
+declare var require: RequireWithContext;
+
+const ab = require.context('./subdir', false, /\/(a|b)\.js$/);
+const abc = require.context('./subdir', false);
+const abcd = require.context('./subdir', true);
+
+function main() {
+  return {
+    ab: ab.keys(),
+    abc: abc.keys(),
+    abcd: abcd.keys(),
+  };
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-context/mode-eager.js

@@ -0,0 +1,22 @@
+"use strict";
+
+var _utils = require("./utils");
+
+/**
+ * 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
+ *
+ */
+function main() {
+  return (0, _utils.awaitProperties)(
+    (0, _utils.copyContextToObject)(
+      require.context("./subdir", undefined, undefined, "eager")
+    )
+  );
+}
+
+module.exports = main();

package/src/integration_tests/basic_bundle/require-context/mode-eager.js.flow

@@ -0,0 +1,24 @@
+/**
+ * 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
+ * @flow strict-local
+ */
+
+import {copyContextToObject, awaitProperties} from './utils';
+import type {RequireWithContext} from './utils';
+
+declare var require: RequireWithContext;
+
+function main() {
+  return awaitProperties(
+    copyContextToObject(
+      require.context('./subdir', undefined, undefined, 'eager'),
+    ),
+  );
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-context/mode-lazy-once.js

@@ -0,0 +1,22 @@
+"use strict";
+
+var _utils = require("./utils");
+
+/**
+ * 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
+ *
+ */
+function main() {
+  return (0, _utils.awaitProperties)(
+    (0, _utils.copyContextToObject)(
+      require.context("./subdir", undefined, undefined, "lazy-once")
+    )
+  );
+}
+
+module.exports = main();

package/src/integration_tests/basic_bundle/require-context/mode-lazy-once.js.flow

@@ -0,0 +1,24 @@
+/**
+ * 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
+ * @flow strict-local
+ */
+
+import {copyContextToObject, awaitProperties} from './utils';
+import type {RequireWithContext} from './utils';
+
+declare var require: RequireWithContext;
+
+function main() {
+  return awaitProperties(
+    copyContextToObject(
+      require.context('./subdir', undefined, undefined, 'lazy-once'),
+    ),
+  );
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-context/mode-lazy.js

@@ -0,0 +1,22 @@
+"use strict";
+
+var _utils = require("./utils");
+
+/**
+ * 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
+ *
+ */
+function main() {
+  return (0, _utils.awaitProperties)(
+    (0, _utils.copyContextToObject)(
+      require.context("./subdir", undefined, undefined, "lazy")
+    )
+  );
+}
+
+module.exports = main();

package/src/integration_tests/basic_bundle/require-context/mode-lazy.js.flow

@@ -0,0 +1,24 @@
+/**
+ * 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
+ * @flow strict-local
+ */
+
+import {copyContextToObject, awaitProperties} from './utils';
+import type {RequireWithContext} from './utils';
+
+declare var require: RequireWithContext;
+
+function main() {
+  return awaitProperties(
+    copyContextToObject(
+      require.context('./subdir', undefined, undefined, 'lazy'),
+    ),
+  );
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-context/mode-sync.js

@@ -0,0 +1,20 @@
+"use strict";
+
+var _utils = require("./utils");
+
+/**
+ * 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
+ *
+ */
+function main() {
+  return (0, _utils.copyContextToObject)(
+    require.context("./subdir", undefined, undefined, "sync")
+  );
+}
+
+module.exports = main();

package/src/integration_tests/basic_bundle/require-context/mode-sync.js.flow

@@ -0,0 +1,22 @@
+/**
+ * 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
+ * @flow strict-local
+ */
+
+import {copyContextToObject} from './utils';
+import type {RequireWithContext} from './utils';
+
+declare var require: RequireWithContext;
+
+function main() {
+  return copyContextToObject(
+    require.context('./subdir', undefined, undefined, 'sync'),
+  );
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-context/subdir/a.js

@@ -0,0 +1,12 @@
+"use strict";
+
+/**
+ * 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
+ *
+ */
+module.exports = "a";

package/src/integration_tests/basic_bundle/require-context/subdir/a.js.flow

@@ -0,0 +1,11 @@
+/**
+ * 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
+ * @flow strict
+ */
+
+module.exports = 'a';

package/src/integration_tests/basic_bundle/require-context/subdir/b.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
+
+/**
+ * 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
+ *
+ */
+var _default = "b";
+exports.default = _default;

package/src/integration_tests/basic_bundle/require-context/subdir/b.js.flow

@@ -0,0 +1,11 @@
+/**
+ * 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
+ * @flow strict
+ */
+
+export default 'b';

package/src/integration_tests/basic_bundle/require-context/subdir/c.js

@@ -0,0 +1,12 @@
+"use strict";
+
+/**
+ * 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
+ *
+ */
+module.exports = "c";

package/src/integration_tests/basic_bundle/require-context/subdir/c.js.flow

@@ -0,0 +1,11 @@
+/**
+ * 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
+ * @flow strict
+ */
+
+module.exports = 'c';

package/src/integration_tests/basic_bundle/require-context/subdir/nested/d.js

@@ -0,0 +1,12 @@
+"use strict";
+
+/**
+ * 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
+ *
+ */
+module.exports = "d";

package/src/integration_tests/basic_bundle/require-context/subdir/nested/d.js.flow

@@ -0,0 +1,11 @@
+/**
+ * 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
+ * @flow strict
+ */
+
+module.exports = 'd';