From b876df0d543d7537b84590c7759cdea36014756c Mon Sep 17 00:00:00 2001 From: Jean-Louis Leysens Date: Thu, 2 Jan 2020 11:59:54 +0100 Subject: [PATCH 1/6] Move fp-ts and immer to "." package.json --- package.json | 2 ++ x-pack/package.json | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 651ffb60d7b88..2ffaafb96075f 100644 --- a/package.json +++ b/package.json @@ -173,6 +173,7 @@ "fast-deep-equal": "^3.1.1", "file-loader": "4.2.0", "font-awesome": "4.7.0", + "fp-ts": "^2.0.5", "getos": "^3.1.0", "glob": "^7.1.2", "glob-all": "^3.1.0", @@ -417,6 +418,7 @@ "gulp-sourcemaps": "2.6.5", "has-ansi": "^3.0.0", "iedriver": "^3.14.1", + "immer": "^1.5.0", "intl-messageformat-parser": "^1.4.0", "is-path-inside": "^2.1.0", "istanbul-instrumenter-loader": "3.0.1", diff --git a/x-pack/package.json b/x-pack/package.json index a90c1ed7f5b53..e733ca7556797 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -231,7 +231,6 @@ "file-type": "^10.9.0", "font-awesome": "4.7.0", "formsy-react": "^1.1.5", - "fp-ts": "^2.0.5", "geojson-rewind": "^0.3.1", "get-port": "4.2.0", "getos": "^3.1.0", @@ -249,7 +248,6 @@ "i18n-iso-countries": "^4.3.1", "icalendar": "0.7.1", "idx": "^2.5.6", - "immer": "^1.5.0", "inline-style": "^2.0.0", "intl": "^1.2.5", "io-ts": "^2.0.1", From 55b153903c1e9c4ee94c8a89fff59c3a086667c8 Mon Sep 17 00:00:00 2001 From: Jean-Louis Leysens Date: Thu, 2 Jan 2020 16:34:21 +0100 Subject: [PATCH 2/6] Revert "Move fp-ts and immer to "." package.json" This reverts commit b876df0d543d7537b84590c7759cdea36014756c. --- package.json | 2 -- x-pack/package.json | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e338b305dfca8..a0f5dd3af14c0 100644 --- a/package.json +++ b/package.json @@ -173,7 +173,6 @@ "fast-deep-equal": "^3.1.1", "file-loader": "4.2.0", "font-awesome": "4.7.0", - "fp-ts": "^2.0.5", "getos": "^3.1.0", "glob": "^7.1.2", "glob-all": "^3.1.0", @@ -418,7 +417,6 @@ "gulp-sourcemaps": "2.6.5", "has-ansi": "^3.0.0", "iedriver": "^3.14.1", - "immer": "^1.5.0", "intl-messageformat-parser": "^1.4.0", "is-path-inside": "^2.1.0", "istanbul-instrumenter-loader": "3.0.1", diff --git a/x-pack/package.json b/x-pack/package.json index e733ca7556797..a90c1ed7f5b53 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -231,6 +231,7 @@ "file-type": "^10.9.0", "font-awesome": "4.7.0", "formsy-react": "^1.1.5", + "fp-ts": "^2.0.5", "geojson-rewind": "^0.3.1", "get-port": "4.2.0", "getos": "^3.1.0", @@ -248,6 +249,7 @@ "i18n-iso-countries": "^4.3.1", "icalendar": "0.7.1", "idx": "^2.5.6", + "immer": "^1.5.0", "inline-style": "^2.0.0", "intl": "^1.2.5", "io-ts": "^2.0.1", From ecfab7eed94b15f3111f3008e9fc678bba03c308 Mon Sep 17 00:00:00 2001 From: Jean-Louis Leysens Date: Thu, 2 Jan 2020 17:19:21 +0100 Subject: [PATCH 3/6] Second attempt, fp-ts and immer -> root --- package.json | 2 ++ x-pack/package.json | 6 ++---- yarn.lock | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index a0f5dd3af14c0..2ba09d502154f 100644 --- a/package.json +++ b/package.json @@ -173,6 +173,7 @@ "fast-deep-equal": "^3.1.1", "file-loader": "4.2.0", "font-awesome": "4.7.0", + "fp-ts": "^2.0.5", "getos": "^3.1.0", "glob": "^7.1.2", "glob-all": "^3.1.0", @@ -187,6 +188,7 @@ "hoek": "^5.0.4", "http-proxy-agent": "^2.1.0", "https-proxy-agent": "^2.2.2", + "immer": "^1.5.0", "inert": "^5.1.0", "inline-style": "^2.0.0", "joi": "^13.5.2", diff --git a/x-pack/package.json b/x-pack/package.json index a90c1ed7f5b53..720951600192f 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -42,8 +42,8 @@ "@storybook/addon-storyshots": "^5.2.6", "@storybook/react": "^5.2.6", "@storybook/theming": "^5.2.6", - "@testing-library/react": "^9.3.2", "@testing-library/jest-dom": "4.2.0", + "@testing-library/react": "^9.3.2", "@types/angular": "^1.6.56", "@types/archiver": "^3.0.0", "@types/base64-js": "^1.2.5", @@ -66,8 +66,8 @@ "@types/graphql": "^0.13.2", "@types/gulp": "^4.0.6", "@types/hapi__wreck": "^15.0.1", - "@types/hoist-non-react-statics": "^3.3.0", "@types/history": "^4.7.3", + "@types/hoist-non-react-statics": "^3.3.0", "@types/jest": "24.0.19", "@types/joi": "^13.4.2", "@types/js-yaml": "^3.11.1", @@ -231,7 +231,6 @@ "file-type": "^10.9.0", "font-awesome": "4.7.0", "formsy-react": "^1.1.5", - "fp-ts": "^2.0.5", "geojson-rewind": "^0.3.1", "get-port": "4.2.0", "getos": "^3.1.0", @@ -249,7 +248,6 @@ "i18n-iso-countries": "^4.3.1", "icalendar": "0.7.1", "idx": "^2.5.6", - "immer": "^1.5.0", "inline-style": "^2.0.0", "intl": "^1.2.5", "io-ts": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index 6b096306b78d4..86ef85aa9796c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13184,9 +13184,9 @@ fp-ts@^1.14.2: integrity sha512-r4gHfAWaRrYPsmdzRl1U9CkpbdOi8fPg5F5KiazAadENz5DKdWEaCDPl2Tf92fvkZGD/ekZ3EHu3gtXIVcsXtA== fp-ts@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.0.5.tgz#9560d8a6a4f53cbda9f9b31ed8d1458e41939e07" - integrity sha512-opI5r+rVlpZE7Rhk0YtqsrmxGkbIw0dRNqGca8FEAMMnjomXotG+R9QkLQg20onx7R8qhepAn4CCOP8usma/Xw== + version "2.3.1" + resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.3.1.tgz#8068bfcca118227932941101e062134d7ecd9119" + integrity sha512-KevPBnYt0aaJiuUzmU9YIxjrhC9AgJ8CLtLlXmwArovlNTeYM5NtEoKd86B0wHd7FIbzeE8sNXzCoYIOr7e6Iw== fragment-cache@^0.2.1: version "0.2.1" From 925b67eb90e1d10e5541215c83c169b6a67d6ff8 Mon Sep 17 00:00:00 2001 From: Jean-Louis Leysens Date: Mon, 6 Jan 2020 12:18:57 +0100 Subject: [PATCH 4/6] fp-ts -> 2.3.1 --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2ba09d502154f..e27322a453fec 100644 --- a/package.json +++ b/package.json @@ -173,7 +173,7 @@ "fast-deep-equal": "^3.1.1", "file-loader": "4.2.0", "font-awesome": "4.7.0", - "fp-ts": "^2.0.5", + "fp-ts": "^2.3.1", "getos": "^3.1.0", "glob": "^7.1.2", "glob-all": "^3.1.0", diff --git a/yarn.lock b/yarn.lock index 86ef85aa9796c..c91969a96ed22 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13183,7 +13183,7 @@ fp-ts@^1.14.2: resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-1.17.3.tgz#5064afc4bee8ddcaea567479bfc62d527e015825" integrity sha512-r4gHfAWaRrYPsmdzRl1U9CkpbdOi8fPg5F5KiazAadENz5DKdWEaCDPl2Tf92fvkZGD/ekZ3EHu3gtXIVcsXtA== -fp-ts@^2.0.5: +fp-ts@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.3.1.tgz#8068bfcca118227932941101e062134d7ecd9119" integrity sha512-KevPBnYt0aaJiuUzmU9YIxjrhC9AgJ8CLtLlXmwArovlNTeYM5NtEoKd86B0wHd7FIbzeE8sNXzCoYIOr7e6Iw== From 632e27ed6c709d6d43aaf861bbb8655c719181fc Mon Sep 17 00:00:00 2001 From: Jean-Louis Leysens Date: Mon, 6 Jan 2020 12:20:43 +0100 Subject: [PATCH 5/6] Revert x-pack/package.json --- x-pack/package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/x-pack/package.json b/x-pack/package.json index 720951600192f..a90c1ed7f5b53 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -42,8 +42,8 @@ "@storybook/addon-storyshots": "^5.2.6", "@storybook/react": "^5.2.6", "@storybook/theming": "^5.2.6", - "@testing-library/jest-dom": "4.2.0", "@testing-library/react": "^9.3.2", + "@testing-library/jest-dom": "4.2.0", "@types/angular": "^1.6.56", "@types/archiver": "^3.0.0", "@types/base64-js": "^1.2.5", @@ -66,8 +66,8 @@ "@types/graphql": "^0.13.2", "@types/gulp": "^4.0.6", "@types/hapi__wreck": "^15.0.1", - "@types/history": "^4.7.3", "@types/hoist-non-react-statics": "^3.3.0", + "@types/history": "^4.7.3", "@types/jest": "24.0.19", "@types/joi": "^13.4.2", "@types/js-yaml": "^3.11.1", @@ -231,6 +231,7 @@ "file-type": "^10.9.0", "font-awesome": "4.7.0", "formsy-react": "^1.1.5", + "fp-ts": "^2.0.5", "geojson-rewind": "^0.3.1", "get-port": "4.2.0", "getos": "^3.1.0", @@ -248,6 +249,7 @@ "i18n-iso-countries": "^4.3.1", "icalendar": "0.7.1", "idx": "^2.5.6", + "immer": "^1.5.0", "inline-style": "^2.0.0", "intl": "^1.2.5", "io-ts": "^2.0.1", From bb83c234e11e6b2f60900891dc8fec23b3217060 Mon Sep 17 00:00:00 2001 From: Jean-Louis Leysens Date: Mon, 6 Jan 2020 12:59:58 +0100 Subject: [PATCH 6/6] Update fp-ts in x-pack/package.json --- x-pack/package.json | 2 +- yarn.lock | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/x-pack/package.json b/x-pack/package.json index c0e7a7c86cf0b..110db56c5d4ed 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -230,7 +230,7 @@ "file-type": "^10.9.0", "font-awesome": "4.7.0", "formsy-react": "^1.1.5", - "fp-ts": "^2.0.5", + "fp-ts": "^2.3.1", "geojson-rewind": "^0.3.1", "get-port": "4.2.0", "getos": "^3.1.0", diff --git a/yarn.lock b/yarn.lock index 2f4efcc6a8a9a..0026370927fe1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13099,11 +13099,6 @@ fp-ts@^1.0.0: resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-1.12.0.tgz#d333310e4ac104cdcb6bea47908e381bb09978e7" integrity sha512-fWwnAgVlTsV26Ruo9nx+fxNHIm6l1puE1VJ/C0XJ3nRQJJJIgRHYw6sigB3MuNFZL1o4fpGlhwFhcbxHK0RsOA== -fp-ts@^1.14.2: - version "1.17.3" - resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-1.17.3.tgz#5064afc4bee8ddcaea567479bfc62d527e015825" - integrity sha512-r4gHfAWaRrYPsmdzRl1U9CkpbdOi8fPg5F5KiazAadENz5DKdWEaCDPl2Tf92fvkZGD/ekZ3EHu3gtXIVcsXtA== - fp-ts@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.3.1.tgz#8068bfcca118227932941101e062134d7ecd9119"