Update ember-cli-typescript to dependency.

* Fix types for waitForPromise (returns an RSVP.Promise now)
* Re-run the ember-cli-typescript generator
* Change re-exports to use explicit names (instead of `export * `)

addon/index.ts

@@ -1,3 +1,13 @@
+export {
+  WaiterName,
+  Token,
+  Primitive,
+  Waiter,
+  TestWaiter,
+  TestWaiterDebugInfo,
+  PendingWaiterState,
+} from './types';
+
 export {
   register,
   unregister,
@@ -9,5 +19,3 @@ export {
 
 export { default as buildWaiter } from './build-waiter';
 export { default as waitForPromise } from './wait-for-promise';
-
-export * from './types';

addon/wait-for-promise.ts

@@ -1,4 +1,5 @@
 import { DEBUG } from '@glimmer/env';
+import { Promise } from 'rsvp';
 import buildWaiter from './build-waiter';
 
 const PROMISE_WAITER = buildWaiter('promise-waiter');
@@ -24,7 +25,7 @@ const PROMISE_WAITER = buildWaiter('promise-waiter');
  *   }
  * }
  */
-export default function waitForPromise<T>(promise: Promise<T>, label?: string) {
+export default function waitForPromise<T>(promise: Promise<T>, label?: string): Promise<T> {
   let result = promise;
 
   if (DEBUG) {

package.json

@@ -27,6 +27,7 @@
   },
   "dependencies": {
     "ember-cli-babel": "^7.18.0",
+    "ember-cli-typescript": "^3.1.3",
     "semver": "^7.1.3"
   },
   "devDependencies": {
@@ -47,7 +48,7 @@
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-test-loader": "^3.0.0",
-    "ember-cli-typescript": "^3.1.3",
+    "ember-cli-typescript-blueprints": "^3.0.0",
     "ember-cli-uglify": "^3.0.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",

tests/unit/wait-for-promise-test.ts

@@ -1,8 +1,9 @@
+import MockStableError, { overrideError, resetError } from './utils/mock-stable-error';
+import { _reset, getPendingWaiterState, waitForPromise } from 'ember-test-waiters';
 import { module, test } from 'qunit';
-import { Promise } from 'rsvp';
-import { _reset, waitForPromise, getPendingWaiterState } from 'ember-test-waiters';
-import MockStableError, { resetError, overrideError } from './utils/mock-stable-error';
+
 import { DEBUG } from '@glimmer/env';
+import { Promise } from 'rsvp';
 
 if (DEBUG) {
   module('wait-for-promise', function(hooks) {
@@ -12,7 +13,7 @@ if (DEBUG) {
     });
 
     test('waitForPromise wraps and registers a waiter', async function(assert) {
-      let promise: Promise<{}> = new Promise(resolve => {
+      let promise = new Promise(resolve => {
         resolve();
       });
 
@@ -38,7 +39,7 @@ if (DEBUG) {
     });
 
     test('waitForPromise transitions waiter to not pending even if promise throws', async function(assert) {
-      let promise: Promise<{}> = Promise.resolve().then(() => {
+      let promise = Promise.resolve().then(() => {
         throw new Error('Promise threw');
       });
 
@@ -50,7 +51,7 @@ if (DEBUG) {
     });
 
     test('waitForPromise transitions waiter to not pending even if promise throws when thenable wrapped', async function(assert) {
-      let promise: Promise<{}> = Promise.resolve().then(() => {
+      let promise = Promise.resolve().then(() => {
         throw new Error('Promise threw');
       });
 

tsconfig.json

@@ -19,6 +19,7 @@
     "inlineSources": true,
     "baseUrl": ".",
     "module": "es6",
+    "experimentalDecorators": true,
     "paths": {
       "dummy/tests/*": [
         "tests/*"

types/global.d.ts

@@ -0,0 +1,6 @@
+// Types for compiled templates
+declare module 'ember-test-waiters/templates/*' {
+  import { TemplateFactory } from 'htmlbars-inline-precompile';
+  const tmpl: TemplateFactory;
+  export default tmpl;
+}