Skip to content
New issue

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

#

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

Already on GitHub? # to your account

fix(language-core): try handle node next module resolution #3159

Merged
merged 11 commits into from
Jul 26, 2023
Merged

fix(language-core): try handle node next module resolution #3159

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a15d198
fix(language-core): try handle node next module resolution
kalvenschraut May 11, 2023
2387dd4
fix(vue-language-core): use host.getCurrentDirectory for module resol…
kalvenschraut May 18, 2023
8d5c5c8
refactor(vue-language-core): use maps first parameter since no need f…
kalvenschraut May 18, 2023
a848b46
fix: requested changes
kalvenschraut Jun 7, 2023
5d69154
chore: order of calls to match previous
kalvenschraut Jun 7, 2023
fb7c6f6
chore: missing newline before patchResolveModuleNames
kalvenschraut Jun 7, 2023
afc7279
fix: accidental prettier transform
kalvenschraut Jun 7, 2023
6ec4bd9
fix: missing type
kalvenschraut Jun 7, 2023
48b9c23
Merge branch 'master' into pr/3159
johnsoncodehk Jul 26, 2023
7e19c82
use resolveModuleName api [skip ci]
johnsoncodehk Jul 26, 2023
239d41e
Merge branch 'master' into pr/3159
johnsoncodehk Jul 26, 2023
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
31 changes: 6 additions & 25 deletions packages/vue-language-core/src/languageModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ export function createLanguage(
) {

const vueCompilerOptions = resolveVueCompilerOptions(_vueCompilerOptions);

patchResolveModuleNames(ts, vueCompilerOptions);

const vueLanguagePlugin = getDefaultVueLanguagePlugins(
ts,
compilerOptions,
Expand Down Expand Up @@ -50,6 +47,12 @@ export function createLanguage(
const sharedTypesFileName = path.join(host.rootPath, sharedTypes.baseName);
return {
...host,
resolveModuleName(moduleName, impliedNodeFormat) {
if (impliedNodeFormat === ts.ModuleKind.ESNext && vueCompilerOptions.extensions.some(ext => moduleName.endsWith(ext))) {
return `${moduleName}.js`;
}
return host.resolveModuleName?.(moduleName, impliedNodeFormat) ?? moduleName;
},
getScriptFileNames() {
return [
sharedTypesFileName,
Expand Down Expand Up @@ -80,25 +83,3 @@ export function createLanguages(
...vueCompilerOptions.experimentalAdditionalLanguageModules?.map(module => require(module)) ?? [],
];
}

function patchResolveModuleNames(
ts: typeof import('typescript/lib/tsserverlibrary'),
vueCompilerOptions: VueCompilerOptions,
) {
try {
// from https://github.com/vuejs/language-tools/pull/1543
if (!((ts as any).__vuePatchResolveModuleNames)) {
(ts as any).__vuePatchResolveModuleNames = true;
const resolveModuleNames = ts.resolveModuleName;
ts.resolveModuleName = (...args) => {
if (args[6] === ts.ModuleKind.ESNext && vueCompilerOptions.extensions.some(ext => args[0].endsWith(ext))) {
args[6] = ts.ModuleKind.CommonJS;
}
return resolveModuleNames(...args);
};
}
}
catch (e) {
// console.warn('[volar] patchResolveModuleNames failed', e);
}
}