v0.15.0 (#322)

* fix(getFirestore): correctly load extended firestore instance in `getFirestore` (#318) - @aarajh * fix(orderedReducer): reorder items when `newIndex` is zero (#317) - @matthew-h-cromer * feat(types): add types for reducer (#296, [react-redux-firebase 964](prescottprue/react-redux-firebase#964)) - @msutkowski,@bawahakim * fix(examples): update complete example patterns + major versions * build(deps): bump immer from 5.0.0 to 8.0.1 (#320) * build(deps): bump ini from 1.3.5 to 1.3.8 (#316) * build(deps): bump ini from 1.3.5 to 1.3.8 in /examples/basic (#315) Co-Authored-By: Hakim Bawa <[email protected]> Co-authored-by: Aaraj Habib <[email protected]> Co-authored-by: matthew-h-cromer <[email protected]> Co-authored-by: Matt Sutkowski <[email protected]>
prescottprue · Feb 15, 2021 · 9622158 · 9622158
1 parent 87830e4
commit 9622158
Show file tree

Hide file tree

Showing 121 changed files with 9,012 additions and 6,928 deletions.
diff --git a/examples/basic/yarn.lock b/examples/basic/yarn.lock
@@ -5251,9 +5251,9 @@ [email protected]:
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.5, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 [email protected]:
   version "6.2.1"

diff --git a/examples/complete/.env b/examples/complete/.env
@@ -0,0 +1 @@
+SKIP_PREFLIGHT_CHECK=true
diff --git a/examples/complete/.env.local b/examples/complete/.env.local
@@ -1,3 +1,12 @@
-CI=false
-# Needed to skip warnings from jest@beta in package.json
-SKIP_PREFLIGHT_CHECK=true
+FIREBASE_PROJECT_ID="redux-firestore-3996a"
+FIREBASE_API_KEY="AIzaSyCVKQUFemqhQdkIy-i83mPcSSD5dUqqQBk"
+
+REACT_APP_ENVIRONMENT=stage
+
+# App environment
+REACT_APP_FIREBASE_apiKey=$FIREBASE_API_KEY
+REACT_APP_FIREBASE_authDomain="redux-firestore-3996a.firebaseapp.com"
+REACT_APP_FIREBASE_databaseURL="https://redux-firestore-3996a-default-rtdb.firebaseio.com"
+REACT_APP_FIREBASE_projectId=$FIREBASE_PROJECT_ID
+REACT_APP_FIREBASE_storageBucket="redux-firestore-3996a.appspot.com"
+REACT_APP_FIREBASE_appId="1:69609080163:web:a20aac99c66a2749243f56"
diff --git a/examples/complete/.eslintignore b/examples/complete/.eslintignore
@@ -3,5 +3,4 @@
 dist/**
 build/**
 src/index.html
-blueprints/**
 src/config.js
diff --git a/examples/complete/.eslintrc.js b/examples/complete/.eslintrc.js
@@ -1,5 +1,5 @@
 module.exports = {
-  'extends': ['standard', 'standard-react', 'prettier', 'prettier/react'],
+  extends: ['standard', 'standard-react', 'prettier', 'prettier/react'],
   root: true,
   parser: 'babel-eslint',
   plugins: ['import', 'react', 'react-hooks', 'prettier'],
@@ -14,10 +14,8 @@ module.exports = {
     }
   },
   rules: {
-    semi: [
-      2, 'never'
-    ],
-    'no-console': 'error',
+    semi: [2, 'never'],
+    'no-console': 0,
     'react/forbid-prop-types': 0,
     'react/require-default-props': 0,
     'react/jsx-filename-extension': 0,
@@ -38,5 +36,22 @@ module.exports = {
         useTabs: false
       }
     ]
-  }
+  },
+  overrides: [
+    {
+      files: ['./public/firebase-messaging-sw.js'],
+      env: {
+        browser: true
+      },
+      globals: {
+        self: true,
+        firebase: true,
+        importScripts: true
+      },
+      rules: {
+        'no-restricted-globals': 0,
+        'no-console': 0
+      }
+    }
+  ]
 }
diff --git a/examples/complete/.firebaserc b/examples/complete/.firebaserc
@@ -1,31 +1,7 @@
 {
   "projects": {
-    "default": "redux-firebasev3",
-    "master": "redux-firebasev3",
-    "prod": "redux-firebasev3"
-  },
-  "ci": {
-    "createConfig": {
-      "master": {
-        "env": "staging",
-        "firebase": {
-          "apiKey": "AIzaSyBTvAcJwsN8iygsnwAZyzIuy1uleYEpWIo",
-          "authDomain": "redux-firebasev3.firebaseapp.com",
-          "databaseURL": "https://redux-firebasev3.firebaseio.com",
-          "projectId": "redux-firebasev3",
-          "storageBucket": "redux-firebasev3.appspot.com"
-        }
-      },
-      "prod": {
-        "env": "production",
-        "firebase": {
-          "apiKey": "AIzaSyBTvAcJwsN8iygsnwAZyzIuy1uleYEpWIo",
-          "authDomain": "redux-firebasev3.firebaseapp.com",
-          "databaseURL": "https://redux-firebasev3.firebaseio.com",
-          "projectId": "redux-firebasev3",
-          "storageBucket": "redux-firebasev3.appspot.com"
-        }
-      }
-    }
+    "default": "redux-firestore-3996a",
+    "master": "redux-firestore-3996a",
+    "prod": "redux-firestore-3996a"
   }
 }
diff --git a/examples/complete/.gitignore b/examples/complete/.gitignore
@@ -3,11 +3,14 @@
 **/*.log
 .DS_Store
 **/.DS_Store
-
 # Dependencies
 **/node_modules
 
 # React App
 build
 src/config.js
-.env
+.env.local
+.eslintcache
+
+# Firebase
+.firebase
diff --git a/examples/complete/.yo-rc.json b/examples/complete/.yo-rc.json
@@ -2,12 +2,14 @@
   "generator-react-firebase": {
     "promptValues": {
       "githubUser": "prescottprue",
-      "firebaseName": "redux-firebasev3",
-      "firebaseKey": "AIzaSyBTvAcJwsN8iygsnwAZyzIuy1uleYEpWIo",
+      "firebaseName": "redux-firestore-3996a",
+      "firebaseKey": "AIzaSyCVKQUFemqhQdkIy-i83mPcSSD5dUqqQBk",
       "includeRedux": true,
       "includeFirestore": true,
       "otherFeatures": [],
-      "deployTo": "firebase"
+      "deployTo": "firebase",
+      "firebaseProjectId": "redux-firestore-3996a",
+      "appId": "1:69609080163:web:a20aac99c66a2749243f56"
     }
   }
-}
+}
diff --git a/examples/complete/CONTRIBUTING.md b/examples/complete/CONTRIBUTING.md
@@ -6,9 +6,9 @@ Some basic conventions for contributing to this project.
 
 Please make sure that there aren't existing pull requests attempting to address the issue mentioned. Likewise, please check for issues related to update, as someone else may be working on the issue in a branch or fork.
 
