Skip to content

Commit 2cafc11

Browse files
committed
Drops multiple tsconfig files
It is easier if we only keep one tsconfig file copy. Source maps have been enabled by default even in production to make error reporting slightly easier
1 parent 1834b07 commit 2cafc11

File tree

4 files changed

+9
-22
lines changed

4 files changed

+9
-22
lines changed

src/extension.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// src/extension.ts
2-
import * as which from 'which';
2+
import which from 'which';
33
import * as vscode from 'vscode';
44

55
import { FortranLintingProvider } from './features/linter-provider';
@@ -65,7 +65,7 @@ export async function activate(context: vscode.ExtensionContext) {
6565
// Check if the language server is installed and if not prompt to install it
6666
// Not the most elegant solution but we need pip install to have finished
6767
// before the activate function is called so we do a little code duplication
68-
which(config.get<string>('fortls.path'), err => {
68+
which(config.get<string>('fortls.path'), (err: any) => {
6969
if (!config.get('ignoreWarning.fortls')) {
7070
if (err) {
7171
const msg = `It is highly recommended to use the fortran-language-server to

tsconfig.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
"outDir": "out",
66
"lib": ["ES2020"],
77
"sourceMap": true,
8-
"rootDir": ".",
9-
"resolveJsonModule": true
8+
"resolveJsonModule": true,
9+
"esModuleInterop": true,
10+
"removeComments": true,
11+
"rootDir": "."
1012
},
1113
"include": ["src/**/*.ts"],
1214
"exclude": ["node_modules", ".vscode-test"]

tsconfig.prod.json

-14
This file was deleted.

webpack.config.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ const config = {
3434
{
3535
loader: 'ts-loader',
3636
options: {
37-
configFile:
38-
process.env.NODE_ENV === 'production'
39-
? path.resolve('./tsconfig.prod.json')
40-
: path.resolve('./tsconfig.json'),
37+
compilerOptions: {
38+
sourceMap: true,
39+
},
4140
},
4241
},
4342
],

0 commit comments

Comments
 (0)