From fd78420ad14bcf01c81a91e75fabb220b2bf6079 Mon Sep 17 00:00:00 2001
From: yannis <yannisbarlas@gmail.com>
Date: Wed, 6 Dec 2017 21:19:20 +0200
Subject: [PATCH] make newer version of ink work
---
packages/component-dashboard/package.json | 2 +-
.../src/redux/conversion.js | 2 +-
packages/xpub-collabra/package.json | 4 +--
yarn.lock | 34 +++++--------------
4 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/packages/component-dashboard/package.json b/packages/component-dashboard/package.json
index e34e99383..eb86aeb32 100644
--- a/packages/component-dashboard/package.json
+++ b/packages/component-dashboard/package.json
@@ -13,7 +13,7 @@
"lodash": "^4.17.4",
"prop-types": "^15.5.10",
"pubsweet-client": "^1.0.0-beta.8",
- "pubsweet-component-ink-frontend": "^0.2.2",
+ "pubsweet-component-ink-frontend": "^0.2.3",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-redux": "^5.0.2",
diff --git a/packages/component-dashboard/src/redux/conversion.js b/packages/component-dashboard/src/redux/conversion.js
index 34892de22..4b709a18b 100644
--- a/packages/component-dashboard/src/redux/conversion.js
+++ b/packages/component-dashboard/src/redux/conversion.js
@@ -44,7 +44,7 @@ export const uploadManuscript = (acceptedFiles, history) => dispatch => {
const fileURL = request.responseText
- dispatch(convertToHTML(inputFile))
+ dispatch(convertToHTML(inputFile, {}))
.then(response => {
if (!response.converted) {
throw new Error('The file was not converted')
diff --git a/packages/xpub-collabra/package.json b/packages/xpub-collabra/package.json
index f2b34fc71..5806c4a7a 100644
--- a/packages/xpub-collabra/package.json
+++ b/packages/xpub-collabra/package.json
@@ -19,8 +19,8 @@
"prop-types": "^15.5.10",
"pubsweet": "^1.0.0-beta.5",
"pubsweet-client": "^1.0.0-beta.8",
- "pubsweet-component-ink-backend": "^0.0.13",
- "pubsweet-component-ink-frontend": "^0.2.2",
+ "pubsweet-component-ink-backend": "^0.1.1",
+ "pubsweet-component-ink-frontend": "^0.2.3",
"pubsweet-component-xpub-app": "^0.0.2",
"pubsweet-component-xpub-authentication": "^0.0.2",
"pubsweet-component-xpub-dashboard": "^0.0.2",
diff --git a/yarn.lock b/yarn.lock
index dd2981f66..ef0c868d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2984,10 +2984,6 @@ enzyme@^3.2.0:
raf "^3.4.0"
rst-selector-parser "^2.2.3"
-err-code@^1.0.0:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
-
errno@^0.1.3, errno@^0.1.4, errno@~0.1.1:
version "0.1.4"
resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
@@ -7931,13 +7927,6 @@ promise-queue@^2.2.3:
version "2.2.3"
resolved "https://registry.yarnpkg.com/promise-queue/-/promise-queue-2.2.3.tgz#8534d76bf4673c3baa3a82bba01bd295cc30f14f"
-promise-retry@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
- dependencies:
- err-code "^1.0.0"
- retry "^0.10.0"
-
promise@^7.1.1:
version "7.3.1"
resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -7955,7 +7944,7 @@ prompt@^1.0.0:
utile "0.3.x"
winston "2.1.x"
-"prompt@github:flatiron/prompt#1c95d1d8d333b5fbc13fa5f0619f3dcf0d514f87":
+prompt@flatiron/prompt#1c95d1d8d333b5fbc13fa5f0619f3dcf0d514f87:
version "1.0.0"
resolved "https://codeload.github.com/flatiron/prompt/tar.gz/1c95d1d8d333b5fbc13fa5f0619f3dcf0d514f87"
dependencies:
@@ -8120,19 +8109,18 @@ pubsweet-client@^1.0.0-beta.8:
redux-logger "^3.0.1"
redux-thunk "^2.2.0"
-pubsweet-component-ink-backend@^0.0.13:
- version "0.0.13"
- resolved "https://registry.yarnpkg.com/pubsweet-component-ink-backend/-/pubsweet-component-ink-backend-0.0.13.tgz#44cbb41accf53d5ebc087f1737fb30829f37ff18"
+pubsweet-component-ink-backend@^0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/pubsweet-component-ink-backend/-/pubsweet-component-ink-backend-0.1.1.tgz#a1ed929c91503c14e1d8aaedfde1d33c365ab30c"
dependencies:
"@pubsweet/logger" "^0.0.1"
busboy "^0.2.13"
config "^1.26.1"
- promise-retry "^1.1.1"
- request "^2.79.0"
- request-promise-native "^1.0.3"
+ request "^2.83.0"
+ request-promise-native "^1.0.5"
temp "^0.8.3"
-pubsweet-component-ink-frontend@^0.2.2:
+pubsweet-component-ink-frontend@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/pubsweet-component-ink-frontend/-/pubsweet-component-ink-frontend-0.2.3.tgz#cdd62bb58a1cdc7356b34d9c14ffbec9c9aaea66"
dependencies:
@@ -9040,7 +9028,7 @@ request-promise-core@1.1.1:
dependencies:
lodash "^4.13.1"
-request-promise-native@^1.0.3:
+request-promise-native@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5"
dependencies:
@@ -9048,7 +9036,7 @@ request-promise-native@^1.0.3:
stealthy-require "^1.1.0"
tough-cookie ">=2.3.3"
-request@2, request@^2.79.0, request@^2.81.0:
+request@2, request@^2.79.0, request@^2.81.0, request@^2.83.0:
version "2.83.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
dependencies:
@@ -9254,10 +9242,6 @@ ret@~0.1.10:
version "0.1.15"
resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-retry@^0.10.0:
- version "0.10.1"
- resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
-
revalidator@0.1.x:
version "0.1.8"
resolved "https://registry.yarnpkg.com/revalidator/-/revalidator-0.1.8.tgz#fece61bfa0c1b52a206bd6b18198184bdd523a3b"
--
GitLab