From b8accc03b97c248d6b6a9f05af6e5e94a83b0018 Mon Sep 17 00:00:00 2001 From: Aurelsicoko Date: Fri, 22 Sep 2017 16:56:09 +0200 Subject: [PATCH] Use React and React-DOM through global to use the exact same dependency everywhere --- packages/strapi-admin/admin/src/app.js | 3 --- .../admin/src/components/Header/index.js | 2 -- .../src/components/LeftMenuFooter/index.js | 1 - .../src/components/LeftMenuHeader/index.js | 1 - .../admin/src/components/LeftMenuLink/index.js | 1 - .../components/LeftMenuLinkContainer/index.js | 1 - .../admin/src/components/Notification/index.js | 1 - .../components/NotificationsContainer/index.js | 1 - .../admin/src/components/Toggle/index.js | 1 - .../admin/src/components/ToggleOption/index.js | 1 - .../admin/src/containers/AdminPage/index.js | 1 - .../admin/src/containers/App/index.js | 1 - .../src/containers/ComingSoonPage/index.js | 1 - .../admin/src/containers/Content/index.js | 1 - .../admin/src/containers/HomePage/index.js | 1 - .../src/containers/LanguageProvider/index.js | 1 - .../admin/src/containers/LeftMenu/index.js | 1 - .../admin/src/containers/LocaleToggle/index.js | 1 - .../admin/src/containers/NotFoundPage/index.js | 1 - .../containers/NotificationProvider/index.js | 1 - .../admin/src/containers/PluginPage/index.js | 3 +-- packages/strapi-admin/admin/src/index.html | 2 ++ .../admin/src/utils/injectReducer.js | 2 +- .../strapi-admin/admin/src/utils/injectSaga.js | 2 +- packages/strapi-admin/package.json | 2 +- .../lib/internals/eslint/.eslintrc.json | 1 + .../internals/webpack/webpack.base.babel.js | 18 ++++++++++++++++-- packages/strapi-helper-plugin/lib/src/app.js | 1 - .../lib/src/components/Button/index.js | 1 - .../lib/src/components/Input/index.js | 1 - .../lib/src/components/PluginHeader/index.js | 1 - .../components/PluginHeaderActions/index.js | 1 - .../src/components/PluginHeaderTitle/index.js | 1 - .../lib/src/components/PopUpWarning/index.js | 1 - .../lib/src/utils/injectReducer.js | 2 +- .../lib/src/utils/injectSaga.js | 2 +- .../admin/src/components/Container/index.js | 1 - .../admin/src/components/EditForm/index.js | 1 - .../src/components/EditFormRelations/index.js | 3 +-- .../admin/src/components/LimitSelect/index.js | 1 - .../admin/src/components/Pagination/index.js | 1 - .../admin/src/components/SelectMany/index.js | 1 - .../admin/src/components/SelectOne/index.js | 1 - .../admin/src/components/Table/index.js | 1 - .../admin/src/components/TableEmpty/index.js | 1 - .../admin/src/components/TableFooter/index.js | 3 +-- .../admin/src/components/TableHeader/index.js | 1 - .../admin/src/components/TableRow/index.js | 1 - .../admin/src/containers/App/index.js | 1 - .../admin/src/containers/Edit/index.js | 1 - .../admin/src/containers/Home/index.js | 1 - .../admin/src/containers/List/index.js | 1 - .../admin/src/containers/NotFoundPage/index.js | 1 - .../strapi-plugin-content-manager/package.json | 4 ++-- .../package.json | 2 +- 55 files changed, 30 insertions(+), 61 deletions(-) diff --git a/packages/strapi-admin/admin/src/app.js b/packages/strapi-admin/admin/src/app.js index dbe55d23a7..4bcd6f0130 100644 --- a/packages/strapi-admin/admin/src/app.js +++ b/packages/strapi-admin/admin/src/app.js @@ -7,8 +7,6 @@ import 'babel-polyfill'; // Import all the third party stuff -import React from 'react'; -import ReactDOM from 'react-dom'; import { Provider } from 'react-redux'; import { ConnectedRouter } from 'react-router-redux'; import createHistory from 'history/createBrowserHistory'; @@ -121,7 +119,6 @@ window.Strapi = { apiUrl, refresh: (pluginId) => ({ translationMessages: (translationMessagesUpdated) => { - console.log(translationMessagesUpdated); render(merge({}, translationMessages, translationMessagesUpdated)); }, leftMenuSections: (leftMenuSectionsUpdated) => { diff --git a/packages/strapi-admin/admin/src/components/Header/index.js b/packages/strapi-admin/admin/src/components/Header/index.js index a447e8311c..0309c4e660 100644 --- a/packages/strapi-admin/admin/src/components/Header/index.js +++ b/packages/strapi-admin/admin/src/components/Header/index.js @@ -4,8 +4,6 @@ * */ -import React from 'react'; - import styles from './styles.scss'; class Header extends React.Component { // eslint-disable-line react/prefer-stateless-function diff --git a/packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js b/packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js index a9ad2b2a1b..57398e6c8d 100644 --- a/packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js +++ b/packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import { defineMessages, FormattedMessage } from 'react-intl'; import LocaleToggle from 'containers/LocaleToggle'; diff --git a/packages/strapi-admin/admin/src/components/LeftMenuHeader/index.js b/packages/strapi-admin/admin/src/components/LeftMenuHeader/index.js index fc114b0593..c8843a71e7 100644 --- a/packages/strapi-admin/admin/src/components/LeftMenuHeader/index.js +++ b/packages/strapi-admin/admin/src/components/LeftMenuHeader/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import { Link } from 'react-router-dom'; import styles from './styles.scss'; diff --git a/packages/strapi-admin/admin/src/components/LeftMenuLink/index.js b/packages/strapi-admin/admin/src/components/LeftMenuLink/index.js index d67472fe97..dc8bb81bd5 100644 --- a/packages/strapi-admin/admin/src/components/LeftMenuLink/index.js +++ b/packages/strapi-admin/admin/src/components/LeftMenuLink/index.js @@ -5,7 +5,6 @@ */ import _ from 'lodash'; -import React from 'react'; import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router-dom'; diff --git a/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js b/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js index 7002ade35a..932f70455f 100644 --- a/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js +++ b/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { map } from 'lodash'; diff --git a/packages/strapi-admin/admin/src/components/Notification/index.js b/packages/strapi-admin/admin/src/components/Notification/index.js index d2876f7df0..4847493322 100644 --- a/packages/strapi-admin/admin/src/components/Notification/index.js +++ b/packages/strapi-admin/admin/src/components/Notification/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; diff --git a/packages/strapi-admin/admin/src/components/NotificationsContainer/index.js b/packages/strapi-admin/admin/src/components/NotificationsContainer/index.js index 5b69e919ca..58ca593354 100644 --- a/packages/strapi-admin/admin/src/components/NotificationsContainer/index.js +++ b/packages/strapi-admin/admin/src/components/NotificationsContainer/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import ReactCSSTransitionGroup from 'react/lib/ReactCSSTransitionGroup'; import Notification from 'components/Notification'; diff --git a/packages/strapi-admin/admin/src/components/Toggle/index.js b/packages/strapi-admin/admin/src/components/Toggle/index.js index 0d3cce44f6..9f7fe59424 100644 --- a/packages/strapi-admin/admin/src/components/Toggle/index.js +++ b/packages/strapi-admin/admin/src/components/Toggle/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import ToggleOption from 'components/ToggleOption'; diff --git a/packages/strapi-admin/admin/src/components/ToggleOption/index.js b/packages/strapi-admin/admin/src/components/ToggleOption/index.js index f72109a57a..6fb67a44b5 100644 --- a/packages/strapi-admin/admin/src/components/ToggleOption/index.js +++ b/packages/strapi-admin/admin/src/components/ToggleOption/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import { injectIntl, intlShape } from 'react-intl'; diff --git a/packages/strapi-admin/admin/src/containers/AdminPage/index.js b/packages/strapi-admin/admin/src/containers/AdminPage/index.js index 4fe17333d7..a5ec88f087 100644 --- a/packages/strapi-admin/admin/src/containers/AdminPage/index.js +++ b/packages/strapi-admin/admin/src/containers/AdminPage/index.js @@ -9,7 +9,6 @@ * the linting exception. */ -import React from 'react'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { createStructuredSelector } from 'reselect'; diff --git a/packages/strapi-admin/admin/src/containers/App/index.js b/packages/strapi-admin/admin/src/containers/App/index.js index 7441753f96..2d832477b1 100644 --- a/packages/strapi-admin/admin/src/containers/App/index.js +++ b/packages/strapi-admin/admin/src/containers/App/index.js @@ -11,7 +11,6 @@ * the linting exception. */ -import React from 'react'; import PropTypes from 'prop-types'; import { Switch, Route } from 'react-router-dom'; diff --git a/packages/strapi-admin/admin/src/containers/ComingSoonPage/index.js b/packages/strapi-admin/admin/src/containers/ComingSoonPage/index.js index 67c6dcdd16..aea3a0c74e 100644 --- a/packages/strapi-admin/admin/src/containers/ComingSoonPage/index.js +++ b/packages/strapi-admin/admin/src/containers/ComingSoonPage/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import { connect } from 'react-redux'; import Helmet from 'react-helmet'; diff --git a/packages/strapi-admin/admin/src/containers/Content/index.js b/packages/strapi-admin/admin/src/containers/Content/index.js index 0b2d751ef5..38b6bf4d00 100644 --- a/packages/strapi-admin/admin/src/containers/Content/index.js +++ b/packages/strapi-admin/admin/src/containers/Content/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; diff --git a/packages/strapi-admin/admin/src/containers/HomePage/index.js b/packages/strapi-admin/admin/src/containers/HomePage/index.js index d3fc554480..e256d315cd 100644 --- a/packages/strapi-admin/admin/src/containers/HomePage/index.js +++ b/packages/strapi-admin/admin/src/containers/HomePage/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import { connect } from 'react-redux'; import Helmet from 'react-helmet'; import { FormattedMessage } from 'react-intl'; diff --git a/packages/strapi-admin/admin/src/containers/LanguageProvider/index.js b/packages/strapi-admin/admin/src/containers/LanguageProvider/index.js index cf6a183e8f..5fc465c591 100644 --- a/packages/strapi-admin/admin/src/containers/LanguageProvider/index.js +++ b/packages/strapi-admin/admin/src/containers/LanguageProvider/index.js @@ -6,7 +6,6 @@ * IntlProvider component and i18n messages (loaded from `app/translations`) */ -import React from 'react'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; diff --git a/packages/strapi-admin/admin/src/containers/LeftMenu/index.js b/packages/strapi-admin/admin/src/containers/LeftMenu/index.js index 202412b49b..35cd08b6d6 100644 --- a/packages/strapi-admin/admin/src/containers/LeftMenu/index.js +++ b/packages/strapi-admin/admin/src/containers/LeftMenu/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; diff --git a/packages/strapi-admin/admin/src/containers/LocaleToggle/index.js b/packages/strapi-admin/admin/src/containers/LocaleToggle/index.js index eacba0b0a2..e4aec6fd4d 100644 --- a/packages/strapi-admin/admin/src/containers/LocaleToggle/index.js +++ b/packages/strapi-admin/admin/src/containers/LocaleToggle/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; diff --git a/packages/strapi-admin/admin/src/containers/NotFoundPage/index.js b/packages/strapi-admin/admin/src/containers/NotFoundPage/index.js index 1612506de6..0013c9db28 100644 --- a/packages/strapi-admin/admin/src/containers/NotFoundPage/index.js +++ b/packages/strapi-admin/admin/src/containers/NotFoundPage/index.js @@ -9,7 +9,6 @@ * the linting exception. */ -import React from 'react'; import PropTypes from 'prop-types'; import { defineMessages, FormattedMessage } from 'react-intl'; diff --git a/packages/strapi-admin/admin/src/containers/NotificationProvider/index.js b/packages/strapi-admin/admin/src/containers/NotificationProvider/index.js index 94e54ffe42..1106f37860 100644 --- a/packages/strapi-admin/admin/src/containers/NotificationProvider/index.js +++ b/packages/strapi-admin/admin/src/containers/NotificationProvider/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { createStructuredSelector } from 'reselect'; diff --git a/packages/strapi-admin/admin/src/containers/PluginPage/index.js b/packages/strapi-admin/admin/src/containers/PluginPage/index.js index 793596c0cc..2db1f6f6d8 100644 --- a/packages/strapi-admin/admin/src/containers/PluginPage/index.js +++ b/packages/strapi-admin/admin/src/containers/PluginPage/index.js @@ -3,8 +3,7 @@ * PluginPage * */ - -import React from 'react'; + import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import Helmet from 'react-helmet'; diff --git a/packages/strapi-admin/admin/src/index.html b/packages/strapi-admin/admin/src/index.html index ff86160ebd..6a9f825ebf 100644 --- a/packages/strapi-admin/admin/src/index.html +++ b/packages/strapi-admin/admin/src/index.html @@ -12,5 +12,7 @@
+ + diff --git a/packages/strapi-admin/admin/src/utils/injectReducer.js b/packages/strapi-admin/admin/src/utils/injectReducer.js index 1e46dbb3b8..27f2751b2e 100644 --- a/packages/strapi-admin/admin/src/utils/injectReducer.js +++ b/packages/strapi-admin/admin/src/utils/injectReducer.js @@ -1,4 +1,4 @@ -import React from 'react'; + import PropTypes from 'prop-types'; import hoistNonReactStatics from 'hoist-non-react-statics'; diff --git a/packages/strapi-admin/admin/src/utils/injectSaga.js b/packages/strapi-admin/admin/src/utils/injectSaga.js index 1679cf9a99..161993fe19 100644 --- a/packages/strapi-admin/admin/src/utils/injectSaga.js +++ b/packages/strapi-admin/admin/src/utils/injectSaga.js @@ -1,4 +1,4 @@ -import React from 'react'; + import PropTypes from 'prop-types'; import hoistNonReactStatics from 'hoist-non-react-statics'; diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json index 0b089932eb..668f89d2f1 100644 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -30,7 +30,7 @@ }, "devDependencies": { "cross-env": "^5.0.5", - "eslint": "^4.7.1", + "eslint": "^4.7.2", "eslint-config-airbnb": "^15.1.0", "eslint-config-airbnb-base": "^11.3.2", "eslint-config-prettier": "^2.5.0", diff --git a/packages/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json b/packages/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json index ce19848793..7db7bccfb6 100644 --- a/packages/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json +++ b/packages/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json @@ -71,6 +71,7 @@ "no-use-before-define": 0, "prefer-template": 2, "class-methods-use-this": 0, + "react/react-in-jsx-scope": 0, "react/forbid-prop-types": 0, "react/jsx-first-prop-new-line": [ 2, diff --git a/packages/strapi-helper-plugin/lib/internals/webpack/webpack.base.babel.js b/packages/strapi-helper-plugin/lib/internals/webpack/webpack.base.babel.js index 9e8de74b1c..c93186ddcc 100644 --- a/packages/strapi-helper-plugin/lib/internals/webpack/webpack.base.babel.js +++ b/packages/strapi-helper-plugin/lib/internals/webpack/webpack.base.babel.js @@ -16,8 +16,13 @@ module.exports = (options) => ({ publicPath: '/', }, options.output), // Merge with env dependent settings module: { + // Comment + noParse: [ + /\/react\//g, + /\/react-dom\//g, + ], loaders: [{ - test: /\.js$/, // Transform all .js files required somewhere with Babel + test: /\.js$/, // Transform all .js files required somewhere with Babel, use: { loader: 'babel-loader', options: { @@ -140,6 +145,8 @@ module.exports = (options) => ({ ], alias: { moment: 'moment/moment.js', + 'react': 'React', + 'react-dom': 'React-DOM', }, symlinks: false, extensions: [ @@ -153,7 +160,7 @@ module.exports = (options) => ({ 'main', ], }, - + externals: generateExternals(), resolveLoader: { modules: [ path.join(__dirname, '..', '..', '..', 'node_modules'), @@ -163,3 +170,10 @@ module.exports = (options) => ({ devtool: options.devtool, target: 'web', // Make web variables accessible to webpack, e.g. window }); + +function generateExternals() { + return { + 'react': 'React', + 'react-dom': 'ReactDOM', + }; +} diff --git a/packages/strapi-helper-plugin/lib/src/app.js b/packages/strapi-helper-plugin/lib/src/app.js index 0c3a32336a..b6bd2605ee 100644 --- a/packages/strapi-helper-plugin/lib/src/app.js +++ b/packages/strapi-helper-plugin/lib/src/app.js @@ -5,7 +5,6 @@ * only setup and plugin code. */ -import React from 'react'; import { Provider } from 'react-redux'; import App, { bootstrap } from 'containers/App'; // eslint-disable-line diff --git a/packages/strapi-helper-plugin/lib/src/components/Button/index.js b/packages/strapi-helper-plugin/lib/src/components/Button/index.js index 37412cab84..2795e155a2 100755 --- a/packages/strapi-helper-plugin/lib/src/components/Button/index.js +++ b/packages/strapi-helper-plugin/lib/src/components/Button/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import styles from './styles.scss'; diff --git a/packages/strapi-helper-plugin/lib/src/components/Input/index.js b/packages/strapi-helper-plugin/lib/src/components/Input/index.js index de63b5116a..9612252e41 100644 --- a/packages/strapi-helper-plugin/lib/src/components/Input/index.js +++ b/packages/strapi-helper-plugin/lib/src/components/Input/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import moment from 'moment'; import PropTypes from 'prop-types'; import { get, isEmpty, map, mapKeys, isObject, reject, includes } from 'lodash'; diff --git a/packages/strapi-helper-plugin/lib/src/components/PluginHeader/index.js b/packages/strapi-helper-plugin/lib/src/components/PluginHeader/index.js index 596076407d..e47d72b02c 100644 --- a/packages/strapi-helper-plugin/lib/src/components/PluginHeader/index.js +++ b/packages/strapi-helper-plugin/lib/src/components/PluginHeader/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import PluginHeaderTitle from 'components/PluginHeaderTitle'; import PluginHeaderActions from 'components/PluginHeaderActions'; diff --git a/packages/strapi-helper-plugin/lib/src/components/PluginHeaderActions/index.js b/packages/strapi-helper-plugin/lib/src/components/PluginHeaderActions/index.js index b57dd2b2ec..3c091661b9 100644 --- a/packages/strapi-helper-plugin/lib/src/components/PluginHeaderActions/index.js +++ b/packages/strapi-helper-plugin/lib/src/components/PluginHeaderActions/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import Button from 'components/Button'; diff --git a/packages/strapi-helper-plugin/lib/src/components/PluginHeaderTitle/index.js b/packages/strapi-helper-plugin/lib/src/components/PluginHeaderTitle/index.js index d602960e29..cf4d2b71ae 100644 --- a/packages/strapi-helper-plugin/lib/src/components/PluginHeaderTitle/index.js +++ b/packages/strapi-helper-plugin/lib/src/components/PluginHeaderTitle/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; diff --git a/packages/strapi-helper-plugin/lib/src/components/PopUpWarning/index.js b/packages/strapi-helper-plugin/lib/src/components/PopUpWarning/index.js index b2bea9cbd9..f7e746f99a 100644 --- a/packages/strapi-helper-plugin/lib/src/components/PopUpWarning/index.js +++ b/packages/strapi-helper-plugin/lib/src/components/PopUpWarning/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; // modal diff --git a/packages/strapi-helper-plugin/lib/src/utils/injectReducer.js b/packages/strapi-helper-plugin/lib/src/utils/injectReducer.js index 1e46dbb3b8..27f2751b2e 100644 --- a/packages/strapi-helper-plugin/lib/src/utils/injectReducer.js +++ b/packages/strapi-helper-plugin/lib/src/utils/injectReducer.js @@ -1,4 +1,4 @@ -import React from 'react'; + import PropTypes from 'prop-types'; import hoistNonReactStatics from 'hoist-non-react-statics'; diff --git a/packages/strapi-helper-plugin/lib/src/utils/injectSaga.js b/packages/strapi-helper-plugin/lib/src/utils/injectSaga.js index 1679cf9a99..161993fe19 100644 --- a/packages/strapi-helper-plugin/lib/src/utils/injectSaga.js +++ b/packages/strapi-helper-plugin/lib/src/utils/injectSaga.js @@ -1,4 +1,4 @@ -import React from 'react'; + import PropTypes from 'prop-types'; import hoistNonReactStatics from 'hoist-non-react-statics'; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js b/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js index 5adee1e0c9..2f62b65b2e 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; class Container extends React.Component { diff --git a/packages/strapi-plugin-content-manager/admin/src/components/EditForm/index.js b/packages/strapi-plugin-content-manager/admin/src/components/EditForm/index.js index 677906641e..abf5435631 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/EditForm/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/EditForm/index.js @@ -5,7 +5,6 @@ */ // Dependencies. -import React from 'react'; import PropTypes from 'prop-types'; import { findIndex, get, omit, isFunction, merge } from 'lodash'; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelations/index.js b/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelations/index.js index bbed8bdf73..7458ae8911 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelations/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelations/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import { map } from 'lodash'; @@ -15,7 +14,7 @@ import styles from './styles.scss'; class EditFormRelations extends React.Component { // eslint-disable-line react/prefer-stateless-function render() { const relations = map(this.props.schema[this.props.currentModelName].relations, (relation, i) => { - + switch (relation.nature) { case 'oneToOne': case 'oneToMany': diff --git a/packages/strapi-plugin-content-manager/admin/src/components/LimitSelect/index.js b/packages/strapi-plugin-content-manager/admin/src/components/LimitSelect/index.js index b86488ea22..b376bc15af 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/LimitSelect/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/LimitSelect/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { map } from 'lodash'; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Pagination/index.js b/packages/strapi-plugin-content-manager/admin/src/components/Pagination/index.js index 5941f8ad36..ed8fa188bb 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Pagination/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Pagination/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import { map } from 'lodash'; import PropTypes from 'prop-types'; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js b/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js index 15f4fba41b..10357d4a3d 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import Select from 'react-select'; import PropTypes from 'prop-types'; import 'react-select/dist/react-select.css'; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/SelectOne/index.js b/packages/strapi-plugin-content-manager/admin/src/components/SelectOne/index.js index 0d0db52219..00721ded5f 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/SelectOne/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/SelectOne/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import Select from 'react-select'; import PropTypes from 'prop-types'; import 'react-select/dist/react-select.css'; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Table/index.js b/packages/strapi-plugin-content-manager/admin/src/components/Table/index.js index ab1ec79293..70fc726d4e 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Table/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Table/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import TableHeader from '../TableHeader'; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/TableEmpty/index.js b/packages/strapi-plugin-content-manager/admin/src/components/TableEmpty/index.js index 49ec28592e..52c3f150bf 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/TableEmpty/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/TableEmpty/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import styles from './styles.scss'; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/TableFooter/index.js b/packages/strapi-plugin-content-manager/admin/src/components/TableFooter/index.js index f4ed2d7768..9208ef29f4 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/TableFooter/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/TableFooter/index.js @@ -4,7 +4,6 @@ * */ -import React from 'react'; import PropTypes from 'prop-types'; import LimitSelect from '../LimitSelect'; @@ -22,7 +21,7 @@ class TableFooter extends React.Component { limit={this.props.limit} /> - +