From 23f9948007f92fa934e922f8ecb49aa45cdff819 Mon Sep 17 00:00:00 2001
From: Alf Eaton <eaton.alf@gmail.com>
Date: Thu, 31 Aug 2017 11:27:01 +0100
Subject: [PATCH] Fix webpack compilation for manuscript page
---
packages/component-app/src/components/ConnectPage.js | 4 ++--
packages/component-manuscript/src/components/Manuscript.js | 1 -
.../component-manuscript/src/components/ManuscriptPage.js | 1 -
packages/xpub-collabra/webpack/common-rules.js | 5 +++--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/packages/component-app/src/components/ConnectPage.js b/packages/component-app/src/components/ConnectPage.js
index 7eb3ab56b..5d27a8728 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 3480db693..72a72e4ad 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 5d3663fe6..6d7974498 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 546107423..3fc4e7642 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]',
--
GitLab