Merge branch 'master' into 'test-happy-path'

# Conflicts:
#   app/components/dashboard/Dashboard.js

app/components/manuscript/Manuscript.js

+import React from 'react'
+import { Heading } from '@pubsweet/ui'
+import { Box } from 'grid-styled'
+import styled from 'styled-components'
+
+const TitleBox = styled(Box)`
+  text-align: center;
+`
+
+const Manuscript = () => (
+  <Box mx={5}>
+    <TitleBox mb={5}>
+      <Heading level={1}>
+        Dynamic representation of 3D auditory space in the midbrain of the
+        free-flying echolocating bat
+      </Heading>
+      <p>Authors details here</p>
+    </TitleBox>
+
+    <Heading level={2}>Abstract</Heading>
+    <p>
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec tellus
+      justo, pharetra imperdiet vehicula a, semper eget sem. Proin euismod sem
+      elit, congue commodo lorem sodales nec. Sed at consequat orci, in
+      ullamcorper odio. Vivamus quis ipsum molestie, eleifend nunc quis,
+      imperdiet ante. Cras congue urna eu tincidunt ultricies. Phasellus mollis
+      magna eget felis ullamcorper, ac pellentesque magna euismod. Donec quis
+      felis vel mi tempor pulvinar. Etiam nec dolor eros.
+    </p>
+  </Box>
+)
+
+export default Manuscript

app/components/manuscript/Manuscript.md

+```js
+<Manuscript />
+```

app/components/manuscript/ManuscriptPage.js

+import React from 'react'
+import Manuscript from './Manuscript'
+
+export default () => <Manuscript />

app/routes.js

@@ -8,6 +8,7 @@ import {
   LoginPage,
 } from './components'
 import SubmissionPage from './components/submission/SubmissionPage'
+import ManuscriptPage from './components/manuscript/ManuscriptPage'
 
 const Routes = () => (
   <Switch>
@@ -16,6 +17,7 @@ const Routes = () => (
       <AppBar />
       <Switch>
         <Route component={SubmissionPage} path="/submit" />
+        <Route component={ManuscriptPage} path="/manuscript" />
         <Route component={Dashboard} />
       </Switch>
     </AuthenticatedComponent>

config/default.js

@@ -15,6 +15,7 @@ module.exports = {
     port: 3000,
     logger,
     uploads: 'uploads',
+    enableExperimentalGraphql: true,
     typeDefs: `
       type Manuscript {
         id: ID!

styleguide.config.js

@@ -13,7 +13,7 @@ module.exports = {
   ],
   webpackConfig: {
     module: {
-      rules: require('./webpack/rules.development.js'),
+      rules: require('./webpack/rules.js'),
     },
   },
   context: {

webpack/rules.production.js

-const ExtractTextPlugin = require('extract-text-webpack-plugin')
-const include = require('./babel-includes')
-const stringReplaceRule = require('./string-replace')
-
-module.exports = [
-  stringReplaceRule,
-  {
-    oneOf: [
-      // ES6 JS
-      {
-        test: /\.jsx?$/,
-        include,
-        loader: 'babel-loader',
-        options: {
-          presets: [
-            [require('babel-preset-env'), { modules: false }],
-            require('babel-preset-react'),
-            require('babel-preset-stage-2'),
-          ],
-        },
-      },
-
-      // CSS Modules
-      {
-        test: /\.local\.css$/,
-        include,
-        use: ExtractTextPlugin.extract({
-          fallback: 'style-loader',
-          use: [
-            {
-              loader: 'css-loader',
-              options: {
-                modules: true,
-                localIdentName: '[name]_[local]-[hash:base64:8]',
-              },
-            },
-          ],
-        }),
-      },
-
-      // global CSS
-      {
-        test: /\.css$/,
-        use: ExtractTextPlugin.extract({
-          fallback: 'style-loader',
-          use: ['css-loader'],
-        }),
-      },
-
-      // files
-      {
-        exclude: [/\.jsx?$/, /\.html$/, /\.json$/],
-        loader: 'file-loader',
-        options: {
-          name: 'static/media/[name].[hash:8].[ext]',
-        },
-      },
-    ],
-  },
-]

webpack/webpack.development.config.js

@@ -2,7 +2,7 @@ const config = require('config')
 const path = require('path')
 const webpack = require('webpack')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
-const rules = require('./rules.development')
+const rules = require('./rules')
 const resolve = require('./common-resolve')
 
 module.exports = [

webpack/webpack.production.config.js

@@ -5,11 +5,10 @@ const config = require('config')
 const path = require('path')
 const webpack = require('webpack')
 const CleanWebpackPlugin = require('clean-webpack-plugin')
-const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const UglifyJSPlugin = require('uglifyjs-webpack-plugin')
-const rules = require('./rules.production')
+const rules = require('./rules')
 const resolve = require('./common-resolve')
 
 module.exports = [
@@ -47,7 +46,6 @@ module.exports = [
         [config.authsome.mode]: config.authsome.mode,
         [config.validations]: config.validations,
       }),
-      new ExtractTextPlugin('styles/main.css'),
       new CopyWebpackPlugin([{ from: '../static' }]),
       new webpack.optimize.AggressiveMergingPlugin(),
       new webpack.optimize.OccurrenceOrderPlugin(),

webpack/webpack.test.config.js

@@ -2,7 +2,7 @@ const config = require('config')
 const path = require('path')
 const webpack = require('webpack')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
-const rules = require('./rules.development')
+const rules = require('./rules')
 const resolve = require('./common-resolve')
 
 module.exports = [