Prefer /private/ deep imports when importing from other Metro packages

robhogan · facebook-github-bot · commit 00012077fc50 · 2025-07-09T05:26:28.000-07:00
Summary:
Migrate Metro OSS to use explicitly-private deep imports between Metro packages, in preparation for disallowing `/src/` imports.

Changelog: Internal

Reviewed By: vzaidman

Differential Revision: D77939836

fbshipit-source-id: e37fa1cf3ee31f3e43a64b90cfd7ffad89ad9449
diff --git a/packages/metro-cache/src/stableHash.js b/packages/metro-cache/src/stableHash.js
@@ -12,7 +12,7 @@
 'use strict';
 
 const crypto = require('crypto');
-const canonicalize = require('metro-core/src/canonicalize');
+const canonicalize = require('metro-core/private/canonicalize');
 
 function stableHash(value: mixed): Buffer {
   return (
diff --git a/packages/metro-config/src/configTypes.flow.js b/packages/metro-config/src/configTypes.flow.js
@@ -17,15 +17,15 @@ import typeof MetroCache from 'metro-cache';
 import type {CacheManagerFactory} from 'metro-file-map';
 import type {CustomResolver} from 'metro-resolver';
 import type {JsTransformerConfig} from 'metro-transform-worker';
-import type {TransformResult} from 'metro/src/DeltaBundler';
+import type {TransformResult} from 'metro/private/DeltaBundler';
 import type {
   DeltaResult,
   Module,
   ReadOnlyGraph,
   SerializerOptions,
-} from 'metro/src/DeltaBundler/types.flow.js';
-import type {Reporter} from 'metro/src/lib/reporting';
-import type MetroServer from 'metro/src/Server';
+} from 'metro/private/DeltaBundler/types.flow';
+import type {Reporter} from 'metro/private/lib/reporting';
+import type MetroServer from 'metro/private/Server';
 
 export type ExtraTransformOptions = $ReadOnly<{
   preloadedModules?: $ReadOnly<{[path: string]: true, ...}> | false,
diff --git a/packages/metro-config/src/defaults/defaults.js b/packages/metro-config/src/defaults/defaults.js
@@ -13,7 +13,7 @@
 
 import type {PerfLogger, RootPerfLogger} from '../configTypes.flow';
 
-const defaultCreateModuleIdFactory = require('metro/src/lib/createModuleIdFactory');
+const defaultCreateModuleIdFactory = require('metro/private/lib/createModuleIdFactory');
 
 exports.assetExts = [
   // Image formats
diff --git a/packages/metro-config/src/defaults/index.js b/packages/metro-config/src/defaults/index.js
@@ -26,8 +26,8 @@ const {
 const exclusionList = require('./exclusionList');
 const {FileStore} = require('metro-cache');
 const {Terminal} = require('metro-core');
-const getMaxWorkers = require('metro/src/lib/getMaxWorkers');
-const TerminalReporter = require('metro/src/lib/TerminalReporter');
+const getMaxWorkers = require('metro/private/lib/getMaxWorkers');
+const TerminalReporter = require('metro/private/lib/TerminalReporter');
 const os = require('os');
 const path = require('path');
 
diff --git a/packages/metro-core/src/Logger.js b/packages/metro-core/src/Logger.js
@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {BundleOptions} from 'metro/src/shared/types.flow';
+import type {BundleOptions} from 'metro/private/shared/types.flow';
 
 const VERSION = require('../package.json').version;
 const {EventEmitter} = require('events');
diff --git a/packages/metro-resolver/src/createDefaultContext.js b/packages/metro-resolver/src/createDefaultContext.js
@@ -10,7 +10,7 @@
  */
 
 import type {ResolutionContext} from './types';
-import type {TransformResultDependency} from 'metro/src/DeltaBundler/types.flow';
+import type {TransformResultDependency} from 'metro/private/DeltaBundler/types.flow';
 
 import {redirectModulePath} from './PackageResolve';
 
diff --git a/packages/metro-resolver/src/types.js b/packages/metro-resolver/src/types.js
@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {TransformResultDependency} from 'metro/src/DeltaBundler/types.flow';
+import type {TransformResultDependency} from 'metro/private/DeltaBundler/types.flow';
 
 export type Result<+TResolution, +TCandidates> =
   | {+type: 'resolved', +resolution: TResolution}
diff --git a/packages/metro-source-map/src/__tests__/generateFunctionMap-test.js b/packages/metro-source-map/src/__tests__/generateFunctionMap-test.js
@@ -29,7 +29,7 @@ const STANDARDIZED_TYPES: Array<BabelNodeStandardized> =
   require('@babel/types').STANDARDIZED_TYPES;
 const {
   SourceMetadataMapConsumer,
-} = require('metro-symbolicate/src/Symbolication');
+} = require('metro-symbolicate/private/Symbolication');
 
 function getAst(source: string) {
   return parse(source, {
diff --git a/packages/metro-source-map/src/composeSourceMaps.js b/packages/metro-source-map/src/composeSourceMaps.js
@@ -26,8 +26,8 @@ function composeSourceMaps(
   maps: $ReadOnlyArray<MixedSourceMap>,
 ): MixedSourceMap {
   // NOTE: require() here to break dependency cycle
-  const SourceMetadataMapConsumer = require('metro-symbolicate/src/SourceMetadataMapConsumer');
-  const GoogleIgnoreListConsumer = require('metro-symbolicate/src/GoogleIgnoreListConsumer');
+  const SourceMetadataMapConsumer = require('metro-symbolicate/private/SourceMetadataMapConsumer');
+  const GoogleIgnoreListConsumer = require('metro-symbolicate/private/GoogleIgnoreListConsumer');
   if (maps.length < 1) {
     throw new Error('composeSourceMaps: Expected at least one map');
   }
diff --git a/packages/metro-transform-plugins/src/__tests__/import-export-plugin-test.js b/packages/metro-transform-plugins/src/__tests__/import-export-plugin-test.js
@@ -11,13 +11,13 @@
 
 'use strict';
 
-import type {Dependency} from 'metro/src/ModuleGraph/worker/collectDependencies';
+import type {Dependency} from 'metro/private/ModuleGraph/worker/collectDependencies';
 
 const {compare, transformToAst} = require('../__mocks__/test-helpers');
 const importExportPlugin = require('../import-export-plugin');
 // $FlowFixMe[untyped-import] @babel/code-frame
 const {codeFrameColumns} = require('@babel/code-frame');
-const collectDependencies = require('metro/src/ModuleGraph/worker/collectDependencies');
+const collectDependencies = require('metro/private/ModuleGraph/worker/collectDependencies');
 
 const opts = {
   importAll: '_$$_IMPORT_ALL',
diff --git a/packages/metro-transform-worker/src/index.js b/packages/metro-transform-worker/src/index.js
@@ -28,12 +28,12 @@ import type {
   InlinePluginOptions,
   InlineRequiresPluginOptions,
 } from 'metro-transform-plugins';
-import type {TransformResultDependency} from 'metro/src/DeltaBundler';
-import type {AllowOptionalDependencies} from 'metro/src/DeltaBundler/types.flow.js';
+import type {TransformResultDependency} from 'metro/private/DeltaBundler';
+import type {AllowOptionalDependencies} from 'metro/private/DeltaBundler/types.flow';
 import type {
   DependencyTransformer,
   DynamicRequiresBehavior,
-} from 'metro/src/ModuleGraph/worker/collectDependencies';
+} from 'metro/private/ModuleGraph/worker/collectDependencies';
 
 const getMinifier = require('./utils/getMinifier');
 const {transformFromAstSync} = require('@babel/core');
@@ -49,16 +49,16 @@ const {
   toSegmentTuple,
 } = require('metro-source-map');
 const metroTransformPlugins = require('metro-transform-plugins');
-const collectDependencies = require('metro/src/ModuleGraph/worker/collectDependencies');
+const collectDependencies = require('metro/private/ModuleGraph/worker/collectDependencies');
 const {
   InvalidRequireCallError: InternalInvalidRequireCallError,
-} = require('metro/src/ModuleGraph/worker/collectDependencies');
-const generateImportNames = require('metro/src/ModuleGraph/worker/generateImportNames');
+} = require('metro/private/ModuleGraph/worker/collectDependencies');
+const generateImportNames = require('metro/private/ModuleGraph/worker/generateImportNames');
 const {
   importLocationsPlugin,
   locToKey,
-} = require('metro/src/ModuleGraph/worker/importLocationsPlugin');
-const JsFileWrapping = require('metro/src/ModuleGraph/worker/JsFileWrapping');
+} = require('metro/private/ModuleGraph/worker/importLocationsPlugin');
+const JsFileWrapping = require('metro/private/ModuleGraph/worker/JsFileWrapping');
 const nullthrows = require('nullthrows');
 
 type MinifierConfig = $ReadOnly<{[string]: mixed, ...}>;
diff --git a/packages/metro-transform-worker/src/utils/assetTransformer.js b/packages/metro-transform-worker/src/utils/assetTransformer.js
@@ -14,8 +14,8 @@
 import type {File} from '@babel/types';
 import type {BabelTransformerArgs} from 'metro-babel-transformer';
 
-const {getAssetData} = require('metro/src/Assets');
-const {generateAssetCodeFileAst} = require('metro/src/Bundler/util');
+const {getAssetData} = require('metro/private/Assets');
+const {generateAssetCodeFileAst} = require('metro/private/Bundler/util');
 const path = require('path');
 
 async function transform(
diff --git a/packages/metro/src/DeltaBundler/Worker.flow.js b/packages/metro/src/DeltaBundler/Worker.flow.js
@@ -12,7 +12,7 @@
 'use strict';
 
 import type {TransformResult} from './types.flow';
-import type {LogEntry} from 'metro-core/src/Logger';
+import type {LogEntry} from 'metro-core/private/Logger';
 import type {
   JsTransformerConfig,
   JsTransformOptions,
diff --git a/packages/metro/src/DeltaBundler/__tests__/Transformer-test.js b/packages/metro/src/DeltaBundler/__tests__/Transformer-test.js
@@ -20,8 +20,8 @@ jest
 
 var Transformer = require('../Transformer');
 var fs = require('fs');
-var {getDefaultValues} = require('metro-config/src/defaults');
-var {mergeConfig} = require('metro-config/src/loadConfig');
+var {getDefaultValues} = require('metro-config').getDefaultConfig;
+var {mergeConfig} = require('metro-config/private/loadConfig');
 
 describe('Transformer', function () {
   let watchFolders;
diff --git a/packages/metro/src/DeltaBundler/__tests__/WorkerFarm-test.js b/packages/metro/src/DeltaBundler/__tests__/WorkerFarm-test.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-const getDefaultConfig = require('metro-config/src/defaults');
+const {getDefaultConfig} = require('metro-config');
 const {Readable} = require('stream');
 
 describe('Worker Farm', function () {
diff --git a/packages/metro/src/ModuleGraph/worker/collectDependencies.js b/packages/metro/src/ModuleGraph/worker/collectDependencies.js
@@ -15,7 +15,7 @@ import type {CallExpression, Identifier, StringLiteral} from '@babel/types';
 import type {
   AllowOptionalDependencies,
   AsyncDependencyType,
-} from 'metro/src/DeltaBundler/types.flow.js';
+} from 'metro/private/DeltaBundler/types.flow';
 
 import {isProgram} from '@babel/types';
 
diff --git a/packages/metro/src/Server.js b/packages/metro/src/Server.js
@@ -40,8 +40,8 @@ import type {ConfigT, RootPerfLogger} from 'metro-config';
 import type {
   ActionLogEntryData,
   ActionStartLogEntry,
-} from 'metro-core/src/Logger';
-import type {CustomResolverOptions} from 'metro-resolver/src/types';
+} from 'metro-core/private/Logger';
+import type {CustomResolverOptions} from 'metro-resolver/private/types';
 import type {CustomTransformOptions} from 'metro-transform-worker';
 
 import {SourcePathsMode} from './shared/types.flow';
diff --git a/packages/metro/src/Server/symbolicate.js b/packages/metro/src/Server/symbolicate.js
@@ -17,10 +17,12 @@ import type {
 import type {ExplodedSourceMap} from '../DeltaBundler/Serializers/getExplodedSourceMap';
 import type {ConfigT} from 'metro-config';
 
-const {greatestLowerBound} = require('metro-source-map/src/Consumer/search');
+const {
+  greatestLowerBound,
+} = require('metro-source-map/private/Consumer/search');
 const {
   SourceMetadataMapConsumer,
-} = require('metro-symbolicate/src/Symbolication');
+} = require('metro-symbolicate/private/Symbolication');
 
 export type StackFrameInput = {
   +file: ?string,
diff --git a/packages/metro/src/lib/getGraphId.js b/packages/metro/src/lib/getGraphId.js
@@ -14,7 +14,7 @@
 import type {TransformInputOptions} from '../DeltaBundler/types.flow';
 import type {ResolverInputOptions} from '../shared/types.flow';
 
-const canonicalize = require('metro-core/src/canonicalize');
+const canonicalize = require('metro-core/private/canonicalize');
 
 export opaque type GraphId: string = string;
 
diff --git a/packages/metro/src/lib/getPrependedScripts.js b/packages/metro/src/lib/getPrependedScripts.js
@@ -15,14 +15,14 @@ import type Bundler from '../Bundler';
 import type DeltaBundler, {Module} from '../DeltaBundler';
 import type {TransformInputOptions} from '../DeltaBundler/types.flow';
 import type {ResolverInputOptions} from '../shared/types.flow';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
+import type {ConfigT} from 'metro-config/private/configTypes.flow';
 
 import CountingSet from './CountingSet';
 
 const countLines = require('./countLines');
 const getPreludeCode = require('./getPreludeCode');
 const transformHelpers = require('./transformHelpers');
-const defaults = require('metro-config/src/defaults/defaults');
+const defaults = require('metro-config/private/defaults/defaults');
 
 async function getPrependedScripts(
   config: ConfigT,
diff --git a/packages/metro/src/lib/transformHelpers.js b/packages/metro/src/lib/transformHelpers.js
@@ -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, ...}>, ...}>
diff --git a/packages/metro/src/node-haste/DependencyGraph.js b/packages/metro/src/node-haste/DependencyGraph.js
@@ -37,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');
diff --git a/packages/metro/src/node-haste/DependencyGraph/ModuleResolution.js b/packages/metro/src/node-haste/DependencyGraph/ModuleResolution.js
@@ -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');
 
diff --git a/packages/metro/src/node-haste/Package.js b/packages/metro/src/node-haste/Package.js
@@ -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');
