Skip to content

chore: fall back to verbatimModuleSyntax if possible #649

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
Jul 9, 2024
Merged

chore: fall back to verbatimModuleSyntax if possible #649

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
26 changes: 20 additions & 6 deletions src/transformers/typescript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,15 @@ function getCompilerOptions({
options: Options.Typescript;
basePath: string;
}): CompilerOptions {
const inputOptions = options.compilerOptions ?? {};
const inputOptions = ts.convertCompilerOptionsFromJson(
options.compilerOptions ?? {},
basePath,
);

const { errors, options: convertedCompilerOptions } =
options.tsconfigFile !== false || options.tsconfigDirectory
? loadTsconfig(inputOptions, filename, options)
: ts.convertCompilerOptionsFromJson(inputOptions, basePath);
: inputOptions;

if (errors.length) {
throw new Error(formatDiagnostics(errors, basePath));
Expand All @@ -79,8 +82,16 @@ function getCompilerOptions({
if (!warned_verbatim && !compilerOptions.verbatimModuleSyntax) {
warned_verbatim = true;
console.warn(
'\x1b[1m%s\x1b[0m',
'The TypeScript option verbatimModuleSyntax is now required when using Svelte files with lang="ts". Please add it to your tsconfig.json.',
);
// best effort to still add it, if possible, in case no config was found whatsoever
if (
Object.keys(inputOptions.options).length === 0 &&
convertedCompilerOptions === inputOptions.options
) {
compilerOptions.verbatimModuleSyntax = true;
}
}

if (
Expand Down Expand Up @@ -143,15 +154,18 @@ function transpileTs({
}

export function loadTsconfig(
compilerOptionsJSON: any,
fallback: {
options: ts.CompilerOptions;
errors: ts.Diagnostic[];
},
filename: string,
tsOptions: Options.Typescript,
): {
options: ts.CompilerOptions;
errors: ts.Diagnostic[];
} {
if (typeof tsOptions.tsconfigFile === 'boolean') {
return { errors: [], options: compilerOptionsJSON };
return fallback;
}

let basePath = process.cwd();
Expand All @@ -164,7 +178,7 @@ export function loadTsconfig(
ts.findConfigFile(fileDirectory, ts.sys.fileExists);

if (!tsconfigFile) {
return { errors: [], options: compilerOptionsJSON };
return fallback;
}

tsconfigFile = isAbsolute(tsconfigFile)
Expand Down Expand Up @@ -193,7 +207,7 @@ export function loadTsconfig(
config,
ts.sys,
basePath,
compilerOptionsJSON,
fallback.options,
tsconfigFile,
);

Expand Down