Merge branch 'master' into programmatic-compilation

Author: dfreeman

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [1.2.1] - 2018-03-14
+
+### Fixed
+
+* Blueprint now correctly adds ember-cli-typescript as a dependency, allowing TS to be merged into the regular app tree.
+
 ## [1.2.0] - 2018-03-05
 
 ### Added

README.md

@@ -430,7 +430,7 @@ If you're using [ember-browserify], you're used to writing imports like this:
 import MyModule from 'npm:my-module';
 ```
 
-If the `my-module` has types, you will not be able to resolve them this way by default. You can add a simple tweak to your `tsconfig.json` to resolve the types correctly, hwowever:
+If the `my-module` has types, you will not be able to resolve them this way by default. You can add a simple tweak to your `tsconfig.json` to resolve the types correctly, however:
 
 ```json
 {

blueprints/in-repo-addon/files/lib/__name__/package.json

@@ -2,5 +2,8 @@
   "name": "<%= dasherizedModuleName %>",
   "keywords": [
     "ember-addon"
-  ]
+  ],
+  "devDependencies": {
+    "ember-cli-typescript": "*"
+  }
 }

known-typings.md

@@ -16,6 +16,7 @@ to ask for help in the [Ember Community Slack] ([get an invite]).
 
 (Someday soon this list should get _long and awesome_! Help us make it happen!)
 
+* [ember-test-friendly-error-handler](https://github.com/rwjblue/ember-test-friendly-error-handler)
 * [True Myth](https://github.com/chriskrycho/true-myth)
 
 ## DefinitelyTyped (`@types`)

node-tests/blueprints/in-repo-addon-test.js

@@ -42,6 +42,9 @@ describe('Acceptance: ember generate and destroy in-repo-addon', function() {
           "keywords": [
             "ember-addon",
           ],
+          "devDependencies": {
+            "ember-cli-typescript": "*"
+          }
         });
 
         expect(fs.readJsonSync('package.json')['ember-addon']).to.deep.equal({