metro 0.83.1 → 0.83.2

package/src/shared/{types.flow.js.flow → types.js.flow}

@@ -9,12 +9,10 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type {
   Options as DeltaBundlerOptions,
   TransformInputOptions,
-} from '../DeltaBundler/types.flow';
+} from '../DeltaBundler/types';
 import type {TransformProfile} from 'metro-babel-transformer';
 import type {CustomResolverOptions} from 'metro-resolver';
 import type {
@@ -43,7 +41,6 @@ export type BundleOptions = {
   dev: boolean,
   entryFile: string,
   +excludeSource: boolean,
-  +hot: boolean,
   +inlineSourceMap: boolean,
   +lazy: boolean,
   minify: boolean,
@@ -132,18 +129,20 @@ export type OutputOptions = {
   ...
 };
 
-export type RequestOptions = {
-  entryFile: string,
-  inlineSourceMap?: boolean,
-  sourceMapUrl?: string,
-  dev?: boolean,
-  minify: boolean,
-  platform: string,
-  createModuleIdFactory?: () => (path: string) => number,
-  onProgress?: (transformedFileCount: number, totalFileCount: number) => void,
-  +customResolverOptions?: CustomResolverOptions,
-  +customTransformOptions?: CustomTransformOptions,
-  +unstable_transformProfile?: TransformProfile,
-};
+export type RequestOptions = $ReadOnly<
+  SafeOptionalProps<{
+    entryFile: string,
+    inlineSourceMap?: boolean,
+    sourceMapUrl?: string,
+    dev?: boolean,
+    minify: boolean,
+    platform: string,
+    createModuleIdFactory?: () => (path: string) => number,
+    onProgress?: (transformedFileCount: number, totalFileCount: number) => void,
+    customResolverOptions?: CustomResolverOptions,
+    customTransformOptions?: CustomTransformOptions,
+    unstable_transformProfile?: TransformProfile,
+  }>,
+>;
 
 export type {MinifierOptions};

package/src/lib/createModuleIdFactory.js

@@ -1,15 +0,0 @@
-"use strict";
-
-function createModuleIdFactory() {
-  const fileToIdMap = new Map();
-  let nextId = 0;
-  return (path) => {
-    let id = fileToIdMap.get(path);
-    if (typeof id !== "number") {
-      id = nextId++;
-      fileToIdMap.set(path, id);
-    }
-    return id;
-  };
-}
-module.exports = createModuleIdFactory;

package/src/lib/createModuleIdFactory.js.flow

@@ -1,27 +0,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.
- *
- * @flow strict
- * @format
- * @oncall react_native
- */
-
-'use strict';
-
-function createModuleIdFactory(): (path: string) => number {
-  const fileToIdMap: Map<string, number> = new Map();
-  let nextId = 0;
-  return (path: string) => {
-    let id = fileToIdMap.get(path);
-    if (typeof id !== 'number') {
-      id = nextId++;
-      fileToIdMap.set(path, id);
-    }
-    return id;
-  };
-}
-
-module.exports = createModuleIdFactory;

package/src/lib/getMaxWorkers.js

@@ -1,9 +0,0 @@
-"use strict";
-
-const os = require("os");
-module.exports = (workers) => {
-  const cores = os.availableParallelism();
-  return typeof workers === "number" && Number.isInteger(workers)
-    ? Math.min(cores, workers > 0 ? workers : 1)
-    : Math.max(1, Math.ceil(cores * (0.5 + 0.5 * Math.exp(-cores * 0.07)) - 1));
-};

package/src/lib/getMaxWorkers.js.flow

@@ -1,22 +0,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.
- *
- * @flow strict
- * @format
- * @oncall react_native
- */
-
-'use strict';
-
-const os = require('os');
-
-module.exports = (workers: ?number): number => {
-  // $FlowFixMe[prop-missing] Missing Flow lib def for availableParallelism
-  const cores = os.availableParallelism();
-  return typeof workers === 'number' && Number.isInteger(workers)
-    ? Math.min(cores, workers > 0 ? workers : 1)
-    : Math.max(1, Math.ceil(cores * (0.5 + 0.5 * Math.exp(-cores * 0.07)) - 1));
-};

package/src/lib/parseOptionsFromUrl.js

@@ -1,62 +0,0 @@
-"use strict";
-
-var _types = require("../shared/types.flow");
-const parsePlatformFilePath = require("../node-haste/lib/parsePlatformFilePath");
-const parseCustomResolverOptions = require("./parseCustomResolverOptions");
-const parseCustomTransformOptions = require("./parseCustomTransformOptions");
-const jscSafeUrl = require("jsc-safe-url");
-const nullthrows = require("nullthrows");
-const path = require("path");
-const url = require("url");
-const getBoolean = (query, opt, defaultValue) =>
-  query[opt] == null
-    ? defaultValue
-    : query[opt] === "true" || query[opt] === "1";
-const getBundleType = (bundleType) =>
-  bundleType === "map" ? bundleType : "bundle";
-const getTransformProfile = (transformProfile) =>
-  transformProfile === "hermes-stable" || transformProfile === "hermes-canary"
-    ? transformProfile
-    : "default";
-module.exports = function parseOptionsFromUrl(normalizedRequestUrl, platforms) {
-  const parsedURL = nullthrows(url.parse(normalizedRequestUrl, true));
-  const query = nullthrows(parsedURL.query);
-  const pathname =
-    query.bundleEntry ||
-    (parsedURL.pathname != null ? decodeURIComponent(parsedURL.pathname) : "");
-  const platform =
-    query.platform || parsePlatformFilePath(pathname, platforms).platform;
-  const bundleType = getBundleType(path.extname(pathname).substr(1));
-  return {
-    bundleType,
-    customResolverOptions: parseCustomResolverOptions(parsedURL),
-    customTransformOptions: parseCustomTransformOptions(parsedURL),
-    dev: getBoolean(query, "dev", true),
-    entryFile: pathname.replace(/^(?:\.?\/)?/, "./").replace(/\.[^/.]+$/, ""),
-    excludeSource: getBoolean(query, "excludeSource", false),
-    hot: true,
-    inlineSourceMap: getBoolean(query, "inlineSourceMap", false),
-    lazy: getBoolean(query, "lazy", false),
-    minify: getBoolean(query, "minify", false),
-    modulesOnly: getBoolean(query, "modulesOnly", false),
-    onProgress: null,
-    platform,
-    runModule: getBoolean(query, "runModule", true),
-    shallow: getBoolean(query, "shallow", false),
-    sourceMapUrl: url.format({
-      ...parsedURL,
-      protocol:
-        platform != null && platform.match(/^(android|ios|vr|windows|macos)$/)
-          ? "http"
-          : "",
-      pathname: pathname.replace(/\.(bundle|delta)$/, ".map"),
-    }),
-    sourcePaths:
-      _types.SourcePathsMode.cast(query.sourcePaths) ??
-      _types.SourcePathsMode.Absolute,
-    sourceUrl: jscSafeUrl.toJscSafeUrl(normalizedRequestUrl),
-    unstable_transformProfile: getTransformProfile(
-      query.unstable_transformProfile
-    ),
-  };
-};

package/src/lib/parseOptionsFromUrl.js.flow

@@ -1,97 +0,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.
- *
- * @flow strict-local
- * @format
- * @oncall react_native
- */
-
-'use strict';
-
-import type {BundleOptions} from '../shared/types.flow';
-import type {TransformProfile} from 'metro-babel-transformer';
-
-import {SourcePathsMode} from '../shared/types.flow';
-
-const parsePlatformFilePath = require('../node-haste/lib/parsePlatformFilePath');
-const parseCustomResolverOptions = require('./parseCustomResolverOptions');
-const parseCustomTransformOptions = require('./parseCustomTransformOptions');
-const jscSafeUrl = require('jsc-safe-url');
-const nullthrows = require('nullthrows');
-const path = require('path');
-const url = require('url');
-
-const getBoolean = (
-  query: $ReadOnly<{[opt: string]: string}>,
-  opt: string,
-  defaultValue: boolean,
-) =>
-  query[opt] == null
-    ? defaultValue
-    : query[opt] === 'true' || query[opt] === '1';
-
-const getBundleType = (bundleType: string): 'map' | 'bundle' =>
-  bundleType === 'map' ? bundleType : 'bundle';
-
-const getTransformProfile = (transformProfile: string): TransformProfile =>
-  transformProfile === 'hermes-stable' || transformProfile === 'hermes-canary'
-    ? transformProfile
-    : 'default';
-
-module.exports = function parseOptionsFromUrl(
-  normalizedRequestUrl: string,
-  platforms: Set<string>,
-): {
-  ...BundleOptions,
-  // Retained for backwards compatibility, unused in Metro, to be removed.
-  bundleType: string,
-} {
-  const parsedURL = nullthrows(url.parse(normalizedRequestUrl, true)); // `true` to parse the query param as an object.
-  const query = nullthrows(parsedURL.query);
-  const pathname =
-    query.bundleEntry ||
-    (parsedURL.pathname != null ? decodeURIComponent(parsedURL.pathname) : '');
-  const platform =
-    query.platform || parsePlatformFilePath(pathname, platforms).platform;
-  const bundleType = getBundleType(path.extname(pathname).substr(1));
-
-  return {
-    bundleType,
-    customResolverOptions: parseCustomResolverOptions(parsedURL),
-    customTransformOptions: parseCustomTransformOptions(parsedURL),
-    dev: getBoolean(query, 'dev', true),
-    entryFile: pathname.replace(/^(?:\.?\/)?/, './').replace(/\.[^/.]+$/, ''),
-    excludeSource: getBoolean(query, 'excludeSource', false),
-    hot: true,
-    inlineSourceMap: getBoolean(query, 'inlineSourceMap', false),
-    lazy: getBoolean(query, 'lazy', false),
-    minify: getBoolean(query, 'minify', false),
-    modulesOnly: getBoolean(query, 'modulesOnly', false),
-    onProgress: null,
-    platform,
-    runModule: getBoolean(query, 'runModule', true),
-    shallow: getBoolean(query, 'shallow', false),
-    sourceMapUrl: url.format({
-      ...parsedURL,
-      // The Chrome Debugger loads bundles via Blob urls, whose
-      // protocol is blob:http. This breaks loading source maps through
-      // protocol-relative URLs, which is why we must force the HTTP protocol
-      // when loading the bundle for either Android or iOS.
-      // TODO(T167298674): Remove when remote debugging is not needed in React Native
-      protocol:
-        platform != null && platform.match(/^(android|ios|vr|windows|macos)$/)
-          ? 'http'
-          : '',
-      pathname: pathname.replace(/\.(bundle|delta)$/, '.map'),
-    }),
-    sourcePaths:
-      SourcePathsMode.cast(query.sourcePaths) ?? SourcePathsMode.Absolute,
-    sourceUrl: jscSafeUrl.toJscSafeUrl(normalizedRequestUrl),
-    unstable_transformProfile: getTransformProfile(
-      query.unstable_transformProfile,
-    ),
-  };
-};

package/src/node-haste/Module.js

@@ -1,20 +0,0 @@
-"use strict";
-
-var _path = _interopRequireDefault(require("path"));
-function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
-}
-class Module {
-  constructor(file, moduleCache) {
-    if (!_path.default.isAbsolute(file)) {
-      throw new Error("Expected file to be absolute path but got " + file);
-    }
-    this.path = file;
-    this._moduleCache = moduleCache;
-  }
-  getPackage() {
-    return this._moduleCache.getPackageForModule(this)?.pkg;
-  }
-  invalidate() {}
-}
-module.exports = Module;

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

@@ -1,41 +0,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.
- *
- * @flow strict-local
- * @format
- * @oncall react_native
- */
-
-'use strict';
-
-import type ModuleCache from './ModuleCache';
-import type Package from './Package';
-
-import path from 'path';
-
-class Module {
-  path: string;
-
-  _moduleCache: ModuleCache;
-  _sourceCode: ?string;
-
-  constructor(file: string, moduleCache: ModuleCache) {
-    if (!path.isAbsolute(file)) {
-      throw new Error('Expected file to be absolute path but got ' + file);
-    }
-
-    this.path = file;
-    this._moduleCache = moduleCache;
-  }
-
-  getPackage(): ?Package {
-    return this._moduleCache.getPackageForModule(this)?.pkg;
-  }
-
-  invalidate() {}
-}
-
-module.exports = Module;