From aba8f5def748c4bff7d3bc78d27b7e6e1069d514 Mon Sep 17 00:00:00 2001
From: Dan Freeman <dfreeman@salsify.com>
Date: Wed, 1 Jul 2020 13:11:57 +0200
Subject: [PATCH] fix(blueprint): bring apps closer to typechecking out of the
 box

---
 .../__config_root__/config/environment.d.ts               | 8 +++-----
 ts/blueprints/ember-cli-typescript/index.js               | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/blueprint-files/ember-cli-typescript/__config_root__/config/environment.d.ts b/blueprint-files/ember-cli-typescript/__config_root__/config/environment.d.ts
index 3252cc3de..a837adeb7 100644
--- a/blueprint-files/ember-cli-typescript/__config_root__/config/environment.d.ts
+++ b/blueprint-files/ember-cli-typescript/__config_root__/config/environment.d.ts
@@ -2,15 +2,13 @@ export default config;
 
 /**
  * Type declarations for
- *    import config from './config/environment'
- *
- * For now these need to be managed by the developer
- * since different ember addons can materialize new entries.
+ *    import config from 'my-app/config/environment'
  */
 declare const config: {
-  environment: any;
+  environment: string;
   modulePrefix: string;
   podModulePrefix: string;
   locationType: string;
   rootURL: string;
+  APP: Record<string, unknown>;
 };
diff --git a/ts/blueprints/ember-cli-typescript/index.js b/ts/blueprints/ember-cli-typescript/index.js
index b6ddeaea8..a5b242cb1 100644
--- a/ts/blueprints/ember-cli-typescript/index.js
+++ b/ts/blueprints/ember-cli-typescript/index.js
@@ -146,8 +146,8 @@ module.exports = {
       { name: 'ember-cli-typescript-blueprints', target: 'latest' },
       { name: 'typescript', target: 'latest' },
       { name: '@types/ember', target: 'latest' },
-      { name: '@types/rsvp', target: 'latest' },
       { name: '@types/ember__test-helpers', target: 'latest' },
+      { name: '@types/ember-resolver', target: 'latest' },
     ];
 
     if (this._has('ember-data')) {