Skip to content

Commit 4cc7337

Browse files
committed
Merge pull request #656 from TypeStrong/tsconfig-patch
Update `tsconfig` with patches
2 parents fa02b75 + bec1b82 commit 4cc7337

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

dist/main/tsconfig/tsconfig.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,6 @@ function getProjectSync(pathOrSrcFile) {
206206
catch (ex) {
207207
throw errorWithDetails(new Error(exports.errors.GET_PROJECT_JSON_PARSE_FAILED), { projectFilePath: fsu.consistentPath(projectFile), error: ex.message });
208208
}
209-
if (!projectSpec.compilerOptions)
210-
projectSpec.compilerOptions = {};
211209
if (projectSpec.filesGlob) {
212210
var relativeProjectSpec = extend(projectSpec, {
213211
files: projectSpec.files.map(function (x) { return fsu.consistentPath(path.relative(projectFileDirectory, x)); }),

lib/main/tsconfig/tsconfig.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,6 @@ export function getProjectSync(pathOrSrcFile: string): TypeScriptProjectFileDeta
381381
new Error(errors.GET_PROJECT_JSON_PARSE_FAILED), { projectFilePath: fsu.consistentPath(projectFile), error: ex.message });
382382
}
383383

384-
// Setup default project options
385-
if (!projectSpec.compilerOptions) projectSpec.compilerOptions = {};
386-
387384
if (projectSpec.filesGlob) { // for filesGlob we keep the files in sync
388385
var relativeProjectSpec = extend(projectSpec, {
389386
files: projectSpec.files.map(x => fsu.consistentPath(path.relative(projectFileDirectory, x))),

lib/tsconfig.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@
5353
"main/atom/views/plainMessageView.ts",
5454
"main/atom/views/projectSymbolsView.ts",
5555
"main/atom/views/renameView.ts",
56-
"main/atom/views/rView.tsx",
57-
"main/atom/views/semanticView.tsx",
5856
"main/atom/views/semanticViewGlobals.d.ts",
5957
"main/atom/views/simpleOverlaySelectionView.ts",
6058
"main/atom/views/simpleSelectionView.ts",
@@ -128,7 +126,9 @@
128126
"worker/debug.ts",
129127
"worker/lib/workerLib.ts",
130128
"worker/parent.ts",
131-
"worker/queryParent.ts"
129+
"worker/queryParent.ts",
130+
"main/atom/views/rView.tsx",
131+
"main/atom/views/semanticView.tsx"
132132
],
133133
"exclude": []
134134
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"ntypescript": "1.201509200205.1",
5858
"react": "^0.13.3",
5959
"season": "^5.1.4",
60-
"tsconfig": "^1.1.0",
60+
"tsconfig": "^2.0.0",
6161
"xtend": "^4.0.0"
6262
},
6363
"devDependencies": {},

0 commit comments

Comments
 (0)