update package.json and config files

.eslintrc

 // Use this file as a starting point for your project's .eslintrc.
 // Copy this file, and add rule overrides as needed.
 {
-  "extends": ["standard", "standard-react"]
+  "extends": ["standard", "standard-react"],
+  "parser": "babel-eslint",
+  "env": {
+    "es6": true,
+    "browser": true
+  }
 }

.gitignore

 .env.*
 .DS_Store
 _build/*
+__snapshots__/
 api/db/*
 api/db/*
 coverage
@@ -10,5 +11,3 @@ npm-debug.log
 public/assets/*
 public/uploads/*
 pubsweet.log
-uploads/*
-__snapshots__/
\ No newline at end of file

app/.eslintrc

-// Use this file as a starting point for your project's .eslintrc.
-// Copy this file, and add rule overrides as needed.
-
-{
-  "extends": ["standard", "standard-react"]
-}

config/dev.js

@@ -10,16 +10,16 @@ module.exports = {
   pubsweet: {
     components: universal.components
   },
-  'pubsweet-backend': {
-    dbPath: path.join(__dirname, '..', 'api', 'db'),
-    secret: process.env.PUBSWEET_SECRET,
-    API_ENDPOINT: '/api'
-  },
-  'pubsweet-component-ink-backend': universal.inkBackend,
-  'pubsweet-frontend': {
+  'pubsweet-client': {
     theme: universal.theme,
     routes: 'app/routes.jsx',
     navigation: 'app/components/Navigation/Navigation.jsx'
   },
+  'pubsweet-component-ink-backend': universal.inkBackend,
+  'pubsweet-server': {
+    dbPath: path.join(__dirname, '..', 'api', 'db'),
+    secret: process.env.PUBSWEET_SECRET,
+    API_ENDPOINT: '/api'
+  },
   'validations': universal.validations
 }

config/production.js

@@ -10,16 +10,16 @@ module.exports = {
   pubsweet: {
     components: universal.components
   },
-  'pubsweet-backend': {
-    dbPath: path.join(__dirname, '..', 'api', 'db'),
-    secret: '71dcce42-2245-4944-925b-0a62b83425ce',
-    API_ENDPOINT: '/api'
-  },
-  'pubsweet-component-ink-backend': universal.inkBackend,
-  'pubsweet-frontend': {
+  'pubsweet-client': {
     theme: universal.theme,
     routes: 'app/routes.jsx',
     navigation: 'app/components/Navigation/Navigation.jsx'
   },
+  'pubsweet-component-ink-backend': universal.inkBackend,
+  'pubsweet-server': {
+    dbPath: path.join(__dirname, '..', 'api', 'db'),
+    secret: '71dcce42-2245-4944-925b-0a62b83425ce',
+    API_ENDPOINT: '/api'
+  },
   'validations': universal.validations
 }

package.json

@@ -14,31 +14,25 @@
     "bootstrap-sass": "^3.3.7",
     "copy-webpack-plugin": "^4.0.1",
     "css-loader": "^0.25.0",
-    "eslint": "^3.6.0",
-    "eslint-config-standard": "^6.2.0",
-    "eslint-config-standard-react": "^4.2.0",
-    "eslint-loader": "^1.6.0",
-    "eslint-plugin-promise": "^2.0.1",
-    "eslint-plugin-react": "^6.4.1",
-    "eslint-plugin-standard": "^2.0.0",
     "extract-text-webpack-plugin": "^2.0.0-beta.4",
     "file-loader": "^0.9.0",
     "font-awesome": "^4.7.0",
     "html-webpack-plugin": "^2.24.0",
     "json-loader": "^0.5.4",
-    "pubsweet-server": "git+https://gitlab.coko.foundation/pubsweet/pubsweet-server.git",
-    "pubsweet-component-blog": "^0.1.0",
-    "pubsweet-component-ink-backend": "0.0.4-alpha.3",
-    "pubsweet-component-ink-frontend": "0.0.1",
-    "pubsweet-component-login": "0.2.1",
-    "pubsweet-component-manage": "0.1.0",
-    "pubsweet-component-navigation": "0.1.0",
-    "pubsweet-component-signup": "0.1.0",
-    "pubsweet-component-teams-manager": "0.1.1",
+    "lodash": "^4.17.4",
+    "pubsweet-client": "0.8.4",
+    "pubsweet-component-blog": "0.1.2",
+    "pubsweet-component-ink-backend": "0.0.4",
+    "pubsweet-component-ink-frontend": "0.0.2",
+    "pubsweet-component-login": "0.2.2",
+    "pubsweet-component-manage": "0.1.2",
+    "pubsweet-component-navigation": "0.1.1",
+    "pubsweet-component-signup": "0.1.1",
+    "pubsweet-component-teams-manager": "0.1.2",
     "pubsweet-component-theme-editoria": "git+https://gitlab.coko.foundation/yannisbarlas/pubsweet-component-theme-editoria.git",
-    "pubsweet-component-users-manager": "0.1.0",
-    "pubsweet-frontend": "0.7.0",
-    "pubsweet-theme-plugin": "^0.0.1",
+    "pubsweet-component-users-manager": "0.1.1",
+    "pubsweet-server": "0.7.2",
+    "pubsweet-theme-plugin": "0.0.1",
     "react-dnd": "^2.1.4",
     "react-dnd-html5-backend": "^2.1.2",
     "react-hot-loader": "^3.0.0-beta.5",
@@ -53,11 +47,19 @@
     "webpack-hot-middleware": "^2.13.0"
   },
   "devDependencies": {
+    "babel-eslint": "^7.2.1",
     "enzyme": "^2.7.1",
     "enzyme-to-json": "^1.4.5",
-    "react-addons-test-utils": "^15.4.2",
+    "eslint": "^3.6.0",
+    "eslint-config-standard": "^6.2.0",
+    "eslint-config-standard-react": "^4.2.0",
+    "eslint-loader": "^1.6.0",
+    "eslint-plugin-promise": "^2.0.1",
+    "eslint-plugin-react": "^6.4.1",
+    "eslint-plugin-standard": "^2.0.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^18.1.0",
+    "react-addons-test-utils": "^15.4.2",
     "react-test-renderer": "^15.4.2",
     "sinon": "^1.17.7",
     "sinon-as-promised": "^4.0.2"

test/jest.config.js

-global.CONFIG = { 'pubsweet-backend': '' }
+global.CONFIG = { 'pubsweet-server': '' }
 global.PUBSWEET_COMPONENTS = []
 
 global.mock = {

webpack/babel-includes.js

 const path = require('path')
 
 var babelIncludes = [
-  new RegExp(path.join(__dirname, '../node_modules/pubsweet-frontend/src')),
+  new RegExp(path.join(__dirname, '../node_modules/pubsweet-client/src')),
   new RegExp(path.join(__dirname, '../app')),
   new RegExp(path.join(__dirname, '../node_modules/pubsweet-.*'))
 ]

webpack/webpack.dev.config.js

@@ -18,11 +18,11 @@ module.exports = [
       ]
     },
     output: {
-      path: path.join(__dirname, '..', 'public', 'assets'),
+      path: path.join(__dirname, '..', '_build', 'assets'),
       filename: '[name].js',
       publicPath: '/assets/'
     },
-    devtool: 'inline-source-map',
+    devtool: 'cheap-module-source-map',
     module: {
       rules: require('./common-rules')
     },
@@ -33,7 +33,7 @@ module.exports = [
         path.resolve(__dirname, '..', 'node_modules'),
         'node_modules'
       ],
-      plugins: [new ThemePlugin(config['pubsweet-frontend'].theme)],
+      plugins: [new ThemePlugin(config['pubsweet-client'].theme)],
       extensions: ['.js', '.jsx', '.json', '.scss'],
       enforceExtension: false
     },

webpack/webpack.production.config.js

@@ -17,7 +17,7 @@ module.exports = [
       ]
     },
     output: {
-      path: path.join(__dirname, '..', 'public', 'assets'),
+      path: path.join(__dirname, '..', '_build', 'assets'),
       filename: '[name]-[hash].js',
       publicPath: '/assets/'
     },
@@ -32,7 +32,7 @@ module.exports = [
         'node_modules'
       ],
       extensions: ['.js', '.jsx', '.json', '.scss'],
-      plugins: [new ThemePlugin(config['pubsweet-frontend'].theme)]
+      plugins: [new ThemePlugin(config['pubsweet-client'].theme)]
     },
     plugins: [
       new HtmlWebpackPlugin({