Revert "Work around facebook/create-react-app#4053"

This reverts commit 787ca07.
sharils · Apr 12, 2018 · 561faa2 · 561faa2
1 parent 4920a12
commit 561faa2
Show file tree

Hide file tree

Showing 6 changed files with 641 additions and 845 deletions.
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "firebase": "^4.10.1",
     "prop-types": "^15.6.0",
     "ramda": "^0.25.0",
     "react": "^16.2.0",

diff --git a/public/index.html b/public/index.html
@@ -21,12 +21,6 @@
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
     <title>React App</title>
-    <script src="https://www.gstatic.com/firebasejs/4.10.1/firebase.js"></script>
-    <script src="https://www.gstatic.com/firebasejs/4.10.1/firebase-app.js"></script>
-    <script src="https://www.gstatic.com/firebasejs/4.10.1/firebase-auth.js"></script>
-    <script src="https://www.gstatic.com/firebasejs/4.10.1/firebase-database.js"></script>
-    <script src="https://www.gstatic.com/firebasejs/4.10.1/firebase-firestore.js"></script>
-    <script src="https://www.gstatic.com/firebasejs/4.10.1/firebase-messaging.js"></script>
   </head>
   <body>
     <noscript>

diff --git a/src/firebase.js b/src/firebase.js
diff --git a/src/init/initializeApp.js b/src/init/initializeApp.js
@@ -1,6 +1,6 @@
+import * as firebase from "firebase";
 import { call, take } from "redux-saga/effects";
 import { LOGIN, LOGOUT, loginSaga, logoutSaga } from "../login/userCredentials";
-import * as firebase from "../firebase";
 
 export default function* initializeApp({
   apiKey = process.env.REACT_APP_FIREBASE_API_KEY,

diff --git a/src/util/firebase.js b/src/util/firebase.js
@@ -1,4 +1,4 @@
-import * as firebase from "../firebase";
+import * as firebase from "firebase";
 
 export const fbIsLoginError = e => {
   if (e instanceof firebase.auth.Error) {