From d0d9237f109c41ea71ca227d1ea23399a03fba64 Mon Sep 17 00:00:00 2001 From: Piotr Konieczny Date: Mon, 7 Sep 2020 11:44:18 +0200 Subject: [PATCH 1/2] Remove is-ua-webview package --- package.json | 1 - yarn.lock | 5 ----- 2 files changed, 6 deletions(-) diff --git a/package.json b/package.json index 719d029f..815092b7 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "classnames": "^2.2.6", "flat": "^5.0.0", "formik": "^2.1.4", - "is-ua-webview": "^1.0.1", "lodash.invoke": "^4.5.2", "lodash.uniqueid": "^4.0.1", "moment": "^2.24.0", diff --git a/yarn.lock b/yarn.lock index 9fbb20a7..4b019b12 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6480,11 +6480,6 @@ is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= -is-ua-webview@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-ua-webview/-/is-ua-webview-1.0.5.tgz#f5798e50e379aced92b6bf1a13b5ee645dbef09b" - integrity sha512-CfaCxjFTU3xUluvcKg0+3j5uXeyneANFnC9ynSCTFA06nFt1okFBXpkKVxqxtFAKcbsFl+vrOQ7g6hlaDIQu8A== - is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" From f9c316a3ae827a9351adffa6f5013eed18309829 Mon Sep 17 00:00:00 2001 From: Piotr Konieczny Date: Wed, 9 Sep 2020 12:19:41 +0200 Subject: [PATCH 2/2] Fix manual resolve conflicts on wrong branch --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 3bb3a1b4..375f45f6 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "flat": "^5.0.0", "formik": "^2.1.4", "i18next": "^19.6.3", - "is-ua-webview": "^1.0.1", "lodash.invoke": "^4.5.2", "lodash.uniqueid": "^4.0.1", "moment": "^2.24.0", @@ -40,7 +39,7 @@ "yup": "^0.28.3" }, "scripts": { - "start": "react-scripts start", + "start": "PORT=3001 react-scripts start", "prepare-tranlations": "node locales/build/prepareTranlations.js", "after-build-tranlations": "node locales/build/afterBuildTranlations.js", "create-tranlations-file": "node locales/helpers/createTranlationsFile.js",