Skip to content

Add Support for Resolving .cjs, .mjs, .cts and .mts Files #1503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Sep 19, 2022
Merged

Add Support for Resolving .cjs, .mjs, .cts and .mts Files #1503

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
75a4dfd
resolve: Pass implied module kind to typescript
neurolag Sep 17, 2022
8762de4
resolve: Fix detection of declaration files
neurolag Sep 17, 2022
5919999
test: Replace inexistent package
neurolag Sep 18, 2022
a821e26
test: Fix broken docker image
neurolag Sep 18, 2022
62d8033
devcontainer: Update outdated settings
neurolag Sep 18, 2022
be52871
resolve: Allow `.cts`, `.mts`, `.cjs` and `.mjs`
neurolag Sep 18, 2022
402340c
resolve: Fix broken `enhanced-resolve` calls
neurolag Sep 18, 2022
f6ea7b7
resolve: Improve type safety
neurolag Sep 18, 2022
c218be4
interop: Create a separate regex for declarations
neurolag Sep 18, 2022
076e585
types: Remove unnecessary return type
neurolag Sep 18, 2022
8dc552e
test: Add remark on how to regenerate tests
neurolag Sep 18, 2022
85cfc5a
test: Regenerate comparison-tests
neurolag Sep 19, 2022
c415a49
Bump the version number
neurolag Sep 19, 2022
acb60ef
Add changelog entry
neurolag Sep 19, 2022
c35bf1d
doc: Update CHANGELOG.md
neurolag Sep 19, 2022
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
Next Next commit
resolve: Pass implied module kind to typescript
  • Loading branch information
@neurolag
neurolag committed Sep 17, 2022
commit 75a4dfdfa8f1b78914bcf3e21656b0553b37144f
28 changes: 20 additions & 8 deletions src/servicesHost.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,9 @@ function makeResolvers<T extends typescript.ModuleResolutionHost>(
moduleNames: string[],
containingFile: string,
_reusedNames?: string[] | undefined,
redirectedReference?: typescript.ResolvedProjectReference | undefined
redirectedReference?: typescript.ResolvedProjectReference | undefined,
_?: typescript.CompilerOptions,
containingSourceFile?: typescript.SourceFile
): (typescript.ResolvedModule | undefined)[] => {
const resolvedModules = moduleNames.map(moduleName =>
resolveModule(
Expand All @@ -274,7 +276,8 @@ function makeResolvers<T extends typescript.ModuleResolutionHost>(
scriptRegex,
moduleName,
containingFile,
redirectedReference
redirectedReference,
containingSourceFile
)
);

Expand Down Expand Up @@ -1249,7 +1252,8 @@ function resolveModule(
scriptRegex: RegExp,
moduleName: string,
containingFile: string,
redirectedReference: typescript.ResolvedProjectReference | undefined
redirectedReference: typescript.ResolvedProjectReference | undefined,
containingSourceFile: typescript.SourceFile | undefined
) {
let resolutionResult: ResolvedModule;

Expand All @@ -1272,7 +1276,8 @@ function resolveModule(
const tsResolution = resolveModuleName(
moduleName,
containingFile,
redirectedReference
redirectedReference,
containingSourceFile
);
if (tsResolution.resolvedModule !== undefined) {
const resolvedFileName = path.normalize(
Expand All @@ -1297,7 +1302,8 @@ function resolveModule(
type ResolveModuleName = (
moduleName: string,
containingFile: string,
redirectedReference: typescript.ResolvedProjectReference | undefined
redirectedReference: typescript.ResolvedProjectReference | undefined,
containingSourceFile: typescript.SourceFile | undefined
) => typescript.ResolvedModuleWithFailedLookupLocations;

function makeResolveModuleName(
Expand All @@ -1314,14 +1320,20 @@ function makeResolveModuleName(
moduleResolutionHost
);
}
return (moduleName, containingFile, redirectedReference) =>
return (
moduleName,
containingFileName,
redirectedReference,
containingFile
) =>
compiler.resolveModuleName(
moduleName,
containingFile,
containingFileName,
compilerOptions,
moduleResolutionHost,
instance.moduleResolutionCache,
redirectedReference
redirectedReference,
containingFile?.impliedNodeFormat
);
}

Expand Down