Skip to content
Snippets Groups Projects
Commit 2004986f authored by Jure's avatar Jure
Browse files

Merge branch 'fix_dependencies' into 'master' 

Fix missing dependencies

See merge request !479
parents fae2bdd5 910083b1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 87 additions and 59 deletions
.eslintrc
+ 8
− 2
View file @ 2004986f
......@@ -20,7 +20,7 @@
}],
"global-require": 0,
"import/no-dynamic-require": 0,
"import/no-extraneous-dependencies": 0,
"import/no-extraneous-dependencies": ["error", {"devDependencies": false }],
"import/no-named-as-default": 0,
"import/no-named-as-default-member": 0,
"import/prefer-default-export": 0,
......@@ -34,5 +34,11 @@
"react/prop-types": 0,
"react/require-default-props": 0,
"sort-keys": 0
}
},
"overrides": [{
"files": ["*_test.js", "*.test.js", "*.test.jsx", "**/test/**/*.js"],
"rules": {
"import/no-extraneous-dependencies": "off"
}
}]
}
packages/base-model/package.json
+ 8
− 1
View file @ 2004986f
......@@ -9,9 +9,16 @@
"author": "Adam Hyde",
"license": "MIT",
"dependencies": {
"@pubsweet/db-manager": "^2.2.0",
"@pubsweet/logger": "^0.2.9",
"pubsweet-server": "^11.0.0",
"knex": "^0.16.3",
"lodash": "^4.17.11",
"objection": "^1.2.3",
"pubsweet-server": "^11.0.0"
"uuid": "^3.3.2"
},
"peerDependencies": {
"config": "^3.0.1"
},
"publishConfig": {
"access": "public"
......
packages/cli/package.json
+ 2
− 0
View file @ 2004986f
......@@ -19,10 +19,12 @@
"bluebird": "^3.5.0",
"colors": "^1.1.2",
"commander": "^2.9.0",
"config": "^3.0.1",
"express": "^4.15.3",
"forever-monitor": "^1.7.0",
"fs-extra": "^4.0.2",
"inflection": "^1.12.0",
"lodash": "^4.17.11",
"prompt": "flatiron/prompt#1c95d1d8d333b5fbc13fa5f0619f3dcf0d514f87",
"pubsweet-server": "^11.0.0",
"uuid": "^3.0.1",
......
packages/client/package.json
+ 3
− 1
View file @ 2004986f
......@@ -22,6 +22,7 @@
"apollo-link-http": "^1.5.4",
"apollo-link-ws": "^1.0.8",
"apollo-upload-client": "^8.0.0",
"apollo-utilities": "^1.0.27",
"authsome": "^0.1.0",
"config": "^2.0.1",
"event-source-polyfill": "^0.0.10",
......@@ -35,6 +36,7 @@
"react": "^16.2.0",
"react-apollo": "^2.1.0",
"react-redux": "^5.0.2",
"react-router": "^4.3.1",
"react-router-dom": "^4.2.2",
"react-router-redux": "next",
"redux": "^3.6.0",
......@@ -63,7 +65,7 @@
"waait": "^1.0.2"
},
"peerDependencies": {
"pubsweet-server": ">=1.1.0"
"pubsweet-server": ">=11.0.0"
},
"repository": {
"type": "git",
......
packages/components/AWSS3-server/config/test.js deleted 100644 → 0
+ 0
− 7
View file @ fae2bdd5
const path = require('path')
module.exports = {
'pubsweet-component-aws-s3': {
validations: path.join(__dirname, 'upload-validations'),
},
}
packages/components/AWSS3-server/config/upload-validations.js deleted 100644 → 0
+ 0
− 19
View file @ fae2bdd5
const Joi = require('joi')
module.exports = {
manuscripts: Joi.any()
.valid([
'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
'application/pdf',
'application/msword',
])
.error(new Error('Only Word documents and PDFs are allowed')),
supplementary: Joi.any(),
coverLetter: Joi.any()
.valid([
'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
'application/pdf',
'application/msword',
])
.error(new Error('Only Word documents and PDFs are allowed')),
}
packages/components/AWSS3-server/package.json
+ 7
− 2
View file @ 2004986f
......@@ -12,14 +12,19 @@
"archiver": "^2.1.1",
"aws-sdk": "^2.185.0",
"body-parser": "^1.17.2",
"dotenv": "^6.2.0",
"lodash": "^4.17.11",
"multer": "^1.3.0",
"multer-s3": "^2.7.0",
"node-mocks-http": "^1.6.6",
"nodemailer": "^4.4.2"
"nodemailer": "^4.4.2",
"uuid": "^3.3.2"
},
"peerDependencies": {
"@pubsweet/logger": ">=0.0.1",
"pubsweet-server": ">=1.0.0"
"config": "^3.0.1",
"joi": "^14.3.1",
"pubsweet-server": ">=11.0.0"
},
"devDependencies": {
"jest": "^23.6.0",
......
packages/components/EmailTemplating-server/package.json
+ 2
− 1
View file @ 2004986f
......@@ -13,7 +13,8 @@
"handlebars": "^4.0.2"
},
"peerDependencies": {
"@pubsweet/logger": "^0.0.1"
"@pubsweet/logger": "^0.0.1",
"config": "^3.0.1"
},
"repository": {
"type": "git",
......
packages/components/Epub/package.json
+ 3
− 7
View file @ 2004986f
......@@ -17,12 +17,8 @@
"unzipper": "^0.8.9"
},
"peerDependencies": {
"pubsweet": "^2.2.4",
"pubsweet-server": "^7.1.0"
},
"devDependencies": {
"config": "^2.0.1",
"jest": "^23.5.0",
"lodash": "^4.17.4"
"pubsweet": "^3.0.0",
"pubsweet-server": "^11.0.0",
"config": "^3.0.1"
}
}
packages/components/HTML/package.json
+ 2
− 1
View file @ 2004986f
......@@ -8,7 +8,8 @@
"dependencies": {
"prop-types": "^15.5.10",
"react-redux": "^5.0.6",
"redux": "^3.7.2"
"redux": "^3.7.2",
"styled-components": "^4.1.3"
},
"peerDependencies": {
"pubsweet-client": ">=1.0.0",
......
packages/components/Ink-server/package.json
+ 3
− 2
View file @ 2004986f
......@@ -6,12 +6,13 @@
"author": "Collaborative Knowledge Foundation",
"license": "MIT",
"peerDependencies": {
"pubsweet-server": ">=1.0.0"
"pubsweet-server": ">=1.0.0",
"config": ">=3.0.1",
"joi": ">=14.3.1"
},
"dependencies": {
"@pubsweet/logger": "^0.2.9",
"busboy": "^0.2.13",
"config": "^2.0.1",
"pusher-js": "^4.2.1",
"request": "^2.83.0",
"request-promise-native": "^1.0.5",
......
packages/components/Login/__snapshots__/Login.test.jsx.snap
+ 22
− 8
View file @ 2004986f
......@@ -23,11 +23,11 @@ ShallowWrapper {
</ForwardRef>,
false,
<form>
<C
<FormikConnect(FieldInner)
component={[Function]}
name="username"
/>
<C
<FormikConnect(FieldInner)
component={[Function]}
name="password"
/>
......@@ -110,6 +110,7 @@ ShallowWrapper {
],
},
"displayName": "styled.h1",
"foldedComponentIds": Array [],
"render": [Function],
"styledComponentId": "sc-Rmtcm",
"target": "h1",
......@@ -125,11 +126,11 @@ ShallowWrapper {
"nodeType": "host",
"props": Object {
"children": Array [
<C
<FormikConnect(FieldInner)
component={[Function]}
name="username"
/>,
<C
<FormikConnect(FieldInner)
component={[Function]}
name="password"
/>,
......@@ -264,6 +265,7 @@ ShallowWrapper {
],
},
"displayName": "styled.button",
"foldedComponentIds": Array [],
"render": [Function],
"styledComponentId": "sc-kgoBCf",
"target": "button",
......@@ -334,6 +336,7 @@ ShallowWrapper {
],
},
"displayName": "Styled(Link)",
"foldedComponentIds": Array [],
"render": [Function],
"styledComponentId": "sc-csuQGl",
"target": [Function],
......@@ -353,6 +356,7 @@ ShallowWrapper {
"rules": Array [],
},
"displayName": "styled.div",
"foldedComponentIds": Array [],
"render": [Function],
"styledComponentId": "sc-gwVKww",
"target": "div",
......@@ -420,6 +424,7 @@ ShallowWrapper {
],
},
"displayName": "Styled(Link)",
"foldedComponentIds": Array [],
"render": [Function],
"styledComponentId": "sc-csuQGl",
"target": [Function],
......@@ -439,6 +444,7 @@ ShallowWrapper {
"rules": Array [],
},
"displayName": "styled.div",
"foldedComponentIds": Array [],
"render": [Function],
"styledComponentId": "sc-hXRMBi",
"target": "div",
......@@ -464,6 +470,7 @@ ShallowWrapper {
],
},
"displayName": "styled.div",
"foldedComponentIds": Array [],
"propTypes": Object {
"medium": [Function],
"small": [Function],
......@@ -488,11 +495,11 @@ ShallowWrapper {
</ForwardRef>,
false,
<form>
<C
<FormikConnect(FieldInner)
component={[Function]}
name="username"
/>
<C
<FormikConnect(FieldInner)
component={[Function]}
name="password"
/>
......@@ -575,6 +582,7 @@ ShallowWrapper {
],
},
"displayName": "styled.h1",
"foldedComponentIds": Array [],
"render": [Function],
"styledComponentId": "sc-Rmtcm",
"target": "h1",
......@@ -590,11 +598,11 @@ ShallowWrapper {
"nodeType": "host",
"props": Object {
"children": Array [
<C
<FormikConnect(FieldInner)
component={[Function]}
name="username"
/>,
<C
<FormikConnect(FieldInner)
component={[Function]}
name="password"
/>,
......@@ -729,6 +737,7 @@ ShallowWrapper {
],
},
"displayName": "styled.button",
"foldedComponentIds": Array [],
"render": [Function],
"styledComponentId": "sc-kgoBCf",
"target": "button",
......@@ -799,6 +808,7 @@ ShallowWrapper {
],
},
"displayName": "Styled(Link)",
"foldedComponentIds": Array [],
"render": [Function],
"styledComponentId": "sc-csuQGl",
"target": [Function],
......@@ -818,6 +828,7 @@ ShallowWrapper {
"rules": Array [],
},
"displayName": "styled.div",
"foldedComponentIds": Array [],
"render": [Function],
"styledComponentId": "sc-gwVKww",
"target": "div",
......@@ -885,6 +896,7 @@ ShallowWrapper {
],
},
"displayName": "Styled(Link)",
"foldedComponentIds": Array [],
"render": [Function],
"styledComponentId": "sc-csuQGl",
"target": [Function],
......@@ -904,6 +916,7 @@ ShallowWrapper {
"rules": Array [],
},
"displayName": "styled.div",
"foldedComponentIds": Array [],
"render": [Function],
"styledComponentId": "sc-hXRMBi",
"target": "div",
......@@ -929,6 +942,7 @@ ShallowWrapper {
],
},
"displayName": "styled.div",
"foldedComponentIds": Array [],
"propTypes": Object {
"medium": [Function],
"small": [Function],
......
packages/components/Login/package.json
+ 7
− 2
View file @ 2004986f
......@@ -7,7 +7,7 @@
"license": "MIT",
"dependencies": {
"@pubsweet/ui": "^9.1.0",
"formik": "1.3.0",
"formik": "^1.3.0",
"prop-types": "^15.5.10",
"react-redux": "^5.0.6",
"react-router-dom": "^4.2.2",
......@@ -15,8 +15,13 @@
"recompose": "^0.26.0"
},
"peerDependencies": {
"config": "^3.0.1",
"graphql-tag": "^2.10.0",
"lodash": "^4.17.11",
"pubsweet-client": ">=1.0.0",
"react": ">=15"
"react": ">=15",
"react-apollo": "^2.3.3",
"styled-components": "^4.1.3"
},
"repository": {
"type": "git",
......
packages/components/PasswordResetFrontend/package.json
+ 2
− 1
View file @ 2004986f
......@@ -15,7 +15,8 @@
},
"peerDependencies": {
"pubsweet-client": ">=1.0.0",
"react": ">=16"
"react": ">=16",
"react-router-dom": "^4.3.1"
},
"repository": {
"type": "git",
......
packages/components/PollingClient/package.json
+ 1
− 0
View file @ 2004986f
......@@ -16,6 +16,7 @@
"author": "Collaborative Knowledge Foundation",
"license": "MIT",
"dependencies": {
"isomorphic-fetch": "^2.2.1",
"react-redux": "^5.0.6",
"redux": "^3.7.2"
},
......
packages/components/PostsManager/package.json
+ 2
− 1
View file @ 2004986f
......@@ -15,7 +15,8 @@
},
"peerDependencies": {
"pubsweet-client": ">=1.0.0",
"react": ">=16"
"react": ">=16",
"react-router": "^4.3.1"
},
"repository": {
"type": "git",
......
packages/components/SendEmail-server/package.json
+ 2
− 1
View file @ 2004986f
......@@ -13,7 +13,8 @@
"nodemailer": "^4.4.2"
},
"peerDependencies": {
"@pubsweet/logger": "^0.0.1"
"@pubsweet/logger": "^0.0.1",
"config": "^3.0.1"
},
"repository": {
"type": "git",
......
packages/components/Signup/package.json
+ 5
− 2
View file @ 2004986f
......@@ -11,11 +11,14 @@
"react-bootstrap": "^0.32.0",
"react-redux": "^5.0.6",
"react-router": "^4.2.0",
"redux": "^3.7.2"
"recompose": "^0.30.0",
"redux": "^3.7.2",
"redux-form": "^7.4.2"
},
"peerDependencies": {
"pubsweet-client": ">=1.0.0",
"react": ">=16"
"react": ">=16",
"react-router-redux": "^4.0.8"
},
"repository": {
"type": "git",
......
packages/components/SortableList/package.json
+ 3
− 1
View file @ 2004986f
......@@ -8,7 +8,9 @@
"recompose": "^0.26.0"
},
"peerDependencies": {
"react": ">=15"
"lodash": "^4.17.11",
"react": ">=15",
"react-dom": "^16.7.0"
},
"devDependencies": {
"react-dnd-test-backend": "^7.0.0"
......
packages/components/TeamsManager/package.json
+ 5
− 0
View file @ 2004986f
......@@ -8,6 +8,7 @@
"dependencies": {
"@pubsweet/ui": "^9.1.0",
"prop-types": "^15.5.10",
"pubsweet-client": "^8.0.1",
"react-dom": "^16.2.0",
"react-redux": "^5.0.6",
"redux": "^3.7.2"
......@@ -16,5 +17,9 @@
"type": "git",
"url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
"path": "TeamsManager"
},
"peerDependencies": {
"config": "^3.0.1",
"react": "^16.7.0"
}
}
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