From 9e7438a5bb3703a04e99aed136d236e1d009c282 Mon Sep 17 00:00:00 2001
From: Sergio Arbeo <serabe@gmail.com>
Date: Tue, 19 Sep 2017 01:05:13 +0200
Subject: [PATCH 1/3] Adapt code to new format from ember-rfc176-data

New format introduced in ember-cli/ember-rfc176-data#37
---
 package.json |  2 +-
 transform.js | 28 ++++++++++++++++------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 820458a..f84007f 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "ember-rfc176-data": "^0.2.6",
+    "ember-rfc176-data": "^0.3.0",
     "glob": "^7.1.1",
     "jscodeshift": "^0.3.29"
   },
diff --git a/transform.js b/transform.js
index 3a6b9e6..2cd142c 100644
--- a/transform.js
+++ b/transform.js
@@ -99,8 +99,10 @@ function transform(file, api, options) {
   function buildMappings(registry) {
     let mappings = {};
 
-    for (let mapping of Object.keys(MAPPINGS)) {
-      mappings[mapping] = new Mapping(MAPPINGS[mapping], registry);
+    for (let mapping of MAPPINGS) {
+      if (!mapping.deprecated) {
+        mappings[mapping.global.substr('Ember.'.length)] = new Mapping(mapping, registry);
+      }
     }
 
     return mappings;
@@ -256,14 +258,16 @@ function transform(file, api, options) {
       let mapping = mappings[propertyPath];
 
       let mod = mapping.getModule();
-      if (!mod.local) {
+      let local = mod.local;
+      if (!local) {
         // Ember.computed.or => or
-        let local = propertyPath.split(".").slice(-1)[0];
-        if (includes(RESERVED, local)) {
-          local = `Ember${local}`;
-        }
-        mod.local = local;
+        local = propertyPath.split(".").slice(-1)[0];
+      }
+
+      if (includes(RESERVED, local)) {
+        local = `Ember${local}`;
       }
+      mod.local = local;
 
       return new Replacement(nodePath, mod);
     };
@@ -575,10 +579,10 @@ class Replacement {
 }
 
 class Mapping {
-  constructor([source, imported, local], registry) {
-    this.source = source;
-    this.imported = imported || "default";
-    this.local = local;
+  constructor({module, export: exportName, localName}, registry) {
+    this.source = module;
+    this.imported = exportName;
+    this.local = localName;
     this.registry = registry;
   }
 

From 1b31944c9c6831394f872cdf5d589b91782997ec Mon Sep 17 00:00:00 2001
From: Sergio Arbeo <serabe@gmail.com>
Date: Wed, 20 Sep 2017 15:41:34 +0200
Subject: [PATCH 2/3] Point ember-rfc176-data to PR branch

---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index f84007f..c570031 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "ember-rfc176-data": "^0.3.0",
+    "ember-rfc176-data": "Turbo87/ember-rfc176-data#new-structure",
     "glob": "^7.1.1",
     "jscodeshift": "^0.3.29"
   },
diff --git a/yarn.lock b/yarn.lock
index 5b480fb..ad234e2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1221,9 +1221,9 @@ electron-to-chromium@^1.3.16:
   version "1.3.16"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.16.tgz#d0e026735754770901ae301a21664cba45d92f7d"
 
-ember-rfc176-data@^0.2.6:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.2.6.tgz#ff9981d117a885a7344813685a9f3bf8257d1016"
+ember-rfc176-data@Turbo87/ember-rfc176-data#new-structure:
+  version "0.2.7"
+  resolved "https://codeload.github.com/Turbo87/ember-rfc176-data/tar.gz/e590c95e6d68145263dc5820637bdd6726407a37"
 
 errno@^0.1.4:
   version "0.1.4"

From 648d76ca9db6d6e18d0d45df6a9f33767c6b4009 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Tue, 3 Oct 2017 11:03:59 -0400
Subject: [PATCH 3/3] Update to release version of ember-rfc176-data@0.3.0.

---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 10dc9aa..a0a162a 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "ember-rfc176-data": "Turbo87/ember-rfc176-data#new-structure",
+    "ember-rfc176-data": "^0.3.0",
     "execa": "~0.8.0",
     "glob": "^7.1.1",
     "jscodeshift": "^0.3.29"
diff --git a/yarn.lock b/yarn.lock
index beab20b..ccc3cf7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1225,9 +1225,9 @@ electron-to-chromium@^1.3.16:
   version "1.3.16"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.16.tgz#d0e026735754770901ae301a21664cba45d92f7d"
 
-ember-rfc176-data@Turbo87/ember-rfc176-data#new-structure:
-  version "0.2.7"
-  resolved "https://codeload.github.com/Turbo87/ember-rfc176-data/tar.gz/e590c95e6d68145263dc5820637bdd6726407a37"
+ember-rfc176-data@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.0.tgz#6aee728cb521c5f80710990965027b9c320f6f08"
 
 errno@^0.1.4:
   version "0.1.4"