Commit bde9b18c authored by Jure's avatar Jure

Merge branch 'master' into add_xsweet_component

parents a115c7e8 4ebf786d
......@@ -4,10 +4,10 @@
"private": true,
"license": "MIT",
"devDependencies": {
"@babel/preset-env": "^7.0.0",
"@commitlint/cli": "^6.0.5",
"@commitlint/config-conventional": "^6.0.4",
"babel-eslint": "^10.0.1",
"@babel/preset-env": "^7.0.0",
"commitizen": "^2.9.6",
"cz-conventional-changelog": "^2.1.0",
"eslint": "^4.13.1",
......@@ -24,8 +24,8 @@
"lerna": "^3.4.3",
"lint-staged": "^6.0.0",
"prettier": "^1.8.2",
"stylelint": "^8.2.0",
"stylelint-config-prettier": "^2.0.0",
"stylelint": "^9.10.1",
"stylelint-config-prettier": "^4.0.0",
"stylelint-config-pubsweet": "^0.0.3"
},
"scripts": {
......@@ -150,7 +150,9 @@
"setupFilesAfterEnv": [
"<rootDir>/test/setup/enzyme.js"
],
"snapshotSerializers": ["enzyme-to-json/serializer"]
"snapshotSerializers": [
"enzyme-to-json/serializer"
]
},
{
"rootDir": "<rootDir>/packages/base-model",
......
......@@ -9,7 +9,7 @@
],
"main": "index.js",
"dependencies": {
"archiver": "^2.1.1",
"archiver": "^3.0.0",
"aws-sdk": "^2.185.0",
"body-parser": "^1.17.2",
"dotenv": "^6.2.0",
......
......@@ -12,7 +12,7 @@
"@pubsweet/logger": "^0.2.13",
"cheerio": "^1.0.0-rc.2",
"highlight.js": "^9.13.1",
"html-epub": "git+https://git@gitlab.coko.foundation/pubsweet/html-epub#updated-libtidy",
"html-epub": "^1.0.0",
"mkdirp": "^0.5.1",
"unzipper": "^0.8.9"
},
......
......@@ -2,7 +2,9 @@ const knex = require('knex')
const config = require('config')
const { knexSnakeCaseMappers } = require('objection')
const connection = config['pubsweet-server'] && config['pubsweet-server'].db
const connection =
process.env.DATABASE_URL ||
(config['pubsweet-server'] && config['pubsweet-server'].db)
const pool = config['pubsweet-server'] && config['pubsweet-server'].pool
const db = knex({
......
......@@ -2,8 +2,6 @@ import React from 'react'
import styled from 'styled-components'
import { override, th } from '@pubsweet/ui-toolkit'
import Action from './Action'
const Group = styled.div`
${override('ui.ActionGroup')};
`
......@@ -21,22 +19,7 @@ const ActionGroup = props => {
child => child && <ActionWrapper>{child}</ActionWrapper>,
)
return <Group>{children}</Group>
}
ActionGroup.propTypes = {
children: (props, propName, componentName) => {
const prop = props[propName]
let error = null
React.Children.forEach(prop, child => {
if (child.type !== Action) {
error = new Error('ActionGroup should only take Actions as children')
}
})
return error
},
return <Group className={props.className}>{children}</Group>
}
export default ActionGroup
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment