Updates

Author: dfreeman

blueprints/ember-cli-typescript/index.js

@@ -2,7 +2,6 @@
 
 const fs = require('fs');
 const path = require('path');
-const updatePathsForAddon = require('../../lib/utilities/update-paths-for-addon');
 
 const APP_DECLARATIONS = `
 import Ember from 'ember';
@@ -29,6 +28,7 @@ module.exports = {
   },
 
   locals() {
+    let updatePathsForAddon = require('ember-cli-typescript-blueprints/lib/utilities/update-paths-for-addon');
     let inRepoAddons = (this.project.pkg['ember-addon'] || {}).paths || [];
     let hasMirage = 'ember-cli-mirage' in (this.project.pkg.devDependencies || {});
     let isAddon = this.project.isEmberCLIAddon();

index.js

@@ -9,6 +9,14 @@ const stew = require('broccoli-stew');
 module.exports = {
   name: 'ember-cli-typescript',
 
+  init() {
+    this._super.init.apply(this, arguments);
+
+    if (this.project.addons.includes(this)) {
+      this.project.addons.push(this.addons.find(addon => addon.name === 'ember-cli-typescript-blueprints'));
+    }
+  },
+
   included(includer) {
     this._super.included.apply(this, arguments);
 
@@ -76,7 +84,7 @@ module.exports = {
       trees.push(this.compiler.treeForTests());
       trees.push(this.compiler.treeForTestSupport());
     }
-    return this._super.treeForTestSupport.call(this, 
+    return this._super.treeForTestSupport.call(this,
       stew.mv(new MergeTrees(trees), 'test-support/*', '/')
     );
   },

package.json

@@ -31,34 +31,19 @@
     "test:all": "ember try:each"
   },
   "dependencies": {
-    "broccoli-debug": "^0.6.4",
     "broccoli-funnel": "^2.0.1",
     "broccoli-merge-trees": "^2.0.0",
     "broccoli-plugin": "^1.2.1",
     "broccoli-stew": "^1.4.0",
-    "chalk": "^2.3.0",
     "chokidar": "^2.0.3",
     "debug": "^3.1.0",
-    "ember-cli": "*",
-    "ember-cli-get-component-path-option": "^1.0.0",
-    "ember-cli-is-package-missing": "^1.0.0",
-    "ember-cli-normalize-entity-name": "^1.0.0",
-    "ember-cli-path-utils": "^1.0.0",
-    "ember-cli-string-utils": "^1.1.0",
-    "ember-cli-test-info": "^1.0.0",
-    "ember-cli-valid-component-name": "^1.0.0",
-    "ember-cli-version-checker": "^2.1.0",
-    "ember-router-generator": "^1.2.3",
+    "ember-cli-typescript-blueprints": "^1.0.0",
     "escape-string-regexp": "^1.0.5",
     "execa": "^0.9.0",
-    "exists-sync": "^0.0.4",
     "fs-extra": "^5.0.0",
     "glob": "^7.1.2",
-    "inflection": "^1.12.0",
     "resolve": "^1.5.0",
-    "rimraf": "^2.6.2",
     "rsvp": "^4.8.1",
-    "silent-error": "^1.1.0",
     "symlink-or-copy": "^1.1.8",
     "walk-sync": "^0.3.2"
   },
@@ -113,11 +98,6 @@
     "before": [
       "ember-cli-babel"
     ],
-    "after": [
-      "ember-source",
-      "ember-data",
-      "ember-decorators"
-    ],
     "paths": [
       "tests/dummy/lib/in-repo-a",
       "tests/dummy/lib/in-repo-b",

yarn.lock

@@ -1421,7 +1421,7 @@ broccoli-config-replace@^1.1.2:
     debug "^2.2.0"
     fs-extra "^0.24.0"
 
-broccoli-debug@^0.6.1, broccoli-debug@^0.6.2, broccoli-debug@^0.6.3, broccoli-debug@^0.6.4:
+broccoli-debug@^0.6.1, broccoli-debug@^0.6.2, broccoli-debug@^0.6.3:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.4.tgz#986eb3d2005e00e3bb91f9d0a10ab137210cd150"
   dependencies:
@@ -1842,14 +1842,22 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chalk@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
@@ -2653,6 +2661,25 @@ ember-cli-test-loader@^2.2.0:
   dependencies:
     ember-cli-babel "^6.8.1"
 
+ember-cli-typescript-blueprints@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript-blueprints/-/ember-cli-typescript-blueprints-1.0.0.tgz#8470e3c8ed44b7e446c02cf2fd0a7a76b0d77686"
+  dependencies:
+    chalk "^2.4.1"
+    ember-cli-get-component-path-option "^1.0.0"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-path-utils "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-test-info "^1.0.0"
+    ember-cli-valid-component-name "^1.0.0"
+    ember-cli-version-checker "^2.1.0"
+    ember-router-generator "^1.2.3"
+    exists-sync "^0.0.4"
+    fs-extra "^5.0.0"
+    inflection "^1.12.0"
+    silent-error "^1.1.0"
+
 ember-cli-uglify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-2.1.0.tgz#4a0641fe4768d7ab7d4807aca9924cc77c544184"
@@ -6273,7 +6300,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.1.4, rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2, rimraf@^2.1.4, rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies: