Support TypeScript 1.8+

microsoft/TypeScript#5127 microsoft/TypeScript#5310 Closes #6
tildeio · Nov 4, 2015 · 989c0fc · 989c0fc
1 parent 30b3b86
commit 989c0fc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -27,13 +27,27 @@ function replaceExtensions(extensionsRegex, name) {
 function parseOptions(tsconfigPath) {
   try {
     var configFile = fs.readFileSync(tsconfigPath, 'utf8');
-    var rawConfig = ts.parseConfigFileText(tsconfigPath, configFile);
+    var rawConfig;
+
+    if (typeof ts.parseConfigFileText === 'function') {
+      rawConfig = ts.parseConfigFileText(tsconfigPath, configFile);
+    } else {
+      // >= 1.8
+      rawConfig = ts.parseConfigFileTextToJson(tsconfigPath, configFile);
+    }
 
     if (rawConfig.error) {
       throw new Error(rawConfig.error.messageText);
     }
 
-    var parsedConfig = ts.parseConfigFile(rawConfig.config, ts.sys, path.dirname(tsconfigPath));
+    var parsedConfig;
+
+    if (typeof ts.parseConfigFile === 'function') {
+      parsedConfig = ts.parseConfigFile(rawConfig.config, ts.sys, path.dirname(tsconfigPath));
+    } else {
+      // >= 1.8
+      parsedConfig = ts.convertCompilerOptionsFromJson(rawConfig.config.compilerOptions, path.dirname(tsconfigPath));
+    }
 
     if (parsedConfig.errors && parsedConfig.errors.length) {
       throw new Error(parsedConfig.errors.join(', '));

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "json-stable-stringify": "^1.0.0"
   },
   "peerDependencies": {
-    "typescript": "^1.6.2 || ^1.7.0-dev"
+    "typescript": "^1.6.2 || ^1.7.0-dev || ^1.8.0-dev"
   },
   "devDependencies": {
     "broccoli": "^0.16.3",