diff --git a/packages/component-app/src/components/ConnectPage.js b/packages/component-app/src/components/ConnectPage.js index 7eb3ab56b6f75236ccb30684475f192e2ac61df4..5d27a872847a4b0a8489afea243337cfe8b8630e 100644 --- a/packages/component-app/src/components/ConnectPage.js +++ b/packages/component-app/src/components/ConnectPage.js @@ -42,12 +42,12 @@ const ConnectPage = requirements => WrappedComponent => { complete: true, }) }).catch(error => { + console.error(error) + this.setState({ error: error.message }) - console.error(error) - throw error // rethrow }) } diff --git a/packages/component-manuscript/src/components/Manuscript.js b/packages/component-manuscript/src/components/Manuscript.js index 3480db693b8aa0a56afc02623472d44a19027453..72a72e4adf0f6151c855c6510c37028a968e45c4 100644 --- a/packages/component-manuscript/src/components/Manuscript.js +++ b/packages/component-manuscript/src/components/Manuscript.js @@ -1,7 +1,6 @@ import React from 'react' import { browserHistory } from 'react-router' import SimpleEditor from 'pubsweet-component-wax/src/SimpleEditor' -import 'pubsweet-component-wax/src/SimpleEditor.scss' import classes from './Manuscript.local.css' // TODO: convert user teams to roles (see SimpleEditorWrapper)? diff --git a/packages/component-manuscript/src/components/ManuscriptPage.js b/packages/component-manuscript/src/components/ManuscriptPage.js index 5d3663fe6e765cb4b1dbb2d9a71b9591af695f92..6d7974498d7562b3f0ac90b0213f9417f526f38b 100644 --- a/packages/component-manuscript/src/components/ManuscriptPage.js +++ b/packages/component-manuscript/src/components/ManuscriptPage.js @@ -8,7 +8,6 @@ import Manuscript from './Manuscript' export default compose( ConnectPage(params => [ actions.getCollection({ id: params.project }), - // actions.getFragments({ id: params.project }), actions.getFragment({ id: params.project }, { id: params.version }) ]), connect( diff --git a/packages/xpub-collabra/webpack/common-rules.js b/packages/xpub-collabra/webpack/common-rules.js index 546107423077c0294f8cee7afeca6898fc4172e9..3fc4e76426d24a8323eb281790427d61b82f5571 100644 --- a/packages/xpub-collabra/webpack/common-rules.js +++ b/packages/xpub-collabra/webpack/common-rules.js @@ -16,6 +16,7 @@ const requireComponentsString = components const include = [ path.join(__dirname, '..', 'app'), /pubsweet-[^/]+\/src/, + /pubsweet-[^/]+\/[^/]+\.jsx$/, // needed for ink-frontend /xpub-[^/]+\/src/, /component-[^/]+\/src/, ] @@ -38,7 +39,7 @@ module.exports = [ oneOf: [ // ES6 JS { - test: /\.js?$/, + test: /\.jsx?$/, include, loader: 'babel-loader', options: { @@ -112,7 +113,7 @@ module.exports = [ // files { - exclude: [/\.js$/, /\.html$/, /\.json$/], + exclude: [/\.jsx?$/, /\.html$/, /\.json$/], loader: 'file-loader', options: { name: 'static/media/[name].[hash:8].[ext]',