From f27a81950acc9e2e9f95d760e3c6c7fd80735494 Mon Sep 17 00:00:00 2001 From: spalger Date: Thu, 1 Oct 2020 08:22:32 -0700 Subject: [PATCH] upgrade lmdb-store, with jest compat, remove text-encoding shim --- package.json | 1 - packages/kbn-optimizer/package.json | 2 +- src/dev/jest/setup/polyfills.js | 1 - x-pack/dev-tools/jest/setup/polyfills.js | 2 -- x-pack/package.json | 1 - yarn.lock | 29 ++++++++++++------------ 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 51f1069fd888199..1401d1d5acde417 100644 --- a/package.json +++ b/package.json @@ -472,7 +472,6 @@ "supertest": "^3.1.0", "supertest-as-promised": "^4.0.2", "tape": "^4.13.0", - "text-encoding": "^0.7.0", "topojson-client": "3.0.0", "tree-kill": "^1.2.2", "typescript": "4.0.2", diff --git a/packages/kbn-optimizer/package.json b/packages/kbn-optimizer/package.json index a27177d157ae59b..e2158f72a62c060 100644 --- a/packages/kbn-optimizer/package.json +++ b/packages/kbn-optimizer/package.json @@ -29,7 +29,7 @@ "jest-diff": "^25.5.0", "js-yaml": "^3.14.0", "json-stable-stringify": "^1.0.1", - "lmdb-store": "^0.6.9", + "lmdb-store": "^0.6.10", "loader-utils": "^1.2.3", "node-sass": "^4.13.1", "normalize-path": "^3.0.0", diff --git a/src/dev/jest/setup/polyfills.js b/src/dev/jest/setup/polyfills.js index 1b74ff3c25ddc7f..9e4f1db9ac28997 100644 --- a/src/dev/jest/setup/polyfills.js +++ b/src/dev/jest/setup/polyfills.js @@ -28,4 +28,3 @@ const MutationObserver = require('mutation-observer'); Object.defineProperty(window, 'MutationObserver', { value: MutationObserver }); require('whatwg-fetch'); -Object.assign(global, require('text-encoding')); diff --git a/x-pack/dev-tools/jest/setup/polyfills.js b/x-pack/dev-tools/jest/setup/polyfills.js index ef95f3820338f43..a841a3bf9cad0f7 100644 --- a/x-pack/dev-tools/jest/setup/polyfills.js +++ b/x-pack/dev-tools/jest/setup/polyfills.js @@ -22,8 +22,6 @@ if (!global.URL.hasOwnProperty('createObjectURL')) { Object.defineProperty(global.URL, 'createObjectURL', { value: () => '' }); } -Object.assign(global, require('text-encoding')); - // Will be replaced with a better solution in EUI // https://github.com/elastic/eui/issues/3713 global._isJest = true; diff --git a/x-pack/package.json b/x-pack/package.json index eb88b4f61844f91..b78679267a23275 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -254,7 +254,6 @@ "supertest": "^3.1.0", "supertest-as-promised": "^4.0.2", "suricata-sid-db": "^1.0.2", - "text-encoding": "^0.7.0", "tinycolor2": "1.4.1", "topojson-client": "3.0.0", "tree-kill": "^1.2.2", diff --git a/yarn.lock b/yarn.lock index 5fb002283099d91..79ef14191893a62 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19549,15 +19549,16 @@ livereload-js@^2.3.0: resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c" integrity sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw== -lmdb-store@^0.6.9: - version "0.6.9" - resolved "https://registry.yarnpkg.com/lmdb-store/-/lmdb-store-0.6.9.tgz#2e4f02672b5cd5b687f281c01a7f493470b4ac4f" - integrity sha512-gNcTtJNBtNQctZi7wcNOnO0bLOlhBY+cHLaX/9cgAeFrtwp3umhGFewMeaiPEpdWRDWC6PslZqKCma9RepCWyw== +lmdb-store@^0.6.10: + version "0.6.10" + resolved "https://registry.yarnpkg.com/lmdb-store/-/lmdb-store-0.6.10.tgz#db8efde6e052aabd17ebc63c8a913e1f31694129" + integrity sha512-ZLvp3qbBQ5VlBmaWa4EUAPyYEZ8qdUHsW69HmxkDi84pFQ37WMxYhFaF/7PQkdtxS/vyiKkZigd9TFgHjek1Nw== dependencies: fs-extra "^9.0.1" - msgpackr "^0.4.1" + msgpackr "^0.5.0" nan "^2.14.1" node-gyp-build "^4.2.3" + weak-lru-cache "^0.2.0" load-bmfont@^1.3.1, load-bmfont@^1.4.0: version "1.4.0" @@ -21250,10 +21251,10 @@ msgpackr-extract@^0.3.4: nan "^2.14.1" node-gyp-build "^4.2.3" -msgpackr@^0.4.1: - version "0.4.2" - resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-0.4.2.tgz#86345273fa4dd4774f6590eb7935439a85974449" - integrity sha512-O2ysETY4CHEzFOih14y2i9FtJNV8MmqGKgo2ZIGqk/IH1pFPmg6hxQ9fbE4WWbhnslUgdwjJhpXJ3tVWQzcTIw== +msgpackr@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-0.5.1.tgz#7eecbf342645b7718dd2e3386894368d06732b3f" + integrity sha512-nK2uJl67Q5KU3MWkYBUlYynqKS1UUzJ5M1h6TQejuJtJzD3hW2Suv2T1pf01E9lUEr93xaLokf/xC+jwBShMPQ== optionalDependencies: msgpackr-extract "^0.3.4" @@ -28700,11 +28701,6 @@ text-diff@^1.0.1: resolved "https://registry.yarnpkg.com/text-diff/-/text-diff-1.0.1.tgz#6c105905435e337857375c9d2f6ca63e453ff565" integrity sha1-bBBZBUNeM3hXN1ydL2ymPkU/9WU= -text-encoding@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.7.0.tgz#f895e836e45990624086601798ea98e8f36ee643" - integrity sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA== - text-hex@1.0.x: version "1.0.0" resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" @@ -31005,6 +31001,11 @@ wcwidth@^1.0.1: dependencies: defaults "^1.0.3" +weak-lru-cache@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/weak-lru-cache/-/weak-lru-cache-0.2.0.tgz#447379ccff6dfda1b7a9566c9ef168260be859d1" + integrity sha512-M1l5CzKvM7maa7tCbtL0NW6sOnp8gqup853+9Aq7GL0XNWKNnFOkeE3v3Z5X2IeMzedPwQyPbi4RlFvD6rxs7A== + web-namespaces@^1.0.0: version "1.1.4" resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec"