From 29453a470f18b9879ececd0479e629c3a4358b4c Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 12 Dec 2018 22:44:11 +0000 Subject: [PATCH 01/19] fix(package): update styled-icons to version 5.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 52a644445..f46563fc2 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "reselect": "~4.0.0", "smoothscroll-polyfill": "~0.4.0", "styled-components": "~4.1.2", - "styled-icons": "~5.2.2", + "styled-icons": "~5.5.0", "styled-system": "~3.1.11", "tinycon": "~0.6.8", "uuid": "~3.3.2", From a31283388a453822792f97ac46325fd98e45a63f Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 12 Dec 2018 22:44:15 +0000 Subject: [PATCH 02/19] chore(package): update lockfile package-lock.json --- package-lock.json | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 171815ce3..cc1358de6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,7 +95,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -509,7 +509,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true }, @@ -4501,7 +4501,7 @@ "dependencies": { "core-js": { "version": "1.2.7", - "resolved": "http://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" }, "fbjs": { @@ -6778,7 +6778,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -6987,12 +6988,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -7011,6 +7014,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7246,6 +7250,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7289,7 +7294,8 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", @@ -10670,7 +10676,7 @@ }, "globby": { "version": "6.1.0", - "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { @@ -10683,7 +10689,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } @@ -18749,7 +18755,7 @@ "dependencies": { "hoist-non-react-statics": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=" } } @@ -21382,9 +21388,9 @@ } }, "styled-icons": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/styled-icons/-/styled-icons-5.2.2.tgz", - "integrity": "sha512-9xus9e/rzuccgBB4LLNtKcl3ZYF2lmy3uj9Uz7KUahrfVIWZ8KDyFgH+O3VzsWyfKwVzSONNht//2ZberDnwRA==" + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/styled-icons/-/styled-icons-5.5.0.tgz", + "integrity": "sha512-PlKyhEIFHcdhIwMJnPKNJHOA0Bt6X13YneJtqGyjAqXI4rmLrPxtqORVn5BRbAJLccA+dSBOG7gMs+jpxJS94w==" }, "styled-system": { "version": "3.1.11", From d551cee919a6d2bc03ea879565eedfedb632b1d6 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 13 Dec 2018 20:41:40 +0000 Subject: [PATCH 03/19] fix(package): update react-i18next to version 8.3.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 52a644445..d756ac150 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "react-dom": "~16.3.2", "react-flip-move": "~3.0.2", "react-helmet": "~5.2.0", - "react-i18next": "~8.0.7", + "react-i18next": "~8.3.9", "react-markdown": "~4.0.3", "react-player": "~1.6.6", "react-redux": "~5.0.7", From a7a8f9ffc700b854af882fa4a82e31246c0699d4 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 13 Dec 2018 20:41:44 +0000 Subject: [PATCH 04/19] chore(package): update lockfile package-lock.json --- package-lock.json | 51 +++++++++++++++++------------------------------ 1 file changed, 18 insertions(+), 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index 171815ce3..03010ed49 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,7 +95,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -509,7 +509,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true }, @@ -4268,27 +4268,6 @@ "requires": { "fbjs": "^0.8.0", "gud": "^1.0.0" - }, - "dependencies": { - "core-js": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", - "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" - }, - "fbjs": { - "version": "0.8.17", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", - "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", - "requires": { - "core-js": "^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" - } - } } }, "cross-spawn": { @@ -4501,7 +4480,7 @@ "dependencies": { "core-js": { "version": "1.2.7", - "resolved": "http://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" }, "fbjs": { @@ -6778,7 +6757,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -6987,12 +6967,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -7011,6 +6993,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7246,6 +7229,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7289,7 +7273,8 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", @@ -10670,7 +10655,7 @@ }, "globby": { "version": "6.1.0", - "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { @@ -10683,7 +10668,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } @@ -18660,9 +18645,9 @@ } }, "react-i18next": { - "version": "8.0.7", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-8.0.7.tgz", - "integrity": "sha512-oJDVe5X8QK72NYYH7/VQtopONZPcNiarlWdVuCSkn9PucQCEAOf/yRt0V2LdjC4nBY48Y20/540glwR1nlE9gA==", + "version": "8.3.9", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-8.3.9.tgz", + "integrity": "sha512-/Une5B2xqkFKuI8uyRKq3BUNx4kFMZDESV+sn7KUNpAgYq4r0Wsd0HhMUEuJh8N7Y+ffeTbF5IaDH+pgPJdBEg==", "requires": { "@babel/runtime": "^7.1.2", "create-react-context": "0.2.3", @@ -18749,7 +18734,7 @@ "dependencies": { "hoist-non-react-statics": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=" } } From 5887784c583362a41a19bdab5edcd8d46f4e1a40 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 13 Dec 2018 21:06:46 +0000 Subject: [PATCH 05/19] fix(package): update react-apollo to version 2.3.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 52a644445..ea01dcfe4 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "prop-types": "~15.6.2", "re-reselect": "~2.1.0", "react": "~16.3.2", - "react-apollo": "~2.1.9", + "react-apollo": "~2.3.3", "react-dom": "~16.3.2", "react-flip-move": "~3.0.2", "react-helmet": "~5.2.0", From bbdc9869e2ed5376ee02410877697355bb8a8a29 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 13 Dec 2018 21:06:50 +0000 Subject: [PATCH 06/19] chore(package): update lockfile package-lock.json --- package-lock.json | 68 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 171815ce3..e07bbd098 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,7 +95,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -509,7 +509,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true }, @@ -4501,7 +4501,7 @@ "dependencies": { "core-js": { "version": "1.2.7", - "resolved": "http://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" }, "fbjs": { @@ -6426,6 +6426,11 @@ } } }, + "fbjs-css-vars": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.1.tgz", + "integrity": "sha512-IM+v/C40MNZWqsLErc32e0TyIk/NhkkQZL0QmjBh6zi1eXv0/GeVKmKmueQX7nn9SXQBQbTUcB8zuexIF3/88w==" + }, "fclone": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/fclone/-/fclone-1.0.11.tgz", @@ -6778,7 +6783,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -6987,12 +6993,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -7011,6 +7019,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7246,6 +7255,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7289,7 +7299,8 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", @@ -10670,7 +10681,7 @@ }, "globby": { "version": "6.1.0", - "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { @@ -10683,7 +10694,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } @@ -11065,11 +11076,15 @@ "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", "dev": true }, + "lodash.flowright": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/lodash.flowright/-/lodash.flowright-3.5.0.tgz", + "integrity": "sha1-K1//OZcW1+fcVyT+k0n2cGUYTWc=" + }, "lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", - "dev": true + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=" }, "lodash.kebabcase": { "version": "4.1.1", @@ -18592,21 +18607,32 @@ } }, "react-apollo": { - "version": "2.1.11", - "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.1.11.tgz", - "integrity": "sha512-WRoSOuZiQYgieXTgep4v3YwtVlxRnPHdcLEJBLX5+zq2atLmonvEkuFLJNjhAAOW/mYM8XhbLrbaC5NPrFrn0w==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.3.3.tgz", + "integrity": "sha512-y4CwwmJjp0De/An7vrvEWOJ27lxmS/SXT8z22I8aOEBC2wzdcavDPjKzeLYJKs+hv1MGS3h84PSwFtlU4Em/bA==", "requires": { - "fbjs": "^0.8.16", - "hoist-non-react-statics": "^2.5.0", + "fbjs": "^1.0.0", + "hoist-non-react-statics": "^3.0.0", "invariant": "^2.2.2", - "lodash": "^4.17.10", + "lodash.flowright": "^3.5.0", + "lodash.isequal": "^4.5.0", "prop-types": "^15.6.0" }, "dependencies": { - "hoist-non-react-statics": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", - "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" + "fbjs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-1.0.0.tgz", + "integrity": "sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==", + "requires": { + "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" + } } } }, @@ -18749,7 +18775,7 @@ "dependencies": { "hoist-non-react-statics": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=" } } From 77e5a49e3c634aeb6898becd68c066a450d21fad Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Fri, 14 Dec 2018 07:24:59 +0000 Subject: [PATCH 07/19] fix(package): update i18next to version 13.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 52a644445..3d9a324b4 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "faker": "~4.1.0", "graphql": "~14.0.2", "graphql-tag": "~2.9.2", - "i18next": "~12.0.0", + "i18next": "~13.0.0", "immutable": "~4.0.0-rc.9", "is-promise": "~2.1.0", "isomorphic-fetch": "~2.2.1", From 77c43ccfeee0086657ac03a9fa810dfdab3c9612 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Fri, 14 Dec 2018 07:25:03 +0000 Subject: [PATCH 08/19] chore(package): update lockfile package-lock.json --- package-lock.json | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 171815ce3..121750094 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,7 +95,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -509,7 +509,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true }, @@ -4501,7 +4501,7 @@ "dependencies": { "core-js": { "version": "1.2.7", - "resolved": "http://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" }, "fbjs": { @@ -6778,7 +6778,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -6987,12 +6988,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -7011,6 +7014,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7246,6 +7250,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7289,7 +7294,8 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", @@ -8423,9 +8429,9 @@ } }, "i18next": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-12.0.0.tgz", - "integrity": "sha512-Zy/nFpmBZxgmi6k9HkHbf+MwvAwiY5BDzNjNfvyLPKyalc2YBwwZtblESDlTKLDO8XSv23qYRY2uZcADDlRSjQ==" + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-13.0.0.tgz", + "integrity": "sha512-P8SDA5PN4bI5/ZdLE2AlanZhU+eXh31icrojQvbGcG7jovoDoz79eKY9mSgQ0LAeuDFKAw4Vl4mGf1/EWGFACg==" }, "iconv-lite": { "version": "0.4.24", @@ -10670,7 +10676,7 @@ }, "globby": { "version": "6.1.0", - "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { @@ -10683,7 +10689,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } @@ -18749,7 +18755,7 @@ "dependencies": { "hoist-non-react-statics": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=" } } From 22eacc75445821e4026a84a0d8b860cb02643af6 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 18 Dec 2018 10:04:23 +0000 Subject: [PATCH 09/19] fix(package): update core-js to version 2.6.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 52a644445..08e999253 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "apollo-boost": "~0.1.12", "bulma": "~0.7.2", "classnames": "~2.2.6", - "core-js": "~2.5.6", + "core-js": "~2.6.1", "date-fns": "~1.28.5", "debounce": "~1.0.2", "debounce-promise": "~3.1.0", From 98825a3ddda57283a589db3c2ba102bae514b8c5 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 18 Dec 2018 10:04:28 +0000 Subject: [PATCH 10/19] chore(package): update lockfile package-lock.json --- package-lock.json | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 171815ce3..77029e63f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,7 +95,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -509,7 +509,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true }, @@ -4160,9 +4160,9 @@ } }, "core-js": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", - "integrity": "sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=" + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.1.tgz", + "integrity": "sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg==" }, "core-util-is": { "version": "1.0.2", @@ -4501,7 +4501,7 @@ "dependencies": { "core-js": { "version": "1.2.7", - "resolved": "http://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" }, "fbjs": { @@ -6778,7 +6778,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -6987,12 +6988,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -7011,6 +7014,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7246,6 +7250,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7289,7 +7294,8 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", @@ -10670,7 +10676,7 @@ }, "globby": { "version": "6.1.0", - "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { @@ -10683,7 +10689,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } @@ -18749,7 +18755,7 @@ "dependencies": { "hoist-non-react-statics": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=" } } From 9b559d85e2edcf2443185c81230164301f97d708 Mon Sep 17 00:00:00 2001 From: Benjamin Piouffle Date: Wed, 19 Dec 2018 00:53:15 +0100 Subject: [PATCH 11/19] chore(Videos): Improve error message when creation fails --- app/components/Videos/AddVideoForm.jsx | 9 +++---- app/i18n/en/errors.js | 3 ++- app/i18n/fr/errors.js | 3 ++- app/state/flashes/reducer.js | 33 +++++++++++++++----------- app/state/videos/effects.js | 10 ++++---- 5 files changed, 34 insertions(+), 24 deletions(-) diff --git a/app/components/Videos/AddVideoForm.jsx b/app/components/Videos/AddVideoForm.jsx index b79d02b02..4b04248b4 100644 --- a/app/components/Videos/AddVideoForm.jsx +++ b/app/components/Videos/AddVideoForm.jsx @@ -90,11 +90,12 @@ export class AddVideoForm extends React.PureComponent { } handleSubmit(video) { - const promise = this.props.postVideo(video) - return promise.then(action => { - if (!action.error) this.props.router.push(`/videos/${action.payload.hash_id}`) - else if (action.payload === 'unauthorized' && !this.props.isAuthenticated) + return this.props.postVideo(video).then(action => { + if (!action.error) { + this.props.router.push(`/videos/${action.payload.hash_id}`) + } else if (action.payload === 'unauthorized' && !this.props.isAuthenticated) { this.props.router.push('/login') + } }) } } diff --git a/app/i18n/en/errors.js b/app/i18n/en/errors.js index f56adeaa4..3ae3afa02 100644 --- a/app/i18n/en/errors.js +++ b/app/i18n/en/errors.js @@ -15,7 +15,8 @@ export default { action_already_done: 'This action has already been done', unauthenticated: 'You need an account to do that', unauthorized: 'Please (re)connect to continue', - noInternet: 'Server connection failed, try refreshing the page' + noInternet: 'Server connection failed, try refreshing the page', + remote_video_404: "Remote video doesn't seems to exist" }, client: { joinCrashed: 'Server connection failed', diff --git a/app/i18n/fr/errors.js b/app/i18n/fr/errors.js index 764bf9830..1c8282be1 100644 --- a/app/i18n/fr/errors.js +++ b/app/i18n/fr/errors.js @@ -15,7 +15,8 @@ export default { action_already_done: 'Cette action a déjà été effectuée', unauthenticated: 'Vous devez vous connecter pour effectuer cette action', unauthorized: 'Merci de vous (re)connecter pour continuer', - noInternet: 'La connexion au serveur a échoué, essayez de rafraichir la page' + noInternet: 'La connexion au serveur a échoué, essayez de rafraichir la page', + remote_video_404: "Il semble que cette vidéo n'existe pas" }, client: { joinCrashed: 'La cconnexion au serveur a échoué', diff --git a/app/state/flashes/reducer.js b/app/state/flashes/reducer.js index a0e21b7c7..3ad6fe53e 100644 --- a/app/state/flashes/reducer.js +++ b/app/state/flashes/reducer.js @@ -12,27 +12,33 @@ export const unPause = createAction('FLASHES/UNPAUSE', () => false) export const update = createAction('FLASHES/UPDATE') // Actions helpers (use them like regular actions) -export const flashError = options => - addFlash({ +export const flashError = options => { + return addFlash({ flashType: 'danger', iconName: 'exclamation-circle', ...options }) +} + export const flashErrorMsg = message => flashError({ message }) -export const flashErrorUnauthenticated = () => - flashError({ + +export const flashErrorUnauthenticated = () => { + return flashError({ message: 'errors:server.unauthenticated', infoText: 'main:menu.loginSignup', infoUrl: '/login' }) +} -export const flashSuccessMsg = (message, params = {}) => - addFlash({ +export const flashSuccessMsg = (message, params = {}) => { + return addFlash({ flashType: 'success', iconName: 'check-circle', message, ...params }) +} + export function errorToFlash(msg) { const errorInfo = getErrorInfo(msg) let action = null @@ -47,6 +53,7 @@ export function errorToFlash(msg) { action.error = true return action } + // Same as errorToFlash but doesn't show anything if payload is // not a string (useful for forms) export function errorMsgToFlash(msg) { @@ -65,8 +72,8 @@ const FlashesReducer = handleActions( [addFlash]: (state, { payload }) => { // Only display one error for connections problems (instead of one per request) if ( - payload.message === NO_INTERNET_ERROR && - state.flashes.find(f => f.message === NO_INTERNET_ERROR) + payload.message === NO_INTERNET_ERROR + && state.flashes.find(f => f.message === NO_INTERNET_ERROR) ) return state return state.update('flashes', l => l.push(payload)) @@ -76,14 +83,12 @@ const FlashesReducer = handleActions( if (flashIdx !== -1) return state.update('flashes', l => l.delete(flashIdx)) return state }, - [combineActions(pause, unPause)]: (state, { payload }) => - state.set('isPaused', payload), + [combineActions(pause, unPause)]: (state, { payload }) => state.set('isPaused', payload), [update]: (state, { payload }) => { if (!state.isPaused) - return state.update('flashes', flashes => - flashes - .map(f => f.set('timeLeft', f.timeLeft - payload)) - .filter(msg => msg.timeLeft > 0) + return state.update('flashes', flashes => flashes + .map(f => f.set('timeLeft', f.timeLeft - payload)) + .filter(msg => msg.timeLeft > 0) ) return state } diff --git a/app/state/videos/effects.js b/app/state/videos/effects.js index 62a3471ef..255635855 100644 --- a/app/state/videos/effects.js +++ b/app/state/videos/effects.js @@ -3,16 +3,18 @@ import { setSubmitting } from './reducer' import { createEffect, returnSuccess, generateFSAError } from '../utils' import { errorToFlash } from '../flashes/reducer' -export const searchVideo = videoUrl => - createEffect(HttpApi.post('search/video', { url: videoUrl }), { +export const searchVideo = videoUrl => { + return createEffect(HttpApi.post('search/video', { url: videoUrl }), { before: setSubmitting(true), then: [setSubmitting(false), returnSuccess], catch: [setSubmitting(false), generateFSAError] }) +} -export const postVideo = video => - createEffect(HttpApi.post('videos', video), { +export const postVideo = video => { + return createEffect(HttpApi.post('videos', video), { before: setSubmitting(true), then: [setSubmitting(false), returnSuccess], catch: [setSubmitting(false), errorToFlash, generateFSAError] }) +} From 16193bc67b627d4f70e7eed5614322c3d98cf82b Mon Sep 17 00:00:00 2001 From: Benjamin Piouffle Date: Wed, 19 Dec 2018 01:43:02 +0100 Subject: [PATCH 12/19] fix(Modal): Close icon --- app/components/Modal/Modal.jsx | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/components/Modal/Modal.jsx b/app/components/Modal/Modal.jsx index 8964b6baa..7c6e5f696 100644 --- a/app/components/Modal/Modal.jsx +++ b/app/components/Modal/Modal.jsx @@ -2,10 +2,21 @@ import React from 'react' import { connect } from 'react-redux' import { Link } from 'react-router' import classNames from 'classnames' +import styled from 'styled-components' + +import { TimesCircle } from 'styled-icons/fa-regular/TimesCircle.cjs' import { popModal } from '../../state/modals/reducer' import { Icon } from '../Utils/Icon' -import Button from '../Utils/Button' + +const CloseIcon = styled(TimesCircle)` + height: 1.5em; + width: 1.5em; + cursor: pointer; + &:hover { + opacity: 0.75; + } +` const Modal = ({ helpLink, @@ -35,7 +46,7 @@ const Modal = ({ )} -