Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* 'master' of https://github.com/popcodeorg/popcode:
  Update dependency hast-util-sanitize to v1.3.1 (popcodeorg#1781)
  Update dependency firebase to v6.5.0 (popcodeorg#1778)
  Update dependency eslint-plugin-react to v7.14.3 (popcodeorg#1777)
  Update dependency bowser to v2.5.4 (popcodeorg#1776)
  Update dependency doctoc to v1.4.0 (popcodeorg#1775)
  Add .yarnrc to default to pinned dependencies (popcodeorg#1759)
  Update Webpack
  • Loading branch information
outoftime committed Sep 4, 2019
2 parents 262a89a + 57e6a81 commit d29d87d
Show file tree
Hide file tree
Showing 4 changed files with 517 additions and 555 deletions.
3 changes: 3 additions & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
--add.exact
--upgrade.exact
--upgrade-interactive.exact
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
"@fortawesome/react-fontawesome": "0.1.4",
"PrettyCSS": "0.3.19",
"array-to-sentence": "2.0.0",
"bowser": "2.5.3",
"bowser": "2.5.4",
"brace": "0.11.1",
"chrono-node": "1.3.11",
"classnames": "2.2.6",
Expand All @@ -208,9 +208,9 @@
"enum": "2.5.0",
"enumify": "1.0.4",
"esprima": "4.0.1",
"firebase": "6.4.2",
"firebase": "6.5.0",
"github-api": "3.0.0",
"hast-util-sanitize": "1.3.0",
"hast-util-sanitize": "1.3.1",
"highlight.js": "9.15.6",
"html-inspector": "0.8.2",
"htmllint": "0.8.0",
Expand All @@ -229,7 +229,7 @@
"loop-breaker": "0.1.1",
"moment": "2.22.2",
"object-inspect": "1.5.0",
"offline-plugin": "5.0.5",
"offline-plugin": "5.0.7",
"p5": "0.9.0",
"parse5-sax-parser": "5.1.0",
"pify": "4.0.1",
Expand Down Expand Up @@ -317,21 +317,21 @@
"caniuse-api": "3.0.0",
"caniuse-lite": "1.0.30000989",
"check-dependencies": "1.1.0",
"circular-dependency-plugin": "5.0.2",
"circular-dependency-plugin": "5.2.0",
"cloudflare": "2.5.1",
"command-exists": "1.2.8",
"cssnano": "3.10.0",
"doctoc": "1.3.1",
"doctoc": "1.4.0",
"eslint": "5.6.0",
"eslint-config-prettier": "5.0.0",
"eslint-import-resolver-webpack": "0.10.1",
"eslint-loader": "2.1.1",
"eslint-import-resolver-webpack": "0.11.1",
"eslint-loader": "2.2.1",
"eslint-plugin-import": "2.17.2",
"eslint-plugin-jest": "22.16.0",
"eslint-plugin-prettier": "3.1.0",
"eslint-plugin-private-props": "0.3.0",
"eslint-plugin-promise": "4.0.1",
"eslint-plugin-react": "7.12.4",
"eslint-plugin-react": "7.14.3",
"eslint_d": "7.1.1",
"exports-loader": "0.7.0",
"gulp": "3.9.1",
Expand Down Expand Up @@ -366,26 +366,26 @@
"raw-loader": "2.0.0",
"redux-saga-test-plan": "4.0.0-beta.4",
"rosie": "2.0.1",
"script-ext-html-webpack-plugin": "2.0.1",
"script-ext-html-webpack-plugin": "2.1.4",
"sinon": "5.1.1",
"source-map-explorer": "1.5.0",
"source-map-loader": "0.2.3",
"stats-webpack-plugin": "0.6.2",
"string-replace-loader": "2.1.1",
"source-map-loader": "0.2.4",
"stats-webpack-plugin": "0.7.0",
"string-replace-loader": "2.2.0",
"stylelint-config-prettier": "5.2.0",
"stylelint-prettier": "1.1.1",
"stylelint-selector-bem-pattern": "2.0.0",
"substitute-loader": "1.0.0",
"svg-react-loader": "0.4.5",
"svg-react-loader": "0.4.6",
"svgo": "1.0.5",
"svgo-loader": "2.1.0",
"svgo-loader": "2.2.1",
"tape": "4.11.0",
"tape-catch": "1.0.6",
"transform-loader": "0.2.4",
"val-loader": "1.1.1",
"webpack": "4.16.5",
"webpack": "4.39.3",
"webpack-bundle-analyzer": "3.4.1",
"webpack-dev-middleware": "3.1.3",
"webpack-dev-middleware": "3.7.0",
"webpack-visualizer-plugin": "0.1.11",
"yarn-deduplicate": "1.1.1"
}
Expand Down
10 changes: 2 additions & 8 deletions src/components/TopBar/CurrentUserMenu.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint react/prop-types: "off" */
import isUndefined from 'lodash-es/isUndefined';
import isNull from 'lodash-es/isNull';

Expand All @@ -17,14 +18,7 @@ const CurrentUserMenu = createMenu({
menuClass: 'top-bar__menu_right',
name: 'currentUser',

renderItems({
/* eslint-disable react/prop-types */
onLinkGitHub,
onLogOut,
onUnlinkGitHub,
user,
/* eslint-enable react/prop-types */
}) {
renderItems({onLinkGitHub, onLogOut, onUnlinkGitHub, user}) {
const githubIdentityProvider = user.identityProviders.get('github.com');
return (
<Fragment>
Expand Down
Loading

0 comments on commit d29d87d

Please sign in to comment.