Skip to content

Commit

Permalink
v6.2.0 (#243)
Browse files Browse the repository at this point in the history
* fix(app): lock firebase to 7.14.3 to prevent bind of undefined issue with firebase@7.16.0 and reactfire
* chore(app): remove lodash from app and functions dependencies
* chore(app): update storage security rules version (closes #210)
* chore(app): add cancel previous runs step to CI workflows
* chore(app): remove recompose when opting into redux
  • Loading branch information
prescottprue authored Jul 23, 2020
1 parent afbd596 commit 5ec25f7
Showing 56 changed files with 6,477 additions and 6,079 deletions.
5 changes: 5 additions & 0 deletions examples/react-firebase-redux/.github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -11,6 +11,11 @@ jobs:
name: Deploy
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.4.0
with:
access_token: ${{ github.token }}

- name: Checkout Repo
uses: actions/checkout@v2

5 changes: 5 additions & 0 deletions examples/react-firebase-redux/.github/workflows/verify.yml
Original file line number Diff line number Diff line change
@@ -7,6 +7,11 @@ jobs:
name: Verify
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.4.0
with:
access_token: ${{ github.token }}

- name: Checkout Repo
uses: actions/checkout@v2

1 change: 0 additions & 1 deletion examples/react-firebase-redux/functions/.babelrc
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@
}]
],
"plugins": [
"lodash",
["module-resolver", {
"root": ["./src"]
}]
12 changes: 5 additions & 7 deletions examples/react-firebase-redux/functions/package.json
Original file line number Diff line number Diff line change
@@ -18,17 +18,15 @@
"deploy": "firebase deploy --only functions"
},
"dependencies": {
"firebase-admin": "^8.12.1",
"firebase-functions": "^3.7.0",
"firebase-admin": "^9.0.0",
"firebase-functions": "^3.8.0",
"glob": "^7.1.6",
"lodash": "^4.17.19",
"source-map-support": "^0.5.19"
},
"devDependencies": {
"@babel/cli": "^7.10.1",
"@babel/core": "^7.10.2",
"@babel/preset-env": "^7.10.2",
"babel-plugin-lodash": "^3.3.4",
"@babel/cli": "^7.10.5",
"@babel/core": "^7.10.5",
"@babel/preset-env": "^7.10.4",
"babel-plugin-module-resolver": "^4.0.0",
"babel-preset-minify": "^0.5.1",
"cross-env": "^7.0.2",
1,985 changes: 810 additions & 1,175 deletions examples/react-firebase-redux/functions/yarn.lock

Large diffs are not rendered by default.

33 changes: 15 additions & 18 deletions examples/react-firebase-redux/package.json
Original file line number Diff line number Diff line change
@@ -33,47 +33,44 @@
"author": "prescottprue (https://github.com/prescottprue)",
"license": "MIT",
"dependencies": {
"@material-ui/core": "^4.9.13",
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"firebase": "^7.14.3",
"history": "^4.10.1",
"lodash": "^4.17.15",
"firebase": "7.14.3",
"prop-types": "^15.7.2",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-google-button": "^0.7.0",
"react-redux": "^7.1.1",
"react-redux-firebase": "^3.1.2",
"react-hook-form": "^5.7.2",
"react-router-dom": "^5.1.2",
"recompose": "^0.30.0",
"react-hook-form": "^6.0.8",
"react-router-dom": "^5.2.0",
"redux": "^4.0.4",
"redux-auth-wrapper": "^2.1.0",
"redux-thunk": "^2.3.0"
},
"devDependencies": {
"babel-eslint": "^10.1.0",
"cross-env": "^7.0.2",
"cypress": "^4.7.0",
"cypress-firebase": "^1.2.0",
"eslint": "^7.1.0",
"cypress": "^4.11.0",
"cypress-firebase": "^1.4.2",
"eslint": "^7.5.0",
"eslint-config-prettier": "^6.11.0",
"eslint-config-standard": "^14.1.1",
"eslint-config-standard-react": "^9.2.0",
"eslint-plugin-chai-friendly": "^0.6.0",
"eslint-plugin-cypress": "^2.11.1",
"eslint-plugin-import": "^2.20.1",
"eslint-plugin-jsdoc": "^26.0.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jsdoc": "^30.0.3",
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-react": "^7.20.0",
"eslint-plugin-react-hooks": "^4.0.0",
"eslint-plugin-react": "^7.20.3",
"eslint-plugin-react-hooks": "^4.0.8",
"eslint-plugin-standard": "^4.0.1",
"firebase-admin": "^8.12.0",
"firebase-ci": "^0.13.0",
"firebase-tools": "^8.4.1",
"firebase-admin": "^9.0.0",
"firebase-ci": "^0.14.0",
"firebase-tools": "^8.6.0",
"husky": "^4.2.5",
"lint-staged": "^10.2.2",
"prettier": "^2.0.5",
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { combineReducers } from 'redux'
import { without, omit } from 'lodash'
import { NOTIFICATION_SHOW, NOTIFICATION_DISMISS } from './actionTypes'

function notification(state = {}, action) {
@@ -18,7 +17,7 @@ function allIds(state = [], action) {
case NOTIFICATION_SHOW:
return [...state, action.payload.id]
case NOTIFICATION_DISMISS:
return without(state, action.payload)
return [...state.filter((currentId) => currentId === action.payload.id)]
default:
return state
}
@@ -32,7 +31,12 @@ function byId(state = {}, action) {
[action.payload.id]: notification(state[action.payload.id], action)
}
case NOTIFICATION_DISMISS:
return omit(state, action.payload)
// eslint-disable-next-line no-case-declarations
const {
[action.payload.id]: notificationToDismiss,
...newState
} = state
return newState
default:
return state
}
3 changes: 2 additions & 1 deletion examples/react-firebase-redux/storage.rules
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Only authenticated users can read or write to the bucket
rules_version = '2';
service firebase.storage {
match /b/{bucket}/o {
match /{allPaths=**} {
// Only authenticated users can read or write to the bucket
allow read, write: if request.auth != null;
}
}
Loading

0 comments on commit 5ec25f7

Please sign in to comment.