From ce8f778bb96a0e5e1949574c28ff11aca60b79b2 Mon Sep 17 00:00:00 2001 From: Thibaut Sardan Date: Mon, 2 Aug 2021 14:23:16 +0200 Subject: [PATCH 1/3] upgarde to v8.1 --- packages/files-ui/package.json | 6 ++-- packages/storage-ui/package.json | 7 +++-- yarn.lock | 52 ++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 6 deletions(-) diff --git a/packages/files-ui/package.json b/packages/files-ui/package.json index 06ee1408ac..da31b881cd 100644 --- a/packages/files-ui/package.json +++ b/packages/files-ui/package.json @@ -65,8 +65,8 @@ "@types/yup": "^0.29.9", "@types/zxcvbn": "^4.4.0", "babel-plugin-macros": "^2.8.0", - "cypress": "^7.6.0", - "cypress-file-upload": "^5.0.7", + "cypress": "^8.1.0", + "cypress-file-upload": "^5.0.8", "cypress-pipe": "^2.0.0" }, "scripts": { @@ -76,7 +76,7 @@ "sentry": "(export REACT_APP_SENTRY_RELEASE=$(sentry-cli releases propose-version); node scripts/sentry.js)", "release": "(export REACT_APP_SENTRY_RELEASE=$(sentry-cli releases propose-version); yarn compile && yarn build && node scripts/sentry.js)", "test": "yarn test:clean && cypress open", - "test:ci": "yarn test:clean && cypress run --browser chrome", + "test:ci": "yarn test:clean && cypress run", "test:clean": "rimraf cypress/fixtures/storage", "analyze": "source-map-explorer 'build/static/js/*.js'", "extract": "lingui extract", diff --git a/packages/storage-ui/package.json b/packages/storage-ui/package.json index 26fc0519d1..c97c6aff1b 100644 --- a/packages/storage-ui/package.json +++ b/packages/storage-ui/package.json @@ -64,8 +64,9 @@ "@types/yup": "^0.29.9", "@types/zxcvbn": "^4.4.0", "babel-plugin-macros": "^2.8.0", - "cypress": "^7.6.0", - "cypress-file-upload": "^5.0.7" + "cypress": "^8.1.0", + "cypress-file-upload": "^5.0.8", + "cypress-pipe": "^2.0.0" }, "scripts": { "postinstall": "yarn compile", @@ -74,7 +75,7 @@ "sentry": "(export REACT_APP_SENTRY_RELEASE=$(sentry-cli releases propose-version); node scripts/sentry.js)", "release": "(export REACT_APP_SENTRY_RELEASE=$(sentry-cli releases propose-version); yarn compile && yarn build && node scripts/sentry.js)", "test": "yarn test:clean && cypress open", - "test:ci": "yarn test:clean && cypress run --browser chrome", + "test:ci": "yarn test:clean && cypress run", "test:clean": "rimraf cypress/fixtures/storage", "analyze": "source-map-explorer 'build/static/js/*.js'", "extract": "lingui extract", diff --git a/yarn.lock b/yarn.lock index d85cac9cfa..fd906c0e10 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9461,6 +9461,11 @@ cypress-file-upload@^5.0.7: resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.7.tgz#acf24fe08a92b2d0c892a58b56811fb933d34ea9" integrity sha512-cgWsWx7igxjyyVm9/VJ9ukdy69jL00I7z0lrwUWtXXLPvX4neO+8JAZ054Ax8Xf+mdV9OerenXzb9nqRoafjHA== +cypress-file-upload@^5.0.8: + version "5.0.8" + resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1" + integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g== + cypress-pipe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/cypress-pipe/-/cypress-pipe-2.0.0.tgz#577df7a70a8603d89a96dfe4092a605962181af8" @@ -9513,6 +9518,53 @@ cypress@^7.6.0: url "^0.11.0" yauzl "^2.10.0" +cypress@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.1.0.tgz#9aaed7fb2a4d1876528b72d437f97bc824db0735" + integrity sha512-GXjlqPjY/6HPbQwAp3AvlA1Mk/NoJTAmqVSUhQsuM/1xDpd/FQHkxVuq5h6O6RrAoCXSgpZPXFsVtdqE+FwEJw== + dependencies: + "@cypress/request" "^2.88.5" + "@cypress/xvfb" "^1.2.4" + "@types/node" "^14.14.31" + "@types/sinonjs__fake-timers" "^6.0.2" + "@types/sizzle" "^2.3.2" + arch "^2.2.0" + blob-util "^2.0.2" + bluebird "^3.7.2" + cachedir "^2.3.0" + chalk "^4.1.0" + check-more-types "^2.24.0" + cli-cursor "^3.1.0" + cli-table3 "~0.6.0" + commander "^5.1.0" + common-tags "^1.8.0" + dayjs "^1.10.4" + debug "^4.3.2" + enquirer "^2.3.6" + eventemitter2 "^6.4.3" + execa "4.1.0" + executable "^4.1.1" + extract-zip "2.0.1" + figures "^3.2.0" + fs-extra "^9.1.0" + getos "^3.2.1" + is-ci "^3.0.0" + is-installed-globally "~0.4.0" + lazy-ass "^1.6.0" + listr2 "^3.8.3" + lodash "^4.17.21" + log-symbols "^4.0.0" + minimist "^1.2.5" + ospath "^1.2.2" + pretty-bytes "^5.6.0" + ramda "~0.27.1" + request-progress "^3.0.0" + supports-color "^8.1.1" + tmp "~0.2.1" + untildify "^4.0.0" + url "^0.11.0" + yauzl "^2.10.0" + d@1, d@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a" From cc60e6fda6e861a4aff5e3f9e3c8815ed5c7f124 Mon Sep 17 00:00:00 2001 From: Thibaut Sardan Date: Mon, 2 Aug 2021 14:27:24 +0200 Subject: [PATCH 2/3] no pipe in storage --- packages/storage-ui/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/storage-ui/package.json b/packages/storage-ui/package.json index c97c6aff1b..8e486d6155 100644 --- a/packages/storage-ui/package.json +++ b/packages/storage-ui/package.json @@ -65,8 +65,7 @@ "@types/zxcvbn": "^4.4.0", "babel-plugin-macros": "^2.8.0", "cypress": "^8.1.0", - "cypress-file-upload": "^5.0.8", - "cypress-pipe": "^2.0.0" + "cypress-file-upload": "^5.0.8" }, "scripts": { "postinstall": "yarn compile", From 3e452861529b4ad413bbd77e7a7ec93408c86dd9 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 2 Aug 2021 12:35:07 +0000 Subject: [PATCH 3/3] lingui extract --- packages/files-ui/src/locales/fr/messages.po | 23 +++++--------------- packages/files-ui/src/locales/no/messages.po | 3 +-- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/packages/files-ui/src/locales/fr/messages.po b/packages/files-ui/src/locales/fr/messages.po index 0ca5035449..dec4d408dc 100644 --- a/packages/files-ui/src/locales/fr/messages.po +++ b/packages/files-ui/src/locales/fr/messages.po @@ -5,8 +5,7 @@ msgstr "" "POT-Creation-Date: 2021-04-23 11:05+0200\n" "PO-Revision-Date: 2021-07-31 19:48+0000\n" "Last-Translator: J. Lavoie \n" -"Language-Team: French \n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -49,9 +48,7 @@ msgid "Approve" msgstr "Accepter" msgid "Are we on the right track? Let us know in less than 1 minute." -msgstr "" -"Sommes-nous sur la bonne voie ? Dites-le-nous en moins d’une minute (en " -"anglais)." +msgstr "Sommes-nous sur la bonne voie ? Dites-le-nous en moins d’une minute (en anglais)." msgid "Back" msgstr "Retour" @@ -90,8 +87,7 @@ msgid "Change password" msgstr "Changer le mot de passe" msgid "Check your inbox! We've sent another email." -msgstr "" -"Vérifiez votre boîte de réception ! Nous avons envoyé un autre courriel." +msgstr "Vérifiez votre boîte de réception ! Nous avons envoyé un autre courriel." msgid "Click or drag to upload files" msgstr "Cliquer ou faire glisser un ficher pour le téléverser" @@ -141,7 +137,6 @@ msgstr "Copier le CID" msgid "Copy info" msgstr "Copier les infos" -#, fuzzy msgid "Copy over" msgstr "Copier sur" @@ -668,9 +663,7 @@ msgid "Social sign in or wallet" msgstr "Connecté avec un réseau social ou wallet" msgid "Something went wrong with email login! Please try again." -msgstr "" -"Un problème est survenu lors de la connexion avec courriel ! Veuillez " -"réessayer." +msgstr "Un problème est survenu lors de la connexion avec courriel ! Veuillez réessayer." msgid "Something went wrong!" msgstr "Quelque chose a mal tourné !" @@ -805,9 +798,7 @@ msgid "Wallet address" msgstr "Addresse du wallet" msgid "We can't encrypt files larger than 2GB. Some items will not be uploaded" -msgstr "" -"Nous ne pouvons pas chiffrer les fichiers de plus de 2 Go. Certains éléments " -"ne pourront pas être téléversés" +msgstr "Nous ne pouvons pas chiffrer les fichiers de plus de 2 Go. Certains éléments ne pourront pas être téléversés" msgid "Web3: {0}" msgstr "Web3 : {0}" @@ -867,9 +858,7 @@ msgid "recovered successfully" msgstr "récupéré avec succès" msgid "{0, plural, one {You are about to delete {1} item.} other {You are about to delete {2} items.}}" -msgstr "" -"{0, plural, one {Vous êtes sur le point de supprimer {1} élément.} other {" -"Vous êtes sur le point de supprimer {2} éléments.}}" +msgstr "{0, plural, one {Vous êtes sur le point de supprimer {1} élément.} other {Vous êtes sur le point de supprimer {2} éléments.}}" msgid "{noOfFiles, plural, one {Uploading and encrypting {noOfFiles} file} other {Uploading and encrypting {noOfFiles} files}}" msgstr "{noOfFiles, plural, one {Téléversement et chiffrement de {noOfFiles} fichier} other {Téléversement et chiffrement de {noOfFiles} fichiers}}" diff --git a/packages/files-ui/src/locales/no/messages.po b/packages/files-ui/src/locales/no/messages.po index f23f7089fa..7a983c49eb 100644 --- a/packages/files-ui/src/locales/no/messages.po +++ b/packages/files-ui/src/locales/no/messages.po @@ -5,8 +5,7 @@ msgstr "" "POT-Creation-Date: 2021-04-20 00:28+0200\n" "PO-Revision-Date: 2021-07-29 09:32+0000\n" "Last-Translator: Allan Nordhøy \n" -"Language-Team: Norwegian Bokmål \n" +"Language-Team: Norwegian Bokmål \n" "Language: no\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n"