Merge branch 'master' into v4

typed-ember · Jul 2, 2020 · 6125853 · 6125853
2 parents 1f46073 + 89e193f
commit 6125853
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -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
@@ -147,8 +147,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')) {