metro 0.82.4 → 0.83.0

package/src/lib/transformHelpers.js.flow

@@ -25,7 +25,7 @@ import type {ConfigT} from 'metro-config';
 import type {Type} from 'metro-transform-worker';
 
 import {getContextModuleTemplate} from './contextModuleTemplates';
-import isAssetFile from 'metro-resolver/src/utils/isAssetFile';
+import isAssetFile from 'metro-resolver/private/utils/isAssetFile';
 
 type InlineRequiresRaw =
   | $ReadOnly<{blockList: $ReadOnly<{[string]: true, ...}>, ...}>
@@ -113,10 +113,6 @@ async function calcTransformerOptions(
 
   return {
     ...baseOptions,
-    inlinePlatform:
-      transform?.unstable_inlinePlatform != null
-        ? transform.unstable_inlinePlatform
-        : true,
     inlineRequires: transform?.inlineRequires || false,
     experimentalImportSupport: transform?.experimentalImportSupport || false,
     unstable_disableES6Transforms:

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

@@ -4,7 +4,7 @@ const { codeFrameColumns } = require("@babel/code-frame");
 const fs = require("fs");
 const invariant = require("invariant");
 const Resolver = require("metro-resolver");
-const createDefaultContext = require("metro-resolver/src/createDefaultContext");
+const createDefaultContext = require("metro-resolver/private/createDefaultContext");
 const path = require("path");
 const util = require("util");
 class ModuleResolver {
@@ -231,6 +231,7 @@ function getArrayLowestItem(a) {
   return lowest;
 }
 class UnableToResolveError extends Error {
+  type = "UnableToResolveError";
   constructor(originModulePath, targetModuleName, message, options) {
     super();
     this.originModulePath = originModulePath;

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

@@ -25,13 +25,13 @@ import type {
   Resolution,
   ResolveAsset,
 } from 'metro-resolver';
-import type {PackageForModule, PackageJson} from 'metro-resolver/src/types';
+import type {PackageForModule, PackageJson} from 'metro-resolver/private/types';
 
 const {codeFrameColumns} = require('@babel/code-frame');
 const fs = require('fs');
 const invariant = require('invariant');
 const Resolver = require('metro-resolver');
-const createDefaultContext = require('metro-resolver/src/createDefaultContext');
+const createDefaultContext = require('metro-resolver/private/createDefaultContext');
 const path = require('path');
 const util = require('util');
 
@@ -345,6 +345,10 @@ class UnableToResolveError extends Error {
    * Original error that causes this error
    */
   cause: ?Error;
+  /**
+   * Fixed type field in common with other Metro build errors.
+   */
+  +type: 'UnableToResolveError' = 'UnableToResolveError';
 
   constructor(
     originModulePath: string,

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

@@ -12,10 +12,14 @@ function _getRequireWildcardCache(e) {
 function _interopRequireWildcard(e, r) {
   if (!r && e && e.__esModule) return e;
   if (null === e || ("object" != typeof e && "function" != typeof e))
-    return { default: e };
+    return {
+      default: e,
+    };
   var t = _getRequireWildcardCache(r);
   if (t && t.has(e)) return t.get(e);
-  var n = { __proto__: null },
+  var n = {
+      __proto__: null,
+    },
     a = Object.defineProperty && Object.getOwnPropertyDescriptor;
   for (var u in e)
     if ("default" !== u && {}.hasOwnProperty.call(e, u)) {

package/src/node-haste/DependencyGraph.js

@@ -11,7 +11,7 @@ const {
   Logger: { createActionStartEntry, createActionEndEntry, log },
   PackageResolutionError,
 } = require("metro-core");
-const canonicalize = require("metro-core/src/canonicalize");
+const canonicalize = require("metro-core/private/canonicalize");
 const { InvalidPackageError } = require("metro-resolver");
 const nullthrows = require("nullthrows");
 const path = require("path");

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

@@ -23,6 +23,7 @@ import type MetroFileMap, {
   HealthCheckResult,
   WatcherStatus,
 } from 'metro-file-map';
+import type {FileSystemLookup} from 'metro-resolver';
 
 import {DuplicateHasteCandidatesError} from 'metro-file-map';
 
@@ -36,7 +37,7 @@ const {
   Logger: {createActionStartEntry, createActionEndEntry, log},
   PackageResolutionError,
 } = require('metro-core');
-const canonicalize = require('metro-core/src/canonicalize');
+const canonicalize = require('metro-core/private/canonicalize');
 const {InvalidPackageError} = require('metro-resolver');
 const nullthrows = require('nullthrows');
 const path = require('path');
@@ -167,16 +168,16 @@ class DependencyGraph extends EventEmitter {
   }
 
   _createModuleResolver() {
-    const fileSystemLookup = (path: string) => {
+    const fileSystemLookup = (path: string): ReturnType<FileSystemLookup> => {
       const result = this._fileSystem.lookup(path);
       if (result.exists) {
         return {
-          exists: true as const,
+          exists: true,
           realPath: result.realPath,
           type: result.type,
         };
       }
-      return {exists: false as const};
+      return {exists: false};
     };
 
     this._moduleResolver = new ModuleResolver({

package/src/node-haste/Module.js

@@ -2,7 +2,11 @@
 
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 class Module {
   constructor(file, moduleCache) {

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

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {PackageJson} from 'metro-resolver/src/types';
+import type {PackageJson} from 'metro-resolver/private/types';
 
 const fs = require('fs');
 const path = require('path');

package/src/shared/output/RamBundle/util.js

@@ -2,7 +2,11 @@
 
 var _countLines = _interopRequireDefault(require("../../../lib/countLines"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const invariant = require("invariant");
 function lineToLineSourceMap(source, filename = "") {

package/src/shared/output/RamBundle/util.js.flow

@@ -83,7 +83,7 @@ function combineMaps(
   moduleGroups: ?ModuleGroups,
   options: ?CombineOptions,
 ): Array<IndexMapSection> {
-  const sections = [];
+  const sections: Array<IndexMapSection> = [];
 
   let line = 0;
   modules.forEach((moduleTransport: ModuleTransportLike) => {
@@ -121,6 +121,8 @@ function combineMaps(
       'Random Access Bundle source maps cannot be built from raw mappings',
     );
     sections.push(
+      /* $FlowFixMe[incompatible-exact] Natural Inference rollout. See
+       * https://fburl.com/gdoc/y8dn025u */
       Section(line, column, map || lineToLineSourceMap(code, name)),
     );
     if (offsets != null && id != null) {

package/src/shared/output/RamBundle.js.flow

@@ -26,6 +26,8 @@ async function build(
     ...Server.DEFAULT_BUNDLE_OPTIONS,
     ...requestOptions,
   };
+  /* $FlowFixMe[incompatible-call] Natural Inference rollout. See
+   * https://fburl.com/gdoc/y8dn025u */
   return await packagerClient.getRamBundleInfo(options);
 }
 

package/src/shared/output/bundle.d.ts

@@ -8,15 +8,19 @@
  * @oncall react_native
  */
 
+import type {AssetData} from '../../Asset';
+
 import Server from '../../Server';
-import {OutputOptions, RequestOptions} from '../../shared/types';
+import {BuildOptions, OutputOptions, RequestOptions} from '../../shared/types';
 
 export function build(
   packagerClient: Server,
   requestOptions: RequestOptions,
+  buildOptions?: BuildOptions,
 ): Promise<{
   code: string;
   map: string;
+  assets?: ReadonlyArray<AssetData>;
 }>;
 
 export function save(

package/src/shared/output/bundle.flow.js

@@ -3,11 +3,14 @@
 const relativizeSourceMapInline = require("../../lib/relativizeSourceMap");
 const Server = require("../../Server");
 const writeFile = require("./writeFile");
-function buildBundle(packagerClient, requestOptions) {
-  return packagerClient.build({
-    ...Server.DEFAULT_BUNDLE_OPTIONS,
-    ...requestOptions,
-  });
+function buildBundle(packagerClient, requestOptions, buildOptions = {}) {
+  return packagerClient.build(
+    {
+      ...Server.DEFAULT_BUNDLE_OPTIONS,
+      ...requestOptions,
+    },
+    buildOptions
+  );
 }
 function relativateSerializedMap(map, sourceMapSourcesRoot) {
   const sourceMap = JSON.parse(map);

package/src/shared/output/bundle.flow.js.flow

@@ -11,7 +11,8 @@
 
 'use strict';
 
-import type {OutputOptions, RequestOptions} from '../types.flow';
+import type {AssetData} from '../../Assets';
+import type {BuildOptions, OutputOptions, RequestOptions} from '../types.flow';
 import type {MixedSourceMap} from 'metro-source-map';
 
 const relativizeSourceMapInline = require('../../lib/relativizeSourceMap');
@@ -21,15 +22,20 @@ const writeFile = require('./writeFile');
 function buildBundle(
   packagerClient: Server,
   requestOptions: RequestOptions,
+  buildOptions?: BuildOptions = {},
 ): Promise<{
   code: string,
   map: string,
+  assets?: $ReadOnlyArray<AssetData>,
   ...
 }> {
-  return packagerClient.build({
-    ...Server.DEFAULT_BUNDLE_OPTIONS,
-    ...requestOptions,
-  });
+  return packagerClient.build(
+    {
+      ...Server.DEFAULT_BUNDLE_OPTIONS,
+      ...requestOptions,
+    },
+    buildOptions,
+  );
 }
 
 function relativateSerializedMap(

package/src/shared/types.d.ts

@@ -47,6 +47,10 @@ export interface BundleOptions {
   readonly unstable_transformProfile: TransformProfile;
 }
 
+export interface BuildOptions {
+  readonly withAssets?: boolean;
+}
+
 export interface ResolverInputOptions {
   readonly customResolverOptions?: CustomResolverOptions;
 }

package/src/shared/types.flow.js.flow

@@ -59,6 +59,10 @@ export type BundleOptions = {
   +sourcePaths: SourcePathsMode,
 };
 
+export type BuildOptions = $ReadOnly<{
+  withAssets?: boolean,
+}>;
+
 export type ResolverInputOptions = $ReadOnly<{
   customResolverOptions?: CustomResolverOptions,
   dev: boolean,
@@ -80,14 +84,14 @@ export type GraphOptions = {
 };
 
 // Stricter representation of BundleOptions.
-export type SplitBundleOptions = {
-  +entryFile: string,
-  +resolverOptions: ResolverInputOptions,
-  +transformOptions: TransformInputOptions,
-  +serializerOptions: SerializerOptions,
-  +graphOptions: GraphOptions,
-  +onProgress: DeltaBundlerOptions<>['onProgress'],
-};
+export type SplitBundleOptions = $ReadOnly<{
+  entryFile: string,
+  resolverOptions: ResolverInputOptions,
+  transformOptions: TransformInputOptions,
+  serializerOptions: SerializerOptions,
+  graphOptions: GraphOptions,
+  onProgress: DeltaBundlerOptions<>['onProgress'],
+}>;
 
 export type ModuleGroups = {
   groups: Map<number, Set<number>>,