Merge pull request #687 from TypeStrong/bump-tsconfig

Update to latest `tsconfig`

Author: blakeembrey

dist/main/tsconfig/tsconfig.js

@@ -65,7 +65,6 @@ var path = require('path');
 var tsconfig = require('tsconfig');
 var os = require('os');
 var detectIndent = require('detect-indent');
-var extend = require('xtend');
 var formatting = require('./formatting');
 var projectFileName = 'tsconfig.json';
 var defaultFilesGlob = [
@@ -202,17 +201,13 @@ function getProjectSync(pathOrSrcFile) {
         throw new Error(exports.errors.GET_PROJECT_FAILED_TO_OPEN_PROJECT_FILE);
     }
     try {
-        projectSpec = tsconfig.parseFileSync(projectFileTextContent, projectFile);
+        projectSpec = tsconfig.parseFileSync(projectFileTextContent, projectFile, { resolvePaths: false });
     }
     catch (ex) {
         throw errorWithDetails(new Error(exports.errors.GET_PROJECT_JSON_PARSE_FAILED), { projectFilePath: fsu.consistentPath(projectFile), error: ex.message });
     }
     if (projectSpec.filesGlob) {
-        var relativeProjectSpec = extend(projectSpec, {
-            files: projectSpec.files.map(function (x) { return fsu.consistentPath(path.relative(projectFileDirectory, x)); }),
-            exclude: projectSpec.exclude.map(function (x) { return fsu.consistentPath(path.relative(projectFileDirectory, x)); })
-        });
-        var prettyJSONProjectSpec = prettyJSON(relativeProjectSpec, detectIndent(projectFileTextContent).indent);
+        var prettyJSONProjectSpec = prettyJSON(projectSpec, detectIndent(projectFileTextContent).indent);
         if (prettyJSONProjectSpec !== projectFileTextContent) {
             fs.writeFileSync(projectFile, prettyJSONProjectSpec);
         }
@@ -235,7 +230,7 @@ function getProjectSync(pathOrSrcFile) {
     }
     var project = {
         compilerOptions: {},
-        files: projectSpec.files,
+        files: projectSpec.files.map(function (x) { return path.resolve(projectFileDirectory, x); }),
         filesGlob: projectSpec.filesGlob,
         formatCodeOptions: formatting.makeFormatCodeOptions(projectSpec.formatCodeOptions),
         compileOnSave: projectSpec.compileOnSave == undefined ? true : projectSpec.compileOnSave,

lib/main/tsconfig/tsconfig.ts

@@ -377,19 +377,14 @@ export function getProjectSync(pathOrSrcFile: string): TypeScriptProjectFileDeta
     }
 
     try {
-        projectSpec = tsconfig.parseFileSync(projectFileTextContent, projectFile);
+        projectSpec = tsconfig.parseFileSync(projectFileTextContent, projectFile, { resolvePaths: false });
     } catch (ex) {
         throw errorWithDetails<GET_PROJECT_JSON_PARSE_FAILED_Details>(
             new Error(errors.GET_PROJECT_JSON_PARSE_FAILED), { projectFilePath: fsu.consistentPath(projectFile), error: ex.message });
     }
 
     if (projectSpec.filesGlob) { // for filesGlob we keep the files in sync
-        var relativeProjectSpec = extend(projectSpec, {
-          files: projectSpec.files.map(x => fsu.consistentPath(path.relative(projectFileDirectory, x))),
-          exclude: projectSpec.exclude.map(x => fsu.consistentPath(path.relative(projectFileDirectory, x)))
-        });
-
-        var prettyJSONProjectSpec = prettyJSON(relativeProjectSpec, detectIndent(projectFileTextContent).indent);
+        var prettyJSONProjectSpec = prettyJSON(projectSpec, detectIndent(projectFileTextContent).indent);
 
         if (prettyJSONProjectSpec !== projectFileTextContent) {
             fs.writeFileSync(projectFile, prettyJSONProjectSpec);
@@ -416,7 +411,7 @@ export function getProjectSync(pathOrSrcFile: string): TypeScriptProjectFileDeta
 
     var project: TypeScriptProjectSpecification = {
         compilerOptions: {},
-        files: projectSpec.files,
+        files: projectSpec.files.map(x => path.resolve(projectFileDirectory, x)),
         filesGlob: projectSpec.filesGlob,
         formatCodeOptions: formatting.makeFormatCodeOptions(projectSpec.formatCodeOptions),
         compileOnSave: projectSpec.compileOnSave == undefined ? true : projectSpec.compileOnSave,

package.json

@@ -57,7 +57,7 @@
     "ntypescript": "1.201510270605.1",
     "react": "^0.13.3",
     "season": "^5.1.4",
-    "tsconfig": "^2.0.1",
+    "tsconfig": "^2.1.0",
     "xtend": "^4.0.0"
   },
   "devDependencies": {},