-* Non-trivial changes should be discussed in an issue first
-* Develop in a topic branch, not master
-* Squash your commits
+- Non-trivial changes should be discussed in an issue first
+- Develop in a topic branch, not master
+- Squash your commits
 
 ### Linting
 
@@ -35,14 +35,14 @@ Lines should not exceed 100 characters. This allows the message to be easier to
 
 Must be one of the following:
 
-* **feat**: A new feature
-* **fix**: A bug fix
-* **docs**: Documentation only changes
-* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing
+- **feat**: A new feature
+- **fix**: A bug fix
+- **docs**: Documentation only changes
+- **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing
   semi-colons, etc)
-* **refactor**: A code change that neither fixes a bug or adds a feature
-* **test**: Adding missing tests
-* **chore**: Changes to the build process or auxiliary tools and libraries such as documentation
+- **refactor**: A code change that neither fixes a bug or adds a feature
+- **test**: Adding missing tests
+- **chore**: Changes to the build process or auxiliary tools and libraries such as documentation
   generation
 
 #### Scope
@@ -54,6 +54,6 @@ The scope could be anything specifying place of the commit change. For example `
 
 The subject contains succinct description of the change:
 
-* use the imperative, present tense: "change" not "changed" nor "changes"
-* don't capitalize first letter
-* no dot (.) at the end
+- use the imperative, present tense: "change" not "changed" nor "changes"
+- don't capitalize first letter
+- no dot (.) at the end