From ecaeed6197576ceebd145105e82f8f210ff6b485 Mon Sep 17 00:00:00 2001
From: James Daniels <jamesdaniels@google.com>
Date: Wed, 22 May 2019 11:04:19 -0700
Subject: [PATCH] Moving back to emberfire package

---
 package-lock.json | 51 ++++++++++++++---------------------------------
 package.json      |  2 +-
 tools/build.sh    |  3 ---
 tools/test.sh     |  3 ---
 4 files changed, 16 insertions(+), 43 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bbb9db1a..fd6cbfe3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
-  "name": "emberfire-exp",
-  "version": "3.0.0-rc.1",
+  "name": "emberfire",
+  "version": "3.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -9185,8 +9185,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -9207,14 +9206,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -9229,20 +9226,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -9359,8 +9353,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -9372,7 +9365,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -9387,7 +9379,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -9395,14 +9386,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -9421,7 +9410,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -9502,8 +9490,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -9515,7 +9502,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -9601,8 +9587,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -9638,7 +9623,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -9658,7 +9642,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -9702,14 +9685,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -16539,8 +16520,7 @@
             },
             "balanced-match": {
               "version": "1.0.0",
-              "bundled": true,
-              "optional": true
+              "bundled": true
             },
             "brace-expansion": {
               "version": "1.1.11",
@@ -16561,8 +16541,7 @@
             },
             "concat-map": {
               "version": "0.0.1",
-              "bundled": true,
-              "optional": true
+              "bundled": true
             },
             "console-control-strings": {
               "version": "1.1.0",
diff --git a/package.json b/package.json
index 560622d2..ccb0b70c 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "emberfire-exp",
+  "name": "emberfire",
   "version": "3.0.0",
   "description": "The officially supported adapter for using Firebase with Ember",
   "keywords": [
diff --git a/tools/build.sh b/tools/build.sh
index 8c1c8486..932a15c0 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -1,6 +1,3 @@
-# TODO remove when no longer publishing to emberfire-exp
-export EMBER_CLI_IGNORE_ADDON_NAME_MISMATCH=true
-
 if test $TAG_NAME; then
     npm version $(echo $TAG_NAME | sed 's/^v\(.*\)$/\1/')
 else
diff --git a/tools/test.sh b/tools/test.sh
index 76872ab3..86aa59c1 100755
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -1,6 +1,3 @@
-# TODO remove when no longer publishing to emberfire-exp
-export EMBER_CLI_IGNORE_ADDON_NAME_MISMATCH=true
-
 wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
 echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list