Skip to content

(fix) override react's JSX typings #234

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 1 commit into from
Jun 28, 2020
Merged

(fix) override react's JSX typings #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions packages/language-server/public/sink.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare module 'react' {}
16 changes: 14 additions & 2 deletions packages/language-server/src/plugins/typescript/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,17 @@ export function createLanguageService(
);
}

configJson.compilerOptions = configJson.compilerOptions || {};
// Reroute react paths to a sink with no typings to prevent conflicts between the
// svelte2tsx JSX typings and react's JSX typings.
// This may happen if a node module has (in)directly installed/imported react's types.
if (!configJson.compilerOptions.paths?.react) {
configJson.paths = configJson.paths || {};
configJson.paths.react = [
ts.sys.resolvePath(resolve(__dirname, '../../../../public/sink.d.ts')),
];
}

const parsedConfig = ts.parseJsonConfigFileContent(
configJson,
ts.sys,
Expand All @@ -194,8 +205,9 @@ export function createLanguageService(
const files = parsedConfig.fileNames;

const sveltePkgInfo = getPackageInfo('svelte', workspacePath || process.cwd());
const types = (parsedConfig.options?.types ?? [])
.concat(resolve(sveltePkgInfo.path, 'types', 'runtime'));
const types = (parsedConfig.options?.types ?? []).concat(
resolve(sveltePkgInfo.path, 'types', 'runtime'),
);
const compilerOptions: ts.CompilerOptions = {
...parsedConfig.options,
types,
Expand Down