Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/mpack/src/metro/enhancedResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ export function createResolver(rootPath: string, options?: CreateResolverOptions
conditionNames: options?.conditionNames ?? [...RESOLVER_EXPORTS_MAP_CONDITIONS, 'require', 'node', 'default'],
mainFiles: ['index'],
modules: ['node_modules', path.join(rootPath, 'src')],
alias: {
'react-native': path.join(rootPath, 'node_modules', 'react-native'),
'react': path.join(rootPath, 'node_modules', 'react'),
},
});

function resolve(context: MetroResolutionContext, request: string) {
Expand Down
19 changes: 11 additions & 8 deletions packages/mpack/src/metro/getMetroConfig.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import path from 'path';
import type { AdditionalMetroConfig } from '@granite-js/plugin-core';
import { getPackageRoot } from '@granite-js/utils';
import { createResolver } from './enhancedResolver';
import { getMonorepoRoot } from './getMonorepoRoot';
import path from 'path';
import { DEV_SERVER_DEFAULT_PORT, RESOLVER_MAIN_FIELDS, SOURCE_EXTENSIONS } from '../constants';
import { getDefaultValues } from '../vendors/metro-config/src/defaults';
import exclusionList from '../vendors/metro-config/src/defaults/exclusionList';
import { mergeConfig } from '../vendors/metro-config/src/loadConfig';
import { createResolver } from './enhancedResolver';
import { getMonorepoRoot } from './getMonorepoRoot';

export interface GetMetroConfig {
rootPath: string;
Expand Down Expand Up @@ -78,12 +78,15 @@ export async function getMetroConfig({ rootPath }: GetMetroConfig, additionalCon
resolveRequest,
// metro-file-map
sourceExts: [...SOURCE_EXTENSIONS.map((extension) => extension.replace(/^\.?/, '')), 'cjs', 'mjs'],
blockList: exclusionList(
additionalConfig?.resolver?.blockList ? asArray(additionalConfig.resolver.blockList) : []
),
nodeModulesPaths: additionalConfig?.resolver?.nodeModulesPaths || [],
blockList: exclusionList([
...(additionalConfig?.resolver?.blockList ? asArray(additionalConfig.resolver.blockList) : []),
]),
nodeModulesPaths: [
path.join(rootPath, 'node_modules'),
...(additionalConfig?.resolver?.nodeModulesPaths || []),
],
extraNodeModules: additionalConfig?.resolver?.extraNodeModules || {},
disableHierarchicalLookup: additionalConfig?.resolver?.disableHierarchicalLookup,
disableHierarchicalLookup: additionalConfig?.resolver?.disableHierarchicalLookup ?? true,
resolverMainFields: additionalConfig?.resolver?.resolverMainFields ?? RESOLVER_MAIN_FIELDS,
},
serializer: {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.