Merge branch 'master' into mu

Author: dfreeman

.travis.yml

@@ -24,6 +24,9 @@ env:
 
 matrix:
   fast_finish: true
+  allow_failures:
+    - env: EMBER_TRY_SCENARIO=typescript-beta
+    - env: EMBER_TRY_SCENARIO=ember-cli-beta
 
 before_install:
   - bash ./is_md_only.sh && MD_ONLY=true && echo "Only .md files have changed!" || test true

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [1.3.2] - 2018-06-05
+
+### Fixed
+
+* TypeScript 2.9 no longer causes infinite error loops and/or fails to trigger rebuilds.
+
 ## [1.3.1] - 2018-05-14
 
 ### Fixed
@@ -232,7 +238,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 * Basic, semi-working functionality.
 
 [ember-cli-typify]: https://github.com/winding-lines/ember-cli-typify
-[unreleased]: https://github.com/typed-ember/ember-cli-typescript/compare/v1.3.0...HEAD
+[unreleased]: https://github.com/typed-ember/ember-cli-typescript/compare/v1.3.2...HEAD
+[1.3.2]: https://github.com/typed-ember/ember-cli-typescript/compare/v1.3.1...v1.3.2
 [1.3.1]: https://github.com/typed-ember/ember-cli-typescript/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/typed-ember/ember-cli-typescript/compare/v1.2.1...v1.3.0
 [1.2.1]: https://github.com/typed-ember/ember-cli-typescript/compare/v1.2.0...v1.2.1

lib/incremental-typescript-compiler/index.js

@@ -29,6 +29,7 @@ module.exports = class IncrementalTypescriptCompiler {
 
     this._ts = project.require('typescript');
     this._watchProgram = null;
+    this._compilerOptions = null;
   }
 
   treeForHost() {
@@ -136,6 +137,10 @@ module.exports = class IncrementalTypescriptCompiler {
         }
       }
     });
+
+    // Prefetch the compiler options, because fetching them while reporting a diagnostic
+    // can result in a diagnostic-reporting loop in certain states
+    this._compilerOptions = this.getProgram().getCompilerOptions();
   }
 
   getProgram() {
@@ -151,8 +156,7 @@ module.exports = class IncrementalTypescriptCompiler {
   }
 
   _shouldFailOnTypeError() {
-    let options = this.getProgram().getCompilerOptions();
-    return !!options.noEmitOnError;
+    return !!this._compilerOptions.noEmitOnError;
   }
 
   _mirageDirectory() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli-typescript",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Allow ember apps to use typescript files.",
   "keywords": [
     "ember-addon",