Merge branch 'master' into mu

Author: dfreeman

CHANGELOG.md

@@ -6,43 +6,31 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
-## [1.3.0-beta.5]
+## [1.3.1] - 2018-05-14
 
 ### Fixed
 
-* Simplified the file watching implementation, fixing some odd behavior when trees of files were deleted or moved all at once.
-
-## [1.3.0-beta.4]
-
-* Updated the generated `tsconfig.json` to use the maximum strictness we can with Ember's typings.
-
-## [1.3.0-beta.3]
-
-### Fixed
-
-* The synchronization tweak made in 1.3.0-beta.2 now works properly on Windows.
+* No longer requires TypeScript before it has been installed.
+* Properly ignore the root across platforms.
 
-## [1.3.0-beta.2]
+## [1.3.0] - 2018-05-01
 
 ### Fixed
 
+* Simplified the file watching implementation, fixing some odd behavior when trees of files were deleted or moved all at once.
 * Synchronization between tsc and the broccoli build process has been improved, reducing spurious rebuilds.
-
-## [1.3.0-beta.1]
-
-### Added
-
-* The addon now supports failing the build when there are type errors, using `"noEmitOnError": true` in `tsconfig.json`.
+* TypeScript no longer churns on every change in the `tmp` directory.
+* Make sure ember-cli-typescript is a dev dependency when generating in-repo-addons, so their TypeScript gets built correctly.
+* Eliminated some lint errors in the build.
 
 ### Changed
 
+* Updated the generated `tsconfig.json` to use the maximum strictness we can with Ember's typings.
 * Clarified instructions for sourcemaps.
 
-### Fixed
+### Added
 
-* TypeScript no longer churns on every change in the `tmp` directory.
-* Make sure ember-cli-typescript is a dev dependency when generating in-repo-addons, so their TypeScript gets built correctly.
-* Eliminated some lint errors in the build.
+* The addon now supports failing the build when there are type errors, using `"noEmitOnError": true` in `tsconfig.json`.
 
 ## [1.2.1] - 2018-03-14
 
@@ -244,12 +232,9 @@ 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-beta.5...HEAD
-[1.3.0-beta.5]: https://github.com/typed-ember/ember-cli-typescript/compare/v1.3.0-beta.4...v1.3.0-beta.5
-[1.3.0-beta.4]: https://github.com/typed-ember/ember-cli-typescript/compare/v1.3.0-beta.3...v1.3.0-beta.4
-[1.3.0-beta.3]: https://github.com/typed-ember/ember-cli-typescript/compare/v1.3.0-beta.2...v1.3.0-beta.3
-[1.3.0-beta.2]: https://github.com/typed-ember/ember-cli-typescript/compare/v1.3.0-beta.1...v1.3.0-beta.2
-[1.3.0-beta.1]: https://github.com/typed-ember/ember-cli-typescript/compare/v1.2.1...v1.3.0-beta.1
+[unreleased]: https://github.com/typed-ember/ember-cli-typescript/compare/v1.3.0...HEAD
+[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
 [1.2.0]: https://github.com/typed-ember/ember-cli-typescript/compare/v1.1.6...v1.2.0
 [1.1.6]: https://github.com/typed-ember/ember-cli-typescript/compare/v1.1.5...v1.1.6

lib/incremental-typescript-compiler/index.js

@@ -7,7 +7,6 @@ const path = require('path');
 const fs = require('fs-extra');
 const resolve = require('resolve');
 const compile = require('../utilities/compile');
-const ts = require('typescript');
 const TypescriptOutput = require('./typescript-output-plugin');
 const CompilerState = require('./compiler-state');
 
@@ -28,6 +27,7 @@ module.exports = class IncrementalTypescriptCompiler {
     this.addons = this._discoverAddons(project, []);
     this.state = new CompilerState();
 
+    this._ts = project.require('typescript');
     this._watchProgram = null;
   }
 
@@ -118,14 +118,11 @@ module.exports = class IncrementalTypescriptCompiler {
 
     this._watchProgram = compile(project, { outDir, watch: true }, {
       watchedFileChanged: () => this.state.tscDidStart(),
+      buildComplete: () => this.state.tscDidEnd(),
 
       reportWatchStatus: (diagnostic) => {
         let text = diagnostic.messageText;
         debugTsc(text);
-
-        if (text.indexOf('Compilation complete') !== -1) {
-          this.state.tscDidEnd();
-        }
       },
 
       reportDiagnostic: (diagnostic) => {
@@ -146,10 +143,10 @@ module.exports = class IncrementalTypescriptCompiler {
   }
 
   _formatDiagnosticMessage(diagnostic) {
-    return ts.formatDiagnostic(diagnostic, {
+    return this._ts.formatDiagnostic(diagnostic, {
       getCanonicalFileName: path => path,
-      getCurrentDirectory: ts.sys.getCurrentDirectory,
-      getNewLine: () => ts.sys.newLine,
+      getCurrentDirectory: this._ts.sys.getCurrentDirectory,
+      getNewLine: () => this._ts.sys.newLine,
     });
   }
 

lib/utilities/compile.js

@@ -3,6 +3,7 @@
 
 const chokidar = require('chokidar');
 const fs = require('fs-extra');
+const escapeRegex = require('escape-string-regexp');
 const debug = require('debug')('ember-cli-typescript:tsc:trace');
 
 module.exports = function compile(project, tsOptions, callbacks) {
@@ -18,23 +19,37 @@ module.exports = function compile(project, tsOptions, callbacks) {
   }, tsOptions);
 
   let ts = project.require('typescript');
+  let host = createWatchCompilerHost(ts, fullOptions, project, callbacks);
+
+  return ts.createWatchProgram(host);
+};
+
+function createWatchCompilerHost(ts, options, project, callbacks) {
   let configPath = ts.findConfigFile('./', ts.sys.fileExists, 'tsconfig.json');
   let createProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram;
   let host = ts.createWatchCompilerHost(
     configPath,
-    fullOptions,
-    buildWatchHooks(ts.sys, callbacks),
+    options,
+    buildWatchHooks(project, ts.sys, callbacks),
     createProgram,
     diagnosticCallback(callbacks.reportDiagnostic),
     diagnosticCallback(callbacks.reportWatchStatus)
   );
 
+  let afterCreate = host.afterProgramCreate;
+  host.afterProgramCreate = function() {
+    afterCreate.apply(this, arguments);
+    if (callbacks.buildComplete) {
+      callbacks.buildComplete();
+    }
+  };
+
   if (debug.enabled) {
     host.trace = str => debug(str.trim());
   }
 
-  return ts.createWatchProgram(host);
-};
+  return host;
+}
 
 function diagnosticCallback(callback) {
   if (callback) {
@@ -47,13 +62,17 @@ function diagnosticCallback(callback) {
   }
 }
 
-function buildWatchHooks(sys, callbacks) {
+function buildWatchHooks(project, sys, callbacks) {
+  let root = escapeRegex(project.root);
+  let sep = `[/\\\\]`;
+  let patterns = ['\\..*?', 'dist', 'node_modules', 'tmp'];
+  let ignored = new RegExp(`^${root}${sep}(${patterns.join('|')})${sep}`);
+
   return Object.assign({}, sys, {
     watchFile: null,
     watchDirectory(dir, callback) {
       if (!fs.existsSync(dir)) return;
 
-      let ignored = /\/(\..*?|dist|node_modules|tmp)\//;
       let watcher = chokidar.watch(dir, { ignored, ignoreInitial: true });
 
       watcher.on('all', (type, path) => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli-typescript",
-  "version": "1.3.0-beta.5",
+  "version": "1.3.1",
   "description": "Allow ember apps to use typescript files.",
   "keywords": [
     "ember-addon",
@@ -48,6 +48,7 @@
     "ember-cli-valid-component-name": "^1.0.0",
     "ember-cli-version-checker": "^2.1.0",
     "ember-router-generator": "^1.2.3",
+    "escape-string-regexp": "^1.0.5",
     "execa": "^0.9.0",
     "exists-sync": "^0.0.4",
     "fs-extra": "^5.0.0",
@@ -96,9 +97,6 @@
   "resolutions": {
     "@types/ember": "2.8.13"
   },
-  "peerDependencies": {
-    "typescript": "^2.4.2"
-  },
   "engines": {
     "node": "^4.5 || 6.* || >= 7.*"
   },