From e77ceb1b29547ed89b4110b3cc3edc9ac325b620 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Wed, 2 Jan 2019 16:07:33 +0100 Subject: [PATCH] [Glitch] Update dependencies for Node.js (2018-12-31) Port compatibility changes from 8f5fdab5bf681ff45a07965940bc45c9061a2f89 to glitch-soc --- .../ui/containers/columns_area_container.js | 2 +- .../ui/containers/loading_bar_container.js | 4 +-- .../flavours/glitch/features/ui/index.js | 2 +- .../flavours/glitch/store/configureStore.js | 2 +- app/javascript/flavours/glitch/util/api.js | 2 +- .../flavours/glitch/util/link_header.js | 33 ------------------- 6 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 app/javascript/flavours/glitch/util/link_header.js diff --git a/app/javascript/flavours/glitch/features/ui/containers/columns_area_container.js b/app/javascript/flavours/glitch/features/ui/containers/columns_area_container.js index 95f95618b2c..4e26f3017cf 100644 --- a/app/javascript/flavours/glitch/features/ui/containers/columns_area_container.js +++ b/app/javascript/flavours/glitch/features/ui/containers/columns_area_container.js @@ -5,4 +5,4 @@ const mapStateToProps = state => ({ columns: state.getIn(['settings', 'columns']), }); -export default connect(mapStateToProps, null, null, { withRef: true })(ColumnsArea); +export default connect(mapStateToProps, null, null, { forwardRef: true })(ColumnsArea); diff --git a/app/javascript/flavours/glitch/features/ui/containers/loading_bar_container.js b/app/javascript/flavours/glitch/features/ui/containers/loading_bar_container.js index 4bb90fb689f..63e994f927c 100644 --- a/app/javascript/flavours/glitch/features/ui/containers/loading_bar_container.js +++ b/app/javascript/flavours/glitch/features/ui/containers/loading_bar_container.js @@ -1,8 +1,8 @@ import { connect } from 'react-redux'; import LoadingBar from 'react-redux-loading-bar'; -const mapStateToProps = (state) => ({ - loading: state.get('loadingBar'), +const mapStateToProps = (state, ownProps) => ({ + loading: state.get('loadingBar')[ownProps.scope || 'default'], }); export default connect(mapStateToProps)(LoadingBar.WrappedComponent); diff --git a/app/javascript/flavours/glitch/features/ui/index.js b/app/javascript/flavours/glitch/features/ui/index.js index 5d82f0dd7d2..f043f767e19 100644 --- a/app/javascript/flavours/glitch/features/ui/index.js +++ b/app/javascript/flavours/glitch/features/ui/index.js @@ -303,7 +303,7 @@ export default class UI extends React.Component { } setColumnsAreaRef = c => { - this.columnsAreaNode = c.getWrappedInstance().getWrappedInstance(); + this.columnsAreaNode = c.getWrappedInstance(); } handleHotkeyNew = e => { diff --git a/app/javascript/flavours/glitch/store/configureStore.js b/app/javascript/flavours/glitch/store/configureStore.js index 1376d4cbaf5..7e7472841aa 100644 --- a/app/javascript/flavours/glitch/store/configureStore.js +++ b/app/javascript/flavours/glitch/store/configureStore.js @@ -11,5 +11,5 @@ export default function configureStore() { loadingBarMiddleware({ promiseTypeSuffixes: ['REQUEST', 'SUCCESS', 'FAIL'] }), errorsMiddleware(), soundsMiddleware() - ), window.devToolsExtension ? window.devToolsExtension() : f => f)); + ), window.__REDUX_DEVTOOLS_EXTENSION__ ? window.__REDUX_DEVTOOLS_EXTENSION__() : f => f)); }; diff --git a/app/javascript/flavours/glitch/util/api.js b/app/javascript/flavours/glitch/util/api.js index 0be08d7fdd8..033d2d67b50 100644 --- a/app/javascript/flavours/glitch/util/api.js +++ b/app/javascript/flavours/glitch/util/api.js @@ -1,6 +1,6 @@ import axios from 'axios'; import ready from './ready'; -import LinkHeader from './link_header'; +import LinkHeader from 'http-link-header'; export const getLinks = response => { const value = response.headers.link; diff --git a/app/javascript/flavours/glitch/util/link_header.js b/app/javascript/flavours/glitch/util/link_header.js deleted file mode 100644 index a3e7ccf1c1b..00000000000 --- a/app/javascript/flavours/glitch/util/link_header.js +++ /dev/null @@ -1,33 +0,0 @@ -import Link from 'http-link-header'; -import querystring from 'querystring'; - -Link.parseAttrs = (link, parts) => { - let match = null; - let attr = ''; - let value = ''; - let attrs = ''; - - let uriAttrs = /<(.*)>;\s*(.*)/gi.exec(parts); - - if(uriAttrs) { - attrs = uriAttrs[2]; - link = Link.parseParams(link, uriAttrs[1]); - } - - while(match = Link.attrPattern.exec(attrs)) { // eslint-disable-line no-cond-assign - attr = match[1].toLowerCase(); - value = match[4] || match[3] || match[2]; - - if( /\*$/.test(attr)) { - Link.setAttr(link, attr, Link.parseExtendedValue(value)); - } else if(/%/.test(value)) { - Link.setAttr(link, attr, querystring.decode(value)); - } else { - Link.setAttr(link, attr, value); - } - } - - return link; -}; - -export default Link;