diff --git a/server/xsweet-conversion/index.js b/server/xsweet-conversion/index.js
index 7037a2e45538d41c816e1b379c1e152c82efd402..bf89c5dc3d9a78636dce957b30ff27d538ce5acb 100644
--- a/server/xsweet-conversion/index.js
+++ b/server/xsweet-conversion/index.js
@@ -1,5 +1,4 @@
const fs = require('fs')
-const request = require('request')
const rp = require('request-promise')
const tar = require('../utils/unTar.js')
const logger = require('@pubsweet/logger')
@@ -10,14 +9,14 @@ const path = require('path')
const files = require('../utils/files.js')
const db = require('../utils/db.js')
-// '/home/yogmatee/projects/xmlValidation_files/xweet_files/tiana.docx'
-
+/*
xsweetConvert(
'/home/yogmatee/projects/xmlValidation_files/xweet_files/tiana.docx',
- 'EMS90002',
+ 'EMS90005',
)
+*/
-function xsweetConvert(fileUrl, manuscriptId) {
+module.exports.xsweetConvert = function xsweetConvert(fileUrl, manuscriptId) {
const options = {
method: 'POST',
uri: 'http://localhost:3000/convertDocxToHTML',
@@ -33,18 +32,19 @@ function xsweetConvert(fileUrl, manuscriptId) {
}
rp(options)
- .then(async function(body) {
+ .then(async body => {
try {
const tmpPath = await tar.createTempDir()
const user = await getUser.getAdminUser()
fs.writeFileSync(`${tmpPath}/${manuscriptId}.html`, body)
- console.log('The file has been saved!', tmpPath)
+
const fileInfo = getFileInfo(
`${tmpPath}/${manuscriptId}.html`,
manuscriptId,
user,
)
const uuid = uuidv4()
+
// upload to minio
files.uploadFileToMinio(
`${uuid}${fileInfo.extension}`,
@@ -52,14 +52,18 @@ function xsweetConvert(fileUrl, manuscriptId) {
fileInfo.url,
fileInfo.mimeType,
)
+
+ // update object details for database upsert
+ fileInfo.url = `/download/${uuid}${fileInfo.extension}`
delete fileInfo.extension
- await db.upsertHtmlPrevFile(fileInfo)
- console.log('file has been uploaded to Minio and to db')
+
+ await db.upsertHtmlPrevFile(fileInfo, manuscriptId)
+ logger.info('file has been uploaded to Minio and to db')
} catch (err) {
throw err
}
})
- .catch(function(err) {
+ .catch(err => {
logger.error('Conversion failed:', err)
})
}
diff --git a/yarn.lock b/yarn.lock
index ed00d648d2ad543b12cca5a7f595aa166e9c4f97..f04d43c8e5a62aaaf29fc8ae8c1448dfdf60fa5b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -105,7 +105,7 @@
dependencies:
regenerator-runtime "^0.12.0"
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.0.0-beta.38", "@babel/runtime@^7.0.0-beta.51", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.0.0-beta.38", "@babel/runtime@^7.0.0-beta.51", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.4":
version "7.3.4"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83"
integrity sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==
@@ -222,14 +222,14 @@
objection "^1.2.3"
uuid "^3.3.2"
-"@pubsweet/base-model@^3.0.3":
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/@pubsweet/base-model/-/base-model-3.0.3.tgz#43078c92f1f2d5a9375153cc82643b10c22bc65d"
- integrity sha512-s5MrX9Ue3kme3Gbe5/SMz4B35yUbtKutR9FcnEKkI5IAZVPHG4LeCzRApuuRcu3t15Ob0/U5fbaTojvrP5pczw==
+"@pubsweet/base-model@^3.0.4":
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/@pubsweet/base-model/-/base-model-3.0.4.tgz#b2976e9595acff30a1f17219c3672e40c7749ed2"
+ integrity sha512-UrWwgi5itD2ENanG7KkAWZTU9KrnXRD4owp+oGZoVxXm8hTNSgyJRyWuyJWSgJ3S2o+qGm2u0HuY7Uyo/ihnBQ==
dependencies:
- "@pubsweet/db-manager" "^3.0.2"
- "@pubsweet/errors" "^2.0.6"
- "@pubsweet/logger" "^0.2.16"
+ "@pubsweet/db-manager" "^3.0.3"
+ "@pubsweet/errors" "^2.0.7"
+ "@pubsweet/logger" "^0.2.17"
http-status-codes "^1.3.0"
knex "^0.16.3"
lodash "^4.17.11"
@@ -237,37 +237,37 @@
uuid "^3.3.2"
"@pubsweet/component-send-email@^0.2.4":
- version "0.2.8"
- resolved "https://registry.yarnpkg.com/@pubsweet/component-send-email/-/component-send-email-0.2.8.tgz#448220658cc11543495f952de5e85c8e9ab6c0a3"
- integrity sha512-aPCM8G0gELg4tWXwnQqaIjZyu8Vov3aYw5mQZhdnOF959hfO7kzgobbVxjTrCeWpC7w7dUtPT/c6Gt1Q0CyI1g==
+ version "0.2.13"
+ resolved "https://registry.yarnpkg.com/@pubsweet/component-send-email/-/component-send-email-0.2.13.tgz#f500a0d932203b130350148b3e0c1eaed079db2e"
+ integrity sha512-kd0KHpdNhECR3un413QLtJ7pEbz63sSBEwdEXur+UJ2P3aMJtFXxRFnpZnPg/UhcYMqVs+UF5FV5olZVSyoXGQ==
dependencies:
aws-sdk "^2.185.0"
nodemailer "^4.4.2"
"@pubsweet/db-manager@^2.2.3":
- version "2.2.3"
- resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-2.2.3.tgz#e6ae1a7eceb8c7a7f4f5946c3cf6b4a8e54dcca3"
- integrity sha512-+ZmcWBHnm9hxFnO1htHiOJQuG31qsU1W+xxSqxh2CijUAMoGPe0Cz7WWLaVvKsveqDms+206NuYokKReqWuqGg==
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-2.3.0.tgz#718ebe7438de3b2578e75b9c1aef517d213854be"
+ integrity sha512-ISxX/1T3KHVUA6EMuKtzdzzB4EC/CohESGfe+ZGwdVKs90jvDI5rbW+KvDE+SSoEU5oHnVCz4uze0WK7jGcT/A==
dependencies:
- "@pubsweet/logger" "^0.2.12"
- "@pubsweet/models" "^0.1.3"
+ "@pubsweet/logger" "^0.2.13"
+ "@pubsweet/models" "^0.2.0"
fs-extra "^4.0.2"
isomorphic-fetch "^2.2.1"
joi "^14.3.0"
knex "^0.16.3"
lodash "^4.17.11"
- objection "^1.3.0"
- pg "^7.4.1"
- tmp "^0.0.33"
+ objection "^1.5.3"
+ pg "^7.8.0"
+ tmp-promise "^1.0.5"
umzug "^2.1.0"
-"@pubsweet/db-manager@^3.0.2":
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-3.0.2.tgz#e964addc179bdff16686dca26735a6905f528d02"
- integrity sha512-fG7mWGn0b84z81Wj/Kc0atlZ4KXueqI7ywWJzOCnHdWxFHZOYAOTrIAsLaL8ff/5/vT7u53vjjEAO5qbYecUQw==
+"@pubsweet/db-manager@^3.0.3":
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-3.0.3.tgz#43f43813079a686c915b0890f6d9361f92b18d97"
+ integrity sha512-6F/2W4e9AgV7KwML/x6SsV2yNtpu1id6iB+k+HOXtSe7O6+Wulj4z3CBMh9Vi7wb8d6YLOdje0+xdSGAQ+EEvg==
dependencies:
- "@pubsweet/logger" "^0.2.16"
- "@pubsweet/models" "^0.2.3"
+ "@pubsweet/logger" "^0.2.17"
+ "@pubsweet/models" "^0.2.4"
fs-extra "^4.0.2"
isomorphic-fetch "^2.2.1"
joi "^14.3.0"
@@ -278,17 +278,10 @@
tmp-promise "^1.0.5"
umzug "^2.1.0"
-"@pubsweet/errors@^2.0.2":
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/@pubsweet/errors/-/errors-2.0.2.tgz#ef9789a03eed40504889ab8da06985fabea84290"
- integrity sha512-D8emW9RsKzPU407IWPD4ZURSvGunesJwB0GeaSx3580ipPps8ieIYPEJAg4bg8GYJ0GHKr9ZK3quP78++zrpPA==
- dependencies:
- http-status-codes "^1.3.0"
-
-"@pubsweet/errors@^2.0.6":
- version "2.0.6"
- resolved "https://registry.yarnpkg.com/@pubsweet/errors/-/errors-2.0.6.tgz#b67aee7de919b61ed506dfb5b8e94413577e9cd2"
- integrity sha512-abpzN1V6eNzeu73ULA4PSFIal0/p6NKt1HtWED/DZRZsOrOE/vqJaPSYQtl3GH8y9nmZMZxI7IrEX5Zd383RKg==
+"@pubsweet/errors@^2.0.2", "@pubsweet/errors@^2.0.7":
+ version "2.0.7"
+ resolved "https://registry.yarnpkg.com/@pubsweet/errors/-/errors-2.0.7.tgz#6dff6df7c6314ea683865683f94bcce29199848e"
+ integrity sha512-jt6bvRD36sewthGavm2ypt3qHbh6tt7mLXvJUj1f8g0cdM+sRJi/QfQ3onPn9guhxbvOh52MmYvoy4xLAQXn0Q==
dependencies:
http-status-codes "^1.3.0"
@@ -310,19 +303,10 @@
config "^1.26.2"
joi "^10.6.0"
-"@pubsweet/logger@^0.2.12", "@pubsweet/logger@^0.2.3", "@pubsweet/logger@^0.2.8", "@pubsweet/logger@^0.2.9":
- version "0.2.12"
- resolved "https://registry.yarnpkg.com/@pubsweet/logger/-/logger-0.2.12.tgz#4df1a52d2827b22fe2b5aeeb56e23b49ab5829d7"
- integrity sha512-mgiETF49q/fnWcHO4C1wPAkZ0E7Spr1eqk5Q/yBMda+oGIW8pm4k0FqWZr+LRqYzqVJP8VqVZ5LmC4AuUprnjA==
- dependencies:
- config "^2.0.1"
- joi "^14.3.0"
- lodash "^4.17.4"
-
-"@pubsweet/logger@^0.2.16":
- version "0.2.16"
- resolved "https://registry.yarnpkg.com/@pubsweet/logger/-/logger-0.2.16.tgz#a42e35afda7343e9d663ea1e86ff42920f687656"
- integrity sha512-/rbP8xivYWO9R7tE6Alg0PNvYpx6c23Y7H+2xeStlYanFEu/K77blR1uaoij7t6BMNDpfWq7SEAwaCpzoHfjXQ==
+"@pubsweet/logger@^0.2.12", "@pubsweet/logger@^0.2.13", "@pubsweet/logger@^0.2.17", "@pubsweet/logger@^0.2.3", "@pubsweet/logger@^0.2.8", "@pubsweet/logger@^0.2.9":
+ version "0.2.17"
+ resolved "https://registry.yarnpkg.com/@pubsweet/logger/-/logger-0.2.17.tgz#0c1d64442a0db338f205bdb0e854f55604aa6818"
+ integrity sha512-Qy/IaLc/CfjZmEdNMKP3aEqFnAmnw5GiEtPwHMQaojO69SBwdDHydXyI4fq0sb2k9kknBM5vVoAVfDcBYXThbg==
dependencies:
config "^3.0.1"
joi "^14.3.0"
@@ -344,14 +328,14 @@
passport-http-bearer "^1.0.1"
passport-local "^1.0.0"
-"@pubsweet/model-user@^4.0.3":
- version "4.0.3"
- resolved "https://registry.yarnpkg.com/@pubsweet/model-user/-/model-user-4.0.3.tgz#6e5b2d05aeb6b2f057967a1a18a6f40a6099c300"
- integrity sha512-K9DMgudLU9phZPTPa/D4PAZbZ42oVxTK+QOroEioYx3OzzWc+jyqPzn8jDxiw9fxo+DGYhufiBHuTcu6dZrqWA==
+"@pubsweet/model-user@^4.0.4":
+ version "4.0.4"
+ resolved "https://registry.yarnpkg.com/@pubsweet/model-user/-/model-user-4.0.4.tgz#76bac4b0f43954d69cf4251dff5f2c65f36f32c3"
+ integrity sha512-iiqBVbH/8wnsBGHbeoApGcGaC9CE9cUbUFAlltp9Tb1anV1iwulNuHrh0Z+H0HQHEkoOJehLGbRd6vd+vdXyBA==
dependencies:
- "@pubsweet/base-model" "^3.0.3"
- "@pubsweet/errors" "^2.0.6"
- "@pubsweet/logger" "^0.2.16"
+ "@pubsweet/base-model" "^3.0.4"
+ "@pubsweet/errors" "^2.0.7"
+ "@pubsweet/logger" "^0.2.17"
bcrypt "3.0.2"
http-status-codes "^1.3.0"
jsonwebtoken "^8.4.0"
@@ -368,13 +352,13 @@
objection "^1.2.3"
pubsweet-server "^12.0.2"
-"@pubsweet/models@^0.2.3":
- version "0.2.3"
- resolved "https://registry.yarnpkg.com/@pubsweet/models/-/models-0.2.3.tgz#7f0d20f96f1376ac711cfeeb18e3dabab9c86b63"
- integrity sha512-qzUpFxRn70oixcXv3r+7XWLCk0sNwjPgfN6r4ak1X46tlM43bvQwHOTxIHKQYCzvxbxTGrMoHictTNbsUMUs5g==
+"@pubsweet/models@^0.2.0", "@pubsweet/models@^0.2.4":
+ version "0.2.4"
+ resolved "https://registry.yarnpkg.com/@pubsweet/models/-/models-0.2.4.tgz#12c2384df5154b3144b110246cfc96fe1b9fb7b3"
+ integrity sha512-yMmER/5qH/CTN63J1dLwBlwPh0LBwJCFpKYU+scVe4ttau7wvdl4wSCTFiCZgZauaQvo6KiEiHM/fmM7+HimMw==
dependencies:
objection "^1.5.3"
- pubsweet-server "^13.1.0"
+ pubsweet-server "^13.2.0"
"@pubsweet/theme@^1.0.0":
version "1.0.0"
@@ -405,10 +389,10 @@
lodash "^4.17.4"
styled-components "^3.2.5"
-"@pubsweet/ui-toolkit@^2.0.0", "@pubsweet/ui-toolkit@^2.0.3-alpha.0", "@pubsweet/ui-toolkit@^2.0.7":
- version "2.0.7"
- resolved "https://registry.yarnpkg.com/@pubsweet/ui-toolkit/-/ui-toolkit-2.0.7.tgz#27cdf66ce44d2d52097a227cfa621fa5482b7bf7"
- integrity sha512-IChSeh1LAG6L8n9+kJP5gHIu5PEvCyn3UGxEPklInwJ/40kAOLtl8ktWrKmV0TNfQxG07IQ0VHVeZcsIAdSVSg==
+"@pubsweet/ui-toolkit@^2.0.0", "@pubsweet/ui-toolkit@^2.0.3-alpha.0", "@pubsweet/ui-toolkit@^2.0.7", "@pubsweet/ui-toolkit@^2.1.4":
+ version "2.1.4"
+ resolved "https://registry.yarnpkg.com/@pubsweet/ui-toolkit/-/ui-toolkit-2.1.4.tgz#ae744b7b5da128567ec8d81b9bdeac7709cbf82d"
+ integrity sha512-AjeMjuhKywY+UqJo5iiHTjEeMdz1ZqOxET7b6FmYxKJzbIPEtFkL/qL+p5xFDhggOYI4uwYu4T6+/amxSDasog==
dependencies:
color "^3.0.0"
lodash "^4.17.4"
@@ -439,6 +423,28 @@
redux-form "^7.0.3"
styled-components "^4.1.1"
+"@pubsweet/ui@^10.0.4":
+ version "10.0.4"
+ resolved "https://registry.yarnpkg.com/@pubsweet/ui/-/ui-10.0.4.tgz#d1c5a7dcfa54ec7509f8edbd02593749911891cb"
+ integrity sha512-S+8oT+KJHaOb7TFgxfxOpZmHNGscu5RIjpRfcRmcTnnmX6Aq79n6ZDLpG1/QF0QqZ8OdSs3BHg24lOFmGVsD6w==
+ dependencies:
+ "@pubsweet/ui-toolkit" "^2.1.4"
+ classnames "^2.2.5"
+ enzyme "^3.7.0"
+ enzyme-adapter-react-16 "^1.1.1"
+ formik "^1.4.2"
+ invariant "^2.2.3"
+ lodash "^4.17.4"
+ moment "^2.22.1"
+ prop-types "^15.5.10"
+ react "^16.2.0"
+ react-dom "^16.2.0"
+ react-feather "^1.0.8"
+ react-router-dom "^4.2.2"
+ react-tag-autocomplete "^5.5.0"
+ recompose "^0.26.0"
+ styled-components "^4.1.1"
+
"@pubsweet/ui@^8.8.0":
version "8.8.0"
resolved "https://registry.yarnpkg.com/@pubsweet/ui/-/ui-8.8.0.tgz#d6a845cd6d0d51c1c14956dccc11900fb87d2178"
@@ -518,14 +524,14 @@
integrity sha1-4ByfjIXKg7YQMgxiJYsMkCat4Pc=
"@types/lodash@^4.14.72":
- version "4.14.121"
- resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.121.tgz#9327e20d49b95fc2bf983fc2f045b2c6effc80b9"
- integrity sha512-ORj7IBWj13iYufXt/VXrCNMbUuCTJfhzme5kx9U/UtcIPdJYuvPDUAlHlbNhz/8lKCLy9XGIZnGrqXOtQbPGoQ==
+ version "4.14.123"
+ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.123.tgz#39be5d211478c8dd3bdae98ee75bb7efe4abfe4d"
+ integrity sha512-pQvPkc4Nltyx7G1Ww45OjVqUsJP4UsZm+GWJpigXgkikZqJgRm4c48g027o6tdgubWHwFRF15iFd+Y4Pmqv6+Q==
"@types/node@*":
- version "11.9.5"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-11.9.5.tgz#011eece9d3f839a806b63973e228f85967b79ed3"
- integrity sha512-vVjM0SVzgaOUpflq4GYBvCpozes8OgIIS5gVXVka+OfK3hvnkC1i93U8WiY2OtNE4XUWyyy/86Kf6e0IHTQw1Q==
+ version "11.11.1"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.1.tgz#9ee55ffce20f72e141863b0036a6e51c6fc09a1f"
+ integrity sha512-2azXFP9n4aA2QNLkKm/F9pzKxgYj1SMawZ5Eh9iC21RH3XNcFsivLVU2NhpMgQm7YobSByvIol4c42ZFusXFHQ==
"@types/zen-observable@^0.8.0":
version "0.8.0"
@@ -634,9 +640,9 @@ ajv@^5.0.0, ajv@^5.2.3, ajv@^5.3.0:
json-schema-traverse "^0.3.0"
ajv@^6.0.1, ajv@^6.1.0, ajv@^6.1.1, ajv@^6.5.5:
- version "6.9.2"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.2.tgz#4927adb83e7f48e5a32b45729744c71ec39c9c7b"
- integrity sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==
+ version "6.10.0"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+ integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
dependencies:
fast-deep-equal "^2.0.1"
fast-json-stable-stringify "^2.0.0"
@@ -813,41 +819,47 @@ apollo-client@^2.2.2, apollo-client@^2.3.4, apollo-client@^2.3.7, apollo-client@
zen-observable "^0.8.0"
apollo-link-context@^1.0.5:
- version "1.0.14"
- resolved "https://registry.yarnpkg.com/apollo-link-context/-/apollo-link-context-1.0.14.tgz#6265eef49bedadddbbcff4026d04cd351094cd6c"
- integrity sha512-l6SIN7Fwqhgg5C5eA8xSrt8gulHBmYTE3J4z5/Q2hP/8Kok0rQ/z5q3uy42/hkdYlnaktOvpz+ZIwEFzcXwujQ==
+ version "1.0.15"
+ resolved "https://registry.yarnpkg.com/apollo-link-context/-/apollo-link-context-1.0.15.tgz#9e5dc3eb874b3ed975f0bb0062a65aa946fd30a2"
+ integrity sha512-CkUB0CaaNGCsiNxG6GImPSsXHL8f+lQZukl2TLdpDKao3EyCuPC9gSWvclUagwZ1TDnY8O+wJnNBDGymQiZTsA==
dependencies:
- apollo-link "^1.2.8"
+ apollo-link "^1.2.9"
+ tslib "^1.9.3"
apollo-link-dedup@^1.0.0:
- version "1.0.15"
- resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.15.tgz#028148f1028e806a9ab2f4abf3bde9dc292565e9"
- integrity sha512-14/+Tg7ogcYVrvZa8C7uBQIvX2B/dCKSnojI41yDYGp/t2eWD5ITCWdgjhciXpi0Ij6z+NRyMEebACz3EOwm4w==
+ version "1.0.16"
+ resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.16.tgz#7d1a883329ca04edf925746b5a46f72bdd0c96b6"
+ integrity sha512-ckPrS0jU2ad8qTXw8GXh3YHZkbnjtsjbCOPT0QmLRM0GpESFTqhoTGl2gBxIlHZE5/Vw/L6NY8u2JAMw6tcy/A==
dependencies:
- apollo-link "^1.2.8"
+ apollo-link "^1.2.9"
+ tslib "^1.9.3"
apollo-link-error@^1.0.3:
- version "1.1.7"
- resolved "https://registry.yarnpkg.com/apollo-link-error/-/apollo-link-error-1.1.7.tgz#6233a339d732def831af2dd417065b2ffd9feb5c"
- integrity sha512-olPTKr3yFoavFHSXSLqC5QSWrRACN8TK3+E0pVL8uVR0zILJflUSCRb8HizKQmxZWtr9yM+D2gRLu9mStI8qTA==
+ version "1.1.8"
+ resolved "https://registry.yarnpkg.com/apollo-link-error/-/apollo-link-error-1.1.8.tgz#3a957b22b843cf6c307d516709cdc42371c9aafe"
+ integrity sha512-5hbMIBaINWOsZapWgTF8H2X0q3NjrQD/y4HlqDnUeLmT12OqejLasNh+EFE6q37/l28UHQu1/AuyRn15J7gvCA==
dependencies:
- apollo-link "^1.2.8"
- apollo-link-http-common "^0.2.10"
+ apollo-link "^1.2.9"
+ apollo-link-http-common "^0.2.11"
+ tslib "^1.9.3"
-apollo-link-http-common@^0.2.10, apollo-link-http-common@^0.2.4:
- version "0.2.10"
- resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.10.tgz#b5bbf502ff40a81cc00281ba3b8543b7ad866dfe"
- integrity sha512-KY9nhpAurw3z48OIYV0sCZFXrzWp/wjECsveK+Q9GUhhSe1kEbbUjFfmi+qigg+iELgdp5V8ioRJhinl1vPojw==
+apollo-link-http-common@^0.2.11, apollo-link-http-common@^0.2.4:
+ version "0.2.11"
+ resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.11.tgz#d4e494ed1e45ea0e0c0ed60f3df64541d0de682d"
+ integrity sha512-FjtzEDiG6blH/2MR4fpVNoxdZUFmddP0sez34qnoLaYz6ABFbTDlmRE/dVN79nPExM4Spfs/DtW7KRqyjJ3tOg==
dependencies:
- apollo-link "^1.2.8"
+ apollo-link "^1.2.9"
+ ts-invariant "^0.3.2"
+ tslib "^1.9.3"
apollo-link-http@^1.3.1, apollo-link-http@^1.5.4:
- version "1.5.11"
- resolved "https://registry.yarnpkg.com/apollo-link-http/-/apollo-link-http-1.5.11.tgz#1f72a377d03e874a08bc9eadb1ce7ecb166f1e56"
- integrity sha512-wDG+I9UmpfaZRPIvTYBgkvqiCgmz6yWgvuzW/S24Q4r4Xrfe6sLpg2FmarhtdP+hdN+IXTLbFNCZ+Trgfpifow==
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/apollo-link-http/-/apollo-link-http-1.5.12.tgz#878d48bf9d8ae091752710529a222c4a5548118e"
+ integrity sha512-2tS36RIU6OdxzoWYTPrjvDTF2sCrnlaJ6SL7j0ILPn1Lmw4y6YLwKDsv/SWLwtodtVe9v1dLCGKIGMRMM/SdyA==
dependencies:
- apollo-link "^1.2.8"
- apollo-link-http-common "^0.2.10"
+ apollo-link "^1.2.9"
+ apollo-link-http-common "^0.2.11"
+ tslib "^1.9.3"
apollo-link-state@^0.4.0:
version "0.4.2"
@@ -858,18 +870,22 @@ apollo-link-state@^0.4.0:
graphql-anywhere "^4.1.0-alpha.0"
apollo-link-ws@^1.0.8:
- version "1.0.14"
- resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.14.tgz#588f898b7f953930a27e283941614d89907adf13"
- integrity sha512-KwHVnhKKDUA5PmmzpiqkyahjBcwGdf2eFlTZg4DIwgH1R0KcBmn/A6rkZnmClBbUNgV6t+kR46dW2fyx64Jm3A==
+ version "1.0.15"
+ resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.15.tgz#1a0132ee3c700640d64c5b00ad8cff5cb974ff62"
+ integrity sha512-zXYfvKBpgf7QXIIEO11qgKLYyodo1mDkJr2IojcvOqbGGtqi7+DtOxX21/mrM2pzcwczYGCSDrtFhas4A7RnNA==
dependencies:
- apollo-link "^1.2.8"
+ apollo-link "^1.2.9"
+ tslib "^1.9.3"
-apollo-link@^1.0.0, apollo-link@^1.0.6, apollo-link@^1.2.1, apollo-link@^1.2.3, apollo-link@^1.2.8:
- version "1.2.8"
- resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.8.tgz#0f252adefd5047ac1a9f35ba9439d216587dcd84"
- integrity sha512-lfzGRxhK9RmiH3HPFi7TIEBhhDY9M5a2ZDnllcfy5QDk7cCQHQ1WQArcw1FK0g1B+mV4Kl72DSrlvZHZJEolrA==
+apollo-link@^1.0.0, apollo-link@^1.0.6, apollo-link@^1.2.1, apollo-link@^1.2.3, apollo-link@^1.2.9:
+ version "1.2.9"
+ resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.9.tgz#40a8f0b90716ce3fd6beb27b7eae1108b92e0054"
+ integrity sha512-ZLUwthOFZq4lxchQ2jeBfVqS/UDdcVmmh8aUw6Ar9awZH4r+RgkcDeu2ooFLUfodWE3mZr7wIZuYsBas/MaNVA==
dependencies:
- zen-observable-ts "^0.8.15"
+ apollo-utilities "^1.2.1"
+ ts-invariant "^0.3.2"
+ tslib "^1.9.3"
+ zen-observable-ts "^0.8.16"
apollo-server-core@^1.4.0:
version "1.4.0"
@@ -1249,9 +1265,9 @@ autoprefixer@^7.1.2:
postcss-value-parser "^3.2.3"
aws-sdk@^2.185.0:
- version "2.411.0"
- resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.411.0.tgz#1a6df6c4eed402b43a047c57eaef839279718b34"
- integrity sha512-8SqJeIoXDfOu4dyiMfaw/outfkXiwDV8cZcGjFD7D+qyAipGuJc+rnzNwAzeKedAz+1KZpxOXrrovDJWKAik5g==
+ version "2.419.0"
+ resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.419.0.tgz#e0fec4acde5cec0d1591f819284bae7c1130726c"
+ integrity sha512-v071NTHwsgYmrnJBAboOjhcTVqB99GAQuqVaaeLBBt33/AebawxoJUkuJrezIni+inqnKOi9F6pi87g48iR1+w==
dependencies:
buffer "4.9.1"
events "1.1.1"
@@ -2680,14 +2696,14 @@ caniuse-api@^1.5.2:
lodash.uniq "^4.5.0"
caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
- version "1.0.30000939"
- resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000939.tgz#8cb54a9868fe040fbf2e2441408c68b7008912e8"
- integrity sha512-nB5tLf3hOs+biXl1lhKjHRgNC0J1I7H52h/t1FP7qxARKKwpB0z+P/JewJLYAlxCBP/q7rxJzQzHHrQMl0viKg==
+ version "1.0.30000945"
+ resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000945.tgz#b0852f92914e99669cd21911acbc31d6482ffae6"
+ integrity sha512-H4atTGETWjwtHzAs0q90AuQ2ecBroObRljmTIDynT9ffibwb+H9gX24qKcxlZawJIANI1aYvmyZZt77qVQCgZQ==
caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000844:
- version "1.0.30000939"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000939.tgz#b9ab7ac9e861bf78840b80c5dfbc471a5cd7e679"
- integrity sha512-oXB23ImDJOgQpGjRv1tCtzAvJr4/OvrHi5SO2vUgB0g0xpdZZoA/BxfImiWfdwoYdUTtQrPsXsvYU/dmCSM8gg==
+ version "1.0.30000945"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000945.tgz#d51e3750416dd05126d5ac94a9c57d1c26c6fd21"
+ integrity sha512-PSGwYChNIXJ4FZr9Z9mrVzBCB1TF3yyiRmIDRIdKDHZ6u+1jYH6xeR28XaquxnMwcZVX3f48S9zi7eswO/G1nQ==
capture-exit@^1.2.0:
version "1.2.0"
@@ -4223,9 +4239,9 @@ ee-first@1.1.1:
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.47:
- version "1.3.113"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9"
- integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==
+ version "1.3.115"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.115.tgz#fdaa56c19b9f7386dbf29abc1cc632ff5468ff3b"
+ integrity sha512-mN2qeapQWdi2B9uddxTZ4nl80y46hbyKY5Wt9Yjih+QZFQLdaujEDK4qJky35WhyxMzHF3ZY41Lgjd2BPDuBhg==
elegant-spinner@^1.0.1:
version "1.0.1"
@@ -4327,14 +4343,14 @@ enzyme-adapter-react-16@^1.1.1:
react-test-renderer "^16.0.0-0"
enzyme-adapter-utils@^1.10.0:
- version "1.10.0"
- resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.10.0.tgz#5836169f68b9e8733cb5b69cad5da2a49e34f550"
- integrity sha512-VnIXJDYVTzKGbdW+lgK8MQmYHJquTQZiGzu/AseCZ7eHtOMAj4Rtvk8ZRopodkfPves0EXaHkXBDkVhPa3t0jA==
+ version "1.10.1"
+ resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.10.1.tgz#58264efa19a7befdbf964fb7981a108a5452ac96"
+ integrity sha512-oasinhhLoBuZsIkTe8mx0HiudtfErUtG0Ooe1FOplu/t4c9rOmyG5gtrBASK6u4whHIRWvv0cbZMElzNTR21SA==
dependencies:
function.prototype.name "^1.1.0"
object.assign "^4.1.0"
object.fromentries "^2.0.0"
- prop-types "^15.6.2"
+ prop-types "^15.7.2"
semver "^5.6.0"
enzyme@^3.7.0:
@@ -4407,13 +4423,13 @@ es-to-primitive@^1.2.0:
is-symbol "^1.0.2"
es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
- version "0.10.48"
- resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.48.tgz#9a0b31eeded39e64453bcedf6f9d50bbbfb43850"
- integrity sha512-CdRvPlX/24Mj5L4NVxTs4804sxiS2CjVprgCmrgoDkdmjdY4D+ySHa7K3jJf8R40dFg0tIm3z/dk326LrnuSGw==
+ version "0.10.49"
+ resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.49.tgz#059a239de862c94494fec28f8150c977028c6c5e"
+ integrity sha512-3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg==
dependencies:
es6-iterator "~2.0.3"
es6-symbol "~3.1.1"
- next-tick "1"
+ next-tick "^1.0.0"
es6-error@^2.0.2:
version "2.1.1"
@@ -4980,16 +4996,15 @@ express-fileupload@v1.1.1-alpha.2:
streamifier "^0.1.1"
express-middleware-minio@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/express-middleware-minio/-/express-middleware-minio-2.2.0.tgz#a28d3641c7a11e781f678aa85628f6acd4223ab4"
- integrity sha512-V9OuSk0sTNVLD+9VJucKrTG7RLwbjtUb4/4u4n7sRixsD/0xZCVYhHgd+uZtNW01TlV3ZbKvFLYcBXR+9eh2jA==
+ version "2.3.2"
+ resolved "https://registry.yarnpkg.com/express-middleware-minio/-/express-middleware-minio-2.3.2.tgz#ac558e6aa6b1dad20057f5be75fb5c3ce49e8874"
+ integrity sha512-EUsmjDwvOCqHw8TZbMKuQ1LA5d7jhe5vJofWzfXPJHrL6pNhpUbAh4ajQtJ4cpMjaAEIV3n5UbrKm8ShRL85Og==
dependencies:
config "^3.0.1"
dotenv "^6.0.0"
formidable "^1.2.1"
minio "^7.0.1"
uuid "^3.2.1"
->>>>>>> shared-data-model
express@^4.15.3, express@^4.16.1:
version "4.16.4"
@@ -6114,9 +6129,9 @@ helmet-csp@2.7.1:
platform "1.3.5"
helmet@^3.8.1:
- version "3.15.1"
- resolved "https://registry.yarnpkg.com/helmet/-/helmet-3.15.1.tgz#2c80d1a59138b6f23929605afca4b1c88b3298ec"
- integrity sha512-hgoNe/sjKlKNvJ3g9Gz149H14BjMMWOCmW/DTXl7IfyKGtIK37GePwZrHNfr4aPXdKVyXcTj26RgRFbPKDy9lw==
+ version "3.16.0"
+ resolved "https://registry.yarnpkg.com/helmet/-/helmet-3.16.0.tgz#7df41a4bfe4c83d90147c1e30d70893f92a9d97c"
+ integrity sha512-rsTKRogc5OYGlvSHuq5QsmOsOzF6uDoMqpfh+Np8r23+QxDq+SUx90Rf8HyIKQVl7H6NswZEwfcykinbAeZ6UQ==
dependencies:
depd "2.0.0"
dns-prefetch-control "0.1.0"
@@ -6128,8 +6143,8 @@ helmet@^3.8.1:
helmet-csp "2.7.1"
hide-powered-by "1.0.0"
hpkp "2.0.0"
- hsts "2.1.0"
- ienoopen "1.0.0"
+ hsts "2.2.0"
+ ienoopen "1.1.0"
nocache "2.0.0"
referrer-policy "1.1.0"
x-xss-protection "1.1.0"
@@ -6220,10 +6235,12 @@ hpkp@2.0.0:
resolved "https://registry.yarnpkg.com/hpkp/-/hpkp-2.0.0.tgz#10e142264e76215a5d30c44ec43de64dee6d1672"
integrity sha1-EOFCJk52IVpdMMROxD3mTe5tFnI=
-hsts@2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/hsts/-/hsts-2.1.0.tgz#cbd6c918a2385fee1dd5680bfb2b3a194c0121cc"
- integrity sha512-zXhh/DqgrTXJ7erTN6Fh5k/xjMhDGXCqdYN3wvxUvGUQvnxcFfUd8E+6vLg/nk3ss1TYMb+DhRl25fYABioTvA==
+hsts@2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/hsts/-/hsts-2.2.0.tgz#09119d42f7a8587035d027dda4522366fe75d964"
+ integrity sha512-ToaTnQ2TbJkochoVcdXYm4HOCliNozlviNsg+X2XQLQvZNI/kCHR9rZxVYpJB3UPcHz80PgxRyWQ7PdU1r+VBQ==
+ dependencies:
+ depd "2.0.0"
html-comment-regex@^1.1.0:
version "1.1.2"
@@ -6316,9 +6333,9 @@ http-signature@~1.2.0:
sshpk "^1.7.0"
http-status-codes@^1.0.6, http-status-codes@^1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/http-status-codes/-/http-status-codes-1.3.0.tgz#9cd0e71391773d0671b489d41cbc5094aa4163b6"
- integrity sha1-nNDnE5F3PQZxtInUHLxQlKpBY7Y=
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/http-status-codes/-/http-status-codes-1.3.1.tgz#534ee8ac601037b71e0fe396147d773fc38ecbe0"
+ integrity sha512-j7EfK9geezX8jYI/GCe4N/8y14K67+TB/bseZrYjbGdt5E/j5tx5wY8s450EDdfQFlHKfF1tgfXVIzqyJXfM6w==
https-browserify@^1.0.0:
version "1.0.0"
@@ -6385,10 +6402,10 @@ ieee754@^1.1.4:
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
-ienoopen@1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/ienoopen/-/ienoopen-1.0.0.tgz#346a428f474aac8f50cf3784ea2d0f16f62bda6b"
- integrity sha1-NGpCj0dKrI9QzzeE6i0PFvYr2ms=
+ienoopen@1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/ienoopen/-/ienoopen-1.1.0.tgz#411e5d530c982287dbdc3bb31e7a9c9e32630974"
+ integrity sha512-MFs36e/ca6ohEKtinTJ5VvAJ6oDRAYFdYXweUnGY9L9vcoqFOU4n2ZhmJ0C4z/cwGZ3YIQRSB3XZ1+ghZkY5NQ==
iferr@^0.1.5:
version "0.1.5"
@@ -7661,9 +7678,9 @@ jsx-ast-utils@^2.0.1:
array-includes "^3.0.3"
jwa@^1.2.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.3.0.tgz#061a7c3bb8ab2b3434bb2f432005a8bb7fca0efa"
- integrity sha512-SxObIyzv9a6MYuZYaSN6DhSm9j3+qkokwvCB0/OTSV5ylPq1wUQiygZQcHT5Qlux0I5kmISx3J86TxKhuefItg==
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.0.tgz#8f61dc799acf0309f2d4b22a91ce73d6d2bb206c"
+ integrity sha512-mt6IHaq0ZZWDBspg0Pheu3r9sVNMEZn+GJe1zcdYyhFcDSclp3J8xEdO4PjZolZ2i8xlaVU1LetHM0nJejYsEw==
dependencies:
buffer-equal-constant-time "1.0.1"
ecdsa-sig-formatter "1.0.11"
@@ -8801,7 +8818,7 @@ net@^1.0.2:
resolved "https://registry.yarnpkg.com/net/-/net-1.0.2.tgz#d1757ec9a7fb2371d83cf4755ce3e27e10829388"
integrity sha1-0XV+yaf7I3HYPPR1XOPifhCCk4g=
-next-tick@1:
+next-tick@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
@@ -9327,11 +9344,10 @@ object.values@^1.0.4, object.values@^1.1.0:
function-bind "^1.1.1"
has "^1.0.3"
-
objection@^1.2.3, objection@^1.3.0, objection@^1.5.3:
- version "1.6.2"
- resolved "https://registry.yarnpkg.com/objection/-/objection-1.6.2.tgz#2b9365814dfa5dfb368a7705955d3ebce1ac1719"
- integrity sha512-SI8wjCeQeG9r82ox7nzR99x+JuoENTwrFzjvbYT7yhVZV2uAfI9Pvqk4FXKnhe9WbE4mgQq4cdE/A/LRogovkA==
+ version "1.6.3"
+ resolved "https://registry.yarnpkg.com/objection/-/objection-1.6.3.tgz#c4d08d3ba4a0995ada75e829dffc6ce21111b409"
+ integrity sha512-NZ8jTP4AC9mmOOF3OyKl3dsA0ggOEUOVG3UQIEGDCdMs7RAX/VbIWtzkdCex2YR59Izgv3fco8sjHbOrGCEDIQ==
dependencies:
ajv "^6.1.1"
bluebird "^3.5.3"
@@ -9538,9 +9554,9 @@ pako@~0.2.0:
integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
pako@~1.0.5:
- version "1.0.8"
- resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.8.tgz#6844890aab9c635af868ad5fecc62e8acbba3ea4"
- integrity sha512-6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA==
+ version "1.0.10"
+ resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
+ integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
parallel-transform@^1.1.0:
version "1.1.0"
@@ -9840,9 +9856,9 @@ performance-now@^2.1.0:
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
pg-boss@^3.1.2:
- version "3.1.5"
- resolved "https://registry.yarnpkg.com/pg-boss/-/pg-boss-3.1.5.tgz#7f4f572ea8f70cd79575bef7af820575259d1feb"
- integrity sha512-LZVEbhYKjNKmbYyACDXhggj7C2HNi1scwihEQ3K2AClPu4KjIvCe17WB8uERegi+bsvQoOcVUMXP2eXHa1a8aQ==
+ version "3.1.6"
+ resolved "https://registry.yarnpkg.com/pg-boss/-/pg-boss-3.1.6.tgz#eb3e033bfb29f662290d8c4084ebbbc1a2f28e7d"
+ integrity sha512-RB9rEKMshiUaqznkwpzMpMyikRXkhpS2Eg+C+wqez5NNCj5RZA5TQEkNsh/df6erP7wj1tZ5bUjiirTczPCo2Q==
dependencies:
bluebird "^3.5.2"
pg "^7.4.1"
@@ -9885,9 +9901,9 @@ pg-types@~2.0.0:
postgres-interval "^1.1.0"
pg@^7.4.1, pg@^7.8.0:
- version "7.8.1"
- resolved "https://registry.yarnpkg.com/pg/-/pg-7.8.1.tgz#327e25411784cffe067f1cd1ba275d506e92a82b"
- integrity sha512-m9aIrOV4mgfo+1Ze+eNoJwaWZDvpeBz8Kzwi0zzqLC+tQBsQgIuu+FGPqzyRv9HFlS7tHO1I33LKp9gP5g7U4Q==
+ version "7.8.2"
+ resolved "https://registry.yarnpkg.com/pg/-/pg-7.8.2.tgz#d53ffcbbaa789e15e80ffec570603294d90116e8"
+ integrity sha512-5U4fjV43DnQxelkhyPdU3YfUbYVa21bNmreXRCM/gFFw09YxWaitWWITm/u0twUNF5EYOSDhkgyEAocgtpP9JQ==
dependencies:
buffer-writer "2.0.0"
packet-reader "1.0.0"
@@ -10461,7 +10477,7 @@ prompt@^1.0.0:
utile "0.3.x"
winston "2.1.x"
-prompt@flatiron/prompt#1c95d1d8d333b5fbc13fa5f0619f3dcf0d514f87:
+"prompt@github:flatiron/prompt#1c95d1d8d333b5fbc13fa5f0619f3dcf0d514f87":
version "1.0.0"
resolved "https://codeload.github.com/flatiron/prompt/tar.gz/1c95d1d8d333b5fbc13fa5f0619f3dcf0d514f87"
dependencies:
@@ -10479,7 +10495,7 @@ prop-types-extra@^1.0.1:
react-is "^16.3.2"
warning "^3.0.0"
-prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
+prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
version "15.7.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -10602,9 +10618,9 @@ prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0:
prosemirror-model "^1.0.0"
prosemirror-view@^1.0.0, prosemirror-view@^1.1.0:
- version "1.8.2"
- resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.8.2.tgz#37c847ba5f2e72c1487a9462612f18fc062f8f7d"
- integrity sha512-kN1N6Y2WCPLFGLLHlqUAA1Hx1ngYPIMR0JTG0VhdAMLWad40irLt4Hy6DDYzRUi1O3lbZZqteoFBOvm5JajupA==
+ version "1.8.3"
+ resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.8.3.tgz#f8deff22c7d371f63db2686ac6f3661ded1b3ae3"
+ integrity sha512-CAW3SycaJgfPlWwYcDGiwNaCwcikBLSFAgLF+H+bTn0aCAUzcl2DXQdU9dMvK3HeWG+6Xn/QPQbhyyqCcV3ZBw==
dependencies:
prosemirror-model "^1.1.0"
prosemirror-state "^1.0.0"
@@ -11055,16 +11071,16 @@ pubsweet-server@^12.0.2:
waait "^1.0.2"
winston "^2.2.0"
-pubsweet-server@^13.1.0:
- version "13.1.0"
- resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-13.1.0.tgz#beb0d1fe217dc3521889dce63d677f9ca75e0c3f"
- integrity sha512-MW+6Rj+W0HZ72WAAwAGRp7TVg+DcM1S44PyHhi9umrPSz1amTq+Lgo98BgthiJohygclUjI+v2Q1EF+xIZAEWw==
+pubsweet-server@^13.1.0, pubsweet-server@^13.2.0:
+ version "13.2.0"
+ resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-13.2.0.tgz#35d8f77d6d32281419fba2797c2e4c6b3a2e6e0b"
+ integrity sha512-0R2+x3sHVlBsuIFRYojzso0wrGdDwBMGqLHVw24c3/P8WbfVJKANd+i0NF4jc69rNuMRlSNLsm/Ka+WfBO3gxw==
dependencies:
- "@pubsweet/db-manager" "^3.0.2"
- "@pubsweet/errors" "^2.0.6"
- "@pubsweet/logger" "^0.2.16"
- "@pubsweet/model-user" "^4.0.3"
- "@pubsweet/models" "^0.2.3"
+ "@pubsweet/db-manager" "^3.0.3"
+ "@pubsweet/errors" "^2.0.7"
+ "@pubsweet/logger" "^0.2.17"
+ "@pubsweet/model-user" "^4.0.4"
+ "@pubsweet/models" "^0.2.4"
apollo-server-express "^1.3.2"
apollo-upload-server "^4.0.2"
authsome "^0.1.0"
@@ -11096,21 +11112,16 @@ pubsweet-server@^13.1.0:
pg-boss "^3.1.2"
promise-queue "^2.2.3"
prompt "^1.0.0"
- pubsweet-sse "^1.0.10"
+ pubsweet-sse "^1.0.11"
subscriptions-transport-ws "^0.9.12"
uuid "^3.0.1"
waait "^1.0.2"
winston "^2.2.0"
-pubsweet-sse@^1.0.10:
- version "1.0.10"
- resolved "https://registry.yarnpkg.com/pubsweet-sse/-/pubsweet-sse-1.0.10.tgz#2f934254d9544c7eae79387711c18d5c197994ae"
- integrity sha512-xVkdhdYsJzMnAG5rlzijecfKAAPAub01rZPQn6yOu57a6HXCrpmpBkdv0Qwi0+nAxjIyrZcowwY50w6cT2gHIw==
-
-pubsweet-sse@^1.0.2, pubsweet-sse@^1.0.3, pubsweet-sse@^1.0.6:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/pubsweet-sse/-/pubsweet-sse-1.0.6.tgz#c3b949ea3c338c35e91d2ac2e0e095f37136d6d2"
- integrity sha512-nMUZh0GY4ZXDwa/1rkpfLll/1hAg+obduowZ5WEI7fnDjhxMbaQYTwHtk+TGm1QPJE0H6NzP+YaJ7He1p9ZJwA==
+pubsweet-sse@^1.0.11, pubsweet-sse@^1.0.2, pubsweet-sse@^1.0.3, pubsweet-sse@^1.0.6:
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/pubsweet-sse/-/pubsweet-sse-1.0.11.tgz#ffc98062485bd9b81d462f37de1dc2b6fe3c01f3"
+ integrity sha512-N3m9heGMoUYMi6NlfLO588w0Ss37Shjdp8fc9kWIlJ0/2Th3LKdEqJweqNuWB6W/yjfhVAlzAeE9ZYmT5Av89A==
pubsweet@^3.0.9-alpha.1:
version "3.1.3"
@@ -11402,15 +11413,15 @@ rc@^1.1.7, rc@^1.2.7:
strip-json-comments "~2.0.1"
react-apollo@^2.1.0:
- version "2.5.1"
- resolved "https://registry.yarnpkg.com/react-apollo/-/react-apollo-2.5.1.tgz#85934e1cf41ba88e2e96c921b44588f29d5daad6"
- integrity sha512-obXPcmjJ5O75UkoizcsIbe0PXAXKRqm+SwNu059HQInB3FAab9PIn4wd/KglpPNiB9JXHe8OJDov0lFMcBbHEQ==
+ version "2.5.2"
+ resolved "https://registry.yarnpkg.com/react-apollo/-/react-apollo-2.5.2.tgz#6732c6af55e6adc9ebf97bf189e867a893c449d3"
+ integrity sha512-lmglhG6NQ+lfAUDzx8ZgelWKUbvxBhhy1l7Z2ksgtQ8+FVqwX7i6p5O3zicAZZlIdKzdq82V0kqq5WkxEsffrA==
dependencies:
apollo-utilities "^1.2.1"
hoist-non-react-statics "^3.0.0"
lodash.isequal "^4.5.0"
prop-types "^15.6.0"
- ts-invariant "^0.2.1"
+ ts-invariant "^0.3.0"
tslib "^1.9.3"
react-bootstrap@^0.32.0:
@@ -11446,14 +11457,14 @@ react-deep-force-update@^2.1.1:
integrity sha512-lqD4eHKVuB65RyO/hGbEST53E2/GPbcIPcFYyeW/p4vNngtH4G7jnKGlU6u1OqrFo0uNfIvwuBOg98IbLHlNEA==
react-dom@^16.2.0, react-dom@^16.4.2:
- version "16.8.3"
- resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.3.tgz#ae236029e66210783ac81999d3015dfc475b9c32"
- integrity sha512-ttMem9yJL4/lpItZAQ2NTFAbV7frotHk5DZEHXUOws2rMmrsvh1Na7ThGT0dTzUIl6pqTOi5tYREfL8AEna3lA==
+ version "16.8.4"
+ resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.4.tgz#1061a8e01a2b3b0c8160037441c3bf00a0e3bc48"
+ integrity sha512-Ob2wK7XG2tUDt7ps7LtLzGYYB6DXMCLj0G5fO6WeEICtT4/HdpOi7W/xLzZnR6RCG1tYza60nMdqtxzA8FaPJQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
- scheduler "^0.13.3"
+ scheduler "^0.13.4"
react-dropdown@^1.6.2:
version "1.6.4"
@@ -11505,10 +11516,10 @@ react-input-autosize@^2.1.2:
dependencies:
prop-types "^15.5.8"
-react-is@^16.3.1, react-is@^16.3.2, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.3:
- version "16.8.3"
- resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.3.tgz#4ad8b029c2a718fc0cfc746c8d4e1b7221e5387d"
- integrity sha512-Y4rC1ZJmsxxkkPuMLwvKvlL1Zfpbcu+Bf4ZigkHup3v9EfdYhAlWAaVyA19olXq2o2mGn0w+dFKvk3pVVlYcIA==
+react-is@^16.3.1, react-is@^16.3.2, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4:
+ version "16.8.4"
+ resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2"
+ integrity sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==
react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4:
version "3.0.4"
@@ -11616,14 +11627,14 @@ react-tag-autocomplete@^5.5.0:
integrity sha512-1svOlZ6oQWH9ekGxd8sQgwvEg4lpwarcyH0rluWQ290xQ/nY8PNeIvF6VSZwWpTv+1zCkfjzqyO95TnXcwp+YQ==
react-test-renderer@^16.0.0-0:
- version "16.8.3"
- resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.3.tgz#230006af264cc46aeef94392e04747c21839e05e"
- integrity sha512-rjJGYebduKNZH0k1bUivVrRLX04JfIQ0FKJLPK10TAb06XWhfi4gTobooF9K/DEFNW98iGac3OSxkfIJUN9Mdg==
+ version "16.8.4"
+ resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.4.tgz#abee4c2c3bf967a8892a7b37f77370c5570d5329"
+ integrity sha512-jQ9Tf/ilIGSr55Cz23AZ/7H3ABEdo9oy2zF9nDHZyhLHDSLKuoILxw2ifpBfuuwQvj4LCoqdru9iZf7gwFH28A==
dependencies:
object-assign "^4.1.1"
prop-types "^15.6.2"
- react-is "^16.8.3"
- scheduler "^0.13.3"
+ react-is "^16.8.4"
+ scheduler "^0.13.4"
react-transition-group@^2.0.0, react-transition-group@^2.2.0:
version "2.6.0"
@@ -11636,14 +11647,14 @@ react-transition-group@^2.0.0, react-transition-group@^2.2.0:
react-lifecycles-compat "^3.0.4"
react@>=16.0.0, react@^16.2.0, react@^16.4.2:
- version "16.8.3"
- resolved "https://registry.yarnpkg.com/react/-/react-16.8.3.tgz#c6f988a2ce895375de216edcfaedd6b9a76451d9"
- integrity sha512-3UoSIsEq8yTJuSu0luO1QQWYbgGEILm+eJl2QN/VLDi7hL+EN18M3q3oVZwmVzzBJ3DkM7RMdRwBmZZ+b4IzSA==
+ version "16.8.4"
+ resolved "https://registry.yarnpkg.com/react/-/react-16.8.4.tgz#fdf7bd9ae53f03a9c4cd1a371432c206be1c4768"
+ integrity sha512-0GQ6gFXfUH7aZcjGVymlPOASTuSjlQL4ZtVC5YKH+3JL6bBLCVO21DknzmaPlI90LN253ojj02nsapy+j7wIjg==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
- scheduler "^0.13.3"
+ scheduler "^0.13.4"
read-file-relative@^1.2.0:
version "1.2.0"
@@ -11744,9 +11755,9 @@ readable-stream@1.1.x, readable-stream@~1.1.9:
string_decoder "~0.10.x"
readable-stream@^3.1.1:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
- integrity sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.2.0.tgz#de17f229864c120a9f56945756e4f32c4045245d"
+ integrity sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==
dependencies:
inherits "^2.0.3"
string_decoder "^1.1.1"
@@ -12417,10 +12428,10 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1:
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-scheduler@^0.13.3:
- version "0.13.3"
- resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.3.tgz#bed3c5850f62ea9c716a4d781f9daeb9b2a58896"
- integrity sha512-UxN5QRYWtpR1egNWzJcVLk8jlegxAugswQc984lD3kU7NuobsO37/sRfbpTdBjtnD5TBNFA2Q2oLV5+UmPSmEQ==
+scheduler@^0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.4.tgz#8fef05e7a3580c76c0364d2df5e550e4c9140298"
+ integrity sha512-cvSOlRPxOHs5dAhP9yiS/6IDmVAVxmk33f0CtTJRkmUWcb1Us+t7b1wqdzoC0REw2muC9V5f1L/w5R5uKGaepA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
@@ -13141,12 +13152,12 @@ styled-normalize@^8.0.4:
integrity sha512-tOnAD1+wV04aiVy6chaQA4u/EtkGiGZPlIBYvEfWlZQBrDqRhu9EdPyXlFzLWxpOmANoQelJqSOMlV3QNCDKkw==
"styled-system@>=2.0.0 || >=3.0.0":
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/styled-system/-/styled-system-4.0.1.tgz#0f37a25cadbb172fbe03c4d19de9dfaabe6b6d02"
- integrity sha512-wb7dA8gpl9gr04HLWAaPUABmp7QGICpqB2rUMGbC2Ho0sTgjTeUgLTHTWZBiYR3yybYyVysdku7SXFvLtOh4fg==
+ version "4.0.4"
+ resolved "https://registry.yarnpkg.com/styled-system/-/styled-system-4.0.4.tgz#a754553536366b4fe75be08f4e706b4acd4620f8"
+ integrity sha512-VXtfYSqCOprXv9AEFod4AXkFcvjueEl2b6KBN6k+FecMUiR6PkLmybhzSsjbAtCFK1G0bmmNAVuuqiB9C8i2jg==
dependencies:
- "@babel/runtime" "^7.3.1"
- prop-types "^15.6.2"
+ "@babel/runtime" "^7.3.4"
+ prop-types "^15.7.2"
styled-system@^2.3.1:
version "2.3.6"
@@ -13241,9 +13252,9 @@ stylis@^3.5.0:
integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==
subscriptions-transport-ws@^0.9.12:
- version "0.9.15"
- resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.15.tgz#68a8b7ba0037d8c489fb2f5a102d1494db297d0d"
- integrity sha512-f9eBfWdHsePQV67QIX+VRhf++dn1adyC/PZHP6XI5AfKnZ4n0FW+v5omxwdHVpd4xq2ZijaHEcmlQrhBY79ZWQ==
+ version "0.9.16"
+ resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.16.tgz#90a422f0771d9c32069294c08608af2d47f596ec"
+ integrity sha512-pQdoU7nC+EpStXnCfh/+ho0zE0Z+ma+i7xvj7bkXKb1dvYHSZxgRPaU6spRP+Bjzow67c/rRDoix5RT0uU9omw==
dependencies:
backo2 "^1.0.2"
eventemitter3 "^3.1.0"
@@ -13917,6 +13928,13 @@ ts-invariant@^0.2.1:
dependencies:
tslib "^1.9.3"
+ts-invariant@^0.3.0, ts-invariant@^0.3.2:
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.2.tgz#89a2ffeb70879b777258df1df1c59383c35209b0"
+ integrity sha512-QsY8BCaRnHiB5T6iE4DPlJMAKEG3gzMiUco9FEt1jUXQf0XP6zi0idT0i0rMTu8A326JqNSDsmlkA9dRSh1TRg==
+ dependencies:
+ tslib "^1.9.3"
+
tslib@^1.9.3:
version "1.9.3"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
@@ -14217,9 +14235,9 @@ unset-value@^1.0.0:
isobject "^3.0.0"
upath@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
- integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
+ integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
upper-case@^1.1.1:
version "1.1.3"
@@ -14927,12 +14945,12 @@ xpub-connect@^2.0.7:
styled-components "^4.1.1"
xpub-edit@^2.5.10:
- version "2.5.10"
- resolved "https://registry.yarnpkg.com/xpub-edit/-/xpub-edit-2.5.10.tgz#8f65a2b530a76a24ce60833f890a5f194498457b"
- integrity sha512-r1V84Jk8kq4QXkFj3f6+ZkI1WP+39PMAvUkTVJ96Gex67MWiKnNwDNcjQYJtuV5DsO/TwIIhb50BuUjijtmbxA==
+ version "2.5.15"
+ resolved "https://registry.yarnpkg.com/xpub-edit/-/xpub-edit-2.5.15.tgz#184ae67bd53a22ccee41a6c74811dbfb30dcb47a"
+ integrity sha512-Gh+U9Acb9aJZmolPwFaICTygZozpdG8h28M9CTzsr3vi1YpjtRycQiBSHs2F5ZphV/67AVai23nTA5cjYQSrhw==
dependencies:
- "@pubsweet/ui" "^9.1.3"
- "@pubsweet/ui-toolkit" "^2.0.7"
+ "@pubsweet/ui" "^10.0.4"
+ "@pubsweet/ui-toolkit" "^2.1.4"
classnames "^2.2.6"
prosemirror-commands "^1.0.1"
prosemirror-dropcursor "^1.0.0"
@@ -15150,11 +15168,12 @@ yup@^0.26.6:
synchronous-promise "^2.0.5"
toposort "^2.0.2"
-zen-observable-ts@^0.8.15:
- version "0.8.15"
- resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.15.tgz#6cf7df6aa619076e4af2f707ccf8a6290d26699b"
- integrity sha512-sXKPWiw6JszNEkRv5dQ+lQCttyjHM2Iks74QU5NP8mMPS/NrzTlHDr780gf/wOBqmHkPO6NCLMlsa+fAQ8VE8w==
+zen-observable-ts@^0.8.16:
+ version "0.8.16"
+ resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.16.tgz#969367299074fe17422fe2f46ee417e9a30cf3fa"
+ integrity sha512-pQl75N7qwgybKVsh6WFO+WwPRijeQ52Gn1vSf4uvPFXald9CbVQXLa5QrOPEJhdZiC+CD4quqOVqSG+Ptz5XLA==
dependencies:
+ tslib "^1.9.3"
zen-observable "^0.8.0"
zen-observable@^0.8.0: