Skip to content

Commit 2a66b0a

Browse files
committed
refactor: address a few suggestions
1 parent 89e3937 commit 2a66b0a

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/utils/resolve.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ function isValidNewResolver(resolver: unknown): resolver is NewResolver {
111111
return true
112112
}
113113

114-
let nodeResolverInstanceForLegacyNodeResolverSettings: NewResolver | null = null
114+
let nodeResolverInstanceForLegacyNodeResolverSettings: NewResolver
115115

116116
function fullResolve(
117117
modulePath: string,
@@ -177,12 +177,14 @@ function fullResolve(
177177
Object.prototype.hasOwnProperty.call(settings, 'import-x/resolve') &&
178178
settings['import-x/resolve']
179179
) {
180+
const resolveSettings = settings['import-x/resolve']
181+
180182
nodeResolverInstanceForLegacyNodeResolverSettings ||= createNodeResolver({
181-
extensions: (settings['import-x/resolve'].extensions ||
183+
extensions: (resolveSettings.extensions ||
182184
settings['import-x/extensions']) as string[] | undefined,
183-
builtinModules: settings['import-x/resolve'].includeCoreModules !== false,
184-
modules: settings['import-x/resolve'].moduleDirectory,
185-
symlinks: settings['import-x/resolve'].preserveSymlinks ?? true,
185+
builtinModules: resolveSettings.includeCoreModules !== false,
186+
modules: resolveSettings.moduleDirectory,
187+
symlinks: resolveSettings.preserveSymlinks ?? true,
186188
})
187189

188190
const resolved = nodeResolverInstanceForLegacyNodeResolverSettings.resolve(

0 commit comments

Comments
 (0)