Merge pull request #2511 from ProjectMirador/fix-build

Fixes build by removing circular dependency and renames files per sty…

__tests__/src/extend/pluginValidation.test.js

-import { validatePlugin } from '../../../src/extend';
+import { validatePlugin } from '../../../src/extend/pluginValidation';
 
 /** */
 const createPlugin = props => ({

__tests__/src/extend/withPlugins.test.js

 import React from 'react';
 import { mount } from 'enzyme';
-import { withPlugins, PluginContext } from '../../../src/extend';
+import { withPlugins } from '../../../src/extend/withPlugins';
+import PluginContext from '../../../src/extend/PluginContext';
 
 
 /** Mock target component */

src/containers/AccessTokenSender.js

 import { compose } from 'redux';
 import { connect } from 'react-redux';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import * as actions from '../state/actions';
 import { AccessTokenSender } from '../components/AccessTokenSender';
 

src/containers/AnnotationSettings.js

@@ -2,7 +2,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { withTranslation } from 'react-i18next';
 import * as actions from '../state/actions';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import {
   getAnnotationResourcesByMotivation,
   getWindow,

src/containers/App.js

 import { compose } from 'redux';
 import { connect } from 'react-redux';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import * as actions from '../state/actions';
 import { App } from '../components/App';
 

src/containers/AttributionPanel.js

@@ -2,7 +2,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { withTranslation } from 'react-i18next';
 import { withStyles } from '@material-ui/core/styles';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import {
   getManifestLogo,
   getRequiredStatement,

src/containers/AuthenticationSender.js

 import { compose } from 'redux';
 import { connect } from 'react-redux';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import * as actions from '../state/actions';
 import { AuthenticationSender } from '../components/AuthenticationSender';
 

src/containers/BackgroundPluginArea.js

-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import { BackgroundPluginArea } from '../components/BackgroundPluginArea';
 
 export default withPlugins('BackgroundPluginArea')(BackgroundPluginArea);

src/containers/CanvasInfo.js

 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { withTranslation } from 'react-i18next';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import {
   getDestructuredMetadata,
   getCanvas,

src/containers/CaptionedCanvasThumbnail.js

 import { compose } from 'redux';
 import { withTranslation } from 'react-i18next';
 import { withStyles } from '@material-ui/core/styles';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import { CaptionedCanvasThumbnail } from '../components/CaptionedCanvasThumbnail';
 
 /**

src/containers/ChangeThemeDialog.js

@@ -2,7 +2,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { withStyles } from '@material-ui/core';
 import { withTranslation } from 'react-i18next';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import * as actions from '../state/actions';
 import { ChangeThemeDialog } from '../components/ChangeThemeDialog';
 

src/containers/CompanionArea.js

@@ -2,7 +2,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { withStyles } from '@material-ui/core';
 import { withTranslation } from 'react-i18next';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import { getCompanionWindowsForPosition, getCompanionAreaVisibility, getWindow } from '../state/selectors';
 import * as actions from '../state/actions';
 import { CompanionArea } from '../components/CompanionArea';

src/containers/CompanionWindow.js

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { withTranslation } from 'react-i18next';
 import { withStyles } from '@material-ui/core';
 import { withSize } from 'react-sizeme';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import * as actions from '../state/actions';
 import { getCompanionWindow } from '../state/selectors';
 import { CompanionWindow } from '../components/CompanionWindow';

src/containers/CompanionWindowFactory.js

 import { compose } from 'redux';
 import { connect } from 'react-redux';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import { getCompanionWindow } from '../state/selectors';
 import { CompanionWindowFactory } from '../components/CompanionWindowFactory';
 

src/containers/ErrorDialog.js

@@ -6,7 +6,7 @@ import {
   omit,
   values,
 } from 'lodash';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import { ErrorDialog } from '../components/ErrorDialog';
 import * as actions from '../state/actions';
 

src/containers/GalleryView.js

 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { withStyles } from '@material-ui/core/styles';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import { GalleryView } from '../components/GalleryView';
 import { getManifestCanvases, getCanvasIndex } from '../state/selectors';
 

src/containers/LanguageSettings.js

 import { compose } from 'redux';
 import { connect } from 'react-redux';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import * as actions from '../state/actions';
 import { getLanguagesFromConfigWithCurrent } from '../state/selectors';
 import { LanguageSettings } from '../components/LanguageSettings';

src/containers/ManifestForm.js

@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { withTranslation } from 'react-i18next';
 import { withStyles } from '@material-ui/core';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import * as actions from '../state/actions';
 import { ManifestForm } from '../components/ManifestForm';
 

src/containers/ManifestInfo.js

 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { withTranslation } from 'react-i18next';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import {
   getManifestDescription,
   getManifestTitle,

src/containers/ManifestListItem.js

@@ -2,7 +2,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { withTranslation } from 'react-i18next';
 import { withStyles } from '@material-ui/core';
-import { withPlugins } from '../extend';
+import { withPlugins } from '../extend/withPlugins';
 import {
   getManifest,
   getManifestTitle, getManifestThumbnail, getManifestCanvases,