From 65305879bc1dddb7acfe4842c1bad80d57752752 Mon Sep 17 00:00:00 2001 From: Hem Brahmbhatt Date: Wed, 22 Aug 2018 12:07:26 +0100 Subject: [PATCH 1/2] Revert "Merge pull request #368 from elifesciences/312-push-messages" This reverts commit 08671b3bf2a55d9f1246fb70793bb420c3743c08, reversing changes made to 66c00a84bf03c611f873c0cd1e239200aa5cb48f. --- .../SubmissionWizard/steps/Files/index.js | 61 +++--- app/components/ui/molecules/FileUpload.js | 5 +- .../ui/molecules/FileUpload.test.js | 6 +- config/development.js | 1 - package.json | 2 +- server/dar-server/package.json | 2 +- server/xpub/entities/manuscript/resolvers.js | 18 +- .../entities/manuscript/resolvers.test.js | 10 +- .../entities/manuscript/typeDefs.graphqls | 2 +- server/xpub/package.json | 1 - yarn.lock | 174 +++++++++++++----- 11 files changed, 163 insertions(+), 119 deletions(-) diff --git a/app/components/pages/SubmissionWizard/steps/Files/index.js b/app/components/pages/SubmissionWizard/steps/Files/index.js index ae814265..a8773cd9 100644 --- a/app/components/pages/SubmissionWizard/steps/Files/index.js +++ b/app/components/pages/SubmissionWizard/steps/Files/index.js @@ -1,11 +1,11 @@ import React from 'react' import gql from 'graphql-tag' -import { Mutation, Subscription } from 'react-apollo' +import { Mutation } from 'react-apollo' import FileUploads from './FileUploads' const UPLOAD_MUTATION = gql` - mutation UploadFile($id: ID!, $file: Upload!, $fileSize: Int!) { - uploadManuscript(id: $id, file: $file, fileSize: $fileSize) { + mutation UploadFile($id: ID!, $file: Upload!) { + uploadManuscript(id: $id, file: $file) { id meta { title @@ -18,12 +18,6 @@ const UPLOAD_MUTATION = gql` } ` -const ON_UPLOAD_PROGRESS = gql` - subscription { - uploadProgress - } -` - const FileUploadsPage = ({ setFieldValue, errors, @@ -35,33 +29,28 @@ const FileUploadsPage = ({ {(uploadFile, { loading, error: uploadError }) => { const fieldName = 'files' return ( - - {({ data: uploadData, loading: uploadLoading }) => ( - file.type === 'MANUSCRIPT_SOURCE', - ), - progress: uploadLoading ? 0 : uploadData.uploadProgress, - error: uploadError, - }} - formError={errors[fieldName] && touched[fieldName]} - onDrop={([file]) => - uploadFile({ - variables: { file, id: values.id, fileSize: file.size }, - }).then(({ data }) => { - setFieldValue('meta.title', data.uploadManuscript.meta.title) - setFieldValue(fieldName, data.uploadManuscript.files) - }) - } - previewUrl={`/manuscript/${values.id}`} - setFieldValue={setFieldValue} - {...props} - /> - )} - + file.type === 'MANUSCRIPT_SOURCE', + ), + error: uploadError, + }} + formError={errors[fieldName] && touched[fieldName]} + onDrop={([file]) => + uploadFile({ + variables: { file, id: values.id }, + }).then(({ data }) => { + setFieldValue('meta.title', data.uploadManuscript.meta.title) + setFieldValue(fieldName, data.uploadManuscript.files) + }) + } + previewUrl={`/manuscript/${values.id}`} + setFieldValue={setFieldValue} + {...props} + /> ) }} diff --git a/app/components/ui/molecules/FileUpload.js b/app/components/ui/molecules/FileUpload.js index 0a6a8683..b972c46c 100644 --- a/app/components/ui/molecules/FileUpload.js +++ b/app/components/ui/molecules/FileUpload.js @@ -80,9 +80,9 @@ const DropzoneContent = ({ if (conversion.converting) { return ( - + - Manuscript is uploading {conversion.progress}% + Manuscript is uploading ) @@ -177,7 +177,6 @@ FileUpload.propTypes = { completed: PropTypes.bool, error: PropTypes.instanceOf(Error), converting: PropTypes.bool, - progress: PropTypes.number, }), formError: PropTypes.bool, } diff --git a/app/components/ui/molecules/FileUpload.test.js b/app/components/ui/molecules/FileUpload.test.js index dbe48248..7e7ef03c 100644 --- a/app/components/ui/molecules/FileUpload.test.js +++ b/app/components/ui/molecules/FileUpload.test.js @@ -51,16 +51,14 @@ it('displays success if conversion.completed is set', () => { expect(dropzoneContentWrapper.text()).toBe(manuscriptUploadSuccess) }) -// TODO fix this tests to account for upload % -it.skip('displays uploading if conversion.converting is set', () => { +it('displays uploading if conversion.converting is set', () => { const dropzoneContentWrapper = makeCheerioWrapper({ conversion: { converting: true }, }) expect(dropzoneContentWrapper.text()).toBe(manuscriptUploading) }) -// TODO fix these tests to account for upload % -it.skip('displays uploading even if there are errors', () => { +it('displays uploading even if there are errors', () => { const dropzoneContentWrapper = makeCheerioWrapper({ conversion: { converting: true, error: new Error('Boo') }, formError: true, diff --git a/config/development.js b/config/development.js index beb2b603..422cb299 100644 --- a/config/development.js +++ b/config/development.js @@ -9,7 +9,6 @@ module.exports = { baseUrl: deferConfig( cfg => `http://localhost:${cfg['pubsweet-server'].port}`, ), - hostname: 'localhost', secret: 'not very secret', graphiql: true, logger: winston, diff --git a/package.json b/package.json index 128b8940..500ed71c 100644 --- a/package.json +++ b/package.json @@ -139,7 +139,7 @@ "joi-browser": "^13.4.0", "lint-staged": "^7.2.2", "prettier": "^1.8.2", - "pubsweet": "^2.3.0", + "pubsweet": "^2.2.8", "react-styleguidist": "^7.1.0", "replay": "^2.1.4", "string-replace-loader": "^2.1.1", diff --git a/server/dar-server/package.json b/server/dar-server/package.json index 98c2bbc2..d2949a69 100644 --- a/server/dar-server/package.json +++ b/server/dar-server/package.json @@ -12,6 +12,6 @@ "express": "^4.16.2" }, "peerDependencies": { - "pubsweet-server": "^8.0.0" + "pubsweet-server": "^7.0.0" } } diff --git a/server/xpub/entities/manuscript/resolvers.js b/server/xpub/entities/manuscript/resolvers.js index ebfc6913..099d44dd 100644 --- a/server/xpub/entities/manuscript/resolvers.js +++ b/server/xpub/entities/manuscript/resolvers.js @@ -1,9 +1,5 @@ const config = require('config') const User = require('../user') -const { - getPubsub, - asyncIterators, -} = require('pubsweet-server/src/graphql/pubsub') const mailer = require('@pubsweet/component-send-email') const logger = require('@pubsweet/logger') const request = require('request-promise-native') @@ -14,8 +10,6 @@ const path = require('path') const crypto = require('crypto') const Joi = require('joi') -const { ON_UPLOAD_PROGRESS } = asyncIterators - const parseString = promisify(xml2js.parseString) const randomBytes = promisify(crypto.randomBytes) const uploadsPath = config.get('pubsweet-server').uploads @@ -116,7 +110,7 @@ const resolvers = { return manuscript }, - async uploadManuscript(_, { file, id, fileSize }, context) { + async uploadManuscript(_, { file, id }) { const { stream, filename, mimetype } = await file const manuscriptContainer = path.join(uploadsPath, id) @@ -139,16 +133,6 @@ const resolvers = { // save source file locally const saveFileStream = fs.createWriteStream(manuscriptSourcePath) stream.pipe(saveFileStream) - - let uploadedSize = 0 - const pubsub = await getPubsub() - stream.on('data', chunk => { - uploadedSize += chunk.length - const uploadProgress = Math.floor(uploadedSize * 100 / fileSize) - pubsub.publish(`${ON_UPLOAD_PROGRESS}.${context.user}`, { - uploadProgress, - }) - }) const saveFilePromise = new Promise((resolve, reject) => { saveFileStream.on('finish', () => resolve(true)) saveFileStream.on('error', reject) diff --git a/server/xpub/entities/manuscript/resolvers.test.js b/server/xpub/entities/manuscript/resolvers.test.js index 785cb14b..eaf0b764 100644 --- a/server/xpub/entities/manuscript/resolvers.test.js +++ b/server/xpub/entities/manuscript/resolvers.test.js @@ -272,8 +272,7 @@ describe('Submission', () => { }) describe('uploadManuscript', () => { - // TODO subscribe to uploadProgress before this or mock - it.skip('extracts title from PDF', async () => { + it('extracts title from PDF', async () => { const { id } = await Manuscript.save(Manuscript.new()) const file = { filename: 'manuscript.pdf', @@ -282,12 +281,9 @@ describe('Submission', () => { ), encoding: 'utf8', mimetype: 'application/pdf', - size: 73947, } - const manuscript = await Mutation.uploadManuscript( - {}, - { id, file, fileSize: file.size }, - ) + + const manuscript = await Mutation.uploadManuscript({}, { id, file }) expect(manuscript).toMatchObject({ id, meta: { diff --git a/server/xpub/entities/manuscript/typeDefs.graphqls b/server/xpub/entities/manuscript/typeDefs.graphqls index ef40e685..70efae82 100644 --- a/server/xpub/entities/manuscript/typeDefs.graphqls +++ b/server/xpub/entities/manuscript/typeDefs.graphqls @@ -8,7 +8,7 @@ extend type Mutation { createSubmission: Manuscript! deleteManuscript(id: ID!): ID! updateSubmission(data: ManuscriptInput!, isAutoSave: Boolean): Manuscript! - uploadManuscript(id: ID!, file: Upload!, fileSize: Int!): Manuscript! + uploadManuscript(id: ID!, file: Upload!): Manuscript! finishSubmission(data: ManuscriptInput!): Manuscript! } diff --git a/server/xpub/package.json b/server/xpub/package.json index 391c36e3..8005ff76 100644 --- a/server/xpub/package.json +++ b/server/xpub/package.json @@ -12,7 +12,6 @@ "apollo-boost": "^0.1.13", "config": "^2.0.1", "fs-extra": "^7.0.0", - "graphql-subscriptions": "^0.5.8", "graphql-tag": "^2.8.0", "joi": "^13.6.0", "lodash": "^4.17.5", diff --git a/yarn.lock b/yarn.lock index 81e8b695..f4a2e7a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -177,22 +177,30 @@ aws-sdk "^2.185.0" nodemailer "^4.4.2" -"@pubsweet/db-manager@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-1.3.0.tgz#84473189bf0cc53278e68266d961021c550ac6f5" +"@pubsweet/db-manager@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-1.2.1.tgz#6b79f634bd3b448d2ac954014113cd21b1fdd7bb" dependencies: - "@pubsweet/logger" "^0.2.5" + "@pubsweet/logger" "^0.2.4" fs-extra "^4.0.2" isomorphic-fetch "^2.2.1" joi "^13.1.0" pg "^7.4.1" - pubsweet-server "^8.0.0" + pubsweet-server "^7.2.0" tmp "^0.0.33" umzug "^2.1.0" -"@pubsweet/logger@^0.2.5": - version "0.2.5" - resolved "https://registry.yarnpkg.com/@pubsweet/logger/-/logger-0.2.5.tgz#0fbe1bdd2581fe97927a2c72e449315047569532" +"@pubsweet/logger@^0.2.4": + version "0.2.4" + resolved "https://registry.yarnpkg.com/@pubsweet/logger/-/logger-0.2.4.tgz#e7cf19661ef8d8f3b38868731d15620cb38f96b5" + dependencies: + config "^1.26.2" + joi "^13.1.0" + lodash "^4.17.4" + +"@pubsweet/logger@^0.2.6": + version "0.2.6" + resolved "https://registry.yarnpkg.com/@pubsweet/logger/-/logger-0.2.6.tgz#376f8860304e5209d040adc82e62802ae031ed2f" dependencies: config "^1.26.2" joi "^13.1.0" @@ -206,9 +214,33 @@ lodash "^4.17.4" styled-components "^3.2.5" -"@pubsweet/ui@^8.0.1", "@pubsweet/ui@^8.4.0": - version "8.4.0" - resolved "https://registry.yarnpkg.com/@pubsweet/ui/-/ui-8.4.0.tgz#3c63f4fd8b2484abd819ec852db801c03f968ef3" +"@pubsweet/ui@^8.0.1": + version "8.3.0" + resolved "https://registry.yarnpkg.com/@pubsweet/ui/-/ui-8.3.0.tgz#b8da7be8d9110594abdd18476e3808c9606a74b4" + dependencies: + "@pubsweet/ui-toolkit" "^1.2.0" + babel-jest "^21.2.0" + classnames "^2.2.5" + enzyme "^3.2.0" + enzyme-adapter-react-16 "^1.1.1" + 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-redux "^5.0.2" + react-router-dom "^4.2.2" + react-tag-autocomplete "^5.5.0" + recompose "^0.26.0" + redux "^3.6.0" + redux-form "^7.0.3" + styled-components "^3.2.5" + +"@pubsweet/ui@^8.5.0": + version "8.5.0" + resolved "https://registry.yarnpkg.com/@pubsweet/ui/-/ui-8.5.0.tgz#91dd438e320431ca8e60b0f41d49cd46e1ccb66a" dependencies: "@pubsweet/ui-toolkit" "^1.2.0" babel-jest "^21.2.0" @@ -253,8 +285,8 @@ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.116.tgz#5ccf215653e3e8c786a58390751033a9adca0eb9" "@types/node@*": - version "10.7.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.7.1.tgz#b704d7c259aa40ee052eec678758a68d07132a2e" + version "10.7.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.7.0.tgz#d384b2c8625414ab2aa18fdf989c288d6a7a8202" "@types/zen-observable@^0.8.0": version "0.8.0" @@ -885,8 +917,8 @@ autoprefixer@^9.0.0: postcss-value-parser "^3.2.3" aws-sdk@^2.185.0: - version "2.295.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.295.0.tgz#b034cd101702a6e31a59e6ff9e953986d573310d" + version "2.293.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.293.0.tgz#5474110972d1595f4386e3e0c350af9f6b71ccc8" dependencies: buffer "4.9.1" events "1.1.1" @@ -2277,9 +2309,9 @@ chrome-remote-interface@^0.25.3: commander "2.11.x" ws "3.3.x" -ci-info@^1.3.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.3.1.tgz#da21bc65a5f0d0d250c19a169065532b42fa048c" +ci-info@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.3.0.tgz#ea8219b0355a58692b762baf1cdd76ceb4503283" cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" @@ -3565,8 +3597,8 @@ enzyme-adapter-utils@^1.5.0: prop-types "^15.6.2" enzyme@^3.2.0, enzyme@^3.3.0: - version "3.4.3" - resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.4.3.tgz#86c4a1219a967cddb8d0359f28e119a93302014b" + version "3.4.1" + resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.4.1.tgz#d305af5bdb30b8aca56d199110421588c670ea0e" dependencies: array.prototype.flat "^1.2.1" cheerio "^1.0.0-rc.2" @@ -4901,6 +4933,12 @@ graphql-tools@^2.18.0: iterall "^1.1.3" uuid "^3.1.0" +graphql@^0.12.3: + version "0.12.3" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.12.3.tgz#11668458bbe28261c0dcb6e265f515ba79f6ce07" + dependencies: + iterall "1.1.3" + graphql@^0.13.0, graphql@^0.13.2: version "0.13.2" resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.13.2.tgz#4c740ae3c222823e7004096f832e7b93b2108270" @@ -5582,10 +5620,10 @@ is-callable@^1.1.1, is-callable@^1.1.3, is-callable@^1.1.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" is-ci@^1.0.10: - version "1.2.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.0.tgz#3f4a08d6303a09882cef3f0fb97439c5f5ce2d53" + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5" dependencies: - ci-info "^1.3.0" + ci-info "^1.0.0" is-data-descriptor@^0.1.4: version "0.1.4" @@ -5958,6 +5996,10 @@ istanbul-reports@^1.3.0: dependencies: handlebars "^4.0.3" +iterall@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.3.tgz#1cbbff96204056dde6656e2ed2e2226d0e6d72c9" + iterall@^1.1.3, iterall@^1.2.1, iterall@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7" @@ -7340,8 +7382,8 @@ nanoid@^0.2.2: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-0.2.2.tgz#e2ebc6ad3db5e0454fd8124d30ca39b06555fe56" nanoid@^1.0.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-1.2.1.tgz#922bf6c10e35f7b208993768dad643577c907adf" + version "1.2.0" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-1.2.0.tgz#e2c4dfa45c2bed995d0214aae157ce5052cfcb1d" nanomatch@^1.2.9: version "1.2.13" @@ -7546,8 +7588,8 @@ node-version@^1.0.0: resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.2.0.tgz#34fde3ffa8e1149bd323983479dda620e1b5060d" nodemailer@^4.4.2: - version "4.6.8" - resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-4.6.8.tgz#f82fb407828bf2e76d92acc34b823d83e774f89c" + version "4.6.7" + resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-4.6.7.tgz#b68de7f36d65618bdeeeb76234e3547d51266373" nomnom@~1.6.2: version "1.6.2" @@ -8991,10 +9033,10 @@ public-encrypt@^4.0.0: randombytes "^2.0.1" pubsweet-client@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/pubsweet-client/-/pubsweet-client-4.1.0.tgz#dde1d5f8c3e5c516bbad45d6e41c9e5f56ba00c8" + version "4.1.1" + resolved "https://registry.yarnpkg.com/pubsweet-client/-/pubsweet-client-4.1.1.tgz#4077d5a7f477c74464bdf257f24df975eb32ca5a" dependencies: - "@pubsweet/ui" "^8.4.0" + "@pubsweet/ui" "^8.5.0" "@pubsweet/ui-toolkit" "^1.2.0" apollo-cache-inmemory "^1.2.4" apollo-client "^2.3.4" @@ -9027,11 +9069,49 @@ pubsweet-client@^4.1.0: styled-normalize "^3.0.1" subscriptions-transport-ws "^0.9.12" +pubsweet-server@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-7.2.0.tgz#b930f910b013957e2dfd54b856f2f91ead2b9351" + dependencies: + "@pubsweet/logger" "^0.2.4" + 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 "^1.26.2" + cookie-parser "^1.4.3" + dotenv "^4.0.0" + express "^4.16.1" + graphql "^0.12.3" + graphql-tools "^2.18.0" + helmet "^3.8.1" + http-status-codes "^1.0.6" + joi "^13.1.0" + jsonwebtoken "^7.1.7" + lodash "^4.0.0" + minimist "^1.2.0" + morgan "^1.8.2" + multer "^1.1.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" + promise-queue "^2.2.3" + prompt "^1.0.0" + pubsweet-sse "^1.0.0" + require-relative "^0.8.7" + uuid "^3.0.1" + winston "^2.2.0" + pubsweet-server@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-8.0.0.tgz#f1dea811dbde1803e9c4eaa8472e09061bda2e15" + version "8.0.1" + resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-8.0.1.tgz#cea5a08ad10092ae8dce02dbe1dd1f572ca43f43" dependencies: - "@pubsweet/logger" "^0.2.5" + "@pubsweet/logger" "^0.2.6" apollo-server-express "^1.3.2" apollo-upload-server "^4.0.2" authsome "^0.1.0" @@ -9071,12 +9151,12 @@ pubsweet-sse@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/pubsweet-sse/-/pubsweet-sse-1.0.0.tgz#dd36aa378a302b518d417b545b064da65aec876a" -pubsweet@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pubsweet/-/pubsweet-2.3.0.tgz#2064a6eed67d70c8e6f5700342359e2622a6261e" +pubsweet@^2.2.8: + version "2.2.8" + resolved "https://registry.yarnpkg.com/pubsweet/-/pubsweet-2.2.8.tgz#c0bd09d837a78fec673c011a42cc3578d31fc474" dependencies: - "@pubsweet/db-manager" "^1.3.0" - "@pubsweet/logger" "^0.2.5" + "@pubsweet/db-manager" "^1.2.1" + "@pubsweet/logger" "^0.2.4" bluebird "^3.5.0" colors "^1.1.2" commander "^2.9.0" @@ -9085,7 +9165,7 @@ pubsweet@^2.3.0: fs-extra "^4.0.2" inflection "^1.12.0" prompt flatiron/prompt#1c95d1d8d333b5fbc13fa5f0619f3dcf0d514f87 - pubsweet-server "^8.0.0" + pubsweet-server "^7.2.0" require-relative "^0.8.7" uuid "^3.0.1" webpack "^3.8.1" @@ -9260,14 +9340,14 @@ react-apollo@^2.1.0, react-apollo@^2.1.11: prop-types "^15.6.0" react-autosuggest@^9.3.4: - version "9.4.0" - resolved "https://registry.yarnpkg.com/react-autosuggest/-/react-autosuggest-9.4.0.tgz#3146bc9afa4f171bed067c542421edec5ca94294" + version "9.3.4" + resolved "https://registry.yarnpkg.com/react-autosuggest/-/react-autosuggest-9.3.4.tgz#e47ff800081b2f7c678165bfb7cc84b07f462336" dependencies: prop-types "^15.5.10" - react-autowhatever "^10.1.2" + react-autowhatever "^10.1.0" shallow-equal "^1.0.0" -react-autowhatever@^10.1.2: +react-autowhatever@^10.1.0: version "10.1.2" resolved "https://registry.yarnpkg.com/react-autowhatever/-/react-autowhatever-10.1.2.tgz#200ffc41373b2189e3f6140ac7bdb82363a79fd3" dependencies: @@ -11059,8 +11139,8 @@ substance@1.0.0-preview.53: nth-check "1.0.1" substance@^1.0.0-preview.53: - version "1.0.0-preview.85" - resolved "https://registry.yarnpkg.com/substance/-/substance-1.0.0-preview.85.tgz#d30306e78dbe808adc1a75b427246000ce586958" + version "1.0.0-preview.83" + resolved "https://registry.yarnpkg.com/substance/-/substance-1.0.0-preview.83.tgz#58e30f684418da589d4fd6e97d1f09ff2a2b5ddc" dependencies: boolbase "1.0.0" css-what "2.1.0" @@ -12378,8 +12458,8 @@ xmlbuilder@~9.0.1: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" xpub-edit@^2.4.1: - version "2.5.0" - resolved "https://registry.yarnpkg.com/xpub-edit/-/xpub-edit-2.5.0.tgz#9be67916476690a57a2b6dd4971ecf48aee0e6a4" + version "2.4.1" + resolved "https://registry.yarnpkg.com/xpub-edit/-/xpub-edit-2.4.1.tgz#0c86f30367ff8181db6148ab0af89637855ca97a" dependencies: "@pubsweet/ui-toolkit" "^1.2.0" prosemirror-commands "^1.0.1" From 836d83ae79fedd3618f9725e8f631542be31590e Mon Sep 17 00:00:00 2001 From: Peter Hooper Date: Wed, 22 Aug 2018 12:48:32 +0100 Subject: [PATCH 2/2] Re-instate (don't revert) package versions --- package.json | 2 +- server/dar-server/package.json | 2 +- yarn.lock | 82 ++++++---------------------------- 3 files changed, 15 insertions(+), 71 deletions(-) diff --git a/package.json b/package.json index 500ed71c..128b8940 100644 --- a/package.json +++ b/package.json @@ -139,7 +139,7 @@ "joi-browser": "^13.4.0", "lint-staged": "^7.2.2", "prettier": "^1.8.2", - "pubsweet": "^2.2.8", + "pubsweet": "^2.3.0", "react-styleguidist": "^7.1.0", "replay": "^2.1.4", "string-replace-loader": "^2.1.1", diff --git a/server/dar-server/package.json b/server/dar-server/package.json index d2949a69..98c2bbc2 100644 --- a/server/dar-server/package.json +++ b/server/dar-server/package.json @@ -12,6 +12,6 @@ "express": "^4.16.2" }, "peerDependencies": { - "pubsweet-server": "^7.0.0" + "pubsweet-server": "^8.0.0" } } diff --git a/yarn.lock b/yarn.lock index f4a2e7a1..fa2bc4f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -177,27 +177,19 @@ aws-sdk "^2.185.0" nodemailer "^4.4.2" -"@pubsweet/db-manager@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-1.2.1.tgz#6b79f634bd3b448d2ac954014113cd21b1fdd7bb" +"@pubsweet/db-manager@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-1.3.1.tgz#1501a06839cd1fa0d8abf9a8639b73f593454e2c" dependencies: - "@pubsweet/logger" "^0.2.4" + "@pubsweet/logger" "^0.2.6" fs-extra "^4.0.2" isomorphic-fetch "^2.2.1" joi "^13.1.0" pg "^7.4.1" - pubsweet-server "^7.2.0" + pubsweet-server "^8.0.1" tmp "^0.0.33" umzug "^2.1.0" -"@pubsweet/logger@^0.2.4": - version "0.2.4" - resolved "https://registry.yarnpkg.com/@pubsweet/logger/-/logger-0.2.4.tgz#e7cf19661ef8d8f3b38868731d15620cb38f96b5" - dependencies: - config "^1.26.2" - joi "^13.1.0" - lodash "^4.17.4" - "@pubsweet/logger@^0.2.6": version "0.2.6" resolved "https://registry.yarnpkg.com/@pubsweet/logger/-/logger-0.2.6.tgz#376f8860304e5209d040adc82e62802ae031ed2f" @@ -4933,12 +4925,6 @@ graphql-tools@^2.18.0: iterall "^1.1.3" uuid "^3.1.0" -graphql@^0.12.3: - version "0.12.3" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.12.3.tgz#11668458bbe28261c0dcb6e265f515ba79f6ce07" - dependencies: - iterall "1.1.3" - graphql@^0.13.0, graphql@^0.13.2: version "0.13.2" resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.13.2.tgz#4c740ae3c222823e7004096f832e7b93b2108270" @@ -5996,10 +5982,6 @@ istanbul-reports@^1.3.0: dependencies: handlebars "^4.0.3" -iterall@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.3.tgz#1cbbff96204056dde6656e2ed2e2226d0e6d72c9" - iterall@^1.1.3, iterall@^1.2.1, iterall@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7" @@ -8862,7 +8844,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: @@ -9069,45 +9051,7 @@ pubsweet-client@^4.1.0: styled-normalize "^3.0.1" subscriptions-transport-ws "^0.9.12" -pubsweet-server@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-7.2.0.tgz#b930f910b013957e2dfd54b856f2f91ead2b9351" - dependencies: - "@pubsweet/logger" "^0.2.4" - 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 "^1.26.2" - cookie-parser "^1.4.3" - dotenv "^4.0.0" - express "^4.16.1" - graphql "^0.12.3" - graphql-tools "^2.18.0" - helmet "^3.8.1" - http-status-codes "^1.0.6" - joi "^13.1.0" - jsonwebtoken "^7.1.7" - lodash "^4.0.0" - minimist "^1.2.0" - morgan "^1.8.2" - multer "^1.1.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" - promise-queue "^2.2.3" - prompt "^1.0.0" - pubsweet-sse "^1.0.0" - require-relative "^0.8.7" - uuid "^3.0.1" - winston "^2.2.0" - -pubsweet-server@^8.0.0: +pubsweet-server@^8.0.0, pubsweet-server@^8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-8.0.1.tgz#cea5a08ad10092ae8dce02dbe1dd1f572ca43f43" dependencies: @@ -9151,12 +9095,12 @@ pubsweet-sse@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/pubsweet-sse/-/pubsweet-sse-1.0.0.tgz#dd36aa378a302b518d417b545b064da65aec876a" -pubsweet@^2.2.8: - version "2.2.8" - resolved "https://registry.yarnpkg.com/pubsweet/-/pubsweet-2.2.8.tgz#c0bd09d837a78fec673c011a42cc3578d31fc474" +pubsweet@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/pubsweet/-/pubsweet-2.3.1.tgz#18d37e996a223b0174c752b7a2f457a1ab52790e" dependencies: - "@pubsweet/db-manager" "^1.2.1" - "@pubsweet/logger" "^0.2.4" + "@pubsweet/db-manager" "^1.3.1" + "@pubsweet/logger" "^0.2.6" bluebird "^3.5.0" colors "^1.1.2" commander "^2.9.0" @@ -9165,7 +9109,7 @@ pubsweet@^2.2.8: fs-extra "^4.0.2" inflection "^1.12.0" prompt flatiron/prompt#1c95d1d8d333b5fbc13fa5f0619f3dcf0d514f87 - pubsweet-server "^7.2.0" + pubsweet-server "^8.0.1" require-relative "^0.8.7" uuid "^3.0.1" webpack "^3.8.1"