Skip to content

Commit 71028d2

Browse files
committed
Merge branch 'pr2220' into pr2240
2 parents 91129f6 + 774beac commit 71028d2

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

‎packages/metro/src/node-haste/DependencyGraph/createFileMap.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export default function createFileMap(
9494
config.resolver.hasteImplModulePath != null ||
9595
config.resolver.enableGlobalPackages
9696
) {
97-
const hastePlugin = new HastePlugin({
97+
hasteMap = new HastePlugin({
9898
platforms: new Set([
9999
...config.resolver.platforms,
100100
MetroFileMap.H.NATIVE_PLATFORM,
@@ -104,8 +104,7 @@ export default function createFileMap(
104104
rootDir: config.projectRoot,
105105
failValidationOnConflicts: options?.throwOnModuleCollision ?? true,
106106
});
107-
plugins.push(hastePlugin);
108-
hasteMap = hastePlugin;
107+
plugins.push(hasteMap);
109108
}
110109

111110
const fileMap = new MetroFileMap({

‎packages/metro/src/node-haste/__tests__/createFileMap-test.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ import type {ConfigT} from 'metro-config';
1313
import type {HasteMap} from 'metro-file-map';
1414

1515
import createFileMap from '../DependencyGraph/createFileMap';
16-
import {getDefaultConfig} from 'metro-config';
16+
import {getDefaultConfig, mergeConfig} from 'metro-config';
1717
import {HastePlugin} from 'metro-file-map';
1818

1919
function createHasteMap(resolver: Partial<ConfigT['resolver']>): ?HasteMap {
20-
const defaults = getDefaultConfig.getDefaultValues('/');
2120
return createFileMap(
22-
{...defaults, resolver: {...defaults.resolver, ...resolver}},
21+
mergeConfig(getDefaultConfig.getDefaultValues('/'), {resolver}),
2322
{watch: false},
2423
).hasteMap;
2524
}
@@ -55,7 +54,6 @@ describe('createFileMap', () => {
5554
])('adds the Haste plugin with %s', (_, resolver) => {
5655
const hasteMap = createHasteMap(resolver);
5756

58-
expect(hasteMap).toBeInstanceOf(HastePlugin);
5957
expect(getWorker.mock.instances).toHaveLength(1);
6058
expect(getWorker.mock.instances[0]).toBe(hasteMap);
6159
});

0 commit comments

Comments
 (0)