Merge pull request #18 from Turbo87/rsvp-promise

Support "import { Promise } from 'rsvp';"
ember-cli · Jul 8, 2017 · 9169532 · 9169532
2 parents 4b917f4 + e06dbcc
commit 9169532
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -53,6 +53,7 @@ JSON data for [RFC #176](https://github.com/emberjs/rfcs/blob/master/text/0176-j
 | `Ember.Observable`                       | `import Observable from "@ember/object/observable"`                        |
 | `Ember.PromiseProxyMixin`                | `import PromiseProxyMixin from "@ember/object/promise-proxy-mixin"`        |
 | `Ember.RSVP`                             | `import RSVP from "rsvp"`                                                  |
+| `Ember.RSVP.Promise`                     | `import { Promise } from "rsvp"`                                           |
 | `Ember.Resolver`                         | `import Resolver from "@ember/application/resolver"`                       |
 | `Ember.Route`                            | `import Route from "@ember/routing/route"`                                 |
 | `Ember.Router`                           | `import Router from "@ember/routing/router"`                               |
@@ -404,9 +405,10 @@ JSON data for [RFC #176](https://github.com/emberjs/rfcs/blob/master/text/0176-j
 | `import $ from "jquery"` | `Ember.$` |
 
 #### `rsvp`
-| Module                    | Global       |
-| ---                       | ---          |
-| `import RSVP from "rsvp"` | `Ember.RSVP` |
+| Module                           | Global               |
+| ---                              | ---                  |
+| `import RSVP from "rsvp"`        | `Ember.RSVP`         |
+| `import { Promise } from "rsvp"` | `Ember.RSVP.Promise` |
 
 
 ### Scripts

diff --git a/globals.json b/globals.json
@@ -153,5 +153,6 @@
   "typeOf": ["@ember/utils", "typeOf"],
   "compare": ["@ember/utils", "compare"],
   "$": ["jquery"],
-  "RSVP": ["rsvp"]
+  "RSVP": ["rsvp"],
+  "RSVP.Promise": ["rsvp", "Promise"]
 }