diff --git a/packages/component-user/typeDefs.js b/packages/component-user/typeDefs.js
index 6247dc4a4a09a01caed390e33a0fd8b4b53828e4..d7060e75d53e945a30607e06503068b45f5600ad 100644
--- a/packages/component-user/typeDefs.js
+++ b/packages/component-user/typeDefs.js
@@ -1,13 +1,6 @@
-const typeDefs = `
- extend type Query {
- users: [User]
+module.exports = `
+ type Creasta {
+ id: String!
+ name: String
}
-
- extend type Mutation {
- confirmUser(input: confirmUserInput): User!
- }
-
-
`
-
-module.exports = typeDefs
diff --git a/packages/components-faraday/package.json b/packages/components-faraday/package.json
index ec2887fbaf640fa36eff33017b8d6fb46557e1ba..d7844c44388a0cb5fc05f2bc8b2637b2b1ab249d 100644
--- a/packages/components-faraday/package.json
+++ b/packages/components-faraday/package.json
@@ -8,10 +8,12 @@
"@pubsweet/ui": "^8.6.0",
"@pubsweet/ui-toolkit": "latest",
"country-list": "^1.1.0",
+ "graphql-tag": "^2.10.0",
"moment": "^2.22.1",
"prop-types": "^15.5.10",
"pubsweet-component-login": "^1.2.0",
"react": "^16.4.2",
+ "react-apollo": "^2.3.2",
"react-dnd": "^2.5.4",
"react-dnd-html5-backend": "^2.5.4",
"react-dom": "^16.1.0",
diff --git a/packages/components-faraday/src/components/Admin/AdminUsers.js b/packages/components-faraday/src/components/Admin/AdminUsers.js
index b29d70d4221431fbfdb750fbd965ccbb13dd00b0..7dc07fce97dbce4b6b3a95ef0974b818d2fedef6 100644
--- a/packages/components-faraday/src/components/Admin/AdminUsers.js
+++ b/packages/components-faraday/src/components/Admin/AdminUsers.js
@@ -9,6 +9,8 @@ import { ConnectPage } from 'xpub-connect'
import { withJournal } from 'xpub-journal'
import { compose, withHandlers, withProps } from 'recompose'
import { getAdminUsers } from 'pubsweet-component-faraday-selectors'
+import { Query } from 'react-apollo'
+import gql from 'graphql-tag'
import {
Row,
@@ -26,6 +28,15 @@ import {
import { AddUser } from './'
import { updateUserStatus, onSubmit } from './utils'
+const GET_USERS = gql`
+ query Users {
+ users {
+ id
+ username
+ }
+ }
+`
+
const Users = ({
page,
users,
@@ -64,6 +75,13 @@ const Users = ({
<Pagination {...rest} itemsPerPage={itemsPerPage} page={page} />
</Row>
+ <Query query={GET_USERS}>
+ {({ data }) => {
+ console.log('props query', data)
+ return <span>sebi e retardat</span>
+ }}
+ </Query>
+
<Table>
<thead>
<tr>
diff --git a/packages/xpub-faraday/app/app.js b/packages/xpub-faraday/app/app.js
index 0988df482437853ff3bbe0ee9f20354238071b85..e6466401f8fcb36af5e52be9b4a5efdc2fb14a3d 100644
--- a/packages/xpub-faraday/app/app.js
+++ b/packages/xpub-faraday/app/app.js
@@ -18,6 +18,7 @@ const render = () => {
<AppContainer>
<JournalProvider journal={journal}>
<Root
+ connectToWebSocket={false}
history={history}
routes={<Routes />}
store={store}
diff --git a/packages/xpub-faraday/config/default.js b/packages/xpub-faraday/config/default.js
index a410fa43e53c5f7e91e427f981df974201f8199e..4bd9d05a54c60dd44598653c6c3ebb7226a0328c 100644
--- a/packages/xpub-faraday/config/default.js
+++ b/packages/xpub-faraday/config/default.js
@@ -43,11 +43,8 @@ module.exports = {
port: 3000,
logger,
uploads: 'uploads',
- secret: 'SECRET',
enableExperimentalGraphql: true,
graphiql: true,
- // typeDefs: authors.typeDefs,
- // resolvers,
},
'pubsweet-client': {
API_ENDPOINT: '/api',
diff --git a/packages/xpub-faraday/package.json b/packages/xpub-faraday/package.json
index 54758218ae012ede24d0251340b6bb2bdc8586ce..7e997fbc934e556e48ac2cb1e1232d8135bdce57 100644
--- a/packages/xpub-faraday/package.json
+++ b/packages/xpub-faraday/package.json
@@ -9,8 +9,8 @@
},
"dependencies": {
"@pubsweet/component-aws-s3": "^1.2.0",
- "@pubsweet/component-send-email": "0.2.4",
"@pubsweet/component-email-templating": "0.0.1",
+ "@pubsweet/component-send-email": "0.2.4",
"@pubsweet/styleguide": "3.1.4",
"@pubsweet/ui": "^8.6.0",
"@pubsweet/ui-toolkit": "latest",
@@ -21,16 +21,17 @@
"flavors": "^3.3.1",
"font-awesome": "^4.7.0",
"fs-extra": "^4.0.2",
+ "graphql-tag": "^2.10.0",
"history": "^4.7.2",
"joi": "^10.0.6",
"loadable-components": "^0.3.0",
"moment": "^2.18.1",
"nodemailer-ses-transport": "^1.5.1",
"prop-types": "^15.5.10",
- "pubsweet": "3.0.6",
- "pubsweet-client": "^4.0.4",
+ "pubsweet": "latest",
+ "pubsweet-client": "^6.1.0",
"pubsweet-component-login": "^1.2.0",
- "pubsweet-server": "10.0.1",
+ "pubsweet-server": "10.1.1",
"react": "^16.4.2",
"react-dnd": "^2.5.4",
"react-dnd-html5-backend": "^2.5.4",
@@ -81,8 +82,7 @@
"start": "pubsweet start",
"start:services": "docker-compose up postgres",
"server": "pubsweet server",
- "start-now":
- "echo $secret > config/local-development.json && npm run server",
+ "start-now": "echo $secret > config/local-development.json && npm run server",
"build": "NODE_ENV=production pubsweet build",
"clean": "rm -rf node_modules",
"debug": "pgrep -f startup/start.js | xargs kill -sigusr1",
diff --git a/yarn.lock b/yarn.lock
index 5ac69d613ac6686ad0d572b7fe2b838b917053cf..ec3a52c68f1479e6289f41bbb5c30306664e45c6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -139,17 +139,17 @@
aws-sdk "^2.185.0"
nodemailer "^4.4.2"
-"@pubsweet/db-manager@^2.0.6":
- version "2.0.6"
- resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-2.0.6.tgz#75e5dbc3946c3211ff2146ef914884c3711bb92b"
- integrity sha512-rheDnoOSVyuzlV63AfesAY/IDYHEkEMWxq1RUugtz22QzBLTeMaBQK7Sdp7xhuU7NK4t0kvoWuSo4QRvNgeUyQ==
+"@pubsweet/db-manager@^2.0.9":
+ version "2.0.9"
+ resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-2.0.9.tgz#14358c57f5825323c82faeb7c8581bdc27fd7a76"
+ integrity sha512-03lckB+zdQsoOD/yR0HrC3x0Q4gceM+HfPVBOLNMJFipLpEkKftQBVMBUtmWfhfvbfbeet1n4V8vRj0gzx78DA==
dependencies:
"@pubsweet/logger" "^0.2.7"
fs-extra "^4.0.2"
isomorphic-fetch "^2.2.1"
joi "^13.6.0"
pg "^7.4.1"
- pubsweet-server "^10.0.1"
+ pubsweet-server "^10.1.0"
tmp "^0.0.33"
umzug "^2.1.0"
@@ -212,7 +212,7 @@
lodash "^4.17.4"
styled-components "^3.2.5"
-"@pubsweet/ui@^8.2.0", "@pubsweet/ui@^8.3.0":
+"@pubsweet/ui@^8.2.0":
version "8.3.0"
resolved "https://registry.yarnpkg.com/@pubsweet/ui/-/ui-8.3.0.tgz#b8da7be8d9110594abdd18476e3808c9606a74b4"
integrity sha512-JEBRKh84TLNlBlXj/teUEHQAxFRpCCRse6OgJecQLRTOUkxCROqywpR+5fkkoDG+dXOJqV91Yq/yPURdhI+otQ==
@@ -645,6 +645,13 @@ apollo-link-http@^1.5.4:
apollo-link "^1.2.2"
apollo-link-http-common "^0.2.4"
+apollo-link-ws@^1.0.8:
+ version "1.0.10"
+ resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.10.tgz#9fb5489a36f5fcb0d139b6ada0eea979ecad3967"
+ integrity sha512-1Yx4iIUsWS8wuAdVJ2LF+LdIYAsqHSto8eShwJ/d2SovocsMCwN9hyS+JkaOPD/KHAkavTWzN6l3XwSOdOwevQ==
+ dependencies:
+ apollo-link "^1.2.4"
+
apollo-link@^1.0.0, apollo-link@^1.2.1, apollo-link@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.2.tgz#54c84199b18ac1af8d63553a68ca389c05217a03"
@@ -662,6 +669,14 @@ apollo-link@^1.2.3:
apollo-utilities "^1.0.0"
zen-observable-ts "^0.8.10"
+apollo-link@^1.2.4:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.4.tgz#ab4d21d2e428db848e88b5e8f4adc717b19c954b"
+ integrity sha512-B1z+9H2nTyWEhMXRFSnoZ1vSuAYP+V/EdUJvRx9uZ8yuIBZMm6reyVtr1n0BWlKeSFyPieKJy2RLzmITAAQAMQ==
+ dependencies:
+ apollo-utilities "^1.0.0"
+ zen-observable-ts "^0.8.11"
+
apollo-server-core@^1.3.2:
version "1.3.2"
resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-1.3.2.tgz#f36855a3ebdc2d77b8b9c454380bf1d706105ffc"
@@ -2018,6 +2033,11 @@ bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.1:
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
integrity sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==
+bluebird@^3.5.2:
+ version "3.5.3"
+ resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
+ integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
+
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
version "4.11.8"
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
@@ -2975,7 +2995,7 @@ concat-stream@^1.4.10, concat-stream@^1.5.0, concat-stream@^1.6.0:
readable-stream "^2.2.2"
typedarray "^0.0.6"
-config@^1.21.0, config@^1.26.2:
+config@^1.26.2:
version "1.29.4"
resolved "https://registry.yarnpkg.com/config/-/config-1.29.4.tgz#1b42752ed86b363fc4025960569fd74978862a92"
integrity sha1-G0J1LthrNj/EAllgVp/XSXiGKpI=
@@ -3292,6 +3312,11 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.3:
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
integrity sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=
+core-js@^2.4.1:
+ version "2.5.7"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
+ integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
+
core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -5064,6 +5089,11 @@ fb-watchman@^2.0.0:
dependencies:
bser "^2.0.0"
+fbjs-css-vars@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.1.tgz#836d876e887d702f45610f5ebd2fbeef649527fc"
+ integrity sha512-IM+v/C40MNZWqsLErc32e0TyIk/NhkkQZL0QmjBh6zi1eXv0/GeVKmKmueQX7nn9SXQBQbTUcB8zuexIF3/88w==
+
fbjs@^0.8.0:
version "0.8.17"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
@@ -5090,6 +5120,20 @@ fbjs@^0.8.1, fbjs@^0.8.16, fbjs@^0.8.5, fbjs@^0.8.9:
setimmediate "^1.0.5"
ua-parser-js "^0.7.9"
+fbjs@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-1.0.0.tgz#52c215e0883a3c86af2a7a776ed51525ae8e0a5a"
+ integrity sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==
+ dependencies:
+ core-js "^2.4.1"
+ fbjs-css-vars "^1.0.0"
+ isomorphic-fetch "^2.1.1"
+ loose-envify "^1.0.0"
+ object-assign "^4.1.0"
+ promise "^7.1.1"
+ setimmediate "^1.0.5"
+ ua-parser-js "^0.7.18"
+
figures@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
@@ -5835,6 +5879,11 @@ graphql-subscriptions@^0.5.8:
dependencies:
iterall "^1.2.1"
+graphql-tag@^2.10.0:
+ version "2.10.0"
+ resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.0.tgz#87da024be863e357551b2b8700e496ee2d4353ae"
+ integrity sha512-9FD6cw976TLLf9WYIUPCaaTpniawIjHWZSwIRZSjrfufJamcXbVVYfN2TWvJYbw0Xf2JjYbl1/f2+wDnBVw3/w==
+
graphql-tag@^2.7.3:
version "2.9.1"
resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.9.1.tgz#1ab090ef7d3518b06d8c97d1393672145fe91587"
@@ -5851,13 +5900,6 @@ graphql-tools@^4.0.0:
iterall "^1.1.3"
uuid "^3.1.0"
-graphql@^0.13.0:
- version "0.13.2"
- resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.13.2.tgz#4c740ae3c222823e7004096f832e7b93b2108270"
- integrity sha512-QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog==
- dependencies:
- iterall "^1.2.1"
-
graphql@^14.0.2:
version "14.0.2"
resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.0.2.tgz#7dded337a4c3fd2d075692323384034b357f5650"
@@ -6150,6 +6192,13 @@ hoist-non-react-statics@^2.5.5:
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
+hoist-non-react-statics@^3.0.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.2.0.tgz#d21b9fc72b50fdc38c5d88f6e2c52f2c2dbe5ee2"
+ integrity sha512-3IascCRfaEkbmHjJnUxWSspIUE1okLPjGTMVXW8zraUo1t3yg1BadKAxAGILHwgoBzmMnzrgeeaDGBvpuPz6dA==
+ dependencies:
+ react-is "^16.3.2"
+
home-or-tmp@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
@@ -8138,6 +8187,11 @@ lodash.flattendeep@^4.4.0:
resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=
+lodash.flowright@^3.5.0:
+ version "3.5.0"
+ resolved "https://registry.yarnpkg.com/lodash.flowright/-/lodash.flowright-3.5.0.tgz#2b5fff399716d7e7dc5724fe9349f67065184d67"
+ integrity sha1-K1//OZcW1+fcVyT+k0n2cGUYTWc=
+
lodash.isequal@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
@@ -9848,6 +9902,15 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+pg-boss@^3.1.2:
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/pg-boss/-/pg-boss-3.1.2.tgz#efbe343b0bf01808f3d1d0a158c4bcc969d2776a"
+ integrity sha512-3Mwv2KS1dq4gCwS63IMhd9H2mqhJbjJU2lzxLFXnDzzOitcPy5UdX/UyslMpurkp5wPlV8KXBW1H0iyyExe80Q==
+ dependencies:
+ bluebird "^3.5.2"
+ pg "^7.4.1"
+ uuid "^3.2.1"
+
pg-connection-string@0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7"
@@ -10631,24 +10694,25 @@ public-encrypt@^4.0.0:
parse-asn1 "^5.0.0"
randombytes "^2.0.1"
-pubsweet-client@^4.0.4:
- version "4.0.5"
- resolved "https://registry.yarnpkg.com/pubsweet-client/-/pubsweet-client-4.0.5.tgz#60568218da77a3c7f32071f10f436fb2fa378a4d"
- integrity sha512-jCcqCpNavDuyTHw/oXxFi2pu8L6T47tgeHKmJ6fQ7fusHZvU1PfrHqs08a4J+4GVoBTGXkW+wweOzzpgIr4y3g==
+pubsweet-client@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/pubsweet-client/-/pubsweet-client-6.1.0.tgz#79194234f591bc515bf1802689e1291c8ae8e679"
+ integrity sha512-on/uWQuzkuj0XbLh10ts9IbCL3+tAdFFlODqsVSKNnqB/2QxrcmKIkW2+RI3Oy9rBHCff3HVAjzhhfaHYmb8JQ==
dependencies:
- "@pubsweet/ui" "^8.3.0"
+ "@pubsweet/ui" "^8.8.0"
"@pubsweet/ui-toolkit" "^1.2.0"
apollo-cache-inmemory "^1.2.4"
apollo-client "^2.3.4"
apollo-link "^1.2.1"
apollo-link-context "^1.0.5"
apollo-link-http "^1.5.4"
+ apollo-link-ws "^1.0.8"
apollo-upload-client "^8.0.0"
authsome "^0.1.0"
- config "^1.21.0"
+ config "^2.0.1"
event-source-polyfill "^0.0.10"
global "^4.3.1"
- graphql "^0.13.0"
+ graphql "^14.0.2"
graphql-tag "^2.7.3"
isomorphic-fetch "^2.1.1"
lint-staged "^6.0.0"
@@ -10666,11 +10730,56 @@ pubsweet-client@^4.0.4:
reselect "^3.0.1"
styled-components "^3.2.5"
styled-normalize "^3.0.1"
+ subscriptions-transport-ws "^0.9.12"
+
+pubsweet-server@10.1.1:
+ version "10.1.1"
+ resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-10.1.1.tgz#7229ff1a573e41671f438855f49139cd4eab09fa"
+ integrity sha512-SUFoa1CfoMnWMTqZ0RrXoSZBsyP53M1YdarNprnxyED1OPWlfbvJSj8AgAU7dyKNkQMGowGn7fIcABygHOQnOg==
+ dependencies:
+ "@pubsweet/logger" "^0.2.7"
+ apollo-server-express "^1.3.2"
+ apollo-upload-server "^4.0.2"
+ authsome "^0.1.0"
+ bcrypt "^2.0.1"
+ bluebird "^3.5.1"
+ body-parser "^1.15.2"
+ colors "^1.1.2"
+ config "^2.0.1"
+ cookie-parser "^1.4.3"
+ dotenv "^4.0.0"
+ express "^4.16.1"
+ graphql "^14.0.2"
+ graphql-postgres-subscriptions "^1.0.4"
+ graphql-tools "^4.0.0"
+ helmet "^3.8.1"
+ http-status-codes "^1.0.6"
+ joi "^13.6.0"
+ jsonwebtoken "^7.1.7"
+ knex "^0.15.2"
+ lodash "^4.0.0"
+ minimist "^1.2.0"
+ morgan "^1.8.2"
+ multer "^1.1.0"
+ objection "^1.3.0"
+ passport "^0.3.2"
+ passport-anonymous "^1.0.1"
+ passport-http-bearer "^1.0.1"
+ passport-local "^1.0.0"
+ pg "^7.4.1"
+ pg-boss "^3.1.2"
+ promise-queue "^2.2.3"
+ prompt "^1.0.0"
+ pubsweet-sse "^1.0.1"
+ subscriptions-transport-ws "^0.9.12"
+ uuid "^3.0.1"
+ waait "^1.0.2"
+ winston "^2.2.0"
-pubsweet-server@10.0.1, pubsweet-server@^10.0.1:
- version "10.0.1"
- resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-10.0.1.tgz#ac2ccc0ae1f42f2c97b044be3f90782b11b1d0fa"
- integrity sha512-hUcOfVAV6rWeohgb93NO5sn414m03cOeKKUaOKxCXqn8CNgFmZQhmogLeEXH+MVbEXsnbpYnEuV0rcuwA0boNQ==
+pubsweet-server@^10.1.0:
+ version "10.1.0"
+ resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-10.1.0.tgz#c63c2f054b632af590e2d1a558b360caa7b02900"
+ integrity sha512-HckTcVRZ4Ies5Br5EdS5WsH9SWLAOc1DVlm7mvCQY12RpmPImvoQmLIN2RJkWmjEqS88NUiyKY1rYOeSRArNCA==
dependencies:
"@pubsweet/logger" "^0.2.7"
apollo-server-express "^1.3.2"
@@ -10702,6 +10811,7 @@ pubsweet-server@10.0.1, pubsweet-server@^10.0.1:
passport-http-bearer "^1.0.1"
passport-local "^1.0.0"
pg "^7.4.1"
+ pg-boss "^3.1.2"
promise-queue "^2.2.3"
prompt "^1.0.0"
pubsweet-sse "^1.0.1"
@@ -10714,12 +10824,12 @@ pubsweet-sse@^1.0.1:
resolved "https://registry.yarnpkg.com/pubsweet-sse/-/pubsweet-sse-1.0.1.tgz#675f699213a7c228a448e7c9f272a5a9e7585fcf"
integrity sha512-A5aDdSI38GmrfUhXc3bjXGExqUEzuzcWdm63Km7ww9KIMFQDnHl06ovap8OAP/+BmqxXvXooxHqqeQ/rhe0l7A==
-pubsweet@3.0.6:
- version "3.0.6"
- resolved "https://registry.yarnpkg.com/pubsweet/-/pubsweet-3.0.6.tgz#8f2543f8d101cea596be53edf3d559d6bd89a57f"
- integrity sha512-eJIscLmMvLmZ5+DBsOh9fpMNmXDd1xYtwOHNYty8hMn5pP6+b93EOzXeI+ofoFzdCTVCeAIATWKMAJmzWutOnQ==
+pubsweet@latest:
+ version "3.0.9"
+ resolved "https://registry.yarnpkg.com/pubsweet/-/pubsweet-3.0.9.tgz#d018be045b4b0b1cafa9a8e2d234b6985e0b8f66"
+ integrity sha512-AjZiCgwoeYUMqLo4Lhh3VQem+4xuv9AgMWiYzIJjRa0JzhGK2nnBi3RWvqzkMFOpXOKzf9TqbwrW1HLJ6iFTCA==
dependencies:
- "@pubsweet/db-manager" "^2.0.6"
+ "@pubsweet/db-manager" "^2.0.9"
"@pubsweet/logger" "^0.2.7"
bluebird "^3.5.0"
colors "^1.1.2"
@@ -10729,7 +10839,7 @@ pubsweet@3.0.6:
fs-extra "^4.0.2"
inflection "^1.12.0"
prompt flatiron/prompt#1c95d1d8d333b5fbc13fa5f0619f3dcf0d514f87
- pubsweet-server "^10.0.1"
+ pubsweet-server "^10.1.0"
uuid "^3.0.1"
webpack "^3.8.1"
webpack-dev-middleware "^1.12.0"
@@ -10908,6 +11018,18 @@ react-apollo@^2.1.0:
lodash "4.17.5"
prop-types "^15.6.0"
+react-apollo@^2.3.2:
+ version "2.3.2"
+ resolved "https://registry.yarnpkg.com/react-apollo/-/react-apollo-2.3.2.tgz#b8e287d2813722b9e0a886cabf8149ab3b84a3b7"
+ integrity sha512-3lU9iqmj4KMIZvlWWSuLihxMGLEAL6oNmnSTWrb3/mRP36Zy0zJD4rdaonDx4WzqFYQAnUPaOiFnHGp0UQUTwA==
+ dependencies:
+ fbjs "^1.0.0"
+ hoist-non-react-statics "^3.0.0"
+ invariant "^2.2.2"
+ lodash.flowright "^3.5.0"
+ lodash.isequal "^4.5.0"
+ prop-types "^15.6.0"
+
react-codemirror2@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-5.1.0.tgz#62de4460178adea40eb52eabf7491669bf3794b8"
@@ -11054,6 +11176,11 @@ react-is@^16.3.1:
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.2.tgz#f4d3d0e2f5fbb6ac46450641eb2e25bf05d36b22"
integrity sha512-ybEM7YOr4yBgFd6w8dJqwxegqZGJNBZl6U27HnGKuTZmDvVrD5quWOK/wAnMywiZzW+Qsk+l4X2c70+thp/A8Q==
+react-is@^16.3.2:
+ version "16.6.3"
+ resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.6.3.tgz#d2d7462fcfcbe6ec0da56ad69047e47e56e7eac0"
+ integrity sha512-u7FDWtthB4rWibG/+mFbVd5FvdI20yde86qKGx4lVUTWmPlSWQ4QxbBIrrs+HnXGbxOUlUzTAP/VDmvCwaP2yA==
+
react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
@@ -13895,7 +14022,7 @@ uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
integrity sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==
-uuid@^3.3.2:
+uuid@^3.2.1, uuid@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
@@ -13990,6 +14117,11 @@ w3c-keyname@^1.1.8:
resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-1.1.8.tgz#4e2219663760fd6535b7a1550f1552d71fc9372c"
integrity sha512-2HAdug8GTiu3b4NYhssdtY8PXRue3ICnh1IlxvZYl+hiINRq0GfNWei3XOPDg8L0PsxbmYjWVLuLj6BMRR/9vA==
+waait@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/waait/-/waait-1.0.2.tgz#c234ed748a032cb7d5e83cb691567c6dc545b37d"
+ integrity sha512-amvD7uRx48U2gXOgzwV7PbcpSy8O3Fect2SqiLbBIVH9Zh0UMnDWckSLnsdKNwq7pvarWnPWrpYad2P3pgmRYw==
+
walker@~1.0.5:
version "1.0.7"
resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
@@ -14616,6 +14748,13 @@ zen-observable-ts@^0.8.10:
dependencies:
zen-observable "^0.8.0"
+zen-observable-ts@^0.8.11:
+ version "0.8.11"
+ resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.11.tgz#d54a27cd17dc4b4bb6bd008e5c096af7fcb068a9"
+ integrity sha512-8bs7rgGV4kz5iTb9isudkuQjtWwPnQ8lXq6/T76vrepYZVMsDEv6BXaEA+DHdJSK3KVLduagi9jSpSAJ5NgKHw==
+ dependencies:
+ zen-observable "^0.8.0"
+
zen-observable-ts@^0.8.9:
version "0.8.9"
resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.9.tgz#d3c97af08c0afdca37ebcadf7cc3ee96bda9bab1"