Skip to content

Commit

Permalink
Forked react-helmet since it seems unmaintained. Now it's a Named i…
Browse files Browse the repository at this point in the history
…mport in helpers (#1025)
  • Loading branch information
sneridagh authored Dec 2, 2019
1 parent 7a1528c commit 992c469
Show file tree
Hide file tree
Showing 35 changed files with 1,018 additions and 49 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
### Internal

- Pin Guillotina docker image @sneridagh
- Forked `react-helmet` since it seems unmaintained. Now it's a Named import in helpers. @sneridagh
- Update internal dependencies, fix "unmet peer dependencies" console logs by adding the peer dependencies to the local dependencies @sneridagh
- Update some dependencies, including: react-router, eslint engine and plugins/config and others @sneridagh

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
"react-dnd-html5-backend": "5.0.1",
"react-dom": "16.12.0",
"react-dropzone": "5.1.0",
"react-helmet": "5.2.0",
"react-fast-compare": "2.0.4",
"react-intl": "3.8.0",
"react-intl-redux": "2.2.0",
"react-medium-image-zoom": "3.0.15",
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Add/Add.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { keys } from 'lodash';
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Contents/Contents.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { Portal } from 'react-portal';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { Link } from 'react-router-dom';
import {
Breadcrumb,
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Controlpanels/Controlpanel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { Link, withRouter } from 'react-router-dom';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { Portal } from 'react-portal';
import { Container } from 'semantic-ui-react';
import { defineMessages, injectIntl } from 'react-intl';
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Controlpanels/Controlpanels.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { compose } from 'redux';
import { Link } from 'react-router-dom';
import { concat, filter, last, map, uniqBy } from 'lodash';
import { Portal } from 'react-portal';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { Container, Grid, Header, Icon, Segment } from 'semantic-ui-react';
import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';

Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Controlpanels/ModerateComments.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { Link } from 'react-router-dom';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { Portal } from 'react-portal';
import { Container, Button, Table } from 'semantic-ui-react';
import moment from 'moment';
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Controlpanels/UsersControlpanel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { connect } from 'react-redux';
import { compose, bindActionCreators } from 'redux';
import { Link } from 'react-router-dom';
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Delete/Delete.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { withRouter } from 'react-router-dom';
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Diff/Diff.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { filter, isEqual, map } from 'lodash';
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Edit/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { defineMessages, injectIntl } from 'react-intl';
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/History/History.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { Link } from 'react-router-dom';
import { connect } from 'react-redux';
import { compose } from 'redux';
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Preferences/ChangePassword.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { Link, withRouter } from 'react-router-dom';
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Sharing/Sharing.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { Link, withRouter } from 'react-router-dom';
Expand Down
2 changes: 1 addition & 1 deletion src/components/theme/ContactForm/ContactForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { Portal } from 'react-portal';
Expand Down
2 changes: 1 addition & 1 deletion src/components/theme/Login/Login.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { Link } from 'react-router-dom';
Expand Down
2 changes: 1 addition & 1 deletion src/components/theme/PasswordReset/PasswordReset.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { Link, withRouter } from 'react-router-dom';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { Container } from 'semantic-ui-react';
import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { withRouter } from 'react-router-dom';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { Container } from 'semantic-ui-react';
import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';

Expand Down
2 changes: 1 addition & 1 deletion src/components/theme/Register/Register.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import React, { Component } from 'react';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { defineMessages, injectIntl } from 'react-intl';
Expand Down
2 changes: 1 addition & 1 deletion src/components/theme/Search/Search.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { compose } from 'redux';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { Link } from 'react-router-dom';
import { asyncConnect } from 'redux-connect';
import { FormattedMessage } from 'react-intl';
Expand Down
2 changes: 1 addition & 1 deletion src/components/theme/View/DefaultView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { defineMessages, injectIntl } from 'react-intl';

import { Container, Image } from 'semantic-ui-react';
Expand Down
2 changes: 1 addition & 1 deletion src/components/theme/View/FileView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { Container } from 'semantic-ui-react';

import { flattenToAppURL } from '../../../helpers';
Expand Down
2 changes: 1 addition & 1 deletion src/components/theme/View/ImageView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { Container } from 'semantic-ui-react';

import { flattenToAppURL } from '../../../helpers';
Expand Down
2 changes: 1 addition & 1 deletion src/components/theme/View/LinkView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { Link } from 'react-router-dom';
import { Container } from 'semantic-ui-react';

Expand Down
2 changes: 1 addition & 1 deletion src/components/theme/View/ListingView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { Link } from 'react-router-dom';
import { Container, Image } from 'semantic-ui-react';

Expand Down
2 changes: 1 addition & 1 deletion src/components/theme/View/NewsItemView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { Container, Image } from 'semantic-ui-react';

import { flattenToAppURL } from '../../../helpers';
Expand Down
2 changes: 1 addition & 1 deletion src/components/theme/View/SummaryView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { Link } from 'react-router-dom';
import { Container, Image } from 'semantic-ui-react';
import { FormattedMessage } from 'react-intl';
Expand Down
2 changes: 1 addition & 1 deletion src/components/theme/View/TabularView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
import { Helmet } from '@plone/volto/helpers';
import { Link } from 'react-router-dom';
import { Container, Table } from 'semantic-ui-react';
import { FormattedMessage } from 'react-intl';
Expand Down
Loading

0 comments on commit 992c469

Please sign in to comment.