From 3fc7fe31f91b0ca5bb19d3de1100bf2d292a0872 Mon Sep 17 00:00:00 2001 From: Anton Korotkov Date: Wed, 19 Oct 2022 16:49:34 +0200 Subject: [PATCH 01/11] installed carts lib, code clean --- app/dumper/Options.js | 13 +++--- package.json | 9 +++-- rollup.config.mjs => rollup.config.js | 0 yarn.lock | 58 ++++++++++++++------------- 4 files changed, 41 insertions(+), 39 deletions(-) rename rollup.config.mjs => rollup.config.js (100%) diff --git a/app/dumper/Options.js b/app/dumper/Options.js index dce10c7..fcce9ca 100644 --- a/app/dumper/Options.js +++ b/app/dumper/Options.js @@ -284,8 +284,6 @@ class Options { 'output' ) - console.log(_options) - return _options } @@ -309,7 +307,7 @@ class Options { */ getHeaders(current, way) { try { - const currectInputHeaders = JSON.parse(current) + const currentInputHeaders = JSON.parse(current) const types = { input: this.getInputType(), @@ -325,12 +323,12 @@ class Options { connection.password ) return { - ...currectInputHeaders, + ...currentInputHeaders, ...authHeaderObject, } } - return currectInputHeaders + return currentInputHeaders } if (types[way] === 'remote-index') { @@ -349,15 +347,14 @@ class Options { theConnection.password ) return { - ...currectInputHeaders, + ...currentInputHeaders, ...authHeaderObject, } } - return currectInputHeaders + return currentInputHeaders } } catch (e) { - console.log(e) throw new Error(`Could not parse ${way} headers. Please use valid JSON.`) } } diff --git a/package.json b/package.json index eb05ff9..70e3f96 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "Full featured elasticsearch client", "main": "main.js", "scripts": { - "build": "rollup -c", - "dev": "rollup -c -w", + "build": "rollup -c --bundleConfigAsCjs", + "dev": "rollup -c -w --bundleConfigAsCjs", "start-local": "sirv public", "start": "ENV=development electron .", "start:prod": "electron .", @@ -69,9 +69,10 @@ "axios": "^1.1.3", "btoa": "^1.2.1", "compare-versions": "^5.0.1", - "elasticdump": "^6.84.0", + "elasticdump": "^6.91.0", "electron-log": "^4.4.7", "electron-updater": "^5.0.1", + "frappe-charts": "^1.6.2", "https": "^1.0.0", "jsoneditor": "^9.8.0", "local-storage": "^2.0.0", @@ -91,7 +92,7 @@ "electron-builder": "^23.0.3", "electron-notarize": "^1.2.1", "node-sass": "^7.0.1", - "rollup": "^3.2.0", + "rollup": "^3.2.3", "rollup-plugin-css-only": "^3.1.0", "rollup-plugin-livereload": "^2.0.0", "rollup-plugin-replace": "^2.2.0", diff --git a/rollup.config.mjs b/rollup.config.js similarity index 100% rename from rollup.config.mjs rename to rollup.config.js diff --git a/yarn.lock b/yarn.lock index a48280f..358f3ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -297,9 +297,9 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "18.11.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.0.tgz#f38c7139247a1d619f6cc6f27b072606af7c289d" - integrity sha512-IOXCvVRToe7e0ny7HpT/X9Rb2RYtElG1a+VshjwT00HxrM2dWBApHQoqsI6WiY7Q03vdf2bCrIGzVrkF/5t10w== + version "18.11.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.2.tgz#c59b7641832531264fda3f1ba610362dc9a7dfc8" + integrity sha512-BWN3M23gLO2jVG8g/XHIRFWiiV4/GckeFIqbU/C4V3xpoBBWSMk4OZomouN0wCkfQFPqgZikyLr7DOYDysIkkw== "@types/node@^14.0.1": version "14.18.32" @@ -307,9 +307,9 @@ integrity sha512-Y6S38pFr04yb13qqHf8uk1nHE3lXgQ30WZbv1mLliV9pt0NjvqdWttLcrOYLnXbOafknVYRHZGoMSpR9UwfYow== "@types/node@^16.11.26": - version "16.11.65" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.65.tgz#59500b86af757d6fcabd3dec32fecb6e357d7a45" - integrity sha512-Vfz7wGMOr4jbQGiQHVJm8VjeQwM9Ya7mHe9LtQ264/Epf5n1KiZShOFqk++nBzw6a/ubgYdB9Od7P+MH/LjoWw== + version "16.11.68" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.68.tgz#30ee923f4d940793e0380f5ce61c0bd4b7196b6c" + integrity sha512-JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -384,9 +384,9 @@ abbrev@1: integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== ace-builds@^1.10.1: - version "1.12.0" - resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.12.0.tgz#7bec18c9a6dc316d2ec2751b430def2f09168003" - integrity sha512-jKRKAgPVc+1iPWZaJQMT835zL4nivQqvpoCih1zRMFyQsJgfgQhw3oSUsL469X/DmPLm1z5kkhnrhquuhpwkXw== + version "1.12.3" + resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.12.3.tgz#db77530a5854ee38a0c660e9904d2cb29a247c2f" + integrity sha512-LHAsa5oOaRqmIlb8gBe81nj2kOqlfbV0XkWkFZL4mIfPXL4zoeTUcandHvBgHQCyjif3tGfoLTXelWSlnCT/dA== acorn@^8.5.0: version "8.8.0" @@ -609,9 +609,9 @@ aws-sdk@2.1122.0: xml2js "0.4.19" aws-sdk@^2.0.4: - version "2.1233.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1233.0.tgz#3386515966ca8a5baac048d986ad0977119c0765" - integrity sha512-e1GbVltsoQpWvx0gxQlEtKOdOrNWyjhD8bjFIMx/3Nwwzw4ac2KOy7CyC5I+lBj8el4AB0399umLHJZmL5WcVg== + version "2.1235.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1235.0.tgz#60495275360956120ef39b25804c0e54da95414f" + integrity sha512-EV2C/GaQh1LBNnNqXfpGdyHR4/8ppQ1BnUfK9voNWMPuFHr1nJ8meIqfo+zwQE8rvGenqcZQBO0lrvauBeNBqw== dependencies: buffer "4.9.2" events "1.1.1" @@ -1229,10 +1229,10 @@ ejs@^3.1.7: dependencies: jake "^10.8.5" -elasticdump@^6.84.0: - version "6.90.0" - resolved "https://registry.yarnpkg.com/elasticdump/-/elasticdump-6.90.0.tgz#48d569d1e9f47b0ecf5384b8d9c3ff7572d0e26c" - integrity sha512-xroof/ETZNWB5c3kVTEUYMqInxk5I64Pt+v+CbNinK6h18+TY6i5srBLPO3Gc+CUCfpiqc7iX3ftzrRc4p0qww== +elasticdump@^6.91.0: + version "6.91.0" + resolved "https://registry.yarnpkg.com/elasticdump/-/elasticdump-6.91.0.tgz#a2b49f6d888b4b248979900ba5053086444baedf" + integrity sha512-8JZTQq9Dn4H0hF2iHZU6gvyJ9Imzkl+d89vNxs3dPooA9Hx2rSecNm8nY1kDizRnvP0/sdMYdYVRD51Goz6wFw== dependencies: JSONStream "^1.3.5" async "^2.6.4" @@ -1577,6 +1577,11 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" +frappe-charts@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-1.6.2.tgz#4671a943a8606e5020180fa65c8ea1835c510baf" + integrity sha512-9TC3/+YVUi84yYoEbxFiSqu+1FQ5If/ydUNj6i8FRpwynd08t6a7RkS+IRJozAk6NfdL8/LVTTE1DUOjjKZZxg== + fs-extra@^10.0.0, fs-extra@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" @@ -2129,9 +2134,9 @@ is-ci@^3.0.0: ci-info "^3.2.0" is-core-module@^2.5.0, is-core-module@^2.9.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed" - integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg== + version "2.11.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" + integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== dependencies: has "^1.0.3" @@ -3383,10 +3388,10 @@ rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.2: dependencies: estree-walker "^0.6.1" -rollup@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.2.0.tgz#a6f44074418e55217967c8eca622f9638d396388" - integrity sha512-0ZkFPyBNvx717KvC700NoxUD31aEEX675u6INJVAmBgKtQuCL8jmmJCj1b9B/qDSnILAvASVKa7UpGS+FLN6AQ== +rollup@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.2.3.tgz#67d894c981ad50cc811779748e52c05742560c64" + integrity sha512-qfadtkY5kl0F5e4dXVdj2D+GtOdifasXHFMiL1SMf9ADQDv5Eti6xReef9FKj+iQPR2pvtqWna57s/PjARY4fg== optionalDependencies: fsevents "~2.3.2" @@ -4088,15 +4093,14 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1: integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== util@^0.12.4: - version "0.12.4" - resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253" - integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw== + version "0.12.5" + resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc" + integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA== dependencies: inherits "^2.0.3" is-arguments "^1.0.4" is-generator-function "^1.0.7" is-typed-array "^1.1.3" - safe-buffer "^5.1.2" which-typed-array "^1.1.2" uuid@3.3.2: From 5b540393583f47bd8eec0e3451ebb27c5e06a046 Mon Sep 17 00:00:00 2001 From: Anton Korotkov Date: Sat, 22 Apr 2023 10:17:34 +0200 Subject: [PATCH 02/11] updated libs --- main.js | 9 - yarn.lock | 598 +++++++++++++++++++++--------------------------------- 2 files changed, 228 insertions(+), 379 deletions(-) diff --git a/main.js b/main.js index cee79d1..d465ab7 100644 --- a/main.js +++ b/main.js @@ -70,15 +70,6 @@ const createWindow = () => { await shell.openExternal('https://elastron.eney.solutions') }, }, - { - label: 'Become a Patron 💛', - click: async () => { - const { shell } = require('electron') - await shell.openExternal( - 'https://www.patreon.com/bePatron?u=60793577' - ) - }, - }, { label: 'Check For Updates', click: () => updater.checkForUpdates(true), diff --git a/yarn.lock b/yarn.lock index 358f3ee..06f9468 100644 --- a/yarn.lock +++ b/yarn.lock @@ -53,9 +53,9 @@ global-tunnel-ng "^2.7.1" "@electron/remote@^2.0.8": - version "2.0.8" - resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.8.tgz#85ff321f0490222993207106e2f720273bb1a5c3" - integrity sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw== + version "2.0.9" + resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.9.tgz#092ff085407bc907f45b89a72c36faa773ccf2d9" + integrity sha512-LR0W0ID6WAKHaSs0x5LX9aiG+5pFBNAJL6eQAJfGkCuZPUa6nZz+czZLdlTDETG45CgF/0raSvCtYOYUpr6c+A== "@electron/universal@1.2.1": version "1.2.1" @@ -132,6 +132,11 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== +"@jridgewell/sourcemap-codec@^1.4.13": + version "1.4.15" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" + integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== + "@jridgewell/trace-mapping@^0.3.9": version "0.3.17" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" @@ -179,37 +184,37 @@ integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== "@rollup/plugin-commonjs@^23.0.0": - version "23.0.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-23.0.0.tgz#3f64a49409d0681cd7496a71dd6577f07d39c3b0" - integrity sha512-JbrTRyDNtLQj/rhl7RFUuYXwQ2fac+33oLDAu2k++WD95zweyo28UAomLVA0JMGx4vmCa7Nw4T6k/1F6lelExg== + version "23.0.7" + resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-23.0.7.tgz#7d26d879caa54283086de1974b66f512ef60abdc" + integrity sha512-hsSD5Qzyuat/swzrExGG5l7EuIlPhwTsT7KwKbSCQzIcJWjRxiimi/0tyMYY2bByitNb3i1p+6JWEDGa0NvT0Q== dependencies: - "@rollup/pluginutils" "^4.2.1" + "@rollup/pluginutils" "^5.0.1" commondir "^1.0.1" estree-walker "^2.0.2" glob "^8.0.3" is-reference "1.2.1" - magic-string "^0.26.4" + magic-string "^0.27.0" "@rollup/plugin-json@^5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-5.0.0.tgz#1e3e18302637760353c83a41d1f3c4e760afb20d" - integrity sha512-LsWDA5wJs/ggzakVuKQhZo7HPRcQZgBa3jWIVxQSFxaRToUGNi8ZBh3+k/gQ+1eInVYJgn4WBRCUkmoDrmmGzw== + version "5.0.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-5.0.2.tgz#d7dbbac62ff74064876b3e5d0d863cb3ad1e7cdb" + integrity sha512-D1CoOT2wPvadWLhVcmpkDnesTzjhNIQRWLsc3fA49IFOP2Y84cFOOJ+nKGYedvXHKUsPeq07HR4hXpBBr+CHlA== dependencies: - "@rollup/pluginutils" "^4.2.1" + "@rollup/pluginutils" "^5.0.1" "@rollup/plugin-node-resolve@^15.0.0": - version "15.0.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.0.tgz#44ded58b36702de27bf36bbf19ca420bbd1d0c27" - integrity sha512-iwJbzfTzlzDDQcGmkS7EkCKwe2kSkdBrjX87Fy/KrNjr6UNnLpod0t6X66e502LRe5JJCA4FFqrEscWPnZAkig== + version "15.0.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.2.tgz#8183a80c2cbf7b471f5ac86b16747997f3b5d185" + integrity sha512-Y35fRGUjC3FaurG722uhUuG8YHOJRJQbI6/CkbRkdPotSpDj9NtIN85z1zrcyDcCQIW4qp5mgG72U+gJ0TAFEg== dependencies: - "@rollup/pluginutils" "^4.2.1" + "@rollup/pluginutils" "^5.0.1" "@types/resolve" "1.20.2" deepmerge "^4.2.2" - is-builtin-module "^3.2.0" + is-builtin-module "^3.2.1" is-module "^1.0.0" resolve "^1.22.1" -"@rollup/pluginutils@4", "@rollup/pluginutils@^4.2.1": +"@rollup/pluginutils@4", "@rollup/pluginutils@^4.1.0": version "4.2.1" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d" integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ== @@ -217,6 +222,23 @@ estree-walker "^2.0.1" picomatch "^2.2.2" +"@rollup/pluginutils@^5.0.1": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz#012b8f53c71e4f6f9cb317e311df1404f56e7a33" + integrity sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA== + dependencies: + "@types/estree" "^1.0.0" + estree-walker "^2.0.2" + picomatch "^2.3.1" + +"@search-dump/jsonstream@^1.4.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@search-dump/jsonstream/-/jsonstream-1.5.0.tgz#28e1102f398ce9eaa25b49308ac5609b23cb9415" + integrity sha512-/6JGNTkedAaGCxxWPHLHLzPAv+bJdPK1X4BvdQFfjpUUu8ccwWf5reGRxGf/vPRfly24dspufAwMWkgALW3gbw== + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" + "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" @@ -261,10 +283,10 @@ dependencies: "@types/ms" "*" -"@types/estree@*": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" - integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== +"@types/estree@*", "@types/estree@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" + integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== "@types/fs-extra@^9.0.11": version "9.0.13" @@ -297,19 +319,19 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "18.11.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.2.tgz#c59b7641832531264fda3f1ba610362dc9a7dfc8" - integrity sha512-BWN3M23gLO2jVG8g/XHIRFWiiV4/GckeFIqbU/C4V3xpoBBWSMk4OZomouN0wCkfQFPqgZikyLr7DOYDysIkkw== + version "18.15.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469" + integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q== "@types/node@^14.0.1": - version "14.18.32" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.32.tgz#8074f7106731f1a12ba993fe8bad86ee73905014" - integrity sha512-Y6S38pFr04yb13qqHf8uk1nHE3lXgQ30WZbv1mLliV9pt0NjvqdWttLcrOYLnXbOafknVYRHZGoMSpR9UwfYow== + version "14.18.42" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.42.tgz#fa39b2dc8e0eba61bdf51c66502f84e23b66e114" + integrity sha512-xefu+RBie4xWlK8hwAzGh3npDz/4VhF6icY/shU+zv/1fNn+ZVG7T7CRwe9LId9sAYRPxI+59QBPuKL3WpyGRg== "@types/node@^16.11.26": - version "16.11.68" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.68.tgz#30ee923f4d940793e0380f5ce61c0bd4b7196b6c" - integrity sha512-JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ== + version "16.18.24" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.24.tgz#f21925dd56cd3467b4e1e0c5071d0f2af5e9a316" + integrity sha512-zvSN2Esek1aeLdKDYuntKAYjti9Z2oT4I8bfkLLhIxHlv3dwZ5vvATxOc31820iYm4hQRCwjUgDpwSMFjfTUnw== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -370,23 +392,15 @@ dependencies: "@types/node" "*" -JSONStream@^1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" - integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== - dependencies: - jsonparse "^1.2.0" - through ">=2.2.7 <3" - abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -ace-builds@^1.10.1: - version "1.12.3" - resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.12.3.tgz#db77530a5854ee38a0c660e9904d2cb29a247c2f" - integrity sha512-LHAsa5oOaRqmIlb8gBe81nj2kOqlfbV0XkWkFZL4mIfPXL4zoeTUcandHvBgHQCyjif3tGfoLTXelWSlnCT/dA== +ace-builds@^1.15.2: + version "1.18.0" + resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.18.0.tgz#63a06a7761966ad524adbc2daa071970e5b11bb4" + integrity sha512-ETLeQ3X1XvcWckOZFR+KvTectZyEwDm2p+CckWazS+xsK3THHVxn/PkfkPr37OTNKVY/yJRx29JGERV77YQYXw== acorn@^8.5.0: version "8.8.0" @@ -609,9 +623,9 @@ aws-sdk@2.1122.0: xml2js "0.4.19" aws-sdk@^2.0.4: - version "2.1235.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1235.0.tgz#60495275360956120ef39b25804c0e54da95414f" - integrity sha512-EV2C/GaQh1LBNnNqXfpGdyHR4/8ppQ1BnUfK9voNWMPuFHr1nJ8meIqfo+zwQE8rvGenqcZQBO0lrvauBeNBqw== + version "2.1363.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1363.0.tgz#30c3b7fe999ee2ba1103a533ea27e1b0f5708e1f" + integrity sha512-M2MZZXehgi/EMQv5GlzRkn3TlhoOYHg2cYdSAAqhjv67WaEG50MjaQy5vRvfN1i8XvB24aJFJ5pCrx69TaCaIg== dependencies: buffer "4.9.2" events "1.1.1" @@ -622,7 +636,7 @@ aws-sdk@^2.0.4: url "0.10.3" util "^0.12.4" uuid "8.0.0" - xml2js "0.4.19" + xml2js "0.5.0" aws-sign2@~0.7.0: version "0.7.0" @@ -630,14 +644,14 @@ aws-sign2@~0.7.0: integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA== aws4@^1.11.0, aws4@^1.8.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" - integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== + version "1.12.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3" + integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg== axios@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35" - integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA== + version "1.3.6" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.6.tgz#1ace9a9fb994314b5f6327960918406fa92c6646" + integrity sha512-PEcdkk7JcdPiMDkvM4K6ZBRYq9keuVJsToxm2zQIM70Qqo2WHTdJZMXcG9X+RmRp2VPNUQC8W1RAGbgt6b1yMg== dependencies: follow-redirects "^1.15.0" form-data "^4.0.0" @@ -847,7 +861,7 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" -call-bind@^1.0.0, call-bind@^1.0.2: +call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== @@ -1019,9 +1033,9 @@ compare-version@^0.1.2: integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A== compare-versions@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-5.0.1.tgz#14c6008436d994c3787aba38d4087fabe858555e" - integrity sha512-v8Au3l0b+Nwkp4G142JcgJFh1/TUhdxut7wzD1Nq1dyp5oa3tXaqb03EXOAB6jS4gMlalkjAUPZBMiAfKUixHQ== + version "5.0.3" + resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-5.0.3.tgz#a9b34fea217472650ef4a2651d905f42c28ebfd7" + integrity sha512-4UZlZP8Z99MGEY+Ovg/uJxJuvoXuN4M6B3hKaiackiHrgzQFEe3diJi1mf1PNHbFujM7FvLrK2bpgIaImbtZ1A== concat-map@0.0.1: version "0.0.1" @@ -1114,19 +1128,19 @@ decompress-response@^3.3.0: mimic-response "^1.0.0" deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + version "4.3.1" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" + integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== defer-to-connect@^1.0.1: version "1.1.3" resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== -define-properties@^1.1.3, define-properties@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" - integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== +define-properties@^1.1.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" + integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== dependencies: has-property-descriptors "^1.0.0" object-keys "^1.1.1" @@ -1230,11 +1244,11 @@ ejs@^3.1.7: jake "^10.8.5" elasticdump@^6.91.0: - version "6.91.0" - resolved "https://registry.yarnpkg.com/elasticdump/-/elasticdump-6.91.0.tgz#a2b49f6d888b4b248979900ba5053086444baedf" - integrity sha512-8JZTQq9Dn4H0hF2iHZU6gvyJ9Imzkl+d89vNxs3dPooA9Hx2rSecNm8nY1kDizRnvP0/sdMYdYVRD51Goz6wFw== + version "6.99.0" + resolved "https://registry.yarnpkg.com/elasticdump/-/elasticdump-6.99.0.tgz#c0e32e63ca0b21e4218392e2ec5a538938f8d1a9" + integrity sha512-1wMYsseM5IOBXAM1v6uxNWt7rY+2XFv1GXwvLby8bwGYIY2D8uItBw3uX8oNUH2v3WwwPwfGHzu37cPsCt8Ezg== dependencies: - JSONStream "^1.3.5" + "@search-dump/jsonstream" "^1.4.0" async "^2.6.4" aws-sdk "2.1122.0" aws4 "^1.11.0" @@ -1281,9 +1295,9 @@ electron-log@^4.4.7: integrity sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA== electron-notarize@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.2.1.tgz#347c18eca8e29dddadadee511b870c13d4008baf" - integrity sha512-u/ECWhIrhkSQpZM4cJzVZ5TsmkaqrRo5LDC/KMbGF0sPkm53Ng59+M0zp8QVaql0obfJy9vlVT+4iOkAi2UDlA== + version "1.2.2" + resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.2.2.tgz#ebf2b258e8e08c1c9f8ff61dc53d5b16b439daf4" + integrity sha512-ZStVWYcWI7g87/PgjPJSIIhwQXOaw4/XeXU+pWqMMktSLHaGMLHdyPPN7Cmao7+Cr7fYufA16npdtMndYciHNw== dependencies: debug "^4.1.1" fs-extra "^9.0.1" @@ -1329,9 +1343,9 @@ electron-updater@^5.0.1: typed-emitter "^2.1.0" electron@^21.1.1: - version "21.1.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-21.1.1.tgz#3ee427e31cccafbce45bebd32f2a8eba9e3399ca" - integrity sha512-EM2hvRJtiS3n54yx25Z0Qv54t3LGG+WjUHf1AOl+PKjQj+fmXnjIgVeIF9pM21kP1BTcyjrgvN6Sff0A45OB6A== + version "21.4.4" + resolved "https://registry.yarnpkg.com/electron/-/electron-21.4.4.tgz#46f24eae1ff99416312f4dfecf64b021524bb8e2" + integrity sha512-N5O7y7Gtt7mDgkJLkW49ETiT8M3myZ9tNIEvGTKhpBduX4WdgMj6c3hYeYBD6XW7SvbRkWEQaTl25RNday8Xpw== dependencies: "@electron/get" "^1.14.1" "@types/node" "^16.11.26" @@ -1378,45 +1392,6 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.19.0, es-abstract@^1.19.5, es-abstract@^1.20.0: - version "1.20.4" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861" - integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA== - dependencies: - call-bind "^1.0.2" - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - function.prototype.name "^1.1.5" - get-intrinsic "^1.1.3" - get-symbol-description "^1.0.0" - has "^1.0.3" - has-property-descriptors "^1.0.0" - has-symbols "^1.0.3" - internal-slot "^1.0.3" - is-callable "^1.2.7" - is-negative-zero "^2.0.2" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" - is-string "^1.0.7" - is-weakref "^1.0.2" - object-inspect "^1.12.2" - object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.4.3" - safe-regex-test "^1.0.0" - string.prototype.trimend "^1.0.5" - string.prototype.trimstart "^1.0.5" - unbox-primitive "^1.0.2" - -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - es6-error@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" @@ -1632,21 +1607,6 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== -function.prototype.name@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" - integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.0" - functions-have-names "^1.2.2" - -functions-have-names@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" - integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== - gauge@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395" @@ -1688,10 +1648,10 @@ get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" - integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" + integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -1721,14 +1681,6 @@ get-stream@^5.1.0: dependencies: pump "^3.0.0" -get-symbol-description@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" - integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" - getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" @@ -1756,9 +1708,9 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: path-is-absolute "^1.0.0" glob@^8.0.3: - version "8.0.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" - integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -1816,6 +1768,13 @@ globule@^1.0.0: lodash "^4.17.21" minimatch "~3.0.2" +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + got@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" @@ -1833,11 +1792,16 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.6: +graceful-fs@^4.1.11, graceful-fs@^4.1.3, graceful-fs@^4.2.6: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== +graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== + "graceful-readlink@>= 1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" @@ -1861,11 +1825,6 @@ hard-rejection@^2.1.0: resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== -has-bigints@^1.0.1, has-bigints@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" - integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -1931,7 +1890,12 @@ hsl-to-rgb-for-reals@^1.1.0: resolved "https://registry.yarnpkg.com/hsl-to-rgb-for-reals/-/hsl-to-rgb-for-reals-1.1.1.tgz#e1eb23f6b78016e3722431df68197e6dcdc016d9" integrity sha512-LgOWAkrN0rFaQpfdWBQlv/VhkOxb5AsBjk6NQVx4yEzWS923T07X0M1Y0VNko2H52HeSpZrZNNMJ0aFqsdVzQg== -http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0: +http-cache-semantics@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" + integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== + +http-cache-semantics@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== @@ -1964,9 +1928,9 @@ http-signature@~1.2.0: sshpk "^1.7.0" http-status@^1.5.1: - version "1.5.3" - resolved "https://registry.yarnpkg.com/http-status/-/http-status-1.5.3.tgz#9d1f6adcd1a609f535679f6e1b82811b96c3306e" - integrity sha512-jCClqdnnwigYslmtfb28vPplOgoiZ0siP2Z8C5Ua+3UKbx410v+c+jT+jh1bbI4TvcEySuX0vd/CfFZFbDkJeQ== + version "1.6.2" + resolved "https://registry.yarnpkg.com/http-status/-/http-status-1.6.2.tgz#6dc05188a9856d67d96e48e8b4fd645c719ce82a" + integrity sha512-oUExvfNckrpTpDazph7kNG8sQi5au3BeTo0idaZFXEhTaJKu7GNJCLHI0rYY2wljm548MSTM+Ljj/c6anqu2zQ== https-proxy-agent@^5.0.0: version "5.0.1" @@ -2056,15 +2020,6 @@ install@^0.13.0: resolved "https://registry.yarnpkg.com/install/-/install-0.13.0.tgz#6af6e9da9dd0987de2ab420f78e60d9c17260776" integrity sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA== -internal-slot@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" - integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== - dependencies: - get-intrinsic "^1.1.0" - has "^1.0.3" - side-channel "^1.0.4" - ip-address@~6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-6.1.0.tgz#3c3335bc90f22b3545a6eca5bffefabeb2ea6fd2" @@ -2092,13 +2047,6 @@ is-arrayish@^0.2.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== -is-bigint@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" - integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== - dependencies: - has-bigints "^1.0.1" - is-binary-path@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" @@ -2106,22 +2054,14 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" -is-boolean-object@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" - integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-builtin-module@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.0.tgz#bb0310dfe881f144ca83f30100ceb10cf58835e0" - integrity sha512-phDA4oSGt7vl1n5tJvTWooWWAsXLY+2xCnxNqvKhGEzujg+A43wPlPOyDg3C8XQHN+6k/JTQWJ/j0dQh/qr+Hw== +is-builtin-module@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169" + integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A== dependencies: builtin-modules "^3.3.0" -is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: +is-callable@^1.1.3: version "1.2.7" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== @@ -2133,20 +2073,20 @@ is-ci@^3.0.0: dependencies: ci-info "^3.2.0" -is-core-module@^2.5.0, is-core-module@^2.9.0: +is-core-module@^2.11.0, is-core-module@^2.9.0: + version "2.12.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4" + integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ== + dependencies: + has "^1.0.3" + +is-core-module@^2.5.0: version "2.11.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== dependencies: has "^1.0.3" -is-date-object@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== - dependencies: - has-tostringtag "^1.0.0" - is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -2181,18 +2121,6 @@ is-module@^1.0.0: resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g== -is-negative-zero@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" - integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== - -is-number-object@^1.0.4: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" - integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== - dependencies: - has-tostringtag "^1.0.0" - is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -2210,44 +2138,15 @@ is-reference@1.2.1: dependencies: "@types/estree" "*" -is-regex@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-shared-array-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" - integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== - dependencies: - call-bind "^1.0.2" - -is-string@^1.0.5, is-string@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" - integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== - dependencies: - has-tostringtag "^1.0.0" - -is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" - integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== - dependencies: - has-symbols "^1.0.2" - -is-typed-array@^1.1.3, is-typed-array@^1.1.9: - version "1.1.9" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.9.tgz#246d77d2871e7d9f5aeb1d54b9f52c71329ece67" - integrity sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A== +is-typed-array@^1.1.10, is-typed-array@^1.1.3: + version "1.1.10" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f" + integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A== dependencies: available-typed-arrays "^1.0.5" call-bind "^1.0.2" - es-abstract "^1.20.0" for-each "^0.3.3" + gopd "^1.0.1" has-tostringtag "^1.0.0" is-typedarray@~1.0.0: @@ -2255,13 +2154,6 @@ is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== -is-weakref@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" - integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== - dependencies: - call-bind "^1.0.2" - isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -2381,16 +2273,16 @@ json5@^2.2.0: integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== jsoneditor@^9.8.0: - version "9.9.2" - resolved "https://registry.yarnpkg.com/jsoneditor/-/jsoneditor-9.9.2.tgz#176112f71acbf37e977aae8656a17bc33a7a4269" - integrity sha512-hdM6bgGh3fqnbAEgO1zXM3bNdYfFH/9nPWWJYdNP/wyRU9H+t3Wvb+VtBBE8XjkBYv0rIYjeaYgrwDRaXC3zig== + version "9.10.0" + resolved "https://registry.yarnpkg.com/jsoneditor/-/jsoneditor-9.10.0.tgz#954c3fcf2cf0cef88bbd409304e41379270b93df" + integrity sha512-vmVSD3ubZ8jwkiDKVW5MB5ESI/MUm4trVUw5WnT4j5FV6m81liA2YfQ0l84PlN4qJ3DCeYWFWfprOUoCjzkDhQ== dependencies: - ace-builds "^1.10.1" + ace-builds "^1.15.2" ajv "^6.12.6" javascript-natural-sort "^0.7.1" jmespath "^0.16.0" json-source-map "^0.6.1" - jsonrepair "^2.2.1" + jsonrepair "^3.0.2" mobius1-selectr "^2.4.13" picomodal "^3.0.0" vanilla-picker "^2.12.1" @@ -2416,10 +2308,10 @@ jsonparse@^1.2.0: resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== -jsonrepair@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/jsonrepair/-/jsonrepair-2.2.1.tgz#7c6257c36550a310150c41ab7d5d4cab71828456" - integrity sha512-o9Je8TceILo872uQC9fIBJm957j1Io7z8Ca1iWIqY6S5S65HGE9XN7XEEw7+tUviB9Vq4sygV89MVTxl+rhZyg== +jsonrepair@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/jsonrepair/-/jsonrepair-3.0.3.tgz#f1fb6ad7af6a4409494227a6b6a61452e9c1d24f" + integrity sha512-3Rhz4/UXWBSERKVCPzbfoIQ7CPdKCKkzvcjJdtoRn+aazf1o8dnpGl+PoT58kekOP8EIaA0o/zt70qFqEE3fVA== jsprim@^1.2.2: version "1.4.2" @@ -2564,12 +2456,12 @@ magic-string@^0.25.2, magic-string@^0.25.7: dependencies: sourcemap-codec "^1.4.8" -magic-string@^0.26.4: - version "0.26.7" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.7.tgz#caf7daf61b34e9982f8228c4527474dac8981d6f" - integrity sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow== +magic-string@^0.27.0: + version "0.27.0" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3" + integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA== dependencies: - sourcemap-codec "^1.4.8" + "@jridgewell/sourcemap-codec" "^1.4.13" make-fetch-happen@^9.1.0: version "9.1.0" @@ -2680,9 +2572,9 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: brace-expansion "^1.1.7" minimatch@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" - integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== dependencies: brace-expansion "^2.0.1" @@ -2702,7 +2594,12 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.6: +minimist@^1.1.0, minimist@^1.2.6: + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + +minimist@^1.2.0: version "1.2.7" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== @@ -2937,26 +2834,11 @@ object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -object-inspect@^1.12.2, object-inspect@^1.9.0: - version "1.12.2" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" - integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== - object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object.assign@^4.1.4: - version "4.1.4" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" - integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - has-symbols "^1.0.3" - object-keys "^1.1.1" - once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -3068,7 +2950,7 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -3148,9 +3030,9 @@ punycode@1.3.2: integrity sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw== punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== qs@~6.5.2: version "6.5.3" @@ -3204,7 +3086,7 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -readable-stream@^2.0.1, readable-stream@^2.3.0: +readable-stream@^2.0.1: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -3217,6 +3099,19 @@ readable-stream@^2.0.1, readable-stream@^2.3.0: string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@^2.3.0: + version "2.3.8" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" + integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" @@ -3241,15 +3136,6 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" -regexp.prototype.flags@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" - integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - functions-have-names "^1.2.2" - request@2.88.2, request@^2.88.0: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" @@ -3289,12 +3175,12 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== -require-relative@^0.8.7: - version "0.8.7" - resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de" - integrity sha512-AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg== +resolve.exports@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" + integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg== -resolve@^1.10.0, resolve@^1.22.1: +resolve@^1.10.0: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -3303,6 +3189,15 @@ resolve@^1.10.0, resolve@^1.22.1: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +resolve@^1.22.1: + version "1.22.2" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" + integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== + dependencies: + is-core-module "^2.11.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -3364,12 +3259,12 @@ rollup-plugin-replace@^2.2.0: rollup-pluginutils "^2.6.0" rollup-plugin-svelte@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-svelte/-/rollup-plugin-svelte-7.1.0.tgz#d45f2b92b1014be4eb46b55aa033fb9a9c65f04d" - integrity sha512-vopCUq3G+25sKjwF5VilIbiY6KCuMNHP1PFvx2Vr3REBNMDllKHFZN2B9jwwC+MqNc3UPKkjXnceLPEjTjXGXg== + version "7.1.4" + resolved "https://registry.yarnpkg.com/rollup-plugin-svelte/-/rollup-plugin-svelte-7.1.4.tgz#abd71aebe709c3d5f1e50ad98d9399ee18bdeb41" + integrity sha512-Jm0FCydR7k8bBGe7wimXAes8x2zEK10Ew3f3lEZwYor/Zya3X0AZVeSAPRH7yiXB9hWQVzJu597EUeNwGDTdjQ== dependencies: - require-relative "^0.8.7" - rollup-pluginutils "^2.8.2" + "@rollup/pluginutils" "^4.1.0" + resolve.exports "^2.0.0" rollup-plugin-terser@^7.0.2: version "7.0.2" @@ -3381,7 +3276,7 @@ rollup-plugin-terser@^7.0.2: serialize-javascript "^4.0.0" terser "^5.0.0" -rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.2: +rollup-pluginutils@^2.6.0: version "2.8.2" resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e" integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ== @@ -3389,9 +3284,9 @@ rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.2: estree-walker "^0.6.1" rollup@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.2.3.tgz#67d894c981ad50cc811779748e52c05742560c64" - integrity sha512-qfadtkY5kl0F5e4dXVdj2D+GtOdifasXHFMiL1SMf9ADQDv5Eti6xReef9FKj+iQPR2pvtqWna57s/PjARY4fg== + version "3.20.7" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.20.7.tgz#4f045dfb388abe08dd159f8cd286dcaca1e80b28" + integrity sha512-P7E2zezKSLhWnTz46XxjSmInrbOCiul1yf+kJccMxT56vxjHwCbDfoLbiqFgu+WQoo9ij2PkraYaBstgB2prBA== optionalDependencies: fsevents "~2.3.2" @@ -3442,15 +3337,6 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-regex-test@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295" - integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.3" - is-regex "^1.1.4" - "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -3521,7 +3407,14 @@ semver@^6.2.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: +semver@^7.3.2: + version "7.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0" + integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA== + dependencies: + lru-cache "^6.0.0" + +semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: version "7.3.8" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== @@ -3564,15 +3457,6 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== - dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" - signal-exit@^3.0.0, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" @@ -3777,24 +3661,6 @@ storeon@^3.1.5: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string.prototype.trimend@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0" - integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.19.5" - -string.prototype.trimstart@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef" - integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.19.5" - string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -3867,9 +3733,9 @@ svelte-select@^4.4.7: integrity sha512-fIf9Z8rPI6F8naHZ9wjXT0Pv5gLyhdHAFkHFJnCfVVfELE8e82uOoF0xEVQP6Kir+b4Q5yOvNAzZ61WbSU6A0A== svelte@^3.48.0: - version "3.52.0" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.52.0.tgz#08259eff20904c63882b66a5d409a55e8c6743b8" - integrity sha512-FxcnEUOAVfr10vDU5dVgJN19IvqeHQCS1zfe8vayTfis9A2t5Fhx+JDe5uv/C3j//bB1umpLJ6quhgs9xyUbCQ== + version "3.58.0" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.58.0.tgz#d3e6f103efd6129e51c7d709225ad3b4c052b64e" + integrity sha512-brIBNNB76mXFmU/Kerm4wFnkskBbluBDCjx/8TcpYRb298Yh2dztS2kQ6bhtjMcvUhd5ynClfwpz5h2gnzdQ1A== tar@^6.0.2, tar@^6.1.11, tar@^6.1.2: version "6.1.11" @@ -4018,16 +3884,6 @@ typed-emitter@^2.1.0: optionalDependencies: rxjs "^7.5.2" -unbox-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" - integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== - dependencies: - call-bind "^1.0.2" - has-bigints "^1.0.2" - has-symbols "^1.0.3" - which-boxed-primitive "^1.0.2" - unique-filename@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" @@ -4156,28 +4012,17 @@ verror@^1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -which-boxed-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" - integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== - dependencies: - is-bigint "^1.0.1" - is-boolean-object "^1.1.0" - is-number-object "^1.0.4" - is-string "^1.0.5" - is-symbol "^1.0.3" - which-typed-array@^1.1.2: - version "1.1.8" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.8.tgz#0cfd53401a6f334d90ed1125754a42ed663eb01f" - integrity sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw== + version "1.1.9" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" + integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA== dependencies: available-typed-arrays "^1.0.5" call-bind "^1.0.2" - es-abstract "^1.20.0" for-each "^0.3.3" + gopd "^1.0.1" has-tostringtag "^1.0.0" - is-typed-array "^1.1.9" + is-typed-array "^1.1.10" which@^2.0.1, which@^2.0.2: version "2.0.2" @@ -4229,11 +4074,24 @@ xml2js@0.4.19: sax ">=0.6.0" xmlbuilder "~9.0.1" +xml2js@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7" + integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA== + dependencies: + sax ">=0.6.0" + xmlbuilder "~11.0.0" + xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: version "15.1.1" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== +xmlbuilder@~11.0.0: + version "11.0.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" + integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== + xmlbuilder@~9.0.1: version "9.0.7" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" From 5d371ca3dbbf33441f6feb7992496d1697f68f0a Mon Sep 17 00:00:00 2001 From: Anton Korotkov Date: Thu, 10 Aug 2023 12:58:54 +0200 Subject: [PATCH 03/11] packages upgrade minor --- package.json | 14 +++---- yarn.lock | 109 ++++++++++++++++++++++----------------------------- 2 files changed, 53 insertions(+), 70 deletions(-) diff --git a/package.json b/package.json index 70e3f96..0ebcaf1 100644 --- a/package.json +++ b/package.json @@ -63,18 +63,18 @@ } }, "dependencies": { - "@electron/remote": "^2.0.8", + "@electron/remote": "^2.0.10", "@storeon/router": "^2.0.1", "@storeon/svelte": "^1.0.0", - "axios": "^1.1.3", + "axios": "^1.4.0", "btoa": "^1.2.1", "compare-versions": "^5.0.1", - "elasticdump": "^6.91.0", + "elasticdump": "^6.103.0", "electron-log": "^4.4.7", "electron-updater": "^5.0.1", "frappe-charts": "^1.6.2", "https": "^1.0.0", - "jsoneditor": "^9.8.0", + "jsoneditor": "^9.10.2", "local-storage": "^2.0.0", "lodash": "^4.17.21", "node-localstorage": "^2.1.6", @@ -87,16 +87,16 @@ "devDependencies": { "@rollup/plugin-commonjs": "^23.0.0", "@rollup/plugin-json": "^5.0.0", - "@rollup/plugin-node-resolve": "^15.0.0", + "@rollup/plugin-node-resolve": "^15.1.0", "electron": "^21.1.1", "electron-builder": "^23.0.3", "electron-notarize": "^1.2.1", "node-sass": "^7.0.1", - "rollup": "^3.2.3", + "rollup": "^3.28.0", "rollup-plugin-css-only": "^3.1.0", "rollup-plugin-livereload": "^2.0.0", "rollup-plugin-replace": "^2.2.0", - "rollup-plugin-svelte": "^7.1.0", + "rollup-plugin-svelte": "^7.1.6", "rollup-plugin-terser": "^7.0.2", "svelte": "^3.48.0", "svelte-preprocess": "^4.10.7" diff --git a/yarn.lock b/yarn.lock index 06f9468..0c0fce0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -52,10 +52,10 @@ global-agent "^3.0.0" global-tunnel-ng "^2.7.1" -"@electron/remote@^2.0.8": - version "2.0.9" - resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.9.tgz#092ff085407bc907f45b89a72c36faa773ccf2d9" - integrity sha512-LR0W0ID6WAKHaSs0x5LX9aiG+5pFBNAJL6eQAJfGkCuZPUa6nZz+czZLdlTDETG45CgF/0raSvCtYOYUpr6c+A== +"@electron/remote@^2.0.10": + version "2.0.10" + resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.10.tgz#133e2f607b1861ac249bd78b5abd1e961feed713" + integrity sha512-3SFKKaQXcyWgwmibud+UqJl/XlHOgLcI3fwtB9pNelPSJAcTxocOJrF6FaxBIQaj1+R05Di6xuAswZpXAW7xhA== "@electron/universal@1.2.1": version "1.2.1" @@ -202,10 +202,10 @@ dependencies: "@rollup/pluginutils" "^5.0.1" -"@rollup/plugin-node-resolve@^15.0.0": - version "15.0.2" - resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.2.tgz#8183a80c2cbf7b471f5ac86b16747997f3b5d185" - integrity sha512-Y35fRGUjC3FaurG722uhUuG8YHOJRJQbI6/CkbRkdPotSpDj9NtIN85z1zrcyDcCQIW4qp5mgG72U+gJ0TAFEg== +"@rollup/plugin-node-resolve@^15.1.0": + version "15.1.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.1.0.tgz#9ffcd8e8c457080dba89bb9fcb583a6778dc757e" + integrity sha512-xeZHCgsiZ9pzYVgAo9580eCGqwh/XCEUM9q6iQfGNocjgkufHAqC3exA+45URvhiYV8sBF9RlBai650eNs7AsA== dependencies: "@rollup/pluginutils" "^5.0.1" "@types/resolve" "1.20.2" @@ -397,10 +397,10 @@ abbrev@1: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -ace-builds@^1.15.2: - version "1.18.0" - resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.18.0.tgz#63a06a7761966ad524adbc2daa071970e5b11bb4" - integrity sha512-ETLeQ3X1XvcWckOZFR+KvTectZyEwDm2p+CckWazS+xsK3THHVxn/PkfkPr37OTNKVY/yJRx29JGERV77YQYXw== +ace-builds@^1.20.0: + version "1.24.0" + resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.24.0.tgz#2e30b3530d486ac3cee6e5531c4b3d34baa382b3" + integrity sha512-PdM2yG0zK4KBndvZw0Nc0wRLv/U0/HVVzyC9GpZNgsAaNokbcFQYtMIl3lLtkAxXa+fuePyEaFySNQej+WYEFg== acorn@^8.5.0: version "8.8.0" @@ -607,10 +607,10 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -aws-sdk@2.1122.0: - version "2.1122.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1122.0.tgz#5d53e6937f59de9f153e72a8ea3b6df9d97daf9d" - integrity sha512-545VawhsCQ7yEx9jZKV0hTTW3FS/waycISWMvnNwqRfpU9o4FQ4DSu3je7ekn5yFKM+91dxJC+IfJgtIV8WaUw== +aws-sdk@2.1357.0: + version "2.1357.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1357.0.tgz#779628a6e2db847f2fbb3687f01c7557b92cc581" + integrity sha512-bSOfBCVPQ/0NWYpPl34MgqMbJf0eO6PsyVlmjbStlba+98hnE6X7z67tawBRot7S+qH3L49KW2u6dfJjvhDfdQ== dependencies: buffer "4.9.2" events "1.1.1" @@ -619,8 +619,9 @@ aws-sdk@2.1122.0: querystring "0.2.0" sax "1.2.1" url "0.10.3" - uuid "3.3.2" - xml2js "0.4.19" + util "^0.12.4" + uuid "8.0.0" + xml2js "0.5.0" aws-sdk@^2.0.4: version "2.1363.0" @@ -648,10 +649,10 @@ aws4@^1.11.0, aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3" integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg== -axios@^1.1.3: - version "1.3.6" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.6.tgz#1ace9a9fb994314b5f6327960918406fa92c6646" - integrity sha512-PEcdkk7JcdPiMDkvM4K6ZBRYq9keuVJsToxm2zQIM70Qqo2WHTdJZMXcG9X+RmRp2VPNUQC8W1RAGbgt6b1yMg== +axios@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f" + integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA== dependencies: follow-redirects "^1.15.0" form-data "^4.0.0" @@ -1243,14 +1244,14 @@ ejs@^3.1.7: dependencies: jake "^10.8.5" -elasticdump@^6.91.0: - version "6.99.0" - resolved "https://registry.yarnpkg.com/elasticdump/-/elasticdump-6.99.0.tgz#c0e32e63ca0b21e4218392e2ec5a538938f8d1a9" - integrity sha512-1wMYsseM5IOBXAM1v6uxNWt7rY+2XFv1GXwvLby8bwGYIY2D8uItBw3uX8oNUH2v3WwwPwfGHzu37cPsCt8Ezg== +elasticdump@^6.103.0: + version "6.103.0" + resolved "https://registry.yarnpkg.com/elasticdump/-/elasticdump-6.103.0.tgz#8eb4b6f6058a9dd00731c2ced615cbe8ca986e93" + integrity sha512-sBTxGvlI3/u49Sv83RRe/NSijctT6SiCuoqed5sKfCYsM1DnlOi8QT3Kjg4igc4J+L3Vp0kQ+8aPEXhrLBL31w== dependencies: "@search-dump/jsonstream" "^1.4.0" async "^2.6.4" - aws-sdk "2.1122.0" + aws-sdk "2.1357.0" aws4 "^1.11.0" big.js "^5.2.2" bytes "^3.1.2" @@ -2272,17 +2273,17 @@ json5@^2.2.0: resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== -jsoneditor@^9.8.0: - version "9.10.0" - resolved "https://registry.yarnpkg.com/jsoneditor/-/jsoneditor-9.10.0.tgz#954c3fcf2cf0cef88bbd409304e41379270b93df" - integrity sha512-vmVSD3ubZ8jwkiDKVW5MB5ESI/MUm4trVUw5WnT4j5FV6m81liA2YfQ0l84PlN4qJ3DCeYWFWfprOUoCjzkDhQ== +jsoneditor@^9.10.2: + version "9.10.2" + resolved "https://registry.yarnpkg.com/jsoneditor/-/jsoneditor-9.10.2.tgz#c8c3acb59d674931971f059f7c7015c52e5e7460" + integrity sha512-sT9U8T9MB7We5uyCnofugqYPJtQ5rPJngFlvpdtyFTFKFjOMnlWE1jVhFwjTXwGBoFeiLS+S6rVuhIhJ35Jutw== dependencies: - ace-builds "^1.15.2" + ace-builds "^1.20.0" ajv "^6.12.6" javascript-natural-sort "^0.7.1" jmespath "^0.16.0" json-source-map "^0.6.1" - jsonrepair "^3.0.2" + jsonrepair "^3.1.0" mobius1-selectr "^2.4.13" picomodal "^3.0.0" vanilla-picker "^2.12.1" @@ -2308,10 +2309,10 @@ jsonparse@^1.2.0: resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== -jsonrepair@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/jsonrepair/-/jsonrepair-3.0.3.tgz#f1fb6ad7af6a4409494227a6b6a61452e9c1d24f" - integrity sha512-3Rhz4/UXWBSERKVCPzbfoIQ7CPdKCKkzvcjJdtoRn+aazf1o8dnpGl+PoT58kekOP8EIaA0o/zt70qFqEE3fVA== +jsonrepair@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/jsonrepair/-/jsonrepair-3.2.0.tgz#ca1b6fdd23ae76bb8c82742f7a5773a7cef3d651" + integrity sha512-6eHBc2z5vipym4S8rzTcCXQBLWpkSzi9bk7I3xTdUxRzXyYvfjoVZzJ97N4C/9vcKI9NgNp3slPwHufDr0rFYw== jsprim@^1.2.2: version "1.4.2" @@ -3258,10 +3259,10 @@ rollup-plugin-replace@^2.2.0: magic-string "^0.25.2" rollup-pluginutils "^2.6.0" -rollup-plugin-svelte@^7.1.0: - version "7.1.4" - resolved "https://registry.yarnpkg.com/rollup-plugin-svelte/-/rollup-plugin-svelte-7.1.4.tgz#abd71aebe709c3d5f1e50ad98d9399ee18bdeb41" - integrity sha512-Jm0FCydR7k8bBGe7wimXAes8x2zEK10Ew3f3lEZwYor/Zya3X0AZVeSAPRH7yiXB9hWQVzJu597EUeNwGDTdjQ== +rollup-plugin-svelte@^7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/rollup-plugin-svelte/-/rollup-plugin-svelte-7.1.6.tgz#44a4ea6c6e8ed976824d9fd40c78d048515e5838" + integrity sha512-nVFRBpGWI2qUY1OcSiEEA/kjCY2+vAjO9BI8SzA7NRrh2GTunLd6w2EYmnMt/atgdg8GvcNjLsmZmbQs/u4SQA== dependencies: "@rollup/pluginutils" "^4.1.0" resolve.exports "^2.0.0" @@ -3283,10 +3284,10 @@ rollup-pluginutils@^2.6.0: dependencies: estree-walker "^0.6.1" -rollup@^3.2.3: - version "3.20.7" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.20.7.tgz#4f045dfb388abe08dd159f8cd286dcaca1e80b28" - integrity sha512-P7E2zezKSLhWnTz46XxjSmInrbOCiul1yf+kJccMxT56vxjHwCbDfoLbiqFgu+WQoo9ij2PkraYaBstgB2prBA== +rollup@^3.28.0: + version "3.28.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.28.0.tgz#a3c70004b01934760c0cb8df717c7a1d932389a2" + integrity sha512-d7zhvo1OUY2SXSM6pfNjgD5+d0Nz87CUp4mt8l/GgVP3oBsPwzNvSzyu1me6BSG9JIgWNTVcafIXBIyM8yQ3yw== optionalDependencies: fsevents "~2.3.2" @@ -3959,11 +3960,6 @@ util@^0.12.4: is-typed-array "^1.1.3" which-typed-array "^1.1.2" -uuid@3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" - integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== - uuid@8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c" @@ -4066,14 +4062,6 @@ ws@^7.4.3: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== -xml2js@0.4.19: - version "0.4.19" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" - integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q== - dependencies: - sax ">=0.6.0" - xmlbuilder "~9.0.1" - xml2js@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7" @@ -4092,11 +4080,6 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== -xmlbuilder@~9.0.1: - version "9.0.7" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" - integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ== - y18n@^5.0.5: version "5.0.8" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" From 07a19feed617878f0c7ae5a0d29c2f75685bd658 Mon Sep 17 00:00:00 2001 From: Anton Korotkov Date: Fri, 11 Aug 2023 11:40:34 +0200 Subject: [PATCH 04/11] support of servers with self-signed ssl certificates --- app/dumper/dumper.js | 2 +- app/requests-node-proxy.js | 53 ++++++++++++++++++++++++++++++++++++++ main.js | 6 +++-- notarize.js | 22 ++++++++-------- package.json | 2 +- src/api/elasticsearch.js | 15 ++++++----- src/utils/helpers.js | 31 ---------------------- 7 files changed, 79 insertions(+), 52 deletions(-) create mode 100644 app/requests-node-proxy.js diff --git a/app/dumper/dumper.js b/app/dumper/dumper.js index 2e9a0ed..d28391f 100644 --- a/app/dumper/dumper.js +++ b/app/dumper/dumper.js @@ -4,7 +4,7 @@ const { Options } = require('./Options') const get = require('lodash/get') const isArray = require('lodash/isArray') const { trackEvent } = require('../analytics') - +process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0' const logError = console.error const init = (messaging, win) => { diff --git a/app/requests-node-proxy.js b/app/requests-node-proxy.js new file mode 100644 index 0000000..d383772 --- /dev/null +++ b/app/requests-node-proxy.js @@ -0,0 +1,53 @@ +const { default: axios } = require("axios") +const { Agent } = require("https") + +/** + * + * @param {*} connection + */ +const buildConnectionHeaders = connection => { + const { useAuth, user, password, addHeaders, headers } = connection + + let headersObject = {} + + if (useAuth) { + headersObject.Authorization = `Basic ${btoa(`${user}:${password}`)}` + } + + if (addHeaders && headers.length) { + for (const header of headers) { + headersObject[header.name] = header.value + } + } + + return headersObject +} + +/** + * + * @param {*} connection + */ +const buildConnectionUrl = connection => { + const { host, port } = connection + return `${host.replace(/\/+$/, '')}${Number(port) > 0 ? `:${port}` : ''}` +} + +const init = messaging => { + let client; + + messaging.respond('elastic-request-client-init', (__, connection) => { + client = axios.create({ + baseURL: buildConnectionUrl(connection), + headers: buildConnectionHeaders(connection), + httpsAgent: new Agent({ + rejectUnauthorized: false + }) + }) + }); + + messaging.respond('elastic-request', (__, method, ...args) => { + return client[method](...args).then(({ data }) => ({ data })); + }) +} + +module.exports = { init } \ No newline at end of file diff --git a/main.js b/main.js index d465ab7..5381d3f 100644 --- a/main.js +++ b/main.js @@ -3,8 +3,9 @@ const { app, BrowserWindow, Menu } = require('electron') const pkg = require('./package.json') const { trackEvent } = require('./app/analytics') const updater = require('./app/updater') -const messanger = require('./app/ipc-main') +const messenger = require('./app/ipc-main') const dumper = require('./app/dumper/dumper') +const elasticProxy = require('./app/requests-node-proxy'); require('@electron/remote/main').initialize() global['trackEvent'] = trackEvent @@ -84,7 +85,7 @@ const createWindow = () => { app.whenReady().then(() => { const window = createWindow() - const messaging = messanger(window) + const messaging = messenger(window) require('@electron/remote/main').enable(window.webContents) @@ -104,4 +105,5 @@ app.whenReady().then(() => { }) dumper.init(messaging, window) + elasticProxy.init(messaging) }) diff --git a/notarize.js b/notarize.js index 42ff4de..e44d2ea 100644 --- a/notarize.js +++ b/notarize.js @@ -2,15 +2,15 @@ require('dotenv').config() const { notarize } = require('electron-notarize') exports.default = async function notarizing(context) { - const { electronPlatformName, appOutDir } = context - if (electronPlatformName !== 'darwin') { - return - } - const appName = context.packager.appInfo.productFilename - return await notarize({ - appBundleId: 'com.elastron.www', - appPath: `${appOutDir}/${appName}.app`, - appleId: process.env.APPLEID, - appleIdPassword: process.env.APPLEIDPASS, - }) + // const { electronPlatformName, appOutDir } = context + // if (electronPlatformName !== 'darwin') { + // return + // } + // const appName = context.packager.appInfo.productFilename + // return await notarize({ + // appBundleId: 'com.elastron.www', + // appPath: `${appOutDir}/${appName}.app`, + // appleId: process.env.APPLEID, + // appleIdPassword: process.env.APPLEIDPASS, + // }) } diff --git a/package.json b/package.json index 0ebcaf1..03ff252 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Elastron", - "version": "1.4.5", + "version": "1.5.0", "description": "Full featured elasticsearch client", "main": "main.js", "scripts": { diff --git a/src/api/elasticsearch.js b/src/api/elasticsearch.js index 0bbfe19..41bc0be 100644 --- a/src/api/elasticsearch.js +++ b/src/api/elasticsearch.js @@ -1,6 +1,5 @@ -import axios from 'axios' import get from 'lodash/get' -import { buildConnectionHeaders, buildConnectionUrl } from '../utils/helpers' +import ipcRenderer from '../api/ipc-renderer' export default class API { /** @@ -8,10 +7,14 @@ export default class API { * @param {*} connection */ constructor(connection) { - this.client = axios.create({ - baseURL: buildConnectionUrl(connection), - headers: buildConnectionHeaders(connection), - }) + ipcRenderer.run('elastic-request-client-init', connection); + + this.client = { + get: (...args) => ipcRenderer.run('elastic-request', 'get', ...args), + post: (...args) => ipcRenderer.run('elastic-request', 'post', ...args), + put: (...args) => ipcRenderer.run('elastic-request', 'put', ...args), + delete: (...args) => ipcRenderer.run('elastic-request', 'delete', ...args), + }; } /** diff --git a/src/utils/helpers.js b/src/utils/helpers.js index 7d19772..9be7ead 100644 --- a/src/utils/helpers.js +++ b/src/utils/helpers.js @@ -75,34 +75,3 @@ export const getIndexListFromIndexData = indexData => { export const randomId = () => { return Math.random().toString() } - -/** - * - * @param {*} connection - */ -export const buildConnectionHeaders = connection => { - const { useAuth, user, password, addHeaders, headers } = connection - - let headersObject = {} - - if (useAuth) { - headersObject.Authorization = `Basic ${btoa(`${user}:${password}`)}` - } - - if (addHeaders && headers.length) { - for (const header of headers) { - headersObject[header.name] = header.value - } - } - - return headersObject -} - -/** - * - * @param {*} connection - */ -export const buildConnectionUrl = connection => { - const { host, port } = connection - return `${host.replace(/\/+$/, '')}${Number(port) > 0 ? `:${port}` : ''}` -} From 2d9ba1fd5432c9e3c2354abbc4a803831a24e980 Mon Sep 17 00:00:00 2001 From: Anton Korotkov Date: Wed, 2 Oct 2024 21:32:02 +0200 Subject: [PATCH 05/11] updated packages and fixed connection error display --- app/ipc-main.js | 26 +- app/requests-node-proxy.js | 65 ++-- main.js | 160 ++++----- package.json | 214 ++++++------ src/api/elasticsearch.js | 662 ++++++++++++++++++------------------- src/api/ipc-renderer.js | 35 +- yarn.lock | 317 ++++++++++++++---- 7 files changed, 841 insertions(+), 638 deletions(-) diff --git a/app/ipc-main.js b/app/ipc-main.js index d9df822..7401817 100644 --- a/app/ipc-main.js +++ b/app/ipc-main.js @@ -1,25 +1,25 @@ const { ipcMain } = require('electron') class MessagingAPI { - constructor(mainWindow) { - this.window = mainWindow - } + constructor(mainWindow) { + this.window = mainWindow + } - listen(eventName, callbackFunction) { - ipcMain.on(eventName, callbackFunction) - } + listen(eventName, callbackFunction) { + ipcMain.on(eventName, callbackFunction) + } - send(eventName, ...messageData) { - this.window.webContents.send(eventName, ...messageData) - } + send(eventName, ...messageData) { + this.window.webContents.send(eventName, ...messageData) + } - respond(eventName, callbackFunction) { - ipcMain.handle(eventName, callbackFunction) - } + respond(eventName, callbackFunction) { + ipcMain.handle(eventName, callbackFunction) + } } const init = mainWindow => { - return new MessagingAPI(mainWindow) + return new MessagingAPI(mainWindow) } module.exports = init diff --git a/app/requests-node-proxy.js b/app/requests-node-proxy.js index d383772..56733e8 100644 --- a/app/requests-node-proxy.js +++ b/app/requests-node-proxy.js @@ -1,26 +1,26 @@ const { default: axios } = require("axios") const { Agent } = require("https") +const get = require("lodash/get") /** - * * @param {*} connection */ const buildConnectionHeaders = connection => { - const { useAuth, user, password, addHeaders, headers } = connection + const { useAuth, user, password, addHeaders, headers } = connection - let headersObject = {} + let headersObject = {} - if (useAuth) { - headersObject.Authorization = `Basic ${btoa(`${user}:${password}`)}` - } + if (useAuth) { + headersObject.Authorization = `Basic ${btoa(`${user}:${password}`)}` + } - if (addHeaders && headers.length) { - for (const header of headers) { - headersObject[header.name] = header.value + if (addHeaders && headers.length) { + for (const header of headers) { + headersObject[header.name] = header.value + } } - } - return headersObject + return headersObject } /** @@ -28,26 +28,37 @@ const buildConnectionHeaders = connection => { * @param {*} connection */ const buildConnectionUrl = connection => { - const { host, port } = connection - return `${host.replace(/\/+$/, '')}${Number(port) > 0 ? `:${port}` : ''}` + const { host, port } = connection + return `${host.replace(/\/+$/, '')}${Number(port) > 0 ? `:${port}` : ''}` } const init = messaging => { - let client; - - messaging.respond('elastic-request-client-init', (__, connection) => { - client = axios.create({ - baseURL: buildConnectionUrl(connection), - headers: buildConnectionHeaders(connection), - httpsAgent: new Agent({ - rejectUnauthorized: false - }) - }) - }); + let client; - messaging.respond('elastic-request', (__, method, ...args) => { - return client[method](...args).then(({ data }) => ({ data })); - }) + messaging.respond('elastic-request-client-init', (__, connection) => { + client = axios.create({ + baseURL: buildConnectionUrl(connection), + headers: buildConnectionHeaders(connection), + httpsAgent: new Agent({ + rejectUnauthorized: false + }) + }) + }); + + messaging.respond('elastic-request', async (__, method, ...args) => { + try { + const response = await client[method](...args); + const { data } = response; + return { data }; + } catch (err) { + const message = get( + err, + 'response.data.error.root_cause[0].reason', + get(err, 'response.data.error.reason', err.message) + ) + throw new Error(message); + } + }) } module.exports = { init } \ No newline at end of file diff --git a/main.js b/main.js index 5381d3f..439afd5 100644 --- a/main.js +++ b/main.js @@ -11,99 +11,99 @@ require('@electron/remote/main').initialize() global['trackEvent'] = trackEvent const createWindow = () => { - // Create the browser window. - const mainWindow = new BrowserWindow({ - width: 1280, - height: 768, - minWidth: 1280, - minHeight: 768, - titleBarStyle: 'hiddenInset', - show: true, - backgroundColor: '#000', - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false, - nativeWindowOpen: true, - devTools: process.env.ENV === 'development', - }, - }) + // Create the browser window. + const mainWindow = new BrowserWindow({ + width: 1280, + height: 768, + minWidth: 1280, + minHeight: 768, + titleBarStyle: 'hiddenInset', + show: true, + backgroundColor: '#000', + webPreferences: { + nodeIntegration: true, + enableRemoteModule: true, + contextIsolation: false, + nativeWindowOpen: true, + devTools: process.env.ENV === 'development', + }, + }) - trackEvent('App', 'Open', `${process.platform}:${pkg.version}`) + trackEvent('App', 'Open', `${process.platform}:${pkg.version}`) - // and load the index.html of the app. - mainWindow.loadFile('public/index.html') + // and load the index.html of the app. + mainWindow.loadFile('public/index.html') - // Open the DevTools. - mainWindow.webContents.openDevTools() + // Open the DevTools. + mainWindow.webContents.openDevTools() - mainWindow.webContents.on('new-window', function (e, url) { - e.preventDefault() - trackEvent('App', 'Open Link', url) - require('electron').shell.openExternal(url) - }) + mainWindow.webContents.on('new-window', function (e, url) { + e.preventDefault() + trackEvent('App', 'Open Link', url) + require('electron').shell.openExternal(url) + }) - Menu.setApplicationMenu( - Menu.buildFromTemplate([ - { - label: app.name, - submenu: [{ role: 'about' }, { role: 'quit' }], - }, - { - label: 'Edit', - submenu: [ - { role: 'undo' }, - { role: 'redo' }, - { type: 'separator' }, - { role: 'cut' }, - { role: 'copy' }, - { role: 'paste' }, - { role: 'selectAll' }, - ], - }, - { - role: 'help', - submenu: [ - { - label: 'Learn More', - click: async () => { - const { shell } = require('electron') - await shell.openExternal('https://elastron.eney.solutions') + Menu.setApplicationMenu( + Menu.buildFromTemplate([ + { + label: app.name, + submenu: [{ role: 'about' }, { role: 'quit' }], }, - }, - { - label: 'Check For Updates', - click: () => updater.checkForUpdates(true), - }, - ], - }, - ]) - ) + { + label: 'Edit', + submenu: [ + { role: 'undo' }, + { role: 'redo' }, + { type: 'separator' }, + { role: 'cut' }, + { role: 'copy' }, + { role: 'paste' }, + { role: 'selectAll' }, + ], + }, + { + role: 'help', + submenu: [ + { + label: 'Learn More', + click: async () => { + const { shell } = require('electron') + await shell.openExternal('https://elastron.eney.solutions') + }, + }, + { + label: 'Check For Updates', + click: () => updater.checkForUpdates(true), + }, + ], + }, + ]) + ) - return mainWindow + return mainWindow } app.whenReady().then(() => { - const window = createWindow() - const messaging = messenger(window) + const window = createWindow() + const messaging = messenger(window) - require('@electron/remote/main').enable(window.webContents) + require('@electron/remote/main').enable(window.webContents) - updater.init(window) - updater.checkForUpdates() + updater.init(window) + updater.checkForUpdates() - messaging.listen('header-doubleclick', () => { - if (window.isMaximized()) { - window.setSize(1280, 768, false) - return window.center() - } - return window.maximize() - }) + messaging.listen('header-doubleclick', () => { + if (window.isMaximized()) { + window.setSize(1280, 768, false) + return window.center() + } + return window.maximize() + }) - messaging.listen('check-for-updates', () => { - if (Math.floor(Math.random() * 10) > 7) updater.checkForUpdates() - }) + messaging.listen('check-for-updates', () => { + if (Math.floor(Math.random() * 10) > 7) updater.checkForUpdates() + }) - dumper.init(messaging, window) - elasticProxy.init(messaging) + dumper.init(messaging, window) + elasticProxy.init(messaging) }) diff --git a/package.json b/package.json index 03ff252..31c990e 100644 --- a/package.json +++ b/package.json @@ -1,111 +1,111 @@ { - "name": "Elastron", - "version": "1.5.0", - "description": "Full featured elasticsearch client", - "main": "main.js", - "scripts": { - "build": "rollup -c --bundleConfigAsCjs", - "dev": "rollup -c -w --bundleConfigAsCjs", - "start-local": "sirv public", - "start": "ENV=development electron .", - "start:prod": "electron .", - "dist-mac": "electron-builder -m", - "dist-win": "electron-builder -w", - "dist": "electron-builder -mw", - "release-mac": "electron-builder -m --publish=onTagOrDraft", - "release-win": "electron-builder -w --publish=onTagOrDraft", - "upgrade-all": "yarn upgrade-interactive --latest" - }, - "repository": "https://github.com/antonkorotkov/elastron", - "keywords": [ - "Electron", - "elasticsearch", - "gui" - ], - "author": "Anton Korotkov", - "license": "MIT", - "build": { - "files": [ - "!.env" - ], - "appId": "com.elastron.www", - "afterSign": "notarize.js", - "mac": { - "category": "db.development.tools", - "icon": "public/icon.icns", - "hardenedRuntime": true, - "gatekeeperAssess": false, - "entitlements": "./entitlements.mac.plist", - "entitlementsInherit": "./entitlements.mac.plist", - "publish": { - "provider": "github", - "repo": "elastron", - "owner": "antonkorotkov", - "private": true - } + "name": "Elastron", + "version": "1.5.0", + "description": "Full featured elasticsearch client", + "main": "main.js", + "scripts": { + "build": "rollup -c --bundleConfigAsCjs", + "dev": "rollup -c -w --bundleConfigAsCjs", + "start-local": "sirv public", + "start": "ENV=development electron .", + "start:prod": "electron .", + "dist-mac": "electron-builder -m", + "dist-win": "electron-builder -w", + "dist": "electron-builder -mw", + "release-mac": "electron-builder -m --publish=onTagOrDraft", + "release-win": "electron-builder -w --publish=onTagOrDraft", + "upgrade-all": "yarn upgrade-interactive --latest" }, - "win": { - "target": [ - { - "target": "nsis", - "arch": [ - "x64", - "ia32" - ] + "repository": "https://github.com/antonkorotkov/elastron", + "keywords": [ + "Electron", + "elasticsearch", + "gui" + ], + "author": "Anton Korotkov", + "license": "MIT", + "build": { + "files": [ + "!.env" + ], + "appId": "com.elastron.www", + "afterSign": "notarize.js", + "mac": { + "category": "db.development.tools", + "icon": "public/icon.icns", + "hardenedRuntime": true, + "gatekeeperAssess": false, + "entitlements": "./entitlements.mac.plist", + "entitlementsInherit": "./entitlements.mac.plist", + "publish": { + "provider": "github", + "repo": "elastron", + "owner": "antonkorotkov", + "private": true + } + }, + "win": { + "target": [ + { + "target": "nsis", + "arch": [ + "x64", + "ia32" + ] + } + ], + "publish": { + "provider": "github", + "repo": "elastron", + "owner": "antonkorotkov", + "private": true + } } - ], - "publish": { - "provider": "github", - "repo": "elastron", - "owner": "antonkorotkov", - "private": true - } + }, + "dependencies": { + "@electron/remote": "^2.1.2", + "@storeon/router": "^2.0.1", + "@storeon/svelte": "^1.0.0", + "axios": "^1.7.7", + "btoa": "^1.2.1", + "compare-versions": "^5.0.1", + "elasticdump": "^6.113.0", + "electron-log": "^4.4.7", + "electron-updater": "^5.0.1", + "frappe-charts": "^1.6.2", + "https": "^1.0.0", + "jsoneditor": "^9.10.2", + "local-storage": "^2.0.0", + "lodash": "^4.17.21", + "node-localstorage": "^2.1.6", + "percent-to-hex": "^1.0.1", + "sirv-cli": "^2.0.2", + "storeon": "^3.1.5", + "svelte-select": "^4.4.7", + "universal-analytics": "^0.5.3" + }, + "devDependencies": { + "@rollup/plugin-commonjs": "^23.0.0", + "@rollup/plugin-json": "^5.0.0", + "@rollup/plugin-node-resolve": "^15.3.0", + "electron": "^21.1.1", + "electron-builder": "^23.0.3", + "electron-notarize": "^1.2.1", + "node-sass": "^7.0.1", + "rollup": "^3.28.0", + "rollup-plugin-css-only": "^3.1.0", + "rollup-plugin-livereload": "^2.0.0", + "rollup-plugin-replace": "^2.2.0", + "rollup-plugin-svelte": "^7.2.2", + "rollup-plugin-terser": "^7.0.2", + "svelte": "^3.48.0", + "svelte-preprocess": "^4.10.7" + }, + "prettier": { + "trailingComma": "es5", + "tabWidth": 2, + "arrowParens": "avoid", + "semi": false, + "singleQuote": true } - }, - "dependencies": { - "@electron/remote": "^2.0.10", - "@storeon/router": "^2.0.1", - "@storeon/svelte": "^1.0.0", - "axios": "^1.4.0", - "btoa": "^1.2.1", - "compare-versions": "^5.0.1", - "elasticdump": "^6.103.0", - "electron-log": "^4.4.7", - "electron-updater": "^5.0.1", - "frappe-charts": "^1.6.2", - "https": "^1.0.0", - "jsoneditor": "^9.10.2", - "local-storage": "^2.0.0", - "lodash": "^4.17.21", - "node-localstorage": "^2.1.6", - "percent-to-hex": "^1.0.1", - "sirv-cli": "^2.0.2", - "storeon": "^3.1.5", - "svelte-select": "^4.4.7", - "universal-analytics": "^0.5.3" - }, - "devDependencies": { - "@rollup/plugin-commonjs": "^23.0.0", - "@rollup/plugin-json": "^5.0.0", - "@rollup/plugin-node-resolve": "^15.1.0", - "electron": "^21.1.1", - "electron-builder": "^23.0.3", - "electron-notarize": "^1.2.1", - "node-sass": "^7.0.1", - "rollup": "^3.28.0", - "rollup-plugin-css-only": "^3.1.0", - "rollup-plugin-livereload": "^2.0.0", - "rollup-plugin-replace": "^2.2.0", - "rollup-plugin-svelte": "^7.1.6", - "rollup-plugin-terser": "^7.0.2", - "svelte": "^3.48.0", - "svelte-preprocess": "^4.10.7" - }, - "prettier": { - "trailingComma": "es5", - "tabWidth": 2, - "arrowParens": "avoid", - "semi": false, - "singleQuote": true - } -} +} \ No newline at end of file diff --git a/src/api/elasticsearch.js b/src/api/elasticsearch.js index 41bc0be..907bbe1 100644 --- a/src/api/elasticsearch.js +++ b/src/api/elasticsearch.js @@ -2,386 +2,386 @@ import get from 'lodash/get' import ipcRenderer from '../api/ipc-renderer' export default class API { - /** - * - * @param {*} connection - */ - constructor(connection) { - ipcRenderer.run('elastic-request-client-init', connection); + /** + * + * @param {*} connection + */ + constructor(connection) { + ipcRenderer.run('elastic-request-client-init', connection); - this.client = { - get: (...args) => ipcRenderer.run('elastic-request', 'get', ...args), - post: (...args) => ipcRenderer.run('elastic-request', 'post', ...args), - put: (...args) => ipcRenderer.run('elastic-request', 'put', ...args), - delete: (...args) => ipcRenderer.run('elastic-request', 'delete', ...args), - }; - } - - /** - * - * @param {*} data - */ - parseCatResponse(data) { - const struct = String(data) - .split('\n') - .map(line => line.split(' ').filter(item => item !== '')) - .filter(row => row.length) - if (struct) { - return { - columns: struct[0], - data: struct.splice(1), - } + this.client = { + get: (...args) => ipcRenderer.run('elastic-request', 'get', ...args), + post: (...args) => ipcRenderer.run('elastic-request', 'post', ...args), + put: (...args) => ipcRenderer.run('elastic-request', 'put', ...args), + delete: (...args) => ipcRenderer.run('elastic-request', 'delete', ...args), + }; } - return false - } + /** + * + * @param {*} data + */ + parseCatResponse(data) { + const struct = String(data) + .split('\n') + .map(line => line.split(' ').filter(item => item !== '')) + .filter(row => row.length) + if (struct) { + return { + columns: struct[0], + data: struct.splice(1), + } + } + + return false + } - /** - * - */ - async test() { - try { - const response = await this.client.get('/', { - timeout: 3000, - }) - if (response.data && response.data.tagline) - return { - success: true, - message: response.data.tagline, - ...response.data, + /** + * + */ + async test() { + try { + const response = await this.client.get('/', { + timeout: 3000, + }) + if (response.data && response.data.tagline) + return { + success: true, + message: response.data.tagline, + ...response.data, + } + return { + success: false, + message: 'Something went wrong', + } + } catch (err) { + throw new ConnectionError(err) } - return { - success: false, - message: 'Something went wrong', - } - } catch (err) { - throw new ConnectionError(err) } - } - /** - * - */ - async getIndices() { - try { - const response = await this.client.get('/_cat/indices?v') - return this.parseCatResponse(response.data) - } catch (err) { - throw new ConnectionError(err) + /** + * + */ + async getIndices() { + try { + const response = await this.client.get('/_cat/indices?v') + return this.parseCatResponse(response.data) + } catch (err) { + throw new ConnectionError(err) + } } - } - /** - * - */ - async getAllocation() { - try { - const response = await this.client.get('/_cat/allocation?v') - return this.parseCatResponse(response.data) - } catch (err) { - throw new ConnectionError(err) + /** + * + */ + async getAllocation() { + try { + const response = await this.client.get('/_cat/allocation?v') + return this.parseCatResponse(response.data) + } catch (err) { + throw new ConnectionError(err) + } } - } - /** - * - */ - async getShards() { - try { - const response = await this.client.get('/_cat/shards?v') - return this.parseCatResponse(response.data) - } catch (err) { - throw new ConnectionError(err) + /** + * + */ + async getShards() { + try { + const response = await this.client.get('/_cat/shards?v') + return this.parseCatResponse(response.data) + } catch (err) { + throw new ConnectionError(err) + } } - } - /** - * - * @param {*} params - */ - async uriSearch(params) { - const { index, type, query, size, from, sort, _source, explain } = params - const response = await this.client.get( - `${index ? `/${index}` : ''}${type ? `/${type}` : ''}/_search`, - { - params: { - q: query, - size, - from, - sort, - _source, - explain, - }, - } - ) - return response.data - } + /** + * + * @param {*} params + */ + async uriSearch(params) { + const { index, type, query, size, from, sort, _source, explain } = params + const response = await this.client.get( + `${index ? `/${index}` : ''}${type ? `/${type}` : ''}/_search`, + { + params: { + q: query, + size, + from, + sort, + _source, + explain, + }, + } + ) + return response.data + } - /** - * - * @param {*} params - */ - async bodySearch(params) { - const { index, type, query } = params - const response = await this.client.post( - `${index ? `/${index}` : ''}${type ? `/${type}` : ''}/_search`, - { - ...query, - } - ) - return response.data - } + /** + * + * @param {*} params + */ + async bodySearch(params) { + const { index, type, query } = params + const response = await this.client.post( + `${index ? `/${index}` : ''}${type ? `/${type}` : ''}/_search`, + { + ...query, + } + ) + return response.data + } - /** - * - * @param {*} index - * @param {*} type - * @param {*} id - * @param {*} params - */ - async deleteDocument(index, type, id, params = {}) { - const response = await this.client.delete(`${index}/${type}/${id}`, { - params, - }) - return response.data - } + /** + * + * @param {*} index + * @param {*} type + * @param {*} id + * @param {*} params + */ + async deleteDocument(index, type, id, params = {}) { + const response = await this.client.delete(`${index}/${type}/${id}`, { + params, + }) + return response.data + } - /** - * - * @param {*} index - * @param {*} id - * @param {*} fields - */ - async updateDocument(index, type, id, fields = {}) { - try { - const response = await this.client.post( - `${index}/${type}/${id}/_update?refresh=true`, - { - doc: fields, + /** + * + * @param {*} index + * @param {*} id + * @param {*} fields + */ + async updateDocument(index, type, id, fields = {}) { + try { + const response = await this.client.post( + `${index}/${type}/${id}/_update?refresh=true`, + { + doc: fields, + } + ) + return response.data + } catch (err) { + throw new ConnectionError(err) } - ) - return response.data - } catch (err) { - throw new ConnectionError(err) } - } - /** - * - * @param {*} index - * @param {*} id - * @param {*} fields - */ - async indexDocument(index, type, id, fields = {}) { - const response = await this.client.put(`${index}/${type}/${id}`, fields) - return response.data - } + /** + * + * @param {*} index + * @param {*} id + * @param {*} fields + */ + async indexDocument(index, type, id, fields = {}) { + const response = await this.client.put(`${index}/${type}/${id}`, fields) + return response.data + } - /** - * - * @param {*} index - */ - async getIndex(index) { - try { - const response = await this.client.get(`/${index}`) - return response.data - } catch (err) { - throw new ConnectionError(err) + /** + * + * @param {*} index + */ + async getIndex(index) { + try { + const response = await this.client.get(`/${index}`) + return response.data + } catch (err) { + throw new ConnectionError(err) + } } - } - /** - * - * @param {*} index - */ - async deleteIndex(index) { - try { - const response = await this.client.delete(`/${index}`) - return response.data - } catch (err) { - throw new ConnectionError(err) + /** + * + * @param {*} index + */ + async deleteIndex(index) { + try { + const response = await this.client.delete(`/${index}`) + return response.data + } catch (err) { + throw new ConnectionError(err) + } } - } - /** - * - * @param {*} index - */ - async closeIndex(index) { - try { - const response = await this.client.post(`/${index}/_close`) - return response.data - } catch (err) { - throw new ConnectionError(err) + /** + * + * @param {*} index + */ + async closeIndex(index) { + try { + const response = await this.client.post(`/${index}/_close`) + return response.data + } catch (err) { + throw new ConnectionError(err) + } } - } - /** - * - * @param {*} index - */ - async openIndex(index) { - try { - const response = await this.client.post(`/${index}/_open`) - return response.data - } catch (err) { - throw new ConnectionError(err) + /** + * + * @param {*} index + */ + async openIndex(index) { + try { + const response = await this.client.post(`/${index}/_open`) + return response.data + } catch (err) { + throw new ConnectionError(err) + } } - } - /** - * - * @param {*} index - */ - async createIndex(index, settings = {}) { - try { - const response = await this.client.put(`/${index}`, settings) - return response.data - } catch (err) { - throw new ConnectionError(err) + /** + * + * @param {*} index + */ + async createIndex(index, settings = {}) { + try { + const response = await this.client.put(`/${index}`, settings) + return response.data + } catch (err) { + throw new ConnectionError(err) + } } - } - /** - * - * @param {*} existingIndex - * @param {*} newIndex - */ - async cloneIndex(existingIndex, newIndex) { - try { - const response = await this.client.post( - `/${existingIndex}/_clone/${newIndex}` - ) - return response.data - } catch (err) { - throw new ConnectionError(err) + /** + * + * @param {*} existingIndex + * @param {*} newIndex + */ + async cloneIndex(existingIndex, newIndex) { + try { + const response = await this.client.post( + `/${existingIndex}/_clone/${newIndex}` + ) + return response.data + } catch (err) { + throw new ConnectionError(err) + } } - } - /** - * - * @param {*} index - */ - async freezeIndex(index) { - try { - const response = await this.client.post(`/${index}/_freeze`) - return response.data - } catch (err) { - throw new ConnectionError(err) + /** + * + * @param {*} index + */ + async freezeIndex(index) { + try { + const response = await this.client.post(`/${index}/_freeze`) + return response.data + } catch (err) { + throw new ConnectionError(err) + } } - } - /** - * - * @param {*} index - */ - async unfreezeIndex(index) { - try { - const response = await this.client.post(`/${index}/_unfreeze`) - return response.data - } catch (err) { - throw new ConnectionError(err) + /** + * + * @param {*} index + */ + async unfreezeIndex(index) { + try { + const response = await this.client.post(`/${index}/_unfreeze`) + return response.data + } catch (err) { + throw new ConnectionError(err) + } } - } - /** - * - * @param {*} index - */ - async wipeIndex(index) { - try { - const response = await this.client.post( - `/${index}/_delete_by_query?conflicts=proceed`, - { - query: { - match_all: {}, - }, + /** + * + * @param {*} index + */ + async wipeIndex(index) { + try { + const response = await this.client.post( + `/${index}/_delete_by_query?conflicts=proceed`, + { + query: { + match_all: {}, + }, + } + ) + return response.data + } catch (err) { + throw new ConnectionError(err) } - ) - return response.data - } catch (err) { - throw new ConnectionError(err) } - } - /** - * - * @param {*} index - * @param {*} mapping - */ - async updateIndexMapping(index, mapping) { - try { - const types = Object.getOwnPropertyNames(mapping) - if (types.length === 1 && types[0] === 'properties') { - const response = await this.client.put(`/${index}/_mapping`, mapping) - return response.data - } else { - const responses = [] + /** + * + * @param {*} index + * @param {*} mapping + */ + async updateIndexMapping(index, mapping) { + try { + const types = Object.getOwnPropertyNames(mapping) + if (types.length === 1 && types[0] === 'properties') { + const response = await this.client.put(`/${index}/_mapping`, mapping) + return response.data + } else { + const responses = [] - for (var i in mapping) { - const response = await this.client.post( - `/${index}/_mapping/${i}`, - mapping[i] - ) - responses.push(response.data) - } + for (var i in mapping) { + const response = await this.client.post( + `/${index}/_mapping/${i}`, + mapping[i] + ) + responses.push(response.data) + } - return responses - } - } catch (err) { - throw new ConnectionError(err) + return responses + } + } catch (err) { + throw new ConnectionError(err) + } } - } - /** - * - * @param {*} index - * @param {*} settings - */ - async updateIndexSettings(index, settings) { - try { - const response = await this.client.put(`/${index}/_settings`, settings) - return response.data - } catch (err) { - throw new ConnectionError(err) + /** + * + * @param {*} index + * @param {*} settings + */ + async updateIndexSettings(index, settings) { + try { + const response = await this.client.put(`/${index}/_settings`, settings) + return response.data + } catch (err) { + throw new ConnectionError(err) + } } - } - /** - * - * @param {*} index - */ - async deleteIndexAlias(index, alias) { - try { - const response = await this.client.delete(`/${index}/_alias/${alias}`) - return response.data - } catch (err) { - throw new ConnectionError(err) + /** + * + * @param {*} index + */ + async deleteIndexAlias(index, alias) { + try { + const response = await this.client.delete(`/${index}/_alias/${alias}`) + return response.data + } catch (err) { + throw new ConnectionError(err) + } } - } - /** - * - */ - async createIndexAlias(index, alias, data) { - try { - const response = await this.client.post(`/${index}/_alias/${alias}`, data) - return response.data - } catch (err) { - throw new ConnectionError(err) + /** + * + */ + async createIndexAlias(index, alias, data) { + try { + const response = await this.client.post(`/${index}/_alias/${alias}`, data) + return response.data + } catch (err) { + throw new ConnectionError(err) + } } - } } class ConnectionError extends Error { - constructor(error) { - const message = get( - error, - 'response.data.error.root_cause[0].reason', - get(error, 'response.data.error.reason', error.message) - ) - super(message) - this.type = 'ConnectionError' - this.message = message - } + constructor(error) { + const message = get( + error, + 'response.data.error.root_cause[0].reason', + get(error, 'response.data.error.reason', error.message) + ) + super(message) + this.type = 'ConnectionError' + this.message = message + } } diff --git a/src/api/ipc-renderer.js b/src/api/ipc-renderer.js index c0193a6..5bf1871 100644 --- a/src/api/ipc-renderer.js +++ b/src/api/ipc-renderer.js @@ -1,28 +1,29 @@ let ipcRenderer = { - on: () => {}, - once: () => {}, - send: () => {}, - run: () => {}, + on: () => { }, + once: () => { }, + send: () => { }, + run: () => { }, + invoke: () => { } } if (typeof require === 'function') { - ipcRenderer = require('electron').ipcRenderer + ipcRenderer = require('electron').ipcRenderer } export default { - listen: (eventName, callbackFunction) => { - ipcRenderer.on(eventName, callbackFunction) - }, + listen: (eventName, callbackFunction) => { + ipcRenderer.on(eventName, callbackFunction) + }, - once: (eventName, callbackFunction) => { - ipcRenderer.once(eventName, callbackFunction) - }, + once: (eventName, callbackFunction) => { + ipcRenderer.once(eventName, callbackFunction) + }, - send: (eventName, ...messageData) => { - ipcRenderer.send(eventName, ...messageData) - }, + send: (eventName, ...messageData) => { + ipcRenderer.send(eventName, ...messageData) + }, - run: (eventName, ...messageData) => { - return ipcRenderer.invoke(eventName, ...messageData) - }, + run: (eventName, ...messageData) => { + return ipcRenderer.invoke(eventName, ...messageData) + }, } diff --git a/yarn.lock b/yarn.lock index 0c0fce0..9fbe49a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -52,10 +52,10 @@ global-agent "^3.0.0" global-tunnel-ng "^2.7.1" -"@electron/remote@^2.0.10": - version "2.0.10" - resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.10.tgz#133e2f607b1861ac249bd78b5abd1e961feed713" - integrity sha512-3SFKKaQXcyWgwmibud+UqJl/XlHOgLcI3fwtB9pNelPSJAcTxocOJrF6FaxBIQaj1+R05Di6xuAswZpXAW7xhA== +"@electron/remote@^2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.1.2.tgz#52a97c8faa5b769155b649ef262f2f8c851776e6" + integrity sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA== "@electron/universal@1.2.1": version "1.2.1" @@ -202,15 +202,14 @@ dependencies: "@rollup/pluginutils" "^5.0.1" -"@rollup/plugin-node-resolve@^15.1.0": - version "15.1.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.1.0.tgz#9ffcd8e8c457080dba89bb9fcb583a6778dc757e" - integrity sha512-xeZHCgsiZ9pzYVgAo9580eCGqwh/XCEUM9q6iQfGNocjgkufHAqC3exA+45URvhiYV8sBF9RlBai650eNs7AsA== +"@rollup/plugin-node-resolve@^15.3.0": + version "15.3.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.0.tgz#efbb35515c9672e541c08d59caba2eff492a55d5" + integrity sha512-9eO5McEICxMzJpDW9OnMYSv4Sta3hmt7VtBFz5zR9273suNOydOyq/FrGeGy+KsTRFm8w0SLVhzig2ILFT63Ag== dependencies: "@rollup/pluginutils" "^5.0.1" "@types/resolve" "1.20.2" deepmerge "^4.2.2" - is-builtin-module "^3.2.1" is-module "^1.0.0" resolve "^1.22.1" @@ -231,14 +230,6 @@ estree-walker "^2.0.2" picomatch "^2.3.1" -"@search-dump/jsonstream@^1.4.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@search-dump/jsonstream/-/jsonstream-1.5.0.tgz#28e1102f398ce9eaa25b49308ac5609b23cb9415" - integrity sha512-/6JGNTkedAaGCxxWPHLHLzPAv+bJdPK1X4BvdQFfjpUUu8ccwWf5reGRxGf/vPRfly24dspufAwMWkgALW3gbw== - dependencies: - jsonparse "^1.2.0" - through ">=2.2.7 <3" - "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" @@ -392,6 +383,14 @@ dependencies: "@types/node" "*" +"JSONStream@npm:@search-dump/jsonstream@^1.4.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@search-dump/jsonstream/-/jsonstream-1.5.0.tgz#28e1102f398ce9eaa25b49308ac5609b23cb9415" + integrity sha512-/6JGNTkedAaGCxxWPHLHLzPAv+bJdPK1X4BvdQFfjpUUu8ccwWf5reGRxGf/vPRfly24dspufAwMWkgALW3gbw== + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" + abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -607,10 +606,10 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -aws-sdk@2.1357.0: - version "2.1357.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1357.0.tgz#779628a6e2db847f2fbb3687f01c7557b92cc581" - integrity sha512-bSOfBCVPQ/0NWYpPl34MgqMbJf0eO6PsyVlmjbStlba+98hnE6X7z67tawBRot7S+qH3L49KW2u6dfJjvhDfdQ== +aws-sdk@2.1472.0: + version "2.1472.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1472.0.tgz#f9bbdea05b6c0b83e97779f91da01857354f10e9" + integrity sha512-U7kAHRbvTy753IXKV8Oom/AqlqnsbXG+Kw5gRbKi6VcsZ3hR/EpNMzdRXTWO5U415bnLWGo8WAqIz67PIaaKsw== dependencies: buffer "4.9.2" events "1.1.1" @@ -644,17 +643,22 @@ aws-sign2@~0.7.0: resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA== -aws4@^1.11.0, aws4@^1.8.0: +aws4@^1.12.0: + version "1.13.2" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef" + integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw== + +aws4@^1.8.0: version "1.12.0" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3" integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg== -axios@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f" - integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA== +axios@^1.7.7: + version "1.7.7" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f" + integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q== dependencies: - follow-redirects "^1.15.0" + follow-redirects "^1.15.6" form-data "^4.0.0" proxy-from-env "^1.1.0" @@ -815,11 +819,6 @@ builder-util@23.6.0: stat-mode "^1.0.0" temp-file "^3.4.0" -builtin-modules@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6" - integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw== - bytes@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" @@ -870,6 +869,17 @@ call-bind@^1.0.2: function-bind "^1.1.1" get-intrinsic "^1.0.2" +call-bind@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" + camelcase-keys@^6.2.2: version "6.2.2" resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0" @@ -1138,6 +1148,15 @@ defer-to-connect@^1.0.1: resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== +define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + gopd "^1.0.1" + define-properties@^1.1.3: version "1.2.0" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" @@ -1244,15 +1263,15 @@ ejs@^3.1.7: dependencies: jake "^10.8.5" -elasticdump@^6.103.0: - version "6.103.0" - resolved "https://registry.yarnpkg.com/elasticdump/-/elasticdump-6.103.0.tgz#8eb4b6f6058a9dd00731c2ced615cbe8ca986e93" - integrity sha512-sBTxGvlI3/u49Sv83RRe/NSijctT6SiCuoqed5sKfCYsM1DnlOi8QT3Kjg4igc4J+L3Vp0kQ+8aPEXhrLBL31w== +elasticdump@^6.113.0: + version "6.113.0" + resolved "https://registry.yarnpkg.com/elasticdump/-/elasticdump-6.113.0.tgz#678ac394b56ec4a253c3da591fb7ec064c0cd34f" + integrity sha512-BhUXtsfrOClWSoPFnRYtqAkY3v8qrxGzHiaJkdORHmB/qEd5JzIGuKvDqjRqkZj/TuCSpxRZ9HECkNxIyZVQFg== dependencies: - "@search-dump/jsonstream" "^1.4.0" + JSONStream "npm:@search-dump/jsonstream@^1.4.0" async "^2.6.4" - aws-sdk "2.1357.0" - aws4 "^1.11.0" + aws-sdk "2.1472.0" + aws4 "^1.12.0" big.js "^5.2.2" bytes "^3.1.2" delay "^5.0.0" @@ -1262,13 +1281,13 @@ elasticdump@^6.103.0: ini "^2.0.0" lodash "^4.17.21" lossless-json "^1.0.5" - minimist "^1.2.6" + minimist "^1.2.8" p-queue "^6.6.2" - request "2.88.2" + request "npm:@cypress/request@^3.0.1" requestretry "^7.1.0" s3-stream-upload "2.0.2" s3urls "^1.5.2" - semver "5.7.1" + semver "7.5.4" socks5-http-client "^1.0.4" socks5-https-client "^1.2.1" @@ -1393,6 +1412,18 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== + dependencies: + get-intrinsic "^1.2.4" + +es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + es6-error@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" @@ -1518,10 +1549,10 @@ find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -follow-redirects@^1.15.0: - version "1.15.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" - integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== +follow-redirects@^1.15.6: + version "1.15.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" + integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== for-each@^0.3.3: version "0.3.3" @@ -1535,7 +1566,7 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== -form-data@^4.0.0: +form-data@^4.0.0, form-data@~4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== @@ -1608,6 +1639,11 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== + gauge@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395" @@ -1658,6 +1694,17 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: has "^1.0.3" has-symbols "^1.0.3" +get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== + dependencies: + es-errors "^1.3.0" + function-bind "^1.1.2" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + get-port@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc" @@ -1843,6 +1890,18 @@ has-property-descriptors@^1.0.0: dependencies: get-intrinsic "^1.1.1" +has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== + dependencies: + es-define-property "^1.0.0" + +has-proto@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" + integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== + has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" @@ -1867,6 +1926,13 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" +hasown@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== + dependencies: + function-bind "^1.1.2" + hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" @@ -1928,6 +1994,15 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" +http-signature@~1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.4.0.tgz#dee5a9ba2bf49416abc544abd6d967f6a94c8c3f" + integrity sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg== + dependencies: + assert-plus "^1.0.0" + jsprim "^2.0.2" + sshpk "^1.18.0" + http-status@^1.5.1: version "1.6.2" resolved "https://registry.yarnpkg.com/http-status/-/http-status-1.6.2.tgz#6dc05188a9856d67d96e48e8b4fd645c719ce82a" @@ -2055,13 +2130,6 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" -is-builtin-module@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169" - integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A== - dependencies: - builtin-modules "^3.3.0" - is-callable@^1.1.3: version "1.2.7" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" @@ -2324,6 +2392,16 @@ jsprim@^1.2.2: json-schema "0.4.0" verror "1.10.0" +jsprim@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-2.0.2.tgz#77ca23dbcd4135cd364800d22ff82c2185803d4d" + integrity sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ== + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.4.0" + verror "1.10.0" + keyv@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" @@ -2595,7 +2673,7 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@^1.1.0, minimist@^1.2.6: +minimist@^1.1.0, minimist@^1.2.6, minimist@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -2835,6 +2913,11 @@ object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== +object-inspect@^1.13.1: + version "1.13.2" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff" + integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g== + object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -3012,7 +3095,7 @@ proxy-from-env@^1.1.0: resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== -psl@^1.1.28: +psl@^1.1.28, psl@^1.1.33: version "1.9.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== @@ -3035,6 +3118,13 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== +qs@6.13.0: + version "6.13.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" + integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== + dependencies: + side-channel "^1.0.6" + qs@~6.5.2: version "6.5.3" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" @@ -3045,6 +3135,11 @@ querystring@0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g== +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + quick-lru@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" @@ -3137,7 +3232,7 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" -request@2.88.2, request@^2.88.0: +request@^2.88.0: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -3163,6 +3258,30 @@ request@2.88.2, request@^2.88.0: tunnel-agent "^0.6.0" uuid "^3.3.2" +"request@npm:@cypress/request@^3.0.1": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.5.tgz#d893a6e68ce2636c085fcd8d7283c3186499ba63" + integrity sha512-v+XHd9XmWbufxF1/bTaVm2yhbxY+TB4YtWRqF2zaXBlDNMkls34KiATz0AVDLavL3iB6bQk9/7n3oY1EoLSWGA== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~4.0.0" + http-signature "~1.4.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + performance-now "^2.1.0" + qs "6.13.0" + safe-buffer "^5.1.2" + tough-cookie "^4.1.3" + tunnel-agent "^0.6.0" + uuid "^8.3.2" + requestretry@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/requestretry/-/requestretry-7.1.0.tgz#d16a1a57a95295211147841550603f3dc527541e" @@ -3176,6 +3295,11 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + resolve.exports@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" @@ -3259,10 +3383,10 @@ rollup-plugin-replace@^2.2.0: magic-string "^0.25.2" rollup-pluginutils "^2.6.0" -rollup-plugin-svelte@^7.1.6: - version "7.1.6" - resolved "https://registry.yarnpkg.com/rollup-plugin-svelte/-/rollup-plugin-svelte-7.1.6.tgz#44a4ea6c6e8ed976824d9fd40c78d048515e5838" - integrity sha512-nVFRBpGWI2qUY1OcSiEEA/kjCY2+vAjO9BI8SzA7NRrh2GTunLd6w2EYmnMt/atgdg8GvcNjLsmZmbQs/u4SQA== +rollup-plugin-svelte@^7.2.2: + version "7.2.2" + resolved "https://registry.yarnpkg.com/rollup-plugin-svelte/-/rollup-plugin-svelte-7.2.2.tgz#2dc4dc9564ba7a92fb1ecb5a38db4a5ff5ac8408" + integrity sha512-hgnIblTRewaBEVQD6N0Q43o+y6q1TmDRhBjaEzQCi50bs8TXqjc+d1zFZyE8tsfgcfNHZQzclh4RxlFUB85H8Q== dependencies: "@rollup/pluginutils" "^4.1.0" resolve.exports "^2.0.0" @@ -3398,11 +3522,18 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== -"semver@2 || 3 || 4 || 5", semver@5.7.1: +"semver@2 || 3 || 4 || 5": version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== +semver@7.5.4: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + dependencies: + lru-cache "^6.0.0" + semver@^6.2.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" @@ -3446,6 +3577,18 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== +set-function-length@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" + integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" + shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -3458,6 +3601,16 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== +side-channel@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" + integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + object-inspect "^1.13.1" + signal-exit@^3.0.0, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" @@ -3614,6 +3767,21 @@ sprintf-js@1.1.2, sprintf-js@^1.1.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== +sshpk@^1.18.0: + version "1.18.0" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028" + integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ== + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" + ecc-jsbn "~0.1.1" + getpass "^0.1.1" + jsbn "~0.1.0" + safer-buffer "^2.0.2" + tweetnacl "~0.14.0" + sshpk@^1.7.0: version "1.17.0" resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5" @@ -3809,6 +3977,16 @@ totalist@^3.0.0: resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.0.tgz#4ef9c58c5f095255cdc3ff2a0a55091c57a3a1bd" integrity sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw== +tough-cookie@^4.1.3: + version "4.1.4" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36" + integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" + tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" @@ -3912,6 +4090,11 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -3931,6 +4114,14 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + url@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64" @@ -3970,7 +4161,7 @@ uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^8.0.0: +uuid@^8.0.0, uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== From c0a35856d99a9d0fe7faab4bac9d46761b29140e Mon Sep 17 00:00:00 2001 From: Anton Korotkov Date: Wed, 2 Oct 2024 22:40:38 +0200 Subject: [PATCH 06/11] packages upgrade --- app/analytics.js | 30 - app/dumper/dumper.js | 11 - app/updater.js | 14 - main.js | 7 +- package.json | 32 +- rollup.config.js | 131 +- src/header/Header.svelte | 12 +- src/store/app.js | 4 - src/store/connection.js | 2 - src/store/elasticsearch/allocation.js | 3 - src/store/elasticsearch/index.js | 3 - src/store/elasticsearch/indices.js | 3 - src/store/elasticsearch/shards.js | 3 - src/store/history.js | 12 - src/store/index.js | 2 +- src/store/search.js | 11 - src/store/server.js | 4 - src/utils/analitycs.js | 8 - yarn.lock | 2006 +++++++++++++++---------- 19 files changed, 1326 insertions(+), 972 deletions(-) delete mode 100644 app/analytics.js delete mode 100644 src/utils/analitycs.js diff --git a/app/analytics.js b/app/analytics.js deleted file mode 100644 index 9999110..0000000 --- a/app/analytics.js +++ /dev/null @@ -1,30 +0,0 @@ -const { app } = require('electron') -const ua = require('universal-analytics') -const { v4: uuid } = require('uuid') -const { JSONStorage } = require('node-localstorage') - -const nodeStorage = new JSONStorage(app.getPath('userData')) - -// Retrieve the userid value, and if it's not there, assign it a new uuid. -const userId = nodeStorage.getItem('userid') || uuid() - -// (re)save the userid, so it persists for the next app session. -nodeStorage.setItem('userid', userId) - -const gId = - process.env.ENV === 'development' ? 'UA-165047740-2' : 'UA-165047740-1' - -const usr = ua(gId, userId) - -const trackEvent = (category, action, label, value) => { - usr - .event({ - ec: category, - ea: action, - el: label, - ev: value, - }) - .send() -} - -module.exports = { trackEvent } diff --git a/app/dumper/dumper.js b/app/dumper/dumper.js index d28391f..f48deed 100644 --- a/app/dumper/dumper.js +++ b/app/dumper/dumper.js @@ -3,7 +3,6 @@ const { dialog } = require('electron') const { Options } = require('./Options') const get = require('lodash/get') const isArray = require('lodash/isArray') -const { trackEvent } = require('../analytics') process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0' const logError = console.error @@ -25,8 +24,6 @@ const init = (messaging, win) => { messaging.respond('import-export-run', (__, options) => { try { - trackEvent('ImportExport', 'Start', options.importExport.type) - console.error = error => { if (get(error, 'error.reason')) messaging.send('dumper-error', get(error, 'error.reason')) @@ -64,15 +61,8 @@ const init = (messaging, win) => { dumper.dump(function (error) { console.error = logError if (error) { - trackEvent( - 'ImportExport', - 'Error', - get(error, 'message', 'Unknown') - ) return reject(false) } - - trackEvent('ImportExport', 'Finish', options.importExport.type) return resolve(true) }) }) @@ -80,7 +70,6 @@ const init = (messaging, win) => { console.error = logError const message = get(e, 'message', 'Error occured in main process') messaging.send('dumper-error', message) - trackEvent('ImportExport', 'Error', message) } }) } diff --git a/app/updater.js b/app/updater.js index 3fc9dd4..f62ed61 100644 --- a/app/updater.js +++ b/app/updater.js @@ -1,6 +1,5 @@ const { autoUpdater } = require('electron-updater') -const { trackEvent } = require('./analytics') const pkg = require('../package.json') const { dialog } = require('electron') @@ -10,8 +9,6 @@ let notifyUpdateNotAvailable = false const init = window => { autoUpdater.on('error', async e => { - trackEvent('Error', 'Update', e.message || 'no message') - await dialog.showMessageBox(window, { type: 'error', title: 'Oops...', @@ -28,8 +25,6 @@ const init = window => { }) autoUpdater.on('update-available', async () => { - trackEvent('App', 'Update Available', `${process.platform}:${pkg.version}`) - const answer = await dialog.showMessageBox(window, { type: 'info', title: 'Found Updates', @@ -41,12 +36,6 @@ const init = window => { }) autoUpdater.on('update-not-available', async () => { - trackEvent( - 'App', - 'Update Not Available', - `${process.platform}:${pkg.version}` - ) - if (!notifyUpdateNotAvailable) return await dialog.showMessageBox(window, { @@ -56,8 +45,6 @@ const init = window => { }) autoUpdater.on('update-downloaded', async () => { - trackEvent('App', 'Update Downloaded', `${process.platform}:${pkg.version}`) - await dialog.showMessageBox(window, { title: 'Install Updates', message: 'Updates downloaded. Application will be restarted.', @@ -69,7 +56,6 @@ const init = window => { const checkForUpdates = (notify = false) => { notifyUpdateNotAvailable = notify autoUpdater.checkForUpdates() - trackEvent('App', 'Update Check', `${process.platform}:${pkg.version}`) } module.exports = { init, checkForUpdates } diff --git a/main.js b/main.js index 439afd5..d22305e 100644 --- a/main.js +++ b/main.js @@ -1,14 +1,12 @@ const { app, BrowserWindow, Menu } = require('electron') const pkg = require('./package.json') -const { trackEvent } = require('./app/analytics') const updater = require('./app/updater') const messenger = require('./app/ipc-main') const dumper = require('./app/dumper/dumper') const elasticProxy = require('./app/requests-node-proxy'); require('@electron/remote/main').initialize() -global['trackEvent'] = trackEvent const createWindow = () => { // Create the browser window. @@ -25,12 +23,10 @@ const createWindow = () => { enableRemoteModule: true, contextIsolation: false, nativeWindowOpen: true, - devTools: process.env.ENV === 'development', + devTools: true //process.env.ENV === 'development', }, }) - trackEvent('App', 'Open', `${process.platform}:${pkg.version}`) - // and load the index.html of the app. mainWindow.loadFile('public/index.html') @@ -39,7 +35,6 @@ const createWindow = () => { mainWindow.webContents.on('new-window', function (e, url) { e.preventDefault() - trackEvent('App', 'Open Link', url) require('electron').shell.openExternal(url) }) diff --git a/package.json b/package.json index 31c990e..1383466 100644 --- a/package.json +++ b/package.json @@ -68,38 +68,38 @@ "@storeon/svelte": "^1.0.0", "axios": "^1.7.7", "btoa": "^1.2.1", - "compare-versions": "^5.0.1", + "compare-versions": "^6.1.1", "elasticdump": "^6.113.0", - "electron-log": "^4.4.7", - "electron-updater": "^5.0.1", + "electron-log": "^5.2.0", + "electron-updater": "^6.3.4", "frappe-charts": "^1.6.2", "https": "^1.0.0", - "jsoneditor": "^9.10.2", + "jsoneditor": "^10.1.0", "local-storage": "^2.0.0", "lodash": "^4.17.21", - "node-localstorage": "^2.1.6", + "node-localstorage": "^3.0.5", "percent-to-hex": "^1.0.1", "sirv-cli": "^2.0.2", "storeon": "^3.1.5", - "svelte-select": "^4.4.7", + "svelte-select": "^5.8.3", "universal-analytics": "^0.5.3" }, "devDependencies": { - "@rollup/plugin-commonjs": "^23.0.0", - "@rollup/plugin-json": "^5.0.0", + "@rollup/plugin-commonjs": "^28.0.0", + "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "^15.3.0", - "electron": "^21.1.1", - "electron-builder": "^23.0.3", + "electron": "^32.1.2", + "electron-builder": "^25.0.5", "electron-notarize": "^1.2.1", - "node-sass": "^7.0.1", - "rollup": "^3.28.0", - "rollup-plugin-css-only": "^3.1.0", + "node-sass": "^9.0.0", + "rollup": "^4.24.0", + "rollup-plugin-css-only": "^4.5.2", "rollup-plugin-livereload": "^2.0.0", "rollup-plugin-replace": "^2.2.0", "rollup-plugin-svelte": "^7.2.2", "rollup-plugin-terser": "^7.0.2", - "svelte": "^3.48.0", - "svelte-preprocess": "^4.10.7" + "svelte": "^4.2.19", + "svelte-preprocess": "^6.0.3" }, "prettier": { "trailingComma": "es5", @@ -108,4 +108,4 @@ "semi": false, "singleQuote": true } -} \ No newline at end of file +} diff --git a/rollup.config.js b/rollup.config.js index b8775e3..5479def 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -5,88 +5,89 @@ import livereload from 'rollup-plugin-livereload' import { terser } from 'rollup-plugin-terser' import replace from 'rollup-plugin-replace' import css from 'rollup-plugin-css-only' -import autoPreprocess from 'svelte-preprocess' +import { sveltePreprocess } from 'svelte-preprocess' import json from '@rollup/plugin-json' const production = !process.env.ROLLUP_WATCH export default { - input: 'src/main.js', - output: { - sourcemap: true, - format: 'iife', - name: 'app', - file: 'public/build/bundle.js', - }, - plugins: [ - json(), + input: 'src/main.js', + output: { + sourcemap: true, + format: 'iife', + name: 'app', + file: 'public/build/bundle.js', + }, + plugins: [ + json(), - svelte({ - compilerOptions: { - // enable run-time checks when not in production - dev: !production, - // we'll extract any component CSS out into - // a separate file - better for performance - }, + svelte({ + compilerOptions: { + // enable run-time checks when not in production + dev: !production, + // we'll extract any component CSS out into + // a separate file - better for performance + }, - emitCss: false, + emitCss: false, - preprocess: autoPreprocess({ - /* options */ - }), - }), + preprocess: sveltePreprocess({ + /* options */ + }), + }), - css({ output: 'public/extra.css' }), + css({ output: 'public/extra.css' }), - replace({ - 'process.env.NODE_ENV': JSON.stringify('production'), - }), + replace({ + 'process.env.NODE_ENV': JSON.stringify('production'), + }), - // If you have external dependencies installed from - // npm, you'll most likely need these plugins. In - // some cases you'll need additional configuration - - // consult the documentation for details: - // https://github.com/rollup/plugins/tree/master/packages/commonjs - resolve({ - browser: true, - dedupe: ['svelte'], - }), - commonjs(), + // If you have external dependencies installed from + // npm, you'll most likely need these plugins. In + // some cases you'll need additional configuration - + // consult the documentation for details: + // https://github.com/rollup/plugins/tree/master/packages/commonjs + resolve({ + exportConditions: ['svelte'], + browser: true, + dedupe: ['svelte'], + }), + commonjs(), - // In dev mode, call `npm run start` once - // the bundle has been generated - !production && serve(), + // In dev mode, call `npm run start` once + // the bundle has been generated + !production && serve(), - // Watch the `public` directory and refresh the - // browser on changes when not in production - !production && livereload({ watch: 'public' }), + // Watch the `public` directory and refresh the + // browser on changes when not in production + !production && livereload({ watch: 'public' }), - // If we're building for production (npm run build - // instead of npm run dev), minify - production && terser(), - ], - watch: { - clearScreen: false, - }, + // If we're building for production (npm run build + // instead of npm run dev), minify + production && terser(), + ], + watch: { + clearScreen: false, + }, } function serve() { - let started = false + let started = false - return { - writeBundle() { - if (!started) { - started = true + return { + writeBundle() { + if (!started) { + started = true - require('child_process').spawn( - 'npm', - ['run', 'start-local', '--', '--dev'], - { - stdio: ['ignore', 'inherit', 'inherit'], - shell: true, - } - ) - } - }, - } + require('child_process').spawn( + 'npm', + ['run', 'start-local', '--', '--dev'], + { + stdio: ['ignore', 'inherit', 'inherit'], + shell: true, + } + ) + } + }, + } } diff --git a/src/header/Header.svelte b/src/header/Header.svelte index 50d7571..ba76c82 100644 --- a/src/header/Header.svelte +++ b/src/header/Header.svelte @@ -6,11 +6,11 @@ import ConnectionDialog from '../components/modal/ConnectionDialog/ConnectionDialog.svelte' import OnlineIndicator from './OnlineIndicator.svelte' - import messanger from '../api/ipc-renderer' + import messenger from '../api/ipc-renderer' - const onHeaderDblClick = () => messanger.send('header-doubleclick') + const onHeaderDblClick = () => messenger.send('header-doubleclick') - const onDashboardClick = () => messanger.send('check-for-updates') + const onDashboardClick = () => messenger.send('check-for-updates') const { open } = getContext('modal-window') @@ -39,9 +39,9 @@
-
-