From 1fdf94271544ef2a1b9c3e9a147839314352751d Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 16 Dec 2021 10:08:32 +0100 Subject: [PATCH 01/75] upgrade electron --- app/package.json | 12 +- app/src/electron.js | 10 +- app/yarn.lock | 1619 ++++++++++++++++--------------------- packages/api/package.json | 2 +- yarn.lock | 8 +- 5 files changed, 730 insertions(+), 921 deletions(-) diff --git a/app/package.json b/app/package.json index cf3829d76..2d7e34b2e 100644 --- a/app/package.json +++ b/app/package.json @@ -5,10 +5,10 @@ "author": "Jan Prochazka ", "description": "Opensource database administration tool", "dependencies": { - "better-sqlite3-with-prebuilds": "^7.1.8", - "electron-log": "^4.3.1", - "electron-store": "^5.1.1", - "electron-updater": "^4.3.5", + "better-sqlite3-with-prebuilds": "^7.4.3", + "electron-log": "^4.4.1", + "electron-store": "^8.0.1", + "electron-updater": "^4.6.1", "patch-package": "^6.4.7" }, "repository": { @@ -103,8 +103,8 @@ "devDependencies": { "copyfiles": "^2.2.0", "cross-env": "^6.0.3", - "electron": "11.2.3", - "electron-builder": "22.10.5" + "electron": "16.0.4", + "electron-builder": "22.14.5" }, "optionalDependencies": { "msnodesqlv8": "^2.4.0" diff --git a/app/src/electron.js b/app/src/electron.js index 23f1992ce..3b80b7897 100644 --- a/app/src/electron.js +++ b/app/src/electron.js @@ -14,6 +14,8 @@ const BrowserWindow = electron.BrowserWindow; const path = require('path'); const url = require('url'); +// require('@electron/remote/main').initialize(); + const store = new Store(); // Keep a global reference of the window object, if you don't, the window will @@ -49,7 +51,7 @@ function buildMenu() { commandItem('new.connection'), commandItem('new.sqliteDatabase'), commandItem('new.modelCompare'), - commandItem('new.freetable'), + commandItem('new.freetable'), { type: 'separator' }, commandItem('file.open'), commandItem('file.openArchive'), @@ -157,10 +159,12 @@ function createWindow() { ...bounds, icon: os.platform() == 'win32' ? 'icon.ico' : path.resolve(__dirname, '../icon.png'), webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, + // nodeIntegration: true, + // contextIsolation: false, + // enableRemoteModule: true, }, }); + // require('@electron/remote/main').enable(mainWindow.webContents); if (store.get('winIsMaximized')) { mainWindow.maximize(); } diff --git a/app/yarn.lock b/app/yarn.lock index 280075a27..de9be3b06 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"7zip-bin@~5.0.3": - version "5.0.3" - resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" - integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA== +"7zip-bin@~5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" + integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== "@develar/schema-utils@~2.6.5": version "2.6.5" @@ -15,26 +15,26 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" -"@electron/get@^1.0.1": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.9.0.tgz#7fa6e61d7ff50fb82a8a41f437af7de3b97aa9a5" - integrity sha512-OBIKtF6ttIJotDXe4KJMUyTBO4xMii+mFjlA8R4CORuD4HvCUaCK3lPjhdTRCvuEv6gzWNbAvd9DNBv0v780lw== +"@electron/get@^1.13.0": + version "1.13.1" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368" + integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA== dependencies: debug "^4.1.1" env-paths "^2.2.0" fs-extra "^8.1.0" got "^9.6.0" progress "^2.0.3" - sanitize-filename "^1.6.2" + semver "^6.2.0" sumchecker "^3.0.1" optionalDependencies: - global-agent "^2.0.2" + global-agent "^3.0.0" global-tunnel-ng "^2.7.1" -"@electron/universal@1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.4.tgz#231ac246c39d45b80e159bd21c3f9027dcaa10f5" - integrity sha512-ajZoumi4XwqwmZe8YVhu4XGkZBCPyWZsVCQONPTIe9TUlleSN+dic3YpXlaWcilx/HOzTdldTKtabNTeI0gDoA== +"@electron/universal@1.0.5": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz#b812340e4ef21da2b3ee77b2b4d35c9b86defe37" + integrity sha512-zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag== dependencies: "@malept/cross-spawn-promise" "^1.1.0" asar "^3.0.3" @@ -49,6 +49,16 @@ dependencies: cross-spawn "^7.0.1" +"@malept/flatpak-bundler@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" + integrity sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q== + dependencies: + debug "^4.1.1" + fs-extra "^9.0.0" + lodash "^4.17.15" + tmp-promise "^3.0.2" + "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" @@ -61,50 +71,52 @@ dependencies: defer-to-connect "^1.0.1" -"@types/color-name@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" - integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== +"@types/debug@^4.1.6": + version "4.1.7" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" + integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg== + dependencies: + "@types/ms" "*" -"@types/debug@^4.1.5": - version "4.1.5" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" - integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== - -"@types/fs-extra@^9.0.7": - version "9.0.11" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.11.tgz#8cc99e103499eab9f347dbc6ca4e99fb8d2c2b87" - integrity sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA== +"@types/fs-extra@^9.0.11": + version "9.0.13" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" + integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== dependencies: "@types/node" "*" "@types/glob@^7.1.1": - version "7.1.3" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" - integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== + version "7.2.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" + integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== dependencies: "@types/minimatch" "*" "@types/node" "*" "@types/integer@latest": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/integer/-/integer-4.0.0.tgz#3b778715df72d2cf8ba73bad27bd9d830907f944" - integrity sha512-2U1i6bIRiqizl6O+ETkp2HhUZIxg7g+burUabh9tzGd0qcszfNaFRaY9bGNlQKgEU7DCsH5qMajRDW5QamWQbw== + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/integer/-/integer-4.0.1.tgz#022f2c77a899e383e6d3dd374142416c22a5b9df" + integrity sha512-QQojPymFcV1hrvWXA1h0pP9RmFBFNuWikZcUEjjVsS19IyKO+jqOX24lp2ZHF4A21EmkosJhJDX7CLG67F2s7A== "@types/minimatch@*": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21" - integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" + integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== + +"@types/ms@*": + version "0.7.31" + resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" + integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "13.9.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.1.tgz#96f606f8cd67fb018847d9b61e93997dabdefc72" - integrity sha512-E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ== + version "17.0.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.0.tgz#62797cee3b8b497f6547503b2312254d4fe3c2bb" + integrity sha512-eMhwJXc931Ihh4tkU+Y7GiLzT/y/DBNpNtr4yU9O2w3SYBsr9NaOPhQlLKRmoWtI54uNwuo0IOUFQjVOTZYRvw== -"@types/node@^12.0.12": - version "12.12.30" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.30.tgz#3501e6f09b954de9c404671cefdbcc5d9d7c45f6" - integrity sha512-sz9MF/zk6qVr3pAnM0BSQvYIBK44tS75QC5N+VbWSE4DjCV/pJ+UzCW/F+vVnl7TkOPcuwQureKNtSSwjBTaMg== +"@types/node@^14.6.2": + version "14.18.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.0.tgz#98df2397f6936bfbff4f089e40e06fa5dd88d32a" + integrity sha512-0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ== "@types/plist@^3.0.1": version "3.0.2" @@ -114,25 +126,25 @@ "@types/node" "*" xmlbuilder ">=11.0.1" -"@types/semver@^7.3.1": - version "7.3.4" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.4.tgz#43d7168fec6fa0988bb1a513a697b29296721afb" - integrity sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ== +"@types/semver@^7.3.6": + version "7.3.9" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc" + integrity sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ== "@types/verror@^1.10.3": - version "1.10.4" - resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.4.tgz#805c0612b3a0c124cf99f517364142946b74ba3b" - integrity sha512-OjJdqx6QlbyZw9LShPwRW+Kmiegeg3eWNI41MQQKaG3vjdU2L9SRElntM51HmHBY1cu7izxQJ1lMYioQh3XMBg== + version "1.10.5" + resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz#2a1413aded46e67a1fe2386800e291123ed75eb1" + integrity sha512-9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw== "@types/yargs-parser@*": - version "15.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" - integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== + version "20.2.1" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" + integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== -"@types/yargs@^15.0.13": - version "15.0.13" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc" - integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ== +"@types/yargs@^17.0.1": + version "17.0.7" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.7.tgz#44a484c634761da4391477515a98772b82b5060f" + integrity sha512-OvLKmpKdea1aWtqHv9bxVVcMoT6syAeK+198dfETIFkAevYRGwqh4H+KFxfjUETZuUuE5sQCAFwdOdoHUdo8eg== dependencies: "@types/yargs-parser" "*" @@ -141,6 +153,13 @@ resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== + dependencies: + ajv "^8.0.0" + ajv-keywords@^3.4.1: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" @@ -156,44 +175,34 @@ ajv@^6.10.0, ajv@^6.12.0: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^6.10.2: - version "6.12.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7" - integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw== +ajv@^8.0.0, ajv@^8.6.3: + version "8.8.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb" + integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw== dependencies: fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" uri-js "^4.2.2" ansi-align@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" - integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw== + version "3.0.1" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== dependencies: - string-width "^3.0.0" + string-width "^4.1.0" ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== - -ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== @@ -201,46 +210,47 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: color-convert "^1.9.0" ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" - integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== dependencies: - "@types/color-name" "^1.1.1" color-convert "^2.0.1" -app-builder-bin@3.5.12: - version "3.5.12" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.12.tgz#bbe174972cc1f481f73d6d92ad47a8b4c7eb4530" - integrity sha512-lQARM2AielmFoBeIo6LZigAe+58Wwe07ZWkt+wVeDxzyieNmeWjlvz/V5dKzinydwdHd+CNswN86sww46yijjA== +app-builder-bin@3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.7.1.tgz#cb0825c5e12efc85b196ac3ed9c89f076c61040e" + integrity sha512-ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw== -app-builder-lib@22.10.5: - version "22.10.5" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.5.tgz#24a88581c891e5b187a0d569aa44e7c4a0dc8de2" - integrity sha512-/W8nlGamJCtKlQtsMWwU9vb+cX4pTNY+rJWCuc7oXUykVSMS50W7LhQusIjCelNfymUQ1XCu6cXEY/ylqhX12A== +app-builder-lib@22.14.5: + version "22.14.5" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.5.tgz#a61a50b132b858e98fdc70b6b88994ae99b4f96d" + integrity sha512-k3VwKP4kpsnUaXoUkm1s4zaSHPHIMFnN4kPMU9yXaKmE1LfHHqBaEah5bXeTAX5V/BC41wFdg8CF5vOjvgy8Rg== dependencies: - "7zip-bin" "~5.0.3" + "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" - "@electron/universal" "1.0.4" + "@electron/universal" "1.0.5" + "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.10.5" - builder-util-runtime "8.7.3" + builder-util "22.14.5" + builder-util-runtime "8.9.1" chromium-pickle-js "^0.2.0" debug "^4.3.2" ejs "^3.1.6" - electron-publish "22.10.5" - fs-extra "^9.1.0" - hosted-git-info "^3.0.8" - is-ci "^2.0.0" - istextorbinary "^5.12.0" - js-yaml "^4.0.0" - lazy-val "^1.0.4" + electron-osx-sign "^0.5.0" + electron-publish "22.14.5" + form-data "^4.0.0" + fs-extra "^10.0.0" + hosted-git-info "^4.0.2" + is-ci "^3.0.0" + isbinaryfile "^4.0.8" + js-yaml "^4.1.0" + lazy-val "^1.0.5" minimatch "^3.0.4" - normalize-package-data "^3.0.0" - read-config-file "6.0.0" + read-config-file "6.2.0" sanitize-filename "^1.6.3" - semver "^7.3.4" - temp-file "^3.3.7" + semver "^7.3.5" + temp-file "^3.4.0" aproba@^1.0.3: version "1.2.0" @@ -248,29 +258,22 @@ aproba@^1.0.3: integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + version "1.1.7" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" + integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== dependencies: delegates "^1.0.0" readable-stream "^2.0.6" -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - argparse@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== asar@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz#1fef03c2d6d2de0cbad138788e4f7ae03b129c7b" - integrity sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw== + version "3.1.0" + resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473" + integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ== dependencies: chromium-pickle-js "^0.2.0" commander "^5.0.0" @@ -284,6 +287,11 @@ assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + async-exit-hook@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" @@ -294,36 +302,41 @@ async@0.9.x: resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + at-least-node@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== +atomically@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/atomically/-/atomically-1.7.0.tgz#c07a0458432ea6dbc9a3506fffa424b48bccaafe" + integrity sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w== + balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== base64-js@^1.3.1, base64-js@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -better-sqlite3-with-prebuilds@^7.1.8: - version "7.1.8" - resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.1.8.tgz#3090c478fe9b60e74ce053a76807b189784f62d7" - integrity sha512-trwg1qhN91cPYEB8D2K0KVHIsMsiAnxKx6/syfQ7rLrtD+zOS3fqJq4VGszMF+OuYAZJNAR4oLsikys3YW/6aA== +better-sqlite3-with-prebuilds@^7.4.3: + version "7.4.3" + resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.4.3.tgz#2ed9c5649a8eb1cf2bece7d3f4849b184ddde038" + integrity sha512-E1MWyMz5RFZCdRNzIcR245dRVR3u1qZO2uV+8Z9Vb/PJsQ6uxOuOnSfA+rZdkuvDbVTbdpowKNL1tuO6FJyt0A== dependencies: "@types/integer" latest bindings "^1.5.0" prebuild-install "^6.0.1" tar "^6.1.0" -binaryextensions@^4.15.0: - version "4.15.0" - resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-4.15.0.tgz#c63a502e0078ff1b0e9b00a9f74d3c2b0f8bd32e" - integrity sha512-MkUl3szxXolQ2scI1PM14WOT951KnaTNJ0eMKg7WzOI4kvSxyNo/Cygx4LOBNhwyINhAuSQpJW1rYD9aBSxGaw== - bindings@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" @@ -332,9 +345,9 @@ bindings@^1.5.0: file-uri-to-path "1.0.0" bl@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489" - integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg== + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== dependencies: buffer "^5.5.0" inherits "^2.0.4" @@ -347,26 +360,26 @@ bluebird-lst@^1.0.9: dependencies: bluebird "^3.5.5" -bluebird@^3.5.5: +bluebird@^3.5.0, bluebird@^3.5.5: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -boolean@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.1.tgz#35ecf2b4a2ee191b0b44986f14eb5f052a5cbb4f" - integrity sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA== +boolean@^3.0.1: + version "3.1.4" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.4.tgz#f51a2fb5838a99e06f9b6ec1edb674de67026435" + integrity sha512-3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w== boxen@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.0.1.tgz#657528bdd3f59a772b8279b831f27ec2c744664b" - integrity sha512-49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA== + version "5.1.2" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== dependencies: ansi-align "^3.0.0" camelcase "^6.2.0" chalk "^4.1.0" cli-boxes "^2.2.1" - string-width "^4.2.0" + string-width "^4.2.2" type-fest "^0.20.2" widest-line "^3.1.0" wrap-ansi "^7.0.0" @@ -386,15 +399,38 @@ braces@^3.0.1: dependencies: fill-range "^7.0.1" +buffer-alloc-unsafe@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== + +buffer-alloc@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== + dependencies: + buffer-alloc-unsafe "^1.1.0" + buffer-fill "^1.0.0" + +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + buffer-equal@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= + buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== buffer@^5.1.0, buffer@^5.5.0: version "5.7.1" @@ -404,41 +440,34 @@ buffer@^5.1.0, buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@8.7.2: - version "8.7.2" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz#d93afc71428a12789b437e13850e1fa7da956d72" - integrity sha512-xBqv+8bg6cfnzAQK1k3OGpfaHg+QkPgIgpEkXNhouZ0WiUkyZCftuRc2LYzQrLucFywpa14Xbc6+hTbpq83yRA== - dependencies: - debug "^4.1.1" - sax "^1.2.4" - -builder-util-runtime@8.7.3: - version "8.7.3" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.3.tgz#0aaafa52d25295c939496f62231ca9ff06c30e40" - integrity sha512-1Q2ReBqFblimF5g/TLg2+0M5Xzv0Ih5LxJ/BMWXvEy/e6pQKeeEpbkPMGsN6OiQgkygaZo5VXCXIjOkOQG5EoQ== +builder-util-runtime@8.9.1: + version "8.9.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz#25f066b3fbc20b3e6236a9b956b1ebb0e33ff66a" + integrity sha512-c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg== dependencies: debug "^4.3.2" sax "^1.2.4" -builder-util@22.10.5: - version "22.10.5" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.5.tgz#8d0b04a3be6acc74938679aa90dcb3181b1ae86b" - integrity sha512-/MkLhmyo1gU3xMwXJxccQaRj/9tm5eTd6ZyebTf8SYouY4r3hRser+LxhOm/f8Z9W6oJvfPe0jc9TFsxYfMcsg== +builder-util@22.14.5: + version "22.14.5" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.5.tgz#42a18608d2a566c0846e91266464776c8bfb0cc9" + integrity sha512-zqIHDFJwmA7jV7SC9aI+33MWwT2mWoijH+Ol9IntNAwuuRXoS+7XeJwnhLBXOhcDBzXT4kDzHnRk4JKeaygEYA== dependencies: - "7zip-bin" "~5.0.3" - "@types/debug" "^4.1.5" - "@types/fs-extra" "^9.0.7" - app-builder-bin "3.5.12" + "7zip-bin" "~5.1.1" + "@types/debug" "^4.1.6" + "@types/fs-extra" "^9.0.11" + app-builder-bin "3.7.1" bluebird-lst "^1.0.9" - builder-util-runtime "8.7.3" - chalk "^4.1.0" + builder-util-runtime "8.9.1" + chalk "^4.1.1" + cross-spawn "^7.0.3" debug "^4.3.2" - fs-extra "^9.1.0" - is-ci "^2.0.0" - js-yaml "^4.0.0" + fs-extra "^10.0.0" + is-ci "^3.0.0" + js-yaml "^4.1.0" source-map-support "^0.5.19" stat-mode "^1.0.0" - temp-file "^3.3.7" + temp-file "^3.4.0" cacheable-request@^6.0.0: version "6.1.0" @@ -453,15 +482,10 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" -camelcase@^5.0.0: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - camelcase@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" - integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== + version "6.2.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" + integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== chalk@^2.4.2: version "2.4.2" @@ -472,10 +496,10 @@ chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== +chalk@^4.1.0, chalk@^4.1.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -500,27 +524,23 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== +ci-info@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" + integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== + cli-boxes@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== -cli-truncate@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086" - integrity sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA== +cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== dependencies: - slice-ansi "^1.0.0" - string-width "^2.0.0" - -cliui@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" - integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== - dependencies: - string-width "^3.1.0" - strip-ansi "^5.2.0" - wrap-ansi "^5.1.0" + slice-ansi "^3.0.0" + string-width "^4.2.0" cliui@^7.0.2: version "7.0.4" @@ -572,6 +592,13 @@ colors@1.0.3: resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + commander@2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" @@ -584,12 +611,17 @@ commander@^5.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== +compare-version@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" + integrity sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA= + concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@1.6.2: +concat-stream@^1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -599,26 +631,26 @@ concat-stream@1.6.2: readable-stream "^2.2.2" typedarray "^0.0.6" -conf@^6.2.1: - version "6.2.3" - resolved "https://registry.yarnpkg.com/conf/-/conf-6.2.3.tgz#0c0611f0fca25174d72c7b633ff6af9173a55f62" - integrity sha512-xwce2fuN77kiXiUq0tQImwJM0SXkGKt1/uZYyiQ9OWUKUQmF6gzIMyCL0idlpgQelKomSFMkAGn2QK7JJ2c1Cg== +conf@^10.0.3: + version "10.1.1" + resolved "https://registry.yarnpkg.com/conf/-/conf-10.1.1.tgz#ff08046d5aeeee0eaff55d57f5b4319193c3dfda" + integrity sha512-z2civwq/k8TMYtcn3SVP0Peso4otIWnHtcTuHhQ0zDZDdP4NTxqEc8owfkz4zBsdMYdn/LFcE+ZhbCeqkhtq3Q== dependencies: - ajv "^6.10.2" - debounce-fn "^3.0.1" - dot-prop "^5.0.0" - env-paths "^2.2.0" - json-schema-typed "^7.0.1" - make-dir "^3.0.0" - onetime "^5.1.0" - pkg-up "^3.0.1" - semver "^6.2.0" - write-file-atomic "^3.0.0" + ajv "^8.6.3" + ajv-formats "^2.1.1" + atomically "^1.7.0" + debounce-fn "^4.0.0" + dot-prop "^6.0.1" + env-paths "^2.2.1" + json-schema-typed "^7.0.3" + onetime "^5.1.2" + pkg-up "^3.1.0" + semver "^7.3.5" config-chain@^1.1.11: - version "1.1.12" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" - integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA== + version "1.1.13" + resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" + integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== dependencies: ini "^1.3.4" proto-list "~1.2.1" @@ -641,27 +673,28 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= copyfiles@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.2.0.tgz#d9fc6c06f299337fb7eeb7ea5887e9d7188d9d47" - integrity sha512-iJbHJI+8OKqsq+4JF0rqgRkZzo++jqO6Wf4FUU1JM41cJF6JcY5968XyF4tm3Kkm7ZOMrqlljdm8N9oyY5raGw== + version "2.4.1" + resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.4.1.tgz#d2dcff60aaad1015f09d0b66e7f0f1c5cd3c5da5" + integrity sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg== dependencies: glob "^7.0.5" minimatch "^3.0.3" - mkdirp "^0.5.1" + mkdirp "^1.0.4" noms "0.0.0" through2 "^2.0.1" - yargs "^13.2.4" + untildify "^4.0.0" + yargs "^16.1.0" -core-js@^3.6.4: - version "3.6.4" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647" - integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw== - -core-util-is@1.0.2, core-util-is@~1.0.0: +core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + crc@^3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" @@ -687,16 +720,7 @@ cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14" - integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -cross-spawn@^7.0.1: +cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -710,46 +734,27 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -debounce-fn@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-3.0.1.tgz#034afe8b904d985d1ec1aa589cd15f388741d680" - integrity sha512-aBoJh5AhpqlRoHZjHmOzZlRx+wz2xVwGL9rjs+Kj0EWUrL4/h4K7OD176thl2Tdoqui/AaA4xhHrNArGLAaI3Q== +debounce-fn@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-4.0.0.tgz#ed76d206d8a50e60de0dd66d494d82835ffe61c7" + integrity sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ== dependencies: - mimic-fn "^2.1.0" + mimic-fn "^3.0.0" -debug@2.6.9: +debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@^4.1.0, debug@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - -debug@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== +debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== dependencies: ms "2.1.2" -debug@^4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== - dependencies: - ms "2.1.2" - -decamelize@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= - decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" @@ -781,6 +786,11 @@ define-properties@^1.1.3: dependencies: object-keys "^1.0.12" +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" @@ -792,9 +802,9 @@ detect-libc@^1.0.3: integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= detect-node@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" - integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw== + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== dir-compare@^2.4.0: version "2.4.0" @@ -806,39 +816,45 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dmg-builder@22.10.5: - version "22.10.5" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.5.tgz#65a33c106ead5a350c7de8997c546559bd6e0e7c" - integrity sha512-58FEpfH8PEFqjbUNka4bYr52snRT8+LSXrP4gy6EZWOVICbOlmTOYj988pfoLam5C5iXb3odmyUQqwWOxlsEUw== +dmg-builder@22.14.5: + version "22.14.5" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.5.tgz#137c0b55e639badcc0b119eb060e6fa4ed61d948" + integrity sha512-1GvFGQE332bvPamcMwZDqWqfWfJTyyDLOsHMcGi0zs+Jh7JOn6/zuBkHJIWHdsj2QJbhzLVyd2/ZqttOKv7I8w== dependencies: - app-builder-lib "22.10.5" - builder-util "22.10.5" - fs-extra "^9.1.0" + app-builder-lib "22.14.5" + builder-util "22.14.5" + builder-util-runtime "8.9.1" + fs-extra "^10.0.0" iconv-lite "^0.6.2" - js-yaml "^4.0.0" - sanitize-filename "^1.6.3" + js-yaml "^4.1.0" optionalDependencies: - dmg-license "^1.0.8" + dmg-license "^1.0.9" -dmg-license@^1.0.8: - version "1.0.9" - resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz#a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f" - integrity sha512-Rq6qMDaDou2+aPN2SYy0x7LDznoJ/XaG6oDcH5wXUp+WRWQMUYE6eM+F+nex+/LSXOp1uw4HLFoed0YbfU8R/Q== +dmg-license@^1.0.9: + version "1.0.10" + resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.10.tgz#89f52afae25d827fce8d818c13aff30af1c16bcc" + integrity sha512-SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A== dependencies: "@types/plist" "^3.0.1" "@types/verror" "^1.10.3" ajv "^6.10.0" - cli-truncate "^1.1.0" crc "^3.8.0" - iconv-corefoundation "^1.1.6" - plist "^3.0.1" + iconv-corefoundation "^1.1.7" + plist "^3.0.4" smart-buffer "^4.0.2" verror "^1.10.0" -dot-prop@^5.0.0, dot-prop@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb" - integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A== +dot-prop@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== + dependencies: + is-obj "^2.0.0" + +dot-prop@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083" + integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA== dependencies: is-obj "^2.0.0" @@ -847,24 +863,16 @@ dotenv-expand@^5.1.0: resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== -dotenv@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" - integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== +dotenv@^9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" + integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= -editions@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/editions/-/editions-6.1.0.tgz#ba6c6cf9f4bb571d9e53ea34e771a602e5a66549" - integrity sha512-h6nWEyIocfgho9J3sTSuhU/WoFOu1hTX75rPBebNrbF38Y9QFDjCDizYXdikHTySW7Y3mSxli8bpDz9RAtc7rA== - dependencies: - errlop "^4.0.0" - version-range "^1.0.0" - ejs@^3.1.6: version "3.1.6" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" @@ -872,80 +880,85 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@22.10.5: - version "22.10.5" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.5.tgz#03b156b93e6012609027c3aaa69201a3ad21e454" - integrity sha512-0q/289UUJUhRou6lZKDz/wzK6WprIQ6VXMTmaI+w9qXvSNugPC9UA5s2zXInOkjZOvO/xKnjeyiavrVSHYF3tA== +electron-builder@22.14.5: + version "22.14.5" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.5.tgz#3a25547bd4fe3728d4704da80956a794c5c31496" + integrity sha512-N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg== dependencies: - "@types/yargs" "^15.0.13" - app-builder-lib "22.10.5" - bluebird-lst "^1.0.9" - builder-util "22.10.5" - builder-util-runtime "8.7.3" - chalk "^4.1.0" - dmg-builder "22.10.5" - fs-extra "^9.1.0" - is-ci "^2.0.0" - lazy-val "^1.0.4" - read-config-file "6.0.0" - sanitize-filename "^1.6.3" + "@types/yargs" "^17.0.1" + app-builder-lib "22.14.5" + builder-util "22.14.5" + builder-util-runtime "8.9.1" + chalk "^4.1.1" + dmg-builder "22.14.5" + fs-extra "^10.0.0" + is-ci "^3.0.0" + lazy-val "^1.0.5" + read-config-file "6.2.0" update-notifier "^5.1.0" - yargs "^16.2.0" + yargs "^17.0.1" -electron-log@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.3.1.tgz#1405fef9d4e6964a5fdb8790a69163aa237ffe91" - integrity sha512-S/0CMjYjgyWUsZ3d27VvErPaI5W4oILp4jfeCuN4DhDqrJW6jKRUD2PxFfTdeZEIjM7+fttGg7A61rPcAcZC1w== +electron-log@^4.4.1: + version "4.4.1" + resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.4.1.tgz#28ebeb474eccba2ebf194a96c40d6328e5353e4d" + integrity sha512-nK/DwxPLtwWbggPCm27eMQhYHc3gzoZ+cokBK99diO4WsZJKrv5l44EUW8mRfWpmC8ZubnMyp6GTUIJyTc9AJA== -electron-publish@22.10.5: - version "22.10.5" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.5.tgz#9cbe46266b6c79d8c6e99840755682e2262d3543" - integrity sha512-dHyuazv3P3j1Xyv7pdwTwAvxWab2pCb0G0Oa6qWQoCc4b1/mRGY00M7AvYW1cPuUijj9zYAf1HmXfM6MifaMlA== +electron-osx-sign@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz#fc258c5e896859904bbe3d01da06902c04b51c3a" + integrity sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ== dependencies: - "@types/fs-extra" "^9.0.7" - bluebird-lst "^1.0.9" - builder-util "22.10.5" - builder-util-runtime "8.7.3" - chalk "^4.1.0" - fs-extra "^9.1.0" - lazy-val "^1.0.4" - mime "^2.5.0" + bluebird "^3.5.0" + compare-version "^0.1.2" + debug "^2.6.8" + isbinaryfile "^3.0.2" + minimist "^1.2.0" + plist "^3.0.1" -electron-store@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-5.1.1.tgz#3040e5b4ad25d2e4caea59d505646c1e7c94a09b" - integrity sha512-FLidOVE8JVCdJXHd7xY/JojKJ2r2WNmWt0O/LlX2LuSVV7dkG2RSy2/Gm2LFw8OKDfrNBd9c/s4X1ikMrJEUKg== +electron-publish@22.14.5: + version "22.14.5" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.5.tgz#34bcdce671f0e651330db20040d6919c77c94bd6" + integrity sha512-h+NANRdaA0PqGF15GKvorseWPzh1PXa/zx4I37//PIokW8eKIov8ky23foUSb55ZFWUHGpxQJux7y2NCfBtQeg== dependencies: - conf "^6.2.1" - type-fest "^0.7.1" + "@types/fs-extra" "^9.0.11" + builder-util "22.14.5" + builder-util-runtime "8.9.1" + chalk "^4.1.1" + fs-extra "^10.0.0" + lazy-val "^1.0.5" + mime "^2.5.2" -electron-updater@^4.3.5: - version "4.3.5" - resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.3.5.tgz#4fb36f593a031c87ea07ee141c9f064d5deffb15" - integrity sha512-5jjN7ebvfj1cLI0VZMdCnJk6aC4bP+dy7ryBf21vArR0JzpRVk0OZHA2QBD+H5rm6ZSeDYHOY6+8PrMEqJ4wlQ== +electron-store@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-8.0.1.tgz#9b598c1d2edeffebee9d8c1cd957ad368c528925" + integrity sha512-ZyLvNywiqSpbwC/pp89O/AycVWY/UJIkmtyzF2Bd0Nm/rLmcFc0NTGuLdg6+LE8mS8qsiK5JMoe4PnrecLHH5w== dependencies: - "@types/semver" "^7.3.1" - builder-util-runtime "8.7.2" - fs-extra "^9.0.1" - js-yaml "^3.14.0" - lazy-val "^1.0.4" + conf "^10.0.3" + type-fest "^1.0.2" + +electron-updater@^4.6.1: + version "4.6.1" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.1.tgz#80ca805c4f51b2e682aac29d18fed75d6a533d32" + integrity sha512-YsU1mHqXLrXXmBMsxhxy24PrbaB8rnpZDPmFa2gOkTYk/Ch13+R0fjsRSpPYvqtskVVY0ux8fu+HnUkVkqc7og== + dependencies: + "@types/semver" "^7.3.6" + builder-util-runtime "8.9.1" + fs-extra "^10.0.0" + js-yaml "^4.1.0" + lazy-val "^1.0.5" + lodash.escaperegexp "^4.1.2" lodash.isequal "^4.5.0" - semver "^7.3.2" + semver "^7.3.5" -electron@11.2.3: - version "11.2.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz#8ad1d9858436cfca0e2e5ea7fea326794ae58ebb" - integrity sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ== +electron@16.0.4: + version "16.0.4" + resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.4.tgz#87dfe21d17608537fc6df292c437362297566a73" + integrity sha512-IptwmowvMP1SFOmZLh6rrURwfnOxbDBXBRBcaOdfBM5I+B9mgtdNwzNC3ymFFNzEkZUwdOyg9fu3iyjAAQIQgw== dependencies: - "@electron/get" "^1.0.1" - "@types/node" "^12.0.12" + "@electron/get" "^1.13.0" + "@types/node" "^14.6.2" extract-zip "^1.0.3" -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -963,15 +976,10 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -env-paths@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" - integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== - -errlop@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/errlop/-/errlop-4.1.0.tgz#8e7b8f4f1bf0a6feafce4d14f0c0cf4bf5ef036b" - integrity sha512-vul6gGBuVt0M2TPi1/WrcL86+Hb3Q2Tpu3TME3sbVhZrYf7J1ZMHCodI25RQKCVurh56qTfvgM0p3w5cT4reSQ== +env-paths@^2.2.0, env-paths@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== es6-error@^4.1.1: version "4.1.1" @@ -993,15 +1001,10 @@ escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -escape-string-regexp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" - integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== - -esprima@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== expand-template@^2.0.3: version "2.0.3" @@ -1009,34 +1012,34 @@ expand-template@^2.0.3: integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== extract-zip@^1.0.3: - version "1.6.7" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9" - integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k= + version "1.7.0" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" + integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== dependencies: - concat-stream "1.6.2" - debug "2.6.9" - mkdirp "0.5.1" - yauzl "2.4.1" + concat-stream "^1.6.2" + debug "^2.6.9" + mkdirp "^0.5.4" + yauzl "^2.10.0" extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + version "1.4.1" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" + integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== fast-deep-equal@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" - integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fd-slicer@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" - integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU= +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= dependencies: pend "~1.2.0" @@ -1046,9 +1049,9 @@ file-uri-to-path@1.0.0: integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== filelist@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz#f10d1a3ae86c1694808e8f20906f43d4c9132dbb" - integrity sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ== + version "1.0.2" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" + integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== dependencies: minimatch "^3.0.4" @@ -1073,11 +1076,29 @@ find-yarn-workspace-root@^2.0.0: dependencies: micromatch "^4.0.2" +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== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + fs-constants@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== +fs-extra@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1" + integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs-extra@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" @@ -1096,17 +1117,7 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc" - integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^1.0.0" - -fs-extra@^9.1.0: +fs-extra@^9.0.0, fs-extra@^9.0.1: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== @@ -1128,11 +1139,6 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -1147,7 +1153,7 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" -get-caller-file@^2.0.1, get-caller-file@^2.0.5: +get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== @@ -1160,9 +1166,9 @@ get-stream@^4.1.0: pump "^3.0.0" get-stream@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9" - integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw== + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== dependencies: pump "^3.0.0" @@ -1171,10 +1177,10 @@ github-from-package@0.0.0: resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= -glob@^7.0.5: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== +glob@^7.0.5, glob@^7.1.3, glob@^7.1.6: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -1183,30 +1189,17 @@ glob@^7.0.5: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.3, glob@^7.1.6: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== +global-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" + integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -global-agent@^2.0.2: - version "2.1.8" - resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.8.tgz#99d153662b2c04cbc1199ffbc081a3aa656ac50f" - integrity sha512-VpBe/rhY6Rw2VDOTszAMNambg+4Qv8j0yiTNDYEXXXxkUNGWLHp8A3ztK4YDBbFNcWF4rgsec6/5gPyryya/+A== - dependencies: - boolean "^3.0.0" - core-js "^3.6.4" + boolean "^3.0.1" es6-error "^4.1.1" - matcher "^2.1.0" - roarr "^2.15.2" - semver "^7.1.2" - serialize-error "^5.0.0" + matcher "^3.0.0" + roarr "^2.15.3" + semver "^7.3.2" + serialize-error "^7.0.1" global-dirs@^3.0.0: version "3.0.0" @@ -1226,9 +1219,9 @@ global-tunnel-ng@^2.7.1: tunnel "^0.0.6" globalthis@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9" - integrity sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw== + version "1.0.2" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b" + integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ== dependencies: define-properties "^1.1.3" @@ -1249,15 +1242,10 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.11: - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== - -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: - version "4.2.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" - integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== "graceful-readlink@>= 1.0.0": version "1.0.1" @@ -1284,21 +1272,7 @@ has-yarn@^2.1.0: resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -hosted-git-info@^3.0.8: - version "3.0.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d" - integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw== - dependencies: - lru-cache "^6.0.0" - -hosted-git-info@^4.0.1: +hosted-git-info@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== @@ -1310,18 +1284,18 @@ http-cache-semantics@^4.0.0: resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== -iconv-corefoundation@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz#27c135470237f6f8d13462fa1f5eaf250523c29a" - integrity sha512-1NBe55C75bKGZaY9UHxvXG3G0gEp0ziht7quhuFrW3SPgZDw9HI6qvYXRSV5M/Eupyu8ljuJ6Cba+ec15PZ4Xw== +iconv-corefoundation@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" + integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ== dependencies: - cli-truncate "^1.1.0" + cli-truncate "^2.1.0" node-addon-api "^1.6.3" iconv-lite@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01" - integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ== + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== dependencies: safer-buffer ">= 2.1.2 < 3.0.0" @@ -1370,12 +1344,12 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.2.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" - integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== +is-ci@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" + integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== dependencies: - has "^1.0.3" + ci-info "^3.2.0" is-docker@^2.0.0: version "2.2.1" @@ -1389,11 +1363,6 @@ is-fullwidth-code-point@^1.0.0: dependencies: number-is-nan "^1.0.0" -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= - is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" @@ -1454,20 +1423,23 @@ isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isbinaryfile@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" + integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== + dependencies: + buffer-alloc "^1.2.0" + +isbinaryfile@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf" + integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w== + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -istextorbinary@^5.12.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-5.12.0.tgz#2f84777838668fdf524c305a2363d6057aaeec84" - integrity sha512-wLDRWD7qpNTYubk04+q3en1+XZGS4vYWK0+SxNSXJLaITMMEK+J3o/TlOMyULeH1qozVZ9uUkKcyMA8odyxz8w== - dependencies: - binaryextensions "^4.15.0" - editions "^6.1.0" - textextensions "^5.11.0" - jake@^10.6.1: version "10.8.2" resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" @@ -1478,23 +1450,7 @@ jake@^10.6.1: filelist "^1.0.1" minimatch "^3.0.4" -js-yaml@^3.13.1: - version "3.13.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" - integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -js-yaml@^3.14.0: - version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -js-yaml@^4.0.0: +js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== @@ -1511,7 +1467,12 @@ json-schema-traverse@^0.4.1: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== -json-schema-typed@^7.0.1: +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + +json-schema-typed@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.3.tgz#23ff481b8b4eebcd2ca123b4fa0409e66469a2d9" integrity sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A== @@ -1521,10 +1482,10 @@ json-stringify-safe@^5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json5@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" - integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== +json5@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== dependencies: minimist "^1.2.5" @@ -1536,11 +1497,11 @@ jsonfile@^4.0.0: graceful-fs "^4.1.6" jsonfile@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179" - integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg== + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== dependencies: - universalify "^1.0.0" + universalify "^2.0.0" optionalDependencies: graceful-fs "^4.1.6" @@ -1565,10 +1526,10 @@ latest-version@^5.1.0: dependencies: package-json "^6.3.0" -lazy-val@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65" - integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q== +lazy-val@^1.0.4, lazy-val@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" + integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== locate-path@^3.0.0: version "3.0.0" @@ -1578,12 +1539,17 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" +lodash.escaperegexp@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347" + integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c= + lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= -lodash@^4.17.10: +lodash@^4.17.10, lodash@^4.17.15: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -1606,18 +1572,18 @@ lru-cache@^6.0.0: yallist "^4.0.0" make-dir@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.2.tgz#04a1acbf22221e1d6ef43559f43e05a90dbb4392" - integrity sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w== + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== dependencies: semver "^6.0.0" -matcher@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/matcher/-/matcher-2.1.0.tgz#64e1041c15b993e23b786f93320a7474bf833c28" - integrity sha512-o+nZr+vtJtgPNklyeUKkkH42OsK8WAfdgaJE2FNxcjLPg+5QbeEoT6vRj8Xq/iv18JlQ9cmKsEu0b94ixWf1YQ== +matcher@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" + integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== dependencies: - escape-string-regexp "^2.0.0" + escape-string-regexp "^4.0.0" micromatch@^4.0.2: version "4.0.4" @@ -1627,16 +1593,33 @@ micromatch@^4.0.2: braces "^3.0.1" picomatch "^2.2.3" -mime@^2.5.0: - version "2.5.2" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" - integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== +mime-db@1.51.0: + version "1.51.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== + +mime-types@^2.1.12: + version "2.1.34" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== + dependencies: + mime-db "1.51.0" + +mime@^2.5.2: + version "2.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" + integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +mimic-fn@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74" + integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ== + mimic-response@^1.0.0, mimic-response@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" @@ -1654,20 +1637,15 @@ minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== minipass@^3.0.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" - integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== + version "3.1.6" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee" + integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ== dependencies: yallist "^4.0.0" @@ -1684,14 +1662,14 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== -mkdirp@0.5.1, mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= +mkdirp@^0.5.4: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== dependencies: - minimist "0.0.8" + minimist "^1.2.5" -mkdirp@^1.0.3: +mkdirp@^1.0.3, mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== @@ -1701,23 +1679,23 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= -ms@2.1.2, ms@^2.1.1: +ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -msnodesqlv8@^2.0.10: - version "2.0.10" - resolved "https://registry.yarnpkg.com/msnodesqlv8/-/msnodesqlv8-2.0.10.tgz#47d05157c2d30e5f48fa0aa550a0353ab56a027c" - integrity sha512-oA46Y8ZQxYEW9M8U+Wg4bI5g8nI2pueIkyameEpxanHqr9d5w4a0Pgk2WvugHiY1UYmN1bPziUdqBgwkBSGrnA== +msnodesqlv8@^2.4.0: + version "2.4.4" + resolved "https://registry.yarnpkg.com/msnodesqlv8/-/msnodesqlv8-2.4.4.tgz#1e4e10246480c486b074199d6efddf5dab8af9b9" + integrity sha512-VJpurwVyq6c2mgkEFFe1S0BD1+vZSLy0vv5qbkdnJoIaeC5XBcfLSKYsjeP1V5QEc1fv4CD3oau84kcGXNk/cQ== dependencies: - nan "^2.14.2" - prebuild-install "^6.0.0" + nan "^2.15.0" + prebuild-install "^6.1.4" -nan@^2.14.2: - version "2.14.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" - integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== +nan@^2.15.0: + version "2.15.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" + integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== napi-build-utils@^1.0.1: version "1.0.2" @@ -1730,16 +1708,9 @@ nice-try@^1.0.4: integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== node-abi@^2.21.0: - version "2.26.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.26.0.tgz#355d5d4bc603e856f74197adbf3f5117a396ba40" - integrity sha512-ag/Vos/mXXpWLLAYWsAoQdgS+gW7IwvgMLOgqopm/DbzAjazLltzgzpVMsFlgmo9TzG5hGXeaBZx2AI731RIsQ== - dependencies: - semver "^5.4.1" - -node-abi@^2.7.0: - version "2.19.3" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.3.tgz#252f5dcab12dad1b5503b2d27eddd4733930282d" - integrity sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg== + version "2.30.1" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" + integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== dependencies: semver "^5.4.1" @@ -1756,25 +1727,10 @@ noms@0.0.0: inherits "^2.0.1" readable-stream "~1.0.31" -noop-logger@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" - integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= - -normalize-package-data@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699" - integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg== - dependencies: - hosted-git-info "^4.0.1" - resolve "^1.20.0" - semver "^7.3.4" - validate-npm-package-license "^3.0.1" - normalize-url@^4.1.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" - integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== + version "4.5.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== npm-conf@^1.1.3: version "1.1.3" @@ -1816,10 +1772,10 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -onetime@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" - integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q== +onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== dependencies: mimic-fn "^2.1.0" @@ -1842,9 +1798,9 @@ p-cancelable@^1.0.0: integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== p-limit@^2.0.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" - integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== dependencies: p-try "^2.0.0" @@ -1909,11 +1865,6 @@ path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== - pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" @@ -1929,47 +1880,25 @@ pify@^3.0.0: resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= -pkg-up@^3.0.1: +pkg-up@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== dependencies: find-up "^3.0.0" -plist@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz#74bbf011124b90421c22d15779cee60060ba95bc" - integrity sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ== +plist@^3.0.1, plist@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe" + integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg== dependencies: base64-js "^1.5.1" xmlbuilder "^9.0.7" - xmldom "^0.5.0" -prebuild-install@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.0.0.tgz#669022bcde57c710a869e39c5ca6bf9cd207f316" - integrity sha512-h2ZJ1PXHKWZpp1caLw0oX9sagVpL2YTk+ZwInQbQ3QqNd4J03O6MpFNmMTJlkfgPENWqe5kP0WjQLqz5OjLfsw== - dependencies: - detect-libc "^1.0.3" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^2.7.0" - noop-logger "^0.1.1" - npmlog "^4.0.1" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^3.0.3" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - which-pm-runs "^1.0.0" - -prebuild-install@^6.0.1: - version "6.1.2" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.2.tgz#6ce5fc5978feba5d3cbffedca0682b136a0b5bff" - integrity sha512-PzYWIKZeP+967WuKYXlTOhYBgGOvTRSfaKI89XnfJ0ansRAH7hDU45X+K+FZeI1Wb/7p/NnuctPH3g0IqKUuSQ== +prebuild-install@^6.0.1, prebuild-install@^6.1.4: + version "6.1.4" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" + integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== dependencies: detect-libc "^1.0.3" expand-template "^2.0.3" @@ -1978,7 +1907,6 @@ prebuild-install@^6.0.1: mkdirp-classic "^0.5.3" napi-build-utils "^1.0.1" node-abi "^2.21.0" - noop-logger "^0.1.1" npmlog "^4.0.1" pump "^3.0.0" rc "^1.2.7" @@ -2036,15 +1964,15 @@ rc@^1.2.7, rc@^1.2.8: minimist "^1.2.0" strip-json-comments "~2.0.1" -read-config-file@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz#224b5dca6a5bdc1fb19e63f89f342680efdb9299" - integrity sha512-PHjROSdpceKUmqS06wqwP92VrM46PZSTubmNIMJ5DrMwg1OgenSTSEHIkCa6TiOJ+y/J0xnG1fFwG3M+Oi1aNA== +read-config-file@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" + integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg== dependencies: - dotenv "^8.2.0" + dotenv "^9.0.2" dotenv-expand "^5.1.0" - js-yaml "^3.13.1" - json5 "^2.1.2" + js-yaml "^4.1.0" + json5 "^2.2.0" lazy-val "^1.0.4" readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@~2.3.6: @@ -2080,9 +2008,9 @@ readable-stream@~1.0.31: string_decoder "~0.10.x" registry-auth-token@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.1.1.tgz#40a33be1e82539460f94328b0f7f0f84c16d9479" - integrity sha512-9bKS7nTl9+/A1s7tnPeGrUpRcVY+LUh7bfFgzpndALdPfXQBfQV77rQVtqgUV3ti4vc/Ik81Ex8UJDWDQ12zQA== + version "4.2.1" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" + integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== dependencies: rc "^1.2.8" @@ -2098,18 +2026,10 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= -require-main-filename@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" - integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== - -resolve@^1.20.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== - dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== responselike@^1.0.2: version "1.0.2" @@ -2125,12 +2045,19 @@ rimraf@^2.6.3: dependencies: glob "^7.1.3" -roarr@^2.15.2: - version "2.15.2" - resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.2.tgz#34f6229ae3c8c12167c4ae60f58fe75e79a1e394" - integrity sha512-jmaDhK9CO4YbQAV8zzCnq9vjAqeO489MS5ehZ+rXmFiPFFE6B+S9KYO6prjmLJ5A0zY3QxVlQdrIya7E/azz/Q== +rimraf@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== dependencies: - boolean "^3.0.0" + glob "^7.1.3" + +roarr@^2.15.3: + version "2.15.4" + resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" + integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== + dependencies: + boolean "^3.0.1" detect-node "^2.0.4" globalthis "^1.0.1" json-stringify-safe "^5.0.1" @@ -2152,7 +2079,7 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sanitize-filename@^1.6.2, sanitize-filename@^1.6.3: +sanitize-filename@^1.6.3: version "1.6.3" resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== @@ -2186,33 +2113,21 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.1.2: - version "7.1.3" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6" - integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA== - -semver@^7.3.2: - version "7.3.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== - dependencies: - lru-cache "^6.0.0" - -semver@^7.3.4: +semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" -serialize-error@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-5.0.0.tgz#a7ebbcdb03a5d71a6ed8461ffe0fc1a1afed62ac" - integrity sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA== +serialize-error@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" + integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== dependencies: - type-fest "^0.8.0" + type-fest "^0.13.1" -set-blocking@^2.0.0, set-blocking@~2.0.0: +set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= @@ -2241,15 +2156,10 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -signal-exit@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== - -signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= +signal-exit@^3.0.0, signal-exit@^3.0.2: + version "3.0.6" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== simple-concat@^1.0.0: version "1.0.1" @@ -2270,22 +2180,24 @@ slash@^2.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== -slice-ansi@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" - integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg== +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== dependencies: - is-fullwidth-code-point "^2.0.0" + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" smart-buffer@^4.0.2: - version "4.1.0" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba" - integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw== + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== source-map-support@^0.5.19: - version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" - integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -2295,42 +2207,11 @@ source-map@^0.6.0: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -spdx-correct@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" - integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977" - integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA== - -spdx-expression-parse@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" - integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.5" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" - integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q== - sprintf-js@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - stat-mode@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" @@ -2345,31 +2226,14 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2", string-width@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string-width@^3.0.0, string-width@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" string_decoder@^1.1.1: version "1.3.0" @@ -2397,26 +2261,12 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1: dependencies: ansi-regex "^2.0.0" -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: - ansi-regex "^3.0.0" - -strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== - dependencies: - ansi-regex "^4.1.0" - -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" + ansi-regex "^5.0.1" strip-json-comments@~2.0.1: version "2.0.1" @@ -2438,9 +2288,9 @@ supports-color@^5.3.0: has-flag "^3.0.0" supports-color@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" - integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== dependencies: has-flag "^4.0.0" @@ -2466,9 +2316,9 @@ tar-stream@^2.1.4: readable-stream "^3.1.1" tar@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" - integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== + version "6.1.11" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -2477,18 +2327,13 @@ tar@^6.1.0: mkdirp "^1.0.3" yallist "^4.0.0" -temp-file@^3.3.7: - version "3.3.7" - resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.7.tgz#686885d635f872748e384e871855958470aeb18a" - integrity sha512-9tBJKt7GZAQt/Rg0QzVWA8Am8c1EFl+CAv04/aBVqlx5oyfQ508sFIABshQ0xbZu6mBrFLWIUXO/bbLYghW70g== +temp-file@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" + integrity sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg== dependencies: async-exit-hook "^2.0.1" - fs-extra "^8.1.0" - -textextensions@^5.11.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-5.12.0.tgz#b908120b5c1bd4bb9eba41423d75b176011ab68a" - integrity sha512-IYogUDaP65IXboCiPPC0jTLLBzYlhhw2Y4b0a2trPgbHNGGGEfuHE6tds+yDcCf4mpNDaGISFzwSSezcXt+d6w== + fs-extra "^10.0.0" through2@^2.0.1: version "2.0.5" @@ -2498,6 +2343,13 @@ through2@^2.0.1: readable-stream "~2.3.6" xtend "~4.0.1" +tmp-promise@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" + integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ== + dependencies: + tmp "^0.2.0" + tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -2505,6 +2357,13 @@ tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" +tmp@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== + dependencies: + rimraf "^3.0.0" + to-readable-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" @@ -2536,20 +2395,20 @@ tunnel@^0.0.6: resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== +type-fest@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" + integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== + type-fest@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== -type-fest@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48" - integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg== - -type-fest@^0.8.0: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== +type-fest@^1.0.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" + integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== typedarray-to-buffer@^3.1.5: version "3.1.5" @@ -2575,16 +2434,16 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -universalify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" - integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== - universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== +untildify@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" + integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw== + update-notifier@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" @@ -2606,9 +2465,9 @@ update-notifier@^5.1.0: xdg-basedir "^4.0.0" uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== dependencies: punycode "^2.1.0" @@ -2629,45 +2488,15 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - verror@^1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + version "1.10.1" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb" + integrity sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg== dependencies: assert-plus "^1.0.0" core-util-is "1.0.2" extsprintf "^1.2.0" -version-compare@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/version-compare/-/version-compare-1.1.0.tgz#7b3e67e7e6cec5c72d9c9e586f8854e419ade17c" - integrity sha512-zVKtPOJTC9x23lzS4+4D7J+drq80BXVYAmObnr5zqxxFVH7OffJ1lJlAS7LYsQNV56jx/wtbw0UV7XHLrvd6kQ== - -version-range@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/version-range/-/version-range-1.1.0.tgz#1c233064202ee742afc9d56e21da3b2e15260acf" - integrity sha512-R1Ggfg2EXamrnrV3TkZ6yBNgITDbclB3viwSjbZ3+eK0VVNK4ajkYJTnDz5N0bIMYDtK9MUBvXJUnKO5RWWJ6w== - dependencies: - version-compare "^1.0.0" - -which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= - -which-pm-runs@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" - integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= - which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -2683,11 +2512,11 @@ which@^2.0.1: isexe "^2.0.0" wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== dependencies: - string-width "^1.0.2 || 2" + string-width "^1.0.2 || 2 || 3 || 4" widest-line@^3.1.0: version "3.1.0" @@ -2696,15 +2525,6 @@ widest-line@^3.1.0: dependencies: string-width "^4.0.0" -wrap-ansi@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" - integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== - dependencies: - ansi-styles "^3.2.0" - string-width "^3.0.0" - strip-ansi "^5.0.0" - wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -2744,61 +2564,32 @@ xmlbuilder@^9.0.7: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= -xmldom@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" - integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== - xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -y18n@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" - integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== - y18n@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" - integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yargs-parser@^13.1.2: - version "13.1.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" - integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - yargs-parser@^20.2.2: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs@^13.2.4: - version "13.3.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" - integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== - dependencies: - cliui "^5.0.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^13.1.2" +yargs-parser@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55" + integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA== -yargs@^16.2.0: +yargs@^16.1.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== @@ -2811,9 +2602,23 @@ yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" -yauzl@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" - integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU= +yargs@^17.0.1: + version "17.3.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.0.tgz#295c4ffd0eef148ef3e48f7a2e0f58d0e4f26b1c" + integrity sha512-GQl1pWyDoGptFPJx9b9L6kmR33TGusZvXIZUT+BOz9f7X2L94oeAskFYLEg/FkhV06zZPBYLvLZRWeYId29lew== dependencies: - fd-slicer "~1.0.1" + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.0.0" + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" diff --git a/packages/api/package.json b/packages/api/package.json index 156c04ce7..899c04b23 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -19,7 +19,7 @@ "dependencies": { "async-lock": "^1.2.4", "axios": "^0.21.1", - "better-sqlite3-with-prebuilds": "^7.1.8", + "better-sqlite3-with-prebuilds": "^7.4.3", "body-parser": "^1.19.0", "bufferutil": "^4.0.1", "byline": "^5.0.0", diff --git a/yarn.lock b/yarn.lock index 1e61d3fbb..482681cdc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2061,10 +2061,10 @@ better-assert@~1.0.0: dependencies: callsite "1.0.0" -better-sqlite3-with-prebuilds@^7.1.8: - version "7.1.8" - resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.1.8.tgz#3090c478fe9b60e74ce053a76807b189784f62d7" - integrity sha512-trwg1qhN91cPYEB8D2K0KVHIsMsiAnxKx6/syfQ7rLrtD+zOS3fqJq4VGszMF+OuYAZJNAR4oLsikys3YW/6aA== +better-sqlite3-with-prebuilds@^7.4.3: + version "7.4.3" + resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.4.3.tgz#2ed9c5649a8eb1cf2bece7d3f4849b184ddde038" + integrity sha512-E1MWyMz5RFZCdRNzIcR245dRVR3u1qZO2uV+8Z9Vb/PJsQ6uxOuOnSfA+rZdkuvDbVTbdpowKNL1tuO6FJyt0A== dependencies: "@types/integer" latest bindings "^1.5.0" From 0a7c56dace68a6868ceecd4dd63157da8b7377d3 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 16 Dec 2021 11:26:29 +0100 Subject: [PATCH 02/75] electron initialization without remote --- app/src/electron.js | 27 ++++++++---- packages/web/src/App.svelte | 7 ++- packages/web/src/stores.ts | 6 +-- packages/web/src/utility/axiosInstance.js | 26 +++++++---- packages/web/src/utility/getElectron.ts | 54 ++++++++++++++++++++++- packages/web/src/utility/resolveApi.ts | 27 +++++------- 6 files changed, 107 insertions(+), 40 deletions(-) diff --git a/app/src/electron.js b/app/src/electron.js index 3b80b7897..2c3deb64c 100644 --- a/app/src/electron.js +++ b/app/src/electron.js @@ -159,8 +159,8 @@ function createWindow() { ...bounds, icon: os.platform() == 'win32' ? 'icon.ico' : path.resolve(__dirname, '../icon.png'), webPreferences: { - // nodeIntegration: true, - // contextIsolation: false, + nodeIntegration: true, + contextIsolation: false, // enableRemoteModule: true, }, }); @@ -172,7 +172,7 @@ function createWindow() { mainMenu = buildMenu(); mainWindow.setMenu(mainMenu); - function loadMainWindow() { + function loadMainWindow(initArgs) { const startUrl = process.env.ELECTRON_START_URL || url.format({ @@ -181,7 +181,16 @@ function createWindow() { slashes: true, }); mainWindow.webContents.on('did-finish-load', function () { - // hideSplash(); + mainWindow.webContents.executeJavaScript( + `runInit=()=>{ + try{ + dbgate_initializeElectron(${JSON.stringify(initArgs)}); + }catch(e){ + setTimeout(runInit,100) + } + }; + runInit()` + ); }); mainWindow.on('close', () => { store.set('winBounds', mainWindow.getBounds()); @@ -194,7 +203,7 @@ function createWindow() { } if (process.env.ELECTRON_START_URL) { - loadMainWindow(); + loadMainWindow({}); } else { const apiProcess = fork(path.join(__dirname, '../packages/api/dist/bundle.js'), [ '--dynport', @@ -206,9 +215,11 @@ function createWindow() { apiProcess.on('message', msg => { if (msg.msgtype == 'listening') { const { port, authorization } = msg; - global['port'] = port; - global['authorization'] = authorization; - loadMainWindow(); + + loadMainWindow({ + port, + authorization, + }); } }); } diff --git a/packages/web/src/App.svelte b/packages/web/src/App.svelte index 5b5442323..356019d86 100644 --- a/packages/web/src/App.svelte +++ b/packages/web/src/App.svelte @@ -12,10 +12,16 @@ import axiosInstance from './utility/axiosInstance'; import ErrorHandler from './utility/ErrorHandler.svelte'; import OpenTabsOnStartup from './utility/OpenTabsOnStartup.svelte'; + import { shouldWaitForElectronInitialize } from './utility/getElectron'; let loadedApi = false; async function loadApi() { + if (shouldWaitForElectronInitialize()) { + setTimeout(loadApi, 100); + return; + } + try { const settings = await axiosInstance.get('config/get-settings'); const connections = await axiosInstance.get('connections/list'); @@ -43,7 +49,6 @@ setAppLoaded(); } } - diff --git a/packages/web/src/stores.ts b/packages/web/src/stores.ts index 55226db69..e3e06775e 100644 --- a/packages/web/src/stores.ts +++ b/packages/web/src/stores.ts @@ -74,8 +74,6 @@ export const currentThemeDefinition = derived([currentTheme, extensions], ([$cur $extensions.themes.find(x => x.className == $currentTheme) ); -const electron = getElectron(); - subscribeCssVariable(selectedWidget, x => (x ? 1 : 0), '--dim-visible-left-panel'); subscribeCssVariable(visibleToolbar, x => (x ? 1 : 0), '--dim-visible-toolbar'); subscribeCssVariable(leftPanelWidth, x => `${x}px`, '--dim-left-panel-width'); @@ -119,9 +117,9 @@ let commandsValue = null; commands.subscribe(value => { commandsValue = value; + const electron = getElectron(); if (electron) { - const { ipcRenderer } = electron; - ipcRenderer.send('update-commands', JSON.stringify(value)); + electron.send('update-commands', JSON.stringify(value)); } }); export const getCommands = () => commandsValue; diff --git a/packages/web/src/utility/axiosInstance.js b/packages/web/src/utility/axiosInstance.js index 5735a907d..1e71c2d28 100644 --- a/packages/web/src/utility/axiosInstance.js +++ b/packages/web/src/utility/axiosInstance.js @@ -1,15 +1,23 @@ import axios from 'axios'; import resolveApi, { resolveApiHeaders } from './resolveApi'; -const axiosInstance = axios.create({ - baseURL: resolveApi(), -}); +let axiosInstance; -axiosInstance.defaults.headers = { - 'Cache-Control': 'no-cache', - Pragma: 'no-cache', - Expires: '0', - ...resolveApiHeaders(), -}; +function recreateAxiosInstance() { + axiosInstance = axios.create({ + baseURL: resolveApi(), + }); + + axiosInstance.defaults.headers = { + 'Cache-Control': 'no-cache', + Pragma: 'no-cache', + Expires: '0', + ...resolveApiHeaders(), + }; +} + +window['dbgate_recreateAxiosInstance'] = recreateAxiosInstance; + +recreateAxiosInstance(); export default axiosInstance; diff --git a/packages/web/src/utility/getElectron.ts b/packages/web/src/utility/getElectron.ts index 7f19571cb..111f38c10 100644 --- a/packages/web/src/utility/getElectron.ts +++ b/packages/web/src/utility/getElectron.ts @@ -1,7 +1,57 @@ -export default function getElectron() { +class ElectronApi { + public port?: number; + public authorization?: string; + private ipcRenderer = getIpcRenderer(); + + constructor(args) { + this.port = args.port; + this.authorization = args.authorization; + } + + send(msg, args) { + this.ipcRenderer.send(msg, args); + } +} + +let apiInstance = null; + +function initializeElectron(args) { + // console.log('Initialize electron with args:', args); + + apiInstance = new ElectronApi(args); + if (window['dbgate_recreateAxiosInstance']) { + // console.log('Recreating axios instance'); + + window['dbgate_recreateAxiosInstance'](); + } +} + +window['dbgate_initializeElectron'] = initializeElectron; + +function getIpcRenderer() { if (window['require']) { const electron = window['require']('electron'); - return electron; + return electron?.ipcRenderer; } return null; } + +export function shouldWaitForElectronInitialize() { + return !!getIpcRenderer() && !apiInstance; +} + +export default function getElectron(): ElectronApi { + return apiInstance; + // try { + // // @ts-ignore + // return ipcRenderer; + // } catch (e) { + // return null; + // } + // if (window['require']) { + // const electron = window['require']('electron'); + // console.log('electron?.ipcRenderer', electron?.ipcRenderer); + // return electron?.ipcRenderer; + // } + // return null; +} diff --git a/packages/web/src/utility/resolveApi.ts b/packages/web/src/utility/resolveApi.ts index e584a43bd..afc06a485 100644 --- a/packages/web/src/utility/resolveApi.ts +++ b/packages/web/src/utility/resolveApi.ts @@ -1,18 +1,14 @@ +import getElectron from './getElectron'; + let apiUrl = null; try { apiUrl = process.env.API_URL; } catch {} export default function resolveApi() { - if (window['require']) { - const electron = window['require']('electron'); - - if (electron) { - const port = electron.remote.getGlobal('port'); - if (port) { - return `http://localhost:${port}`; - } - } + const electron = getElectron(); + if (electron?.port) { + return `http://localhost:${electron.port}`; } if (apiUrl) { @@ -22,14 +18,13 @@ export default function resolveApi() { } export function resolveApiHeaders() { - if (window['require']) { - const electron = window['require']('electron'); + const electron = getElectron(); - if (electron) { - return { - Authorization: electron.remote.getGlobal('authorization'), - }; - } + if (electron?.authorization) { + return { + Authorization: electron.authorization, + }; } + return {}; } From e636987f317c8f7519720df083640cd40fa26b32 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 16 Dec 2021 11:46:33 +0100 Subject: [PATCH 03/75] electron app starting --- packages/web/src/App.svelte | 12 +++++++----- .../web/src/appobj/ArchiveFileAppObject.svelte | 6 +++--- .../web/src/appobj/ArchiveFolderAppObject.svelte | 6 +++--- .../web/src/appobj/ConnectionAppObject.svelte | 16 ++++++++-------- packages/web/src/appobj/DatabaseAppObject.svelte | 8 ++++---- .../src/appobj/DatabaseObjectAppObject.svelte | 4 ++-- .../web/src/appobj/FavoriteFileAppObject.svelte | 6 +++--- .../web/src/appobj/SavedFileAppObject.svelte | 8 ++++---- packages/web/src/charts/ChartCore.svelte | 2 +- packages/web/src/charts/chartDataLoader.ts | 4 ++-- .../src/commands/changeDatabaseStatusCommand.ts | 6 +++--- packages/web/src/commands/stdCommands.ts | 8 ++++---- .../src/datagrid/CollectionDataGridCore.svelte | 4 ++-- packages/web/src/datagrid/DataGridCore.svelte | 2 +- packages/web/src/datagrid/JslDataGridCore.svelte | 4 ++-- packages/web/src/datagrid/SqlDataGridCore.svelte | 4 ++-- .../web/src/forms/FormArchiveFolderSelect.svelte | 2 +- packages/web/src/formview/FormView.svelte | 2 +- packages/web/src/formview/SqlFormView.svelte | 4 ++-- .../web/src/freetable/FreeTableGridCore.svelte | 2 +- packages/web/src/impexp/PreviewDataGrid.svelte | 2 +- .../src/modals/ChooseConnectionColorModal.svelte | 4 ++-- packages/web/src/modals/CommandModal.svelte | 4 ++-- packages/web/src/modals/ConnectionModal.svelte | 4 ++-- .../web/src/modals/DictionaryLookupModal.svelte | 2 +- packages/web/src/modals/FavoriteModal.svelte | 6 +++--- packages/web/src/modals/ImportExportModal.svelte | 8 ++++---- packages/web/src/modals/SaveFileModal.svelte | 4 ++-- packages/web/src/modals/SqlGeneratorModal.svelte | 2 +- packages/web/src/modals/ValueLookupModal.svelte | 2 +- packages/web/src/plugins/PluginsProvider.svelte | 2 +- packages/web/src/query/RunnerOutputFiles.svelte | 2 +- packages/web/src/settings/SettingsModal.svelte | 2 +- packages/web/src/tabs/ChangelogTab.svelte | 2 +- packages/web/src/tabs/CollectionDataTab.svelte | 2 +- packages/web/src/tabs/CompareModelTab.svelte | 10 +++++----- packages/web/src/tabs/FavoriteEditorTab.svelte | 2 +- packages/web/src/tabs/FreeTableTab.svelte | 4 ++-- packages/web/src/tabs/MarkdownViewTab.svelte | 2 +- packages/web/src/tabs/PluginTab.svelte | 6 +++--- packages/web/src/tabs/QueryDesignTab.svelte | 6 +++--- packages/web/src/tabs/QueryTab.svelte | 8 ++++---- packages/web/src/tabs/ShellTab.svelte | 6 +++--- packages/web/src/tabs/TableDataTab.svelte | 2 +- packages/web/src/tabs/TableStructureTab.svelte | 6 +++--- packages/web/src/utility/ErrorHandler.svelte | 1 - packages/web/src/utility/alterDatabaseTools.ts | 4 ++-- packages/web/src/utility/axiosInstance.js | 10 ++++++---- packages/web/src/utility/connectionsPinger.js | 4 ++-- packages/web/src/utility/exportElectronFile.ts | 6 +++--- packages/web/src/utility/metadataLoaders.ts | 4 ++-- packages/web/src/utility/openArchiveFolder.ts | 2 +- packages/web/src/utility/openElectronFile.ts | 2 +- packages/web/src/utility/saveTabFile.ts | 4 ++-- packages/web/src/widgets/ArchiveFilesList.svelte | 4 ++-- .../web/src/widgets/ArchiveFolderList.svelte | 2 +- packages/web/src/widgets/ConnectionList.svelte | 2 +- packages/web/src/widgets/QueryHistoryList.svelte | 2 +- packages/web/src/widgets/SqlObjectList.svelte | 2 +- packages/web/src/widgets/StatusBar.svelte | 2 +- 60 files changed, 132 insertions(+), 129 deletions(-) diff --git a/packages/web/src/App.svelte b/packages/web/src/App.svelte index 356019d86..c4688ca26 100644 --- a/packages/web/src/App.svelte +++ b/packages/web/src/App.svelte @@ -23,9 +23,11 @@ } try { - const settings = await axiosInstance.get('config/get-settings'); - const connections = await axiosInstance.get('connections/list'); - const config = await axiosInstance.get('config/get'); + // console.log('************** LOADING API'); + + const settings = await axiosInstance().get('config/get-settings'); + const connections = await axiosInstance().get('connections/list'); + const config = await axiosInstance().get('config/get'); loadedApi = settings?.data && connections?.data && config?.data; if (!loadedApi) { console.log('API not initialized correctly, trying again in 1s'); @@ -51,11 +53,11 @@ } - - {#if loadedApi} + + {#if $loadingPluginStore?.loaded} diff --git a/packages/web/src/appobj/ArchiveFileAppObject.svelte b/packages/web/src/appobj/ArchiveFileAppObject.svelte index 3704accb3..5102d2f77 100644 --- a/packages/web/src/appobj/ArchiveFileAppObject.svelte +++ b/packages/web/src/appobj/ArchiveFileAppObject.svelte @@ -16,7 +16,7 @@ const connProps: any = {}; let tooltip = undefined; - const resp = await axiosInstance.post('files/load', { + const resp = await axiosInstance().post('files/load', { folder: 'archive:' + folderName, file: fileName + '.' + fileType, format: 'text', @@ -91,7 +91,7 @@ label: 'New file name', header: 'Rename file', onConfirm: newFile => { - axiosInstance.post('archive/rename-file', { + axiosInstance().post('archive/rename-file', { file: data.fileName, folder: data.folderName, fileType: data.fileType, @@ -105,7 +105,7 @@ showModal(ConfirmModal, { message: `Really delete file ${data.fileName}?`, onConfirm: () => { - axiosInstance.post('archive/delete-file', { + axiosInstance().post('archive/delete-file', { file: data.fileName, folder: data.folderName, fileType: data.fileType, diff --git a/packages/web/src/appobj/ArchiveFolderAppObject.svelte b/packages/web/src/appobj/ArchiveFolderAppObject.svelte index 6bd006c9b..df7427568 100644 --- a/packages/web/src/appobj/ArchiveFolderAppObject.svelte +++ b/packages/web/src/appobj/ArchiveFolderAppObject.svelte @@ -26,7 +26,7 @@ ? `Really delete link to folder ${data.name}? Folder content remains untouched.` : `Really delete folder ${data.name}?`, onConfirm: () => { - axiosInstance.post('archive/delete-folder', { folder: data.name }); + axiosInstance().post('archive/delete-folder', { folder: data.name }); }, }); }; @@ -41,7 +41,7 @@ label: 'New folder name', header: 'Rename folder', onConfirm: async newFolder => { - await axiosInstance.post('archive/rename-folder', { + await axiosInstance().post('archive/rename-folder', { folder: data.name, newFolder: newFolder + suffix, }); @@ -78,7 +78,7 @@ await dbgateApi.deployDb(${JSON.stringify( }; const handleGenerateDeploySql = async () => { - const resp = await axiosInstance.post('database-connections/generate-deploy-sql', { + const resp = await axiosInstance().post('database-connections/generate-deploy-sql', { conid: $currentDatabase.connection._id, database: $currentDatabase.name, archiveFolder: data.name, diff --git a/packages/web/src/appobj/ConnectionAppObject.svelte b/packages/web/src/appobj/ConnectionAppObject.svelte index 62c07f06e..9d8811185 100644 --- a/packages/web/src/appobj/ConnectionAppObject.svelte +++ b/packages/web/src/appobj/ConnectionAppObject.svelte @@ -44,14 +44,14 @@ const handleConnect = () => { if (data.singleDatabase) { $currentDatabase = { connection: data, name: data.defaultDatabase }; - axiosInstance.post('database-connections/refresh', { + axiosInstance().post('database-connections/refresh', { conid: data._id, database: data.defaultDatabase, keepOpen: true, }); } else { $openedConnections = _.uniq([...$openedConnections, data._id]); - axiosInstance.post('server-connections/refresh', { + axiosInstance().post('server-connections/refresh', { conid: data._id, keepOpen: true, }); @@ -61,16 +61,16 @@ const getContextMenu = () => { const config = getCurrentConfig(); const handleRefresh = () => { - axiosInstance.post('server-connections/refresh', { conid: data._id }); + axiosInstance().post('server-connections/refresh', { conid: data._id }); }; const handleDisconnect = () => { openedConnections.update(list => list.filter(x => x != data._id)); if (electron) { - axiosInstance.post('server-connections/disconnect', { conid: data._id }); + axiosInstance().post('server-connections/disconnect', { conid: data._id }); } if (_.get($currentDatabase, 'connection._id') == data._id) { if (electron) { - axiosInstance.post('database-connections/disconnect', { conid: data._id, database: $currentDatabase.name }); + axiosInstance().post('database-connections/disconnect', { conid: data._id, database: $currentDatabase.name }); } currentDatabase.set(null); } @@ -81,11 +81,11 @@ const handleDelete = () => { showModal(ConfirmModal, { message: `Really delete connection ${getConnectionLabel(data)}?`, - onConfirm: () => axiosInstance.post('connections/delete', data), + onConfirm: () => axiosInstance().post('connections/delete', data), }); }; const handleDuplicate = () => { - axiosInstance.post('connections/save', { + axiosInstance().post('connections/save', { ...data, _id: undefined, displayName: `${getConnectionLabel(data)} - copy`, @@ -97,7 +97,7 @@ value: 'newdb', label: 'Database name', onConfirm: name => - axiosInstance.post('server-connections/create-database', { + axiosInstance().post('server-connections/create-database', { conid: data._id, name, }), diff --git a/packages/web/src/appobj/DatabaseAppObject.svelte b/packages/web/src/appobj/DatabaseAppObject.svelte index 39f74dfa0..218ea76bd 100644 --- a/packages/web/src/appobj/DatabaseAppObject.svelte +++ b/packages/web/src/appobj/DatabaseAppObject.svelte @@ -48,13 +48,13 @@ header: 'Create collection', onConfirm: async newCollection => { const dbid = { conid: connection._id, database: name }; - await axiosInstance.request({ + await axiosInstance().request({ url: 'database-connections/run-script', method: 'post', params: dbid, data: { sql: `db.createCollection('${newCollection}')` }, }); - axiosInstance.post('database-connections/sync-model', dbid); + axiosInstance().post('database-connections/sync-model', dbid); }, }); }; @@ -90,13 +90,13 @@ const handleDisconnect = () => { if (electron) { - axiosInstance.post('database-connections/disconnect', { conid: connection._id, database: name }); + axiosInstance().post('database-connections/disconnect', { conid: connection._id, database: name }); } currentDatabase.set(null); }; const handleExportModel = async () => { - const resp = await axiosInstance.post('database-connections/export-model', { + const resp = await axiosInstance().post('database-connections/export-model', { conid: connection._id, database: name, }); diff --git a/packages/web/src/appobj/DatabaseObjectAppObject.svelte b/packages/web/src/appobj/DatabaseObjectAppObject.svelte index 522dc9ca7..9307bafab 100644 --- a/packages/web/src/appobj/DatabaseObjectAppObject.svelte +++ b/packages/web/src/appobj/DatabaseObjectAppObject.svelte @@ -559,13 +559,13 @@ message: `Really drop collection ${data.pureName}?`, onConfirm: async () => { const dbid = _.pick(data, ['conid', 'database']); - await axiosInstance.request({ + await axiosInstance().request({ url: 'database-connections/run-script', method: 'post', params: dbid, data: { sql: `db.dropCollection('${data.pureName}')` }, }); - axiosInstance.post('database-connections/sync-model', dbid); + axiosInstance().post('database-connections/sync-model', dbid); }, }); } else { diff --git a/packages/web/src/appobj/FavoriteFileAppObject.svelte b/packages/web/src/appobj/FavoriteFileAppObject.svelte index 9c431432c..9c3efddc6 100644 --- a/packages/web/src/appobj/FavoriteFileAppObject.svelte +++ b/packages/web/src/appobj/FavoriteFileAppObject.svelte @@ -7,7 +7,7 @@ const { icon, tabComponent, title, props, tabdata } = favorite; let tabdataNew = tabdata; if (props.savedFile) { - const resp = await axiosInstance.post('files/load', { + const resp = await axiosInstance().post('files/load', { folder: props.savedFolder, file: props.savedFile, format: props.savedFormat, @@ -47,7 +47,7 @@ }; const editFavoriteJson = async () => { - const resp = await axiosInstance.post('files/load', { + const resp = await axiosInstance().post('files/load', { folder: 'favorites', file: data.file, format: 'text', @@ -76,7 +76,7 @@ showModal(ConfirmModal, { message: `Really delete favorite ${data.title}?`, onConfirm: () => { - axiosInstance.post('files/delete', { file: data.file, folder: 'favorites' }); + axiosInstance().post('files/delete', { file: data.file, folder: 'favorites' }); }, }); }; diff --git a/packages/web/src/appobj/SavedFileAppObject.svelte b/packages/web/src/appobj/SavedFileAppObject.svelte index d434db8a9..8f8727d19 100644 --- a/packages/web/src/appobj/SavedFileAppObject.svelte +++ b/packages/web/src/appobj/SavedFileAppObject.svelte @@ -114,7 +114,7 @@ showModal(ConfirmModal, { message: `Really delete file ${data.file}?`, onConfirm: () => { - axiosInstance.post('files/delete', data); + axiosInstance().post('files/delete', data); }, }); }; @@ -125,7 +125,7 @@ label: 'New file name', header: 'Rename file', onConfirm: newFile => { - axiosInstance.post('files/rename', { ...data, newFile }); + axiosInstance().post('files/rename', { ...data, newFile }); }, }); }; @@ -136,13 +136,13 @@ label: 'New file name', header: 'Rename file', onConfirm: newFile => { - axiosInstance.post('files/copy', { ...data, newFile }); + axiosInstance().post('files/copy', { ...data, newFile }); }, }); }; async function openTab() { - const resp = await axiosInstance.post('files/load', { folder, file: data.file, format: handler.format }); + const resp = await axiosInstance().post('files/load', { folder, file: data.file, format: handler.format }); const connProps: any = {}; let tooltip = undefined; diff --git a/packages/web/src/charts/ChartCore.svelte b/packages/web/src/charts/ChartCore.svelte index b3f09ee25..56dd79ea4 100644 --- a/packages/web/src/charts/ChartCore.svelte +++ b/packages/web/src/charts/ChartCore.svelte @@ -61,7 +61,7 @@ export async function exportChart() { saveFileToDisk(async filePath => { - await axiosInstance.post('files/export-chart', { + await axiosInstance().post('files/export-chart', { title, filePath, config: { diff --git a/packages/web/src/charts/chartDataLoader.ts b/packages/web/src/charts/chartDataLoader.ts index ae5786f64..00a927787 100644 --- a/packages/web/src/charts/chartDataLoader.ts +++ b/packages/web/src/charts/chartDataLoader.ts @@ -16,7 +16,7 @@ export async function loadChartStructure(driver: EngineDriver, conid, database, const dmp = driver.createDumper(); dumpSqlSelect(dmp, select); - const resp = await axiosInstance.post('database-connections/query-data', { conid, database, sql: dmp.s }); + const resp = await axiosInstance().post('database-connections/query-data', { conid, database, sql: dmp.s }); if (resp.data.errorMessage) throw new Error(resp.data.errorMessage); return resp.data.columns.map(x => x.columnName); } @@ -74,7 +74,7 @@ export async function loadChartData(driver: EngineDriver, conid, database, sql, const dmp = driver.createDumper(); dumpSqlSelect(dmp, select); - const resp = await axiosInstance.post('database-connections/query-data', { conid, database, sql: dmp.s }); + const resp = await axiosInstance().post('database-connections/query-data', { conid, database, sql: dmp.s }); let { rows, columns, errorMessage } = resp.data; if (errorMessage) { throw new Error(errorMessage); diff --git a/packages/web/src/commands/changeDatabaseStatusCommand.ts b/packages/web/src/commands/changeDatabaseStatusCommand.ts index cb1b59cee..2f18e100c 100644 --- a/packages/web/src/commands/changeDatabaseStatusCommand.ts +++ b/packages/web/src/commands/changeDatabaseStatusCommand.ts @@ -22,19 +22,19 @@ registerCommand({ { text: 'Sync model', onClick: () => { - axiosInstance.post('database-connections/sync-model', dbid); + axiosInstance().post('database-connections/sync-model', dbid); }, }, { text: 'Reopen', onClick: () => { - axiosInstance.post('database-connections/refresh', dbid); + axiosInstance().post('database-connections/refresh', dbid); }, }, { text: 'Disconnect', onClick: () => { - if (electron) axiosInstance.post('database-connections/disconnect', dbid); + if (electron) axiosInstance().post('database-connections/disconnect', dbid); currentDatabase.set(null); }, }, diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts index a55a2b2e5..8bc5e9a48 100644 --- a/packages/web/src/commands/stdCommands.ts +++ b/packages/web/src/commands/stdCommands.ts @@ -123,7 +123,7 @@ registerCommand({ label: 'New archive folder name', header: 'Create archive folder', onConfirm: async folder => { - axiosInstance.post('archive/create-folder', { folder }); + axiosInstance().post('archive/create-folder', { folder }); }, }); }, @@ -190,13 +190,13 @@ registerCommand({ label: 'New collection name', header: 'Create collection', onConfirm: async newCollection => { - await axiosInstance.request({ + await axiosInstance().request({ url: 'database-connections/run-script', method: 'post', params: dbid, data: { sql: `db.createCollection('${newCollection}')` }, }); - axiosInstance.post('database-connections/sync-model', dbid); + axiosInstance().post('database-connections/sync-model', dbid); }, }); }, @@ -258,7 +258,7 @@ registerCommand({ label: 'New database name', header: 'Create SQLite database', onConfirm: async file => { - const resp = await axiosInstance.post('connections/new-sqlite-database', { file }); + const resp = await axiosInstance().post('connections/new-sqlite-database', { file }); const connection = resp.data; currentDatabase.set({ connection, name: `${file}.sqlite` }); }, diff --git a/packages/web/src/datagrid/CollectionDataGridCore.svelte b/packages/web/src/datagrid/CollectionDataGridCore.svelte index 5d968e603..4a8c72c30 100644 --- a/packages/web/src/datagrid/CollectionDataGridCore.svelte +++ b/packages/web/src/datagrid/CollectionDataGridCore.svelte @@ -63,7 +63,7 @@ export async function loadCollectionDataPage(props, offset, limit) { const { conid, database } = props; - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'database-connections/collection-data', method: 'post', params: { @@ -95,7 +95,7 @@ async function loadRowCount(props) { const { conid, database } = props; - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'database-connections/collection-data', method: 'post', params: { diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte index 28d6fae4e..5b9a54c22 100644 --- a/packages/web/src/datagrid/DataGridCore.svelte +++ b/packages/web/src/datagrid/DataGridCore.svelte @@ -404,7 +404,7 @@ } export async function reconnect() { - await axiosInstance.post('database-connections/refresh', { conid, database }); + await axiosInstance().post('database-connections/refresh', { conid, database }); display.reload(); } diff --git a/packages/web/src/datagrid/JslDataGridCore.svelte b/packages/web/src/datagrid/JslDataGridCore.svelte index 73e3efac5..d6c099f7a 100644 --- a/packages/web/src/datagrid/JslDataGridCore.svelte +++ b/packages/web/src/datagrid/JslDataGridCore.svelte @@ -13,7 +13,7 @@ async function loadDataPage(props, offset, limit) { const { jslid, display } = props; - const response = await axiosInstance.post('jsldata/get-rows', { + const response = await axiosInstance().post('jsldata/get-rows', { jslid, offset, limit, @@ -30,7 +30,7 @@ async function loadRowCount(props) { const { jslid } = props; - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'jsldata/get-stats', method: 'get', params: { diff --git a/packages/web/src/datagrid/SqlDataGridCore.svelte b/packages/web/src/datagrid/SqlDataGridCore.svelte index 623bd6f84..cb2289ff7 100644 --- a/packages/web/src/datagrid/SqlDataGridCore.svelte +++ b/packages/web/src/datagrid/SqlDataGridCore.svelte @@ -31,7 +31,7 @@ const sql = display.getPageQuery(offset, limit); - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'database-connections/query-data', method: 'post', params: { @@ -56,7 +56,7 @@ const sql = display.getCountQuery(); - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'database-connections/query-data', method: 'post', params: { diff --git a/packages/web/src/forms/FormArchiveFolderSelect.svelte b/packages/web/src/forms/FormArchiveFolderSelect.svelte index 313c63103..7593dde5c 100644 --- a/packages/web/src/forms/FormArchiveFolderSelect.svelte +++ b/packages/web/src/forms/FormArchiveFolderSelect.svelte @@ -34,7 +34,7 @@ ]; const createOption = folder => { - axiosInstance.post('archive/create-folder', { folder }); + axiosInstance().post('archive/create-folder', { folder }); setFieldValue(name, folder); }; diff --git a/packages/web/src/formview/FormView.svelte b/packages/web/src/formview/FormView.svelte index ed6875d33..315c6bf3a 100644 --- a/packages/web/src/formview/FormView.svelte +++ b/packages/web/src/formview/FormView.svelte @@ -260,7 +260,7 @@ } export async function reconnect() { - await axiosInstance.post('database-connections/refresh', { conid, database }); + await axiosInstance().post('database-connections/refresh', { conid, database }); formDisplay.reload(); } diff --git a/packages/web/src/formview/SqlFormView.svelte b/packages/web/src/formview/SqlFormView.svelte index 9df60108c..561120ffc 100644 --- a/packages/web/src/formview/SqlFormView.svelte +++ b/packages/web/src/formview/SqlFormView.svelte @@ -4,7 +4,7 @@ if (!sql) return null; - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'database-connections/query-data', method: 'post', params: { @@ -124,7 +124,7 @@ $: if (onReferenceSourceChanged && rowData) onReferenceSourceChanged([rowData], loadedTime); // async function handleConfirmSql(sql) { - // const resp = await axiosInstance.request({ + // const resp = await axiosInstance().request({ // url: 'database-connections/query-data', // method: 'post', // params: { diff --git a/packages/web/src/freetable/FreeTableGridCore.svelte b/packages/web/src/freetable/FreeTableGridCore.svelte index 4d9dbabca..c58477e39 100644 --- a/packages/web/src/freetable/FreeTableGridCore.svelte +++ b/packages/web/src/freetable/FreeTableGridCore.svelte @@ -45,7 +45,7 @@ export async function exportGrid() { const jslid = uuidv1(); - await axiosInstance.post('jsldata/save-free-table', { jslid, data: modelState.value }); + await axiosInstance().post('jsldata/save-free-table', { jslid, data: modelState.value }); const initialValues: any = {}; initialValues.sourceStorageType = 'jsldata'; initialValues.sourceJslId = jslid; diff --git a/packages/web/src/impexp/PreviewDataGrid.svelte b/packages/web/src/impexp/PreviewDataGrid.svelte index da916dcd4..64905f600 100644 --- a/packages/web/src/impexp/PreviewDataGrid.svelte +++ b/packages/web/src/impexp/PreviewDataGrid.svelte @@ -27,7 +27,7 @@ } errorMessage = null; isLoading = true; - const resp = await axiosInstance.post('runners/load-reader', sourceReader); + const resp = await axiosInstance().post('runners/load-reader', sourceReader); // @ts-ignore model = resp.data; grider = new RowsArrayGrider(resp.data.rows); diff --git a/packages/web/src/modals/ChooseConnectionColorModal.svelte b/packages/web/src/modals/ChooseConnectionColorModal.svelte index c6ad32068..1ed6063ad 100644 --- a/packages/web/src/modals/ChooseConnectionColorModal.svelte +++ b/packages/web/src/modals/ChooseConnectionColorModal.svelte @@ -27,13 +27,13 @@ value = e.detail; if (database) { - axiosInstance.post('connections/update-database', { + axiosInstance().post('connections/update-database', { conid, database, values: { connectionColor: e.detail }, }); } else { - axiosInstance.post('connections/update', { + axiosInstance().post('connections/update', { _id: conid, values: { connectionColor: e.detail }, }); diff --git a/packages/web/src/modals/CommandModal.svelte b/packages/web/src/modals/CommandModal.svelte index 876171619..378c8bf86 100644 --- a/packages/web/src/modals/CommandModal.svelte +++ b/packages/web/src/modals/CommandModal.svelte @@ -42,7 +42,7 @@ value="OK" on:click={e => { closeCurrentModal(); - axiosInstance.post('config/update-settings', { + axiosInstance().post('config/update-settings', { commands: { ...$commandsSettings, [command.id]: { @@ -58,7 +58,7 @@ value="Reset" on:click={() => { closeCurrentModal(); - axiosInstance.post('config/update-settings', { + axiosInstance().post('config/update-settings', { commands: _.omit($commandsSettings, [command.id]), }); }} diff --git a/packages/web/src/modals/ConnectionModal.svelte b/packages/web/src/modals/ConnectionModal.svelte index 6331302db..962f74a30 100644 --- a/packages/web/src/modals/ConnectionModal.svelte +++ b/packages/web/src/modals/ConnectionModal.svelte @@ -38,7 +38,7 @@ isTesting = true; testIdRef.update(x => x + 1); const testid = testIdRef.get(); - const resp = await axiosInstance.post('connections/test', e.detail); + const resp = await axiosInstance().post('connections/test', e.detail); if (testIdRef.get() != testid) return; isTesting = false; @@ -70,7 +70,7 @@ let connection = _.omit(e.detail, omitProps); if (driver?.beforeConnectionSave) connection = driver?.beforeConnectionSave(connection); - axiosInstance.post('connections/save', connection); + axiosInstance().post('connections/save', connection); closeCurrentModal(); } diff --git a/packages/web/src/modals/DictionaryLookupModal.svelte b/packages/web/src/modals/DictionaryLookupModal.svelte index 19fdfbf97..c1e215031 100644 --- a/packages/web/src/modals/DictionaryLookupModal.svelte +++ b/packages/web/src/modals/DictionaryLookupModal.svelte @@ -100,7 +100,7 @@ dumpSqlSelect(dmp, select); isLoading = true; - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'database-connections/query-data', method: 'post', params: { diff --git a/packages/web/src/modals/FavoriteModal.svelte b/packages/web/src/modals/FavoriteModal.svelte index 98503ab43..45103e81e 100644 --- a/packages/web/src/modals/FavoriteModal.svelte +++ b/packages/web/src/modals/FavoriteModal.svelte @@ -69,7 +69,7 @@ import FormButton from '../forms/FormButton.svelte'; const saveTab = async values => { const data = await getTabSaveData(values); - axiosInstance.post('files/save', { + axiosInstance().post('files/save', { folder: 'favorites', file: uuidv1(), format: 'json', @@ -78,13 +78,13 @@ import FormButton from '../forms/FormButton.svelte'; }; const saveFile = async values => { - const oldDataResp = await axiosInstance.post('files/load', { + const oldDataResp = await axiosInstance().post('files/load', { folder: 'favorites', file: editingData.file, format: 'json', }); - axiosInstance.post('files/save', { + axiosInstance().post('files/save', { folder: 'favorites', file: editingData.file, format: 'json', diff --git a/packages/web/src/modals/ImportExportModal.svelte b/packages/web/src/modals/ImportExportModal.svelte index bf154a035..c338e31f6 100644 --- a/packages/web/src/modals/ImportExportModal.svelte +++ b/packages/web/src/modals/ImportExportModal.svelte @@ -81,8 +81,8 @@ const handleRunnerDone = () => { busy = false; if (refreshArchiveFolderRef.get()) { - axiosInstance.post('archive/refresh-folders', {}); - axiosInstance.post('archive/refresh-files', { folder: refreshArchiveFolderRef.get() }); + axiosInstance().post('archive/refresh-folders', {}); + axiosInstance().post('archive/refresh-files', { folder: refreshArchiveFolderRef.get() }); $currentArchive = refreshArchiveFolderRef.get(); $selectedWidget = 'archive'; } @@ -108,7 +108,7 @@ const script = await createImpExpScript($extensions, values); executeNumber += 1; let runid = runnerId; - const resp = await axiosInstance.post('runners/start', { script }); + const resp = await axiosInstance().post('runners/start', { script }); runid = resp.data.runid; runnerId = runid; @@ -120,7 +120,7 @@ }; const handleCancel = () => { - axiosInstance.post('runners/cancel', { + axiosInstance().post('runners/cancel', { runid: runnerId, }); }; diff --git a/packages/web/src/modals/SaveFileModal.svelte b/packages/web/src/modals/SaveFileModal.svelte index 064235e71..b21eb2566 100644 --- a/packages/web/src/modals/SaveFileModal.svelte +++ b/packages/web/src/modals/SaveFileModal.svelte @@ -22,7 +22,7 @@ const handleSubmit = async e => { const { name } = e.detail; - await axiosInstance.post('files/save', { folder, file: name, data, format }); + await axiosInstance().post('files/save', { folder, file: name, data, format }); closeCurrentModal(); if (onSave) { onSave(name, { @@ -38,7 +38,7 @@ const parsed = path.parse(filePath); // if (!parsed.ext) filePath += `.${fileExtension}`; - await axiosInstance.post('files/save-as', { filePath, data, format }); + await axiosInstance().post('files/save-as', { filePath, data, format }); closeCurrentModal(); if (onSave) { diff --git a/packages/web/src/modals/SqlGeneratorModal.svelte b/packages/web/src/modals/SqlGeneratorModal.svelte index 5d500fc07..d8b66bcc9 100644 --- a/packages/web/src/modals/SqlGeneratorModal.svelte +++ b/packages/web/src/modals/SqlGeneratorModal.svelte @@ -86,7 +86,7 @@ const loadid = uuidv1(); loadRef.set(loadid); busy = true; - const response = await axiosInstance.post('database-connections/sql-preview', { + const response = await axiosInstance().post('database-connections/sql-preview', { conid, database, objects, diff --git a/packages/web/src/modals/ValueLookupModal.svelte b/packages/web/src/modals/ValueLookupModal.svelte index a5bc5b63d..089d73ca6 100644 --- a/packages/web/src/modals/ValueLookupModal.svelte +++ b/packages/web/src/modals/ValueLookupModal.svelte @@ -85,7 +85,7 @@ dumpSqlSelect(dmp, select); isLoading = true; - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'database-connections/query-data', method: 'post', params: { diff --git a/packages/web/src/plugins/PluginsProvider.svelte b/packages/web/src/plugins/PluginsProvider.svelte index c6d30dd61..684811f3a 100644 --- a/packages/web/src/plugins/PluginsProvider.svelte +++ b/packages/web/src/plugins/PluginsProvider.svelte @@ -14,7 +14,7 @@ loaded: false, loadingPackageName: installed.name, }); - const resp = await axiosInstance.request({ + const resp = await axiosInstance().request({ method: 'get', url: 'plugins/script', params: { diff --git a/packages/web/src/query/RunnerOutputFiles.svelte b/packages/web/src/query/RunnerOutputFiles.svelte index cec5a83dc..a19e6d58e 100644 --- a/packages/web/src/query/RunnerOutputFiles.svelte +++ b/packages/web/src/query/RunnerOutputFiles.svelte @@ -34,7 +34,7 @@ $: $effect; const handleRunnerDone = async () => { - const resp = await axiosInstance.get(`runners/files?runid=${runnerId}`); + const resp = await axiosInstance().get(`runners/files?runid=${runnerId}`); files = resp.data; }; diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte index dc0a2a69e..94c97dc15 100644 --- a/packages/web/src/settings/SettingsModal.svelte +++ b/packages/web/src/settings/SettingsModal.svelte @@ -16,7 +16,7 @@ import axiosInstance from '../utility/axiosInstance'; function handleOk(e) { - axiosInstance.post( + axiosInstance().post( 'config/update-settings', _.omitBy(e.detail, (v, k) => k.startsWith(':')) ); diff --git a/packages/web/src/tabs/ChangelogTab.svelte b/packages/web/src/tabs/ChangelogTab.svelte index 575cff2c2..f9278c8f5 100644 --- a/packages/web/src/tabs/ChangelogTab.svelte +++ b/packages/web/src/tabs/ChangelogTab.svelte @@ -14,7 +14,7 @@ const handleLoad = async () => { isLoading = true; - const resp = await axiosInstance.get('config/changelog'); + const resp = await axiosInstance().get('config/changelog'); text = resp.data; isLoading = false; }; diff --git a/packages/web/src/tabs/CollectionDataTab.svelte b/packages/web/src/tabs/CollectionDataTab.svelte index d19b66cae..7ac6ad51c 100644 --- a/packages/web/src/tabs/CollectionDataTab.svelte +++ b/packages/web/src/tabs/CollectionDataTab.svelte @@ -91,7 +91,7 @@ // $: console.log('LOADED ROWS MONGO', loadedRows); async function handleConfirmChange(changeSet) { - const resp = await axiosInstance.request({ + const resp = await axiosInstance().request({ url: 'database-connections/update-collection', method: 'post', params: { diff --git a/packages/web/src/tabs/CompareModelTab.svelte b/packages/web/src/tabs/CompareModelTab.svelte index db6461792..c15c62fa9 100644 --- a/packages/web/src/tabs/CompareModelTab.svelte +++ b/packages/web/src/tabs/CompareModelTab.svelte @@ -228,7 +228,7 @@ export async function showReport() { saveFileToDisk(async filePath => { - await axiosInstance.post('database-connections/generate-db-diff-report', { + await axiosInstance().post('database-connections/generate-db-diff-report', { filePath, sourceConid: $values?.sourceConid, sourceDatabase: $values?.sourceDatabase, @@ -261,11 +261,11 @@ } export function refreshModels() { - axiosInstance.post('database-connections/sync-model', { + axiosInstance().post('database-connections/sync-model', { conid: $values?.targetConid, database: $values?.targetDatabase, }); - axiosInstance.post('database-connections/sync-model', { + axiosInstance().post('database-connections/sync-model', { conid: $values?.sourceConid, database: $values?.sourceDatabase, }); @@ -275,7 +275,7 @@ const conid = $values?.targetConid; const database = $values?.targetDatabase; - const resp = await axiosInstance.request({ + const resp = await axiosInstance().request({ url: 'database-connections/run-script', method: 'post', params: { conid, database }, @@ -286,7 +286,7 @@ showModal(ErrorMessageModal, { title: 'Error when saving', message: errorMessage }); } else { $values = _.omitBy($values, (v, k) => k.startsWith('isChecked_')); - await axiosInstance.post('database-connections/sync-model', { conid, database }); + await axiosInstance().post('database-connections/sync-model', { conid, database }); showSnackbarSuccess('Saved to database'); } } diff --git a/packages/web/src/tabs/FavoriteEditorTab.svelte b/packages/web/src/tabs/FavoriteEditorTab.svelte index 5a21bb0ca..7d05f6f6f 100644 --- a/packages/web/src/tabs/FavoriteEditorTab.svelte +++ b/packages/web/src/tabs/FavoriteEditorTab.svelte @@ -97,7 +97,7 @@ export function save() { try { const data = JSON.parse(getData()); - axiosInstance.post('files/save', { + axiosInstance().post('files/save', { file: savedFile, folder: 'favorites', format: 'json', diff --git a/packages/web/src/tabs/FreeTableTab.svelte b/packages/web/src/tabs/FreeTableTab.svelte index 3763e43c3..d67dc24f0 100644 --- a/packages/web/src/tabs/FreeTableTab.svelte +++ b/packages/web/src/tabs/FreeTableTab.svelte @@ -63,7 +63,7 @@ tabid, loadFromArgs: initialArgs && initialArgs.functionName - ? () => axiosInstance.post('runners/load-reader', initialArgs).then(x => x.data) + ? () => axiosInstance().post('runners/load-reader', initialArgs).then(x => x.data) : null, onInitialData: value => { dispatchModel({ type: 'reset', value }); @@ -84,7 +84,7 @@ } const doSave = async (folder, file) => { - await axiosInstance.post('archive/save-free-table', { folder, file, data: $modelState.value }); + await axiosInstance().post('archive/save-free-table', { folder, file, data: $modelState.value }); changeTab(tabid, tab => ({ ...tab, title: file, diff --git a/packages/web/src/tabs/MarkdownViewTab.svelte b/packages/web/src/tabs/MarkdownViewTab.svelte index 7dd4eb4f1..e162a4715 100644 --- a/packages/web/src/tabs/MarkdownViewTab.svelte +++ b/packages/web/src/tabs/MarkdownViewTab.svelte @@ -16,7 +16,7 @@ const handleLoad = async () => { isLoading = true; - const resp = await axiosInstance.post('files/load', { + const resp = await axiosInstance().post('files/load', { folder: 'markdown', file: savedFile, format: 'text', diff --git a/packages/web/src/tabs/PluginTab.svelte b/packages/web/src/tabs/PluginTab.svelte index 4718c4f97..1f7b65b9c 100644 --- a/packages/web/src/tabs/PluginTab.svelte +++ b/packages/web/src/tabs/PluginTab.svelte @@ -27,13 +27,13 @@ $: isPackaged = $info?.isPackaged; const handleInstall = async () => { - axiosInstance.post('plugins/install', { packageName }); + axiosInstance().post('plugins/install', { packageName }); }; const handleUninstall = async () => { - axiosInstance.post('plugins/uninstall', { packageName }); + axiosInstance().post('plugins/uninstall', { packageName }); }; const handleUpgrade = async () => { - axiosInstance.post('plugins/upgrade', { packageName }); + axiosInstance().post('plugins/upgrade', { packageName }); }; $: installedFound = $installed?.find(x => x.name == packageName); diff --git a/packages/web/src/tabs/QueryDesignTab.svelte b/packages/web/src/tabs/QueryDesignTab.svelte index d9c78ddb3..44f40b76f 100644 --- a/packages/web/src/tabs/QueryDesignTab.svelte +++ b/packages/web/src/tabs/QueryDesignTab.svelte @@ -105,7 +105,7 @@ let sesid = sessionId; if (!sesid) { - const resp = await axiosInstance.post('sessions/create', { + const resp = await axiosInstance().post('sessions/create', { conid, database, }); @@ -114,14 +114,14 @@ } busy = true; timerLabel.start(); - await axiosInstance.post('sessions/execute-query', { + await axiosInstance().post('sessions/execute-query', { sesid, sql: sqlPreview, }); } export async function kill() { - await axiosInstance.post('sessions/kill', { + await axiosInstance().post('sessions/kill', { sesid: sessionId, }); sessionId = null; diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte index 3f9293c6c..2e6284da2 100644 --- a/packages/web/src/tabs/QueryTab.svelte +++ b/packages/web/src/tabs/QueryTab.svelte @@ -150,7 +150,7 @@ let sesid = sessionId; if (!sesid) { - const resp = await axiosInstance.post('sessions/create', { + const resp = await axiosInstance().post('sessions/create', { conid, database, }); @@ -159,11 +159,11 @@ } busy = true; timerLabel.start(); - await axiosInstance.post('sessions/execute-query', { + await axiosInstance().post('sessions/execute-query', { sesid, sql, }); - await axiosInstance.post('query-history/write', { + await axiosInstance().post('query-history/write', { data: { sql, conid, @@ -184,7 +184,7 @@ } export async function kill() { - await axiosInstance.post('sessions/kill', { + await axiosInstance().post('sessions/kill', { sesid: sessionId, }); sessionId = null; diff --git a/packages/web/src/tabs/ShellTab.svelte b/packages/web/src/tabs/ShellTab.svelte index 69a0386ea..9c0c30d38 100644 --- a/packages/web/src/tabs/ShellTab.svelte +++ b/packages/web/src/tabs/ShellTab.svelte @@ -140,7 +140,7 @@ } export async function copyNodeScript() { - const resp = await axiosInstance.post('runners/get-node-script', { script: getActiveScript() }); + const resp = await axiosInstance().post('runners/get-node-script', { script: getActiveScript() }); copyTextToClipboard(resp.data); } @@ -172,7 +172,7 @@ executeNumber += 1; let runid = runnerId; - const resp = await axiosInstance.post('runners/start', { + const resp = await axiosInstance().post('runners/start', { script: getActiveScript(), }); runid = resp.data.runid; @@ -186,7 +186,7 @@ } export function kill() { - axiosInstance.post('runners/cancel', { + axiosInstance().post('runners/cancel', { runid: runnerId, }); timerLabel.stop(); diff --git a/packages/web/src/tabs/TableDataTab.svelte b/packages/web/src/tabs/TableDataTab.svelte index 28dc575a2..6b8e947b8 100644 --- a/packages/web/src/tabs/TableDataTab.svelte +++ b/packages/web/src/tabs/TableDataTab.svelte @@ -70,7 +70,7 @@ const [changeSetStore, dispatchChangeSet] = createUndoReducer(createChangeSet()); async function handleConfirmSql(sql) { - const resp = await axiosInstance.request({ + const resp = await axiosInstance().request({ url: 'database-connections/run-script', method: 'post', params: { diff --git a/packages/web/src/tabs/TableStructureTab.svelte b/packages/web/src/tabs/TableStructureTab.svelte index d30c99938..57b360468 100644 --- a/packages/web/src/tabs/TableStructureTab.svelte +++ b/packages/web/src/tabs/TableStructureTab.svelte @@ -130,7 +130,7 @@ } async function handleConfirmSql(sql, createTableName) { - const resp = await axiosInstance.request({ + const resp = await axiosInstance().request({ url: 'database-connections/run-script', method: 'post', params: { @@ -154,14 +154,14 @@ })); } - await axiosInstance.post('database-connections/sync-model', { conid, database }); + await axiosInstance().post('database-connections/sync-model', { conid, database }); showSnackbarSuccess('Saved to database'); clearEditorData(); } } export async function reset() { - await axiosInstance.post('database-connections/sync-model', { conid, database }); + await axiosInstance().post('database-connections/sync-model', { conid, database }); clearEditorData(); } diff --git a/packages/web/src/utility/ErrorHandler.svelte b/packages/web/src/utility/ErrorHandler.svelte index 195bcea99..efbd98e85 100644 --- a/packages/web/src/utility/ErrorHandler.svelte +++ b/packages/web/src/utility/ErrorHandler.svelte @@ -1,7 +1,6 @@ diff --git a/packages/web/src/widgets/ConnectionList.svelte b/packages/web/src/widgets/ConnectionList.svelte index ee21e9c8b..0243b21c7 100644 --- a/packages/web/src/widgets/ConnectionList.svelte +++ b/packages/web/src/widgets/ConnectionList.svelte @@ -29,7 +29,7 @@ const handleRefreshConnections = () => { for (const conid of $openedConnections) { - axiosInstance.post('server-connections/refresh', { conid }); + axiosInstance().post('server-connections/refresh', { conid }); } }; diff --git a/packages/web/src/widgets/QueryHistoryList.svelte b/packages/web/src/widgets/QueryHistoryList.svelte index b419661e9..5a3d6b073 100644 --- a/packages/web/src/widgets/QueryHistoryList.svelte +++ b/packages/web/src/widgets/QueryHistoryList.svelte @@ -18,7 +18,7 @@ let historyItems = []; async function reloadItems() { - const resp = await axiosInstance.request({ + const resp = await axiosInstance().request({ method: 'get', url: 'query-history/read', params: { diff --git a/packages/web/src/widgets/SqlObjectList.svelte b/packages/web/src/widgets/SqlObjectList.svelte index c490fe078..32c242c7a 100644 --- a/packages/web/src/widgets/SqlObjectList.svelte +++ b/packages/web/src/widgets/SqlObjectList.svelte @@ -62,7 +62,7 @@ // $: objectList = generateObjectList(generateIndex); const handleRefreshDatabase = () => { - axiosInstance.post('database-connections/refresh', { conid, database }); + axiosInstance().post('database-connections/refresh', { conid, database }); }; function createAddMenu() { diff --git a/packages/web/src/widgets/StatusBar.svelte b/packages/web/src/widgets/StatusBar.svelte index bfd8b357d..3fff2cdd8 100644 --- a/packages/web/src/widgets/StatusBar.svelte +++ b/packages/web/src/widgets/StatusBar.svelte @@ -64,7 +64,7 @@ async function handleSyncModel() { if (connection && databaseName) { - await axiosInstance.post('database-connections/sync-model', { conid: connection._id, database: databaseName }); + await axiosInstance().post('database-connections/sync-model', { conid: connection._id, database: databaseName }); } } From 588b8b23f9211c3e7c34430956286164d199b35d Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 16 Dec 2021 13:25:57 +0100 Subject: [PATCH 04/75] bundled electron app starts without error --- packages/web/src/App.svelte | 11 ++++++- .../web/src/datagrid/JslDataGridCore.svelte | 4 +-- .../web/src/modals/ImportExportModal.svelte | 4 +-- packages/web/src/query/ResultTabs.svelte | 4 +-- .../web/src/query/RunnerOutputFiles.svelte | 4 +-- .../web/src/query/SocketMessageView.svelte | 4 +-- packages/web/src/stores.ts | 30 +++++++++++-------- packages/web/src/tabs/QueryDesignTab.svelte | 4 +-- packages/web/src/tabs/QueryTab.svelte | 4 +-- packages/web/src/tabs/ShellTab.svelte | 4 +-- packages/web/src/utility/connectionsPinger.js | 24 ++++++++------- .../web/src/utility/exportElectronFile.ts | 4 +-- packages/web/src/utility/getElectron.ts | 7 ++--- packages/web/src/utility/hasPermission.ts | 15 +++++----- packages/web/src/utility/metadataLoaders.ts | 4 +-- packages/web/src/utility/socket.js | 19 ++++++++++-- .../web/src/widgets/QueryHistoryList.svelte | 4 +-- 17 files changed, 91 insertions(+), 59 deletions(-) diff --git a/packages/web/src/App.svelte b/packages/web/src/App.svelte index c4688ca26..2b92d48be 100644 --- a/packages/web/src/App.svelte +++ b/packages/web/src/App.svelte @@ -7,12 +7,14 @@ import PluginsProvider from './plugins/PluginsProvider.svelte'; import Screen from './Screen.svelte'; - import { loadingPluginStore } from './stores'; + import { loadingPluginStore, subscribeApiDependendStores } from './stores'; import { setAppLoaded } from './utility/appLoadManager'; import axiosInstance from './utility/axiosInstance'; import ErrorHandler from './utility/ErrorHandler.svelte'; import OpenTabsOnStartup from './utility/OpenTabsOnStartup.svelte'; import { shouldWaitForElectronInitialize } from './utility/getElectron'; + import { subscribeConnectionPingers } from './utility/connectionsPinger'; + import { subscribePermissionCompiler } from './utility/hasPermission'; let loadedApi = false; @@ -29,6 +31,13 @@ const connections = await axiosInstance().get('connections/list'); const config = await axiosInstance().get('config/get'); loadedApi = settings?.data && connections?.data && config?.data; + + if (loadedApi) { + subscribeApiDependendStores(); + subscribeConnectionPingers(); + subscribePermissionCompiler(); + } + if (!loadedApi) { console.log('API not initialized correctly, trying again in 1s'); setTimeout(loadApi, 1000); diff --git a/packages/web/src/datagrid/JslDataGridCore.svelte b/packages/web/src/datagrid/JslDataGridCore.svelte index d6c099f7a..71853fb87 100644 --- a/packages/web/src/datagrid/JslDataGridCore.svelte +++ b/packages/web/src/datagrid/JslDataGridCore.svelte @@ -82,9 +82,9 @@ $: effect = useEffect(() => onJslId(jslid)); function onJslId(jslidVal) { if (jslidVal) { - socket.on(`jsldata-stats-${jslidVal}`, handleJslDataStats); + socket().on(`jsldata-stats-${jslidVal}`, handleJslDataStats); return () => { - socket.off(`jsldata-stats-${jslidVal}`, handleJslDataStats); + socket().off(`jsldata-stats-${jslidVal}`, handleJslDataStats); }; } } diff --git a/packages/web/src/modals/ImportExportModal.svelte b/packages/web/src/modals/ImportExportModal.svelte index c338e31f6..662296471 100644 --- a/packages/web/src/modals/ImportExportModal.svelte +++ b/packages/web/src/modals/ImportExportModal.svelte @@ -67,9 +67,9 @@ function registerRunnerDone(rid) { if (rid) { - socket.on(`runner-done-${rid}`, handleRunnerDone); + socket().on(`runner-done-${rid}`, handleRunnerDone); return () => { - socket.off(`runner-done-${rid}`, handleRunnerDone); + socket().off(`runner-done-${rid}`, handleRunnerDone); }; } else { return () => {}; diff --git a/packages/web/src/query/ResultTabs.svelte b/packages/web/src/query/ResultTabs.svelte index 14c6e2ae2..6d78cd85a 100644 --- a/packages/web/src/query/ResultTabs.svelte +++ b/packages/web/src/query/ResultTabs.svelte @@ -66,9 +66,9 @@ }); function onSession(sid) { if (sid) { - socket.on(`session-recordset-${sid}`, handleResultSet); + socket().on(`session-recordset-${sid}`, handleResultSet); return () => { - socket.off(`session-recordset-${sid}`, handleResultSet); + socket().off(`session-recordset-${sid}`, handleResultSet); }; } return () => {}; diff --git a/packages/web/src/query/RunnerOutputFiles.svelte b/packages/web/src/query/RunnerOutputFiles.svelte index a19e6d58e..dbd92bdc3 100644 --- a/packages/web/src/query/RunnerOutputFiles.svelte +++ b/packages/web/src/query/RunnerOutputFiles.svelte @@ -22,9 +22,9 @@ function registerRunnerDone(rid) { if (rid) { - socket.on(`runner-done-${rid}`, handleRunnerDone); + socket().on(`runner-done-${rid}`, handleRunnerDone); return () => { - socket.off(`runner-done-${rid}`, handleRunnerDone); + socket().off(`runner-done-${rid}`, handleRunnerDone); }; } else { return () => {}; diff --git a/packages/web/src/query/SocketMessageView.svelte b/packages/web/src/query/SocketMessageView.svelte index 05dd4c117..200895146 100644 --- a/packages/web/src/query/SocketMessageView.svelte +++ b/packages/web/src/query/SocketMessageView.svelte @@ -30,9 +30,9 @@ $: effect = useEffect(() => { if (eventName) { - socket.on(eventName, handleInfo); + socket().on(eventName, handleInfo); return () => { - socket.off(eventName, handleInfo); + socket().off(eventName, handleInfo); }; } return () => {}; diff --git a/packages/web/src/stores.ts b/packages/web/src/stores.ts index e3e06775e..150df6f5b 100644 --- a/packages/web/src/stores.ts +++ b/packages/web/src/stores.ts @@ -44,7 +44,7 @@ export const activeTab = derived([openedTabs], ([$openedTabs]) => $openedTabs.fi export const recentDatabases = writableWithStorage([], 'recentDatabases'); export const pinnedDatabases = writableWithStorage([], 'pinnedDatabases'); export const pinnedTables = writableWithStorage([], 'pinnedTables'); -export const commandsSettings = derived(useSettings(), (config: any) => (config || {}).commands || {}); +export const commandsSettings = writable({}); export const allResultsInOneTabDefault = writableWithStorage(false, 'allResultsInOneTabDefault'); export const archiveFilesAsDataSheets = writableWithStorage([], 'archiveFilesAsDataSheets'); export const commandsCustomized = derived([commands, commandsSettings], ([$commands, $commandsSettings]) => @@ -130,15 +130,7 @@ activeTab.subscribe(value => { }); export const getActiveTab = () => activeTabValue; -const currentConfigStore = useConfig(); let currentConfigValue = null; -currentConfigStore.subscribe(value => { - currentConfigValue = value; - invalidateCommands(); - if (value.singleDatabase) { - currentDatabase.set(value.singleDatabase); - } -}); export const getCurrentConfig = () => currentConfigValue; let recentDatabasesValue = null; @@ -161,10 +153,6 @@ currentDatabase.subscribe(value => { export const getCurrentDatabase = () => currentDatabaseValue; let currentSettingsValue = null; -useSettings().subscribe(value => { - currentSettingsValue = value; - invalidateCommands(); -}); export const getCurrentSettings = () => currentSettingsValue || {}; let extensionsValue = null; @@ -178,3 +166,19 @@ openedConnections.subscribe(value => { openedConnectionsValue = value; }); export const getOpenedConnections = () => openedConnectionsValue; + +export function subscribeApiDependendStores() { + useSettings().subscribe(value => { + currentSettingsValue = value; + commandsSettings.set((value || {}).commands || {}); + invalidateCommands(); + }); + + useConfig().subscribe(value => { + currentConfigValue = value; + invalidateCommands(); + if (value.singleDatabase) { + currentDatabase.set(value.singleDatabase); + } + }); +} diff --git a/packages/web/src/tabs/QueryDesignTab.svelte b/packages/web/src/tabs/QueryDesignTab.svelte index 44f40b76f..dbaa882d2 100644 --- a/packages/web/src/tabs/QueryDesignTab.svelte +++ b/packages/web/src/tabs/QueryDesignTab.svelte @@ -62,9 +62,9 @@ }); function onSession(sid) { if (sid) { - socket.on(`session-done-${sid}`, handleSessionDone); + socket().on(`session-done-${sid}`, handleSessionDone); return () => { - socket.off(`session-done-${sid}`, handleSessionDone); + socket().off(`session-done-${sid}`, handleSessionDone); }; } return () => {}; diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte index 2e6284da2..134b3cb5b 100644 --- a/packages/web/src/tabs/QueryTab.svelte +++ b/packages/web/src/tabs/QueryTab.svelte @@ -95,9 +95,9 @@ }); function onSession(sid) { if (sid) { - socket.on(`session-done-${sid}`, handleSessionDone); + socket().on(`session-done-${sid}`, handleSessionDone); return () => { - socket.off(`session-done-${sid}`, handleSessionDone); + socket().off(`session-done-${sid}`, handleSessionDone); }; } return () => {}; diff --git a/packages/web/src/tabs/ShellTab.svelte b/packages/web/src/tabs/ShellTab.svelte index 9c0c30d38..8ad4907bd 100644 --- a/packages/web/src/tabs/ShellTab.svelte +++ b/packages/web/src/tabs/ShellTab.svelte @@ -101,9 +101,9 @@ function registerRunnerDone(rid) { if (rid) { - socket.on(`runner-done-${rid}`, handleRunnerDone); + socket().on(`runner-done-${rid}`, handleRunnerDone); return () => { - socket.off(`runner-done-${rid}`, handleRunnerDone); + socket().off(`runner-done-${rid}`, handleRunnerDone); }; } else { return () => {}; diff --git a/packages/web/src/utility/connectionsPinger.js b/packages/web/src/utility/connectionsPinger.js index 16621b8ab..2ffe51112 100644 --- a/packages/web/src/utility/connectionsPinger.js +++ b/packages/web/src/utility/connectionsPinger.js @@ -15,15 +15,19 @@ const doDatabasePing = value => { }; let openedConnectionsHandle = null; -openedConnections.subscribe(value => { - doServerPing(value); - if (openedConnectionsHandle) window.clearInterval(openedConnectionsHandle); - openedConnectionsHandle = window.setInterval(() => doServerPing(value), 30 * 1000); -}); let currentDatabaseHandle = null; -currentDatabase.subscribe(value => { - doDatabasePing(value); - if (currentDatabaseHandle) window.clearInterval(currentDatabaseHandle); - currentDatabaseHandle = window.setInterval(() => doDatabasePing(value), 30 * 1000); -}); + +export function subscribeConnectionPingers() { + openedConnections.subscribe(value => { + doServerPing(value); + if (openedConnectionsHandle) window.clearInterval(openedConnectionsHandle); + openedConnectionsHandle = window.setInterval(() => doServerPing(value), 30 * 1000); + }); + + currentDatabase.subscribe(value => { + doDatabasePing(value); + if (currentDatabaseHandle) window.clearInterval(currentDatabaseHandle); + currentDatabaseHandle = window.setInterval(() => doDatabasePing(value), 30 * 1000); + }); +} diff --git a/packages/web/src/utility/exportElectronFile.ts b/packages/web/src/utility/exportElectronFile.ts index 24b2ff13e..e3bbf83a1 100644 --- a/packages/web/src/utility/exportElectronFile.ts +++ b/packages/web/src/utility/exportElectronFile.ts @@ -48,12 +48,12 @@ export async function exportElectronFile(dataName, reader, format) { function handleRunnerDone() { closeSnackbar(snackId); - socket.off(`runner-done-${runid}`, handleRunnerDone); + socket().off(`runner-done-${runid}`, handleRunnerDone); if (isCanceled) showSnackbarError(`Export ${dataName} canceled`); else showSnackbarInfo(`Export ${dataName} finished`); } - socket.on(`runner-done-${runid}`, handleRunnerDone); + socket().on(`runner-done-${runid}`, handleRunnerDone); } export async function saveFileToDisk( diff --git a/packages/web/src/utility/getElectron.ts b/packages/web/src/utility/getElectron.ts index 111f38c10..b6c3724cd 100644 --- a/packages/web/src/utility/getElectron.ts +++ b/packages/web/src/utility/getElectron.ts @@ -16,14 +16,13 @@ class ElectronApi { let apiInstance = null; function initializeElectron(args) { - // console.log('Initialize electron with args:', args); - apiInstance = new ElectronApi(args); if (window['dbgate_recreateAxiosInstance']) { - // console.log('Recreating axios instance'); - window['dbgate_recreateAxiosInstance'](); } + if (window['dbgate_recreateSocket']) { + window['dbgate_recreateSocket'](); + } } window['dbgate_initializeElectron'] = initializeElectron; diff --git a/packages/web/src/utility/hasPermission.ts b/packages/web/src/utility/hasPermission.ts index 5a6674902..8f546afa2 100644 --- a/packages/web/src/utility/hasPermission.ts +++ b/packages/web/src/utility/hasPermission.ts @@ -3,13 +3,14 @@ import { useConfig } from './metadataLoaders'; let compiled = null; -const config = useConfig(); -config.subscribe(value => { - if (!value) return; - const { permissions } = value; - compiled = compilePermissions(permissions); -}); - export default function hasPermission(tested) { return testPermission(tested, compiled); } + +export function subscribePermissionCompiler() { + useConfig().subscribe(value => { + if (!value) return; + const { permissions } = value; + compiled = compilePermissions(permissions); + }); +} diff --git a/packages/web/src/utility/metadataLoaders.ts b/packages/web/src/utility/metadataLoaders.ts index 61c420d23..df35c5f1d 100644 --- a/packages/web/src/utility/metadataLoaders.ts +++ b/packages/web/src/utility/metadataLoaders.ts @@ -208,11 +208,11 @@ function useCore(loader, args) { handleReload(); if (reloadTrigger && socket) { for (const item of getAsArray(reloadTrigger)) { - socket.on(item, handleReload); + socket().on(item, handleReload); } return () => { for (const item of getAsArray(reloadTrigger)) { - socket.off(item, handleReload); + socket().off(item, handleReload); } }; } diff --git a/packages/web/src/utility/socket.js b/packages/web/src/utility/socket.js index dd3e1d741..ea3be8654 100644 --- a/packages/web/src/utility/socket.js +++ b/packages/web/src/utility/socket.js @@ -1,8 +1,23 @@ import io from 'socket.io-client'; import resolveApi from './resolveApi'; import { cacheClean } from './cache'; +import { shouldWaitForElectronInitialize } from './getElectron'; -const socket = io(resolveApi()); -socket.on('clean-cache', reloadTrigger => cacheClean(reloadTrigger)); +let socketInstance; + +function recreateSocket() { + if (shouldWaitForElectronInitialize()) return; + + socketInstance = io(resolveApi()); + socketInstance.on('clean-cache', reloadTrigger => cacheClean(reloadTrigger)); +} + +window['dbgate_recreateSocket'] = recreateSocket; + +recreateSocket(); + +function socket() { + return socketInstance; +} export default socket; diff --git a/packages/web/src/widgets/QueryHistoryList.svelte b/packages/web/src/widgets/QueryHistoryList.svelte index 5a3d6b073..01ab7c101 100644 --- a/packages/web/src/widgets/QueryHistoryList.svelte +++ b/packages/web/src/widgets/QueryHistoryList.svelte @@ -39,9 +39,9 @@ $: setDebouncedFilter(filter); onMount(() => { - socket.on('query-history-changed', reloadItems); + socket().on('query-history-changed', reloadItems); return () => { - socket.off('query-history-changed', reloadItems); + socket().off('query-history-changed', reloadItems); }; }); From 3d841ef8fe762c3747522ed9146181a55a6e3037 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 16 Dec 2021 15:41:34 +0100 Subject: [PATCH 05/75] removed dependencies on electron remote --- app/src/electron.js | 18 +++++++ .../web/src/appobj/DatabaseAppObject.svelte | 2 +- .../web/src/commands/CommandPalette.svelte | 6 +-- .../commands/changeDatabaseStatusCommand.ts | 3 +- packages/web/src/commands/stdCommands.ts | 47 +++++++++---------- .../forms/FormElectronFileSelectorRaw.svelte | 4 +- .../web/src/impexp/ElectronFilesInput.svelte | 4 +- packages/web/src/modals/FavoriteModal.svelte | 4 +- packages/web/src/modals/SaveFileModal.svelte | 4 +- .../web/src/query/RunnerOutputFiles.svelte | 6 +-- .../web/src/utility/exportElectronFile.ts | 6 +-- packages/web/src/utility/getElectron.ts | 25 +++++++++- packages/web/src/utility/openArchiveFolder.ts | 2 +- packages/web/src/utility/openElectronFile.ts | 4 +- packages/web/src/widgets/TabsPanel.svelte | 6 +-- 15 files changed, 87 insertions(+), 54 deletions(-) diff --git a/app/src/electron.js b/app/src/electron.js index 2c3deb64c..72b6b6e2c 100644 --- a/app/src/electron.js +++ b/app/src/electron.js @@ -148,6 +148,24 @@ ipcMain.on('update-commands', async (event, arg) => { menu.enabled = command.enabled; } }); +ipcMain.on('close-window', async (event, arg) => { + mainWindow.close(); +}); + +ipcMain.handle('showOpenDialog', async (event, options) => { + const res = electron.dialog.showOpenDialogSync(mainWindow, options); + return res; +}); +ipcMain.handle('showSaveDialog', async (event, options) => { + const res = electron.dialog.showSaveDialogSync(mainWindow, options); + return res; +}); +ipcMain.handle('showItemInFolder', async (event, path) => { + electron.shell.showItemInFolder(path); +}); +ipcMain.handle('openExternal', async (event, url) => { + electron.shell.openExternal(url); +}); function createWindow() { const bounds = store.get('winBounds'); diff --git a/packages/web/src/appobj/DatabaseAppObject.svelte b/packages/web/src/appobj/DatabaseAppObject.svelte index 218ea76bd..e0122233e 100644 --- a/packages/web/src/appobj/DatabaseAppObject.svelte +++ b/packages/web/src/appobj/DatabaseAppObject.svelte @@ -1,6 +1,5 @@ diff --git a/packages/web/src/utility/api.ts b/packages/web/src/utility/api.ts new file mode 100644 index 000000000..c842b1c09 --- /dev/null +++ b/packages/web/src/utility/api.ts @@ -0,0 +1,18 @@ +import resolveApi, { resolveApiHeaders } from './resolveApi'; + +export async function apiCall(route: string, args: {} = undefined) { + const resp = await fetch(`${resolveApi()}/${route}`, { + method: 'POST', + cache: 'no-cache', + headers: { + 'Content-Type': 'application/json', + ...resolveApiHeaders(), + }, + body: JSON.stringify(args), + }); + return resp.json(); +} + +export function apiOn(event: string, hander: Function) {} + +export function apiOff(event: string, hander: Function) {} diff --git a/packages/web/src/utility/metadataLoaders.ts b/packages/web/src/utility/metadataLoaders.ts index df35c5f1d..29586c989 100644 --- a/packages/web/src/utility/metadataLoaders.ts +++ b/packages/web/src/utility/metadataLoaders.ts @@ -9,6 +9,7 @@ import { DatabaseInfo } from 'dbgate-types'; import { derived } from 'svelte/store'; import { extendDatabaseInfo } from 'dbgate-tools'; import { setLocalStorage } from '../utility/storageCache'; +import { apiCall } from './api'; const databaseInfoLoader = ({ conid, database }) => ({ url: 'database-connections/structure', @@ -143,12 +144,8 @@ async function getCore(loader, args) { const key = stableStringify({ url, ...params }); async function doLoad() { - const resp = await axiosInstance().request({ - method: 'get', - url, - params, - }); - const res = (transform || (x => x))(resp.data); + const resp = await apiCall(url, params); + const res = (transform || (x => x))(resp); if (onLoaded) onLoaded(res); return res; } @@ -169,12 +166,8 @@ function useCore(loader, args) { subscribe: onChange => { async function handleReload() { async function doLoad() { - const resp = await axiosInstance().request({ - method: 'get', - params, - url, - }); - const res = (transform || (x => x))(resp.data); + const resp = await apiCall(url, params); + const res = (transform || (x => x))(resp); if (onLoaded) onLoaded(res); return res; } @@ -189,7 +182,7 @@ function useCore(loader, args) { cacheSet(cacheKey, res, reloadTrigger); onChange(res); } catch (err) { - console.error('Error when using cached promise', err); + console.error(`Error when using cached promise ${url}`, err); cacheClean(cacheKey); const res = await doLoad(); cacheSet(cacheKey, res, reloadTrigger); From f9c54cdce237be66d25dcb5ae8d201426f77605e Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Wed, 22 Dec 2021 10:16:44 +0100 Subject: [PATCH 11/75] axiosInstance replaced with apiCall --- .../src/appobj/ArchiveFileAppObject.svelte | 9 +-- .../src/appobj/ArchiveFolderAppObject.svelte | 13 +++-- .../web/src/appobj/ConnectionAppObject.svelte | 17 +++--- .../web/src/appobj/DatabaseAppObject.svelte | 19 +++---- .../src/appobj/DatabaseObjectAppObject.svelte | 11 ++-- .../src/appobj/FavoriteFileAppObject.svelte | 11 ++-- .../web/src/appobj/SavedFileAppObject.svelte | 11 ++-- packages/web/src/charts/ChartCore.svelte | 3 +- packages/web/src/charts/chartDataLoader.ts | 11 ++-- .../commands/changeDatabaseStatusCommand.ts | 7 ++- packages/web/src/commands/stdCommands.ts | 16 ++---- .../datagrid/CollectionDataGridCore.svelte | 51 +++++++---------- packages/web/src/datagrid/DataGridCore.svelte | 3 +- .../web/src/datagrid/JslDataGridCore.svelte | 15 ++--- .../web/src/datagrid/SqlDataGridCore.svelte | 31 ++++------ .../src/forms/FormArchiveFolderSelect.svelte | 3 +- packages/web/src/formview/FormView.svelte | 3 +- packages/web/src/formview/SqlFormView.svelte | 56 +++---------------- .../src/freetable/FreeTableGridCore.svelte | 3 +- .../web/src/impexp/PreviewDataGrid.svelte | 11 ++-- .../modals/ChooseConnectionColorModal.svelte | 5 +- packages/web/src/modals/CommandModal.svelte | 5 +- .../web/src/modals/ConnectionModal.svelte | 7 ++- .../src/modals/DictionaryLookupModal.svelte | 15 ++--- packages/web/src/modals/FavoriteModal.svelte | 9 +-- .../web/src/modals/ImportExportModal.svelte | 11 ++-- packages/web/src/modals/SaveFileModal.svelte | 5 +- .../web/src/modals/SqlGeneratorModal.svelte | 5 +- .../web/src/modals/ValueLookupModal.svelte | 17 +++--- .../web/src/query/RunnerOutputFiles.svelte | 4 +- .../web/src/settings/SettingsModal.svelte | 3 +- packages/web/src/tabs/ChangelogTab.svelte | 5 +- .../web/src/tabs/CollectionDataTab.svelte | 13 ++--- packages/web/src/tabs/CompareModelTab.svelte | 16 ++---- .../web/src/tabs/FavoriteEditorTab.svelte | 3 +- packages/web/src/tabs/FreeTableTab.svelte | 8 +-- packages/web/src/tabs/MarkdownViewTab.svelte | 5 +- packages/web/src/tabs/PluginTab.svelte | 7 ++- packages/web/src/tabs/QueryDesignTab.svelte | 9 +-- packages/web/src/tabs/QueryTab.svelte | 11 ++-- packages/web/src/tabs/ShellTab.svelte | 11 ++-- packages/web/src/tabs/TableDataTab.svelte | 13 +---- .../web/src/tabs/TableStructureTab.svelte | 17 ++---- .../web/src/utility/alterDatabaseTools.ts | 13 +---- packages/web/src/utility/connectionsPinger.js | 5 +- .../web/src/utility/exportElectronFile.ts | 13 +++-- packages/web/src/utility/openArchiveFolder.ts | 7 ++- packages/web/src/utility/openElectronFile.ts | 5 +- packages/web/src/utility/saveTabFile.ts | 5 +- .../web/src/widgets/ArchiveFilesList.svelte | 5 +- .../web/src/widgets/ArchiveFolderList.svelte | 3 +- .../web/src/widgets/ConnectionList.svelte | 3 +- .../web/src/widgets/QueryHistoryList.svelte | 12 +--- packages/web/src/widgets/SqlObjectList.svelte | 3 +- packages/web/src/widgets/StatusBar.svelte | 3 +- 55 files changed, 257 insertions(+), 328 deletions(-) diff --git a/packages/web/src/appobj/ArchiveFileAppObject.svelte b/packages/web/src/appobj/ArchiveFileAppObject.svelte index 5102d2f77..384a3690a 100644 --- a/packages/web/src/appobj/ArchiveFileAppObject.svelte +++ b/packages/web/src/appobj/ArchiveFileAppObject.svelte @@ -16,7 +16,7 @@ const connProps: any = {}; let tooltip = undefined; - const resp = await axiosInstance().post('files/load', { + const resp = await apiCall('files/load', { folder: 'archive:' + folderName, file: fileName + '.' + fileType, format: 'text', @@ -36,7 +36,7 @@ ...connProps, }, }, - { editor: resp.data } + { editor: resp } ); } @@ -82,6 +82,7 @@ markArchiveFileAsDataSheet, markArchiveFileAsReadonly, } from '../utility/archiveTools'; +import { apiCall } from '../utility/api'; export let data; @@ -91,7 +92,7 @@ label: 'New file name', header: 'Rename file', onConfirm: newFile => { - axiosInstance().post('archive/rename-file', { + apiCall('archive/rename-file', { file: data.fileName, folder: data.folderName, fileType: data.fileType, @@ -105,7 +106,7 @@ showModal(ConfirmModal, { message: `Really delete file ${data.fileName}?`, onConfirm: () => { - axiosInstance().post('archive/delete-file', { + apiCall('archive/delete-file', { file: data.fileName, folder: data.folderName, fileType: data.fileType, diff --git a/packages/web/src/appobj/ArchiveFolderAppObject.svelte b/packages/web/src/appobj/ArchiveFolderAppObject.svelte index df7427568..e5ffb1e4a 100644 --- a/packages/web/src/appobj/ArchiveFolderAppObject.svelte +++ b/packages/web/src/appobj/ArchiveFolderAppObject.svelte @@ -17,6 +17,7 @@ import ConfirmModal from '../modals/ConfirmModal.svelte'; import InputTextModal from '../modals/InputTextModal.svelte'; import ErrorMessageModal from '../modals/ErrorMessageModal.svelte'; +import { apiCall } from '../utility/api'; export let data; @@ -26,7 +27,7 @@ ? `Really delete link to folder ${data.name}? Folder content remains untouched.` : `Really delete folder ${data.name}?`, onConfirm: () => { - axiosInstance().post('archive/delete-folder', { folder: data.name }); + apiCall('archive/delete-folder', { folder: data.name }); }, }); }; @@ -41,7 +42,7 @@ label: 'New folder name', header: 'Rename folder', onConfirm: async newFolder => { - await axiosInstance().post('archive/rename-folder', { + await apiCall('archive/rename-folder', { folder: data.name, newFolder: newFolder + suffix, }); @@ -78,16 +79,16 @@ await dbgateApi.deployDb(${JSON.stringify( }; const handleGenerateDeploySql = async () => { - const resp = await axiosInstance().post('database-connections/generate-deploy-sql', { + const resp = await apiCall('database-connections/generate-deploy-sql', { conid: $currentDatabase.connection._id, database: $currentDatabase.name, archiveFolder: data.name, }); - if (resp.data.errorMessage) { - showModal(ErrorMessageModal, { message: resp.data.errorMessage }); + if (resp.errorMessage) { + showModal(ErrorMessageModal, { message: resp.errorMessage }); } else { - newQuery({ initialData: resp.data.sql }); + newQuery({ initialData: resp.sql }); } }; diff --git a/packages/web/src/appobj/ConnectionAppObject.svelte b/packages/web/src/appobj/ConnectionAppObject.svelte index 9d8811185..209c208d6 100644 --- a/packages/web/src/appobj/ConnectionAppObject.svelte +++ b/packages/web/src/appobj/ConnectionAppObject.svelte @@ -29,6 +29,7 @@ import getConnectionLabel from '../utility/getConnectionLabel'; import { getDatabaseList } from '../utility/metadataLoaders'; import { getLocalStorage } from '../utility/storageCache'; + import { apiCall } from '../utility/api'; export let data; export let passProps; @@ -44,14 +45,14 @@ const handleConnect = () => { if (data.singleDatabase) { $currentDatabase = { connection: data, name: data.defaultDatabase }; - axiosInstance().post('database-connections/refresh', { + apiCall('database-connections/refresh', { conid: data._id, database: data.defaultDatabase, keepOpen: true, }); } else { $openedConnections = _.uniq([...$openedConnections, data._id]); - axiosInstance().post('server-connections/refresh', { + apiCall('server-connections/refresh', { conid: data._id, keepOpen: true, }); @@ -61,16 +62,16 @@ const getContextMenu = () => { const config = getCurrentConfig(); const handleRefresh = () => { - axiosInstance().post('server-connections/refresh', { conid: data._id }); + apiCall('server-connections/refresh', { conid: data._id }); }; const handleDisconnect = () => { openedConnections.update(list => list.filter(x => x != data._id)); if (electron) { - axiosInstance().post('server-connections/disconnect', { conid: data._id }); + apiCall('server-connections/disconnect', { conid: data._id }); } if (_.get($currentDatabase, 'connection._id') == data._id) { if (electron) { - axiosInstance().post('database-connections/disconnect', { conid: data._id, database: $currentDatabase.name }); + apiCall('database-connections/disconnect', { conid: data._id, database: $currentDatabase.name }); } currentDatabase.set(null); } @@ -81,11 +82,11 @@ const handleDelete = () => { showModal(ConfirmModal, { message: `Really delete connection ${getConnectionLabel(data)}?`, - onConfirm: () => axiosInstance().post('connections/delete', data), + onConfirm: () => apiCall('connections/delete', data), }); }; const handleDuplicate = () => { - axiosInstance().post('connections/save', { + apiCall('connections/save', { ...data, _id: undefined, displayName: `${getConnectionLabel(data)} - copy`, @@ -97,7 +98,7 @@ value: 'newdb', label: 'Database name', onConfirm: name => - axiosInstance().post('server-connections/create-database', { + apiCall('server-connections/create-database', { conid: data._id, name, }), diff --git a/packages/web/src/appobj/DatabaseAppObject.svelte b/packages/web/src/appobj/DatabaseAppObject.svelte index e0122233e..fffd7a693 100644 --- a/packages/web/src/appobj/DatabaseAppObject.svelte +++ b/packages/web/src/appobj/DatabaseAppObject.svelte @@ -47,13 +47,11 @@ header: 'Create collection', onConfirm: async newCollection => { const dbid = { conid: connection._id, database: name }; - await axiosInstance().request({ - url: 'database-connections/run-script', - method: 'post', - params: dbid, - data: { sql: `db.createCollection('${newCollection}')` }, + await apiCall('database-connections/run-script', { + ...dbid, + sql: `db.createCollection('${newCollection}')`, }); - axiosInstance().post('database-connections/sync-model', dbid); + await apiCall('database-connections/sync-model', dbid); }, }); }; @@ -90,19 +88,19 @@ const handleDisconnect = () => { const electron = getElectron(); if (electron) { - axiosInstance().post('database-connections/disconnect', { conid: connection._id, database: name }); + apiCall('database-connections/disconnect', { conid: connection._id, database: name }); } currentDatabase.set(null); }; const handleExportModel = async () => { - const resp = await axiosInstance().post('database-connections/export-model', { + const resp = await apiCall('database-connections/export-model', { conid: connection._id, database: name, }); - currentArchive.set(resp.data.archiveFolder); + currentArchive.set(resp.archiveFolder); selectedWidget.set('archive'); - showSnackbarSuccess(`Saved to archive ${resp.data.archiveFolder}`); + showSnackbarSuccess(`Saved to archive ${resp.archiveFolder}`); }; const handleCompareWithCurrentDb = () => { @@ -182,6 +180,7 @@ import InputTextModal from '../modals/InputTextModal.svelte'; import { getDatabaseInfo } from '../utility/metadataLoaders'; import { openJsonDocument } from '../tabs/JsonTab.svelte'; + import { apiCall } from '../utility/api'; export let data; export let passProps; diff --git a/packages/web/src/appobj/DatabaseObjectAppObject.svelte b/packages/web/src/appobj/DatabaseObjectAppObject.svelte index 9307bafab..e664bc154 100644 --- a/packages/web/src/appobj/DatabaseObjectAppObject.svelte +++ b/packages/web/src/appobj/DatabaseObjectAppObject.svelte @@ -411,6 +411,7 @@ import axiosInstance from '../utility/axiosInstance'; import { alterDatabaseDialog, renameDatabaseObjectDialog } from '../utility/alterDatabaseTools'; import ConfirmModal from '../modals/ConfirmModal.svelte'; + import { apiCall } from '../utility/api'; export let data; export let passProps; @@ -559,13 +560,11 @@ message: `Really drop collection ${data.pureName}?`, onConfirm: async () => { const dbid = _.pick(data, ['conid', 'database']); - await axiosInstance().request({ - url: 'database-connections/run-script', - method: 'post', - params: dbid, - data: { sql: `db.dropCollection('${data.pureName}')` }, + await apiCall('database-connections/run-script', { + ...dbid, + sql: `db.dropCollection('${data.pureName}')`, }); - axiosInstance().post('database-connections/sync-model', dbid); + apiCall('database-connections/sync-model', dbid); }, }); } else { diff --git a/packages/web/src/appobj/FavoriteFileAppObject.svelte b/packages/web/src/appobj/FavoriteFileAppObject.svelte index 9c3efddc6..8f56e9e72 100644 --- a/packages/web/src/appobj/FavoriteFileAppObject.svelte +++ b/packages/web/src/appobj/FavoriteFileAppObject.svelte @@ -7,14 +7,14 @@ const { icon, tabComponent, title, props, tabdata } = favorite; let tabdataNew = tabdata; if (props.savedFile) { - const resp = await axiosInstance().post('files/load', { + const resp = await apiCall('files/load', { folder: props.savedFolder, file: props.savedFile, format: props.savedFormat, }); tabdataNew = { ...tabdata, - editor: resp.data, + editor: resp, }; } openNewTab( @@ -37,6 +37,7 @@ import ConfirmModal from '../modals/ConfirmModal.svelte'; import getElectron from '../utility/getElectron'; import FavoriteModal from '../modals/FavoriteModal.svelte'; + import { apiCall } from '../utility/api'; export let data; @@ -47,7 +48,7 @@ }; const editFavoriteJson = async () => { - const resp = await axiosInstance().post('files/load', { + const resp = await apiCall('files/load', { folder: 'favorites', file: data.file, format: 'text', @@ -64,7 +65,7 @@ savedFolder: 'favorites', }, }, - { editor: JSON.stringify(JSON.parse(resp.data), null, 2) } + { editor: JSON.stringify(JSON.parse(resp), null, 2) } ); }; @@ -76,7 +77,7 @@ showModal(ConfirmModal, { message: `Really delete favorite ${data.title}?`, onConfirm: () => { - axiosInstance().post('files/delete', { file: data.file, folder: 'favorites' }); + apiCall('files/delete', { file: data.file, folder: 'favorites' }); }, }); }; diff --git a/packages/web/src/appobj/SavedFileAppObject.svelte b/packages/web/src/appobj/SavedFileAppObject.svelte index 8f8727d19..5186f6e3e 100644 --- a/packages/web/src/appobj/SavedFileAppObject.svelte +++ b/packages/web/src/appobj/SavedFileAppObject.svelte @@ -74,6 +74,7 @@ import { showModal } from '../modals/modalTools'; import { currentDatabase } from '../stores'; +import { apiCall } from '../utility/api'; import axiosInstance from '../utility/axiosInstance'; import getConnectionLabel from '../utility/getConnectionLabel'; @@ -114,7 +115,7 @@ showModal(ConfirmModal, { message: `Really delete file ${data.file}?`, onConfirm: () => { - axiosInstance().post('files/delete', data); + apiCall('files/delete', data); }, }); }; @@ -125,7 +126,7 @@ label: 'New file name', header: 'Rename file', onConfirm: newFile => { - axiosInstance().post('files/rename', { ...data, newFile }); + apiCall('files/rename', { ...data, newFile }); }, }); }; @@ -136,13 +137,13 @@ label: 'New file name', header: 'Rename file', onConfirm: newFile => { - axiosInstance().post('files/copy', { ...data, newFile }); + apiCall('files/copy', { ...data, newFile }); }, }); }; async function openTab() { - const resp = await axiosInstance().post('files/load', { folder, file: data.file, format: handler.format }); + const resp = await apiCall('files/load', { folder, file: data.file, format: handler.format }); const connProps: any = {}; let tooltip = undefined; @@ -168,7 +169,7 @@ ...connProps, }, }, - { editor: resp.data } + { editor: resp } ); } diff --git a/packages/web/src/charts/ChartCore.svelte b/packages/web/src/charts/ChartCore.svelte index 56dd79ea4..18d4385a7 100644 --- a/packages/web/src/charts/ChartCore.svelte +++ b/packages/web/src/charts/ChartCore.svelte @@ -20,6 +20,7 @@ @@ -127,6 +115,7 @@ import ImportExportModal from '../modals/ImportExportModal.svelte'; import { showModal } from '../modals/modalTools'; import { extensions } from '../stores'; + import { apiCall } from '../utility/api'; import axiosInstance from '../utility/axiosInstance'; import { registerMenu } from '../utility/contextMenu'; diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte index 5b9a54c22..66aaf528c 100644 --- a/packages/web/src/datagrid/DataGridCore.svelte +++ b/packages/web/src/datagrid/DataGridCore.svelte @@ -285,6 +285,7 @@ import { findCommand } from '../commands/runCommand'; import { openJsonDocument } from '../tabs/JsonTab.svelte'; import EditJsonModal from '../modals/EditJsonModal.svelte'; +import { apiCall } from '../utility/api'; export let onLoadNextData = undefined; export let grider = undefined; @@ -404,7 +405,7 @@ } export async function reconnect() { - await axiosInstance().post('database-connections/refresh', { conid, database }); + await apiCall('database-connections/refresh', { conid, database }); display.reload(); } diff --git a/packages/web/src/datagrid/JslDataGridCore.svelte b/packages/web/src/datagrid/JslDataGridCore.svelte index 71853fb87..fa9cc9172 100644 --- a/packages/web/src/datagrid/JslDataGridCore.svelte +++ b/packages/web/src/datagrid/JslDataGridCore.svelte @@ -13,7 +13,7 @@ async function loadDataPage(props, offset, limit) { const { jslid, display } = props; - const response = await axiosInstance().post('jsldata/get-rows', { + const response = await apiCall('jsldata/get-rows', { jslid, offset, limit, @@ -30,16 +30,9 @@ async function loadRowCount(props) { const { jslid } = props; - const response = await axiosInstance().request({ - url: 'jsldata/get-stats', - method: 'get', - params: { - jslid, - }, - }); - return response.data.rowCount; + const response = await apiCall('jsldata/get-stats', { jslid }); + return response.rowCount; } - @@ -77,6 +69,7 @@ import ImportExportModal from '../modals/ImportExportModal.svelte'; import { showModal } from '../modals/modalTools'; import { extensions } from '../stores'; + import { apiCall } from '../utility/api'; import axiosInstance from '../utility/axiosInstance'; import { registerMenu } from '../utility/contextMenu'; diff --git a/packages/web/src/forms/FormArchiveFolderSelect.svelte b/packages/web/src/forms/FormArchiveFolderSelect.svelte index 7593dde5c..cd9940c18 100644 --- a/packages/web/src/forms/FormArchiveFolderSelect.svelte +++ b/packages/web/src/forms/FormArchiveFolderSelect.svelte @@ -2,6 +2,7 @@ import InputTextModal from '../modals/InputTextModal.svelte'; import { showModal } from '../modals/modalTools'; +import { apiCall } from '../utility/api'; import axiosInstance from '../utility/axiosInstance'; import { useArchiveFolders } from '../utility/metadataLoaders'; @@ -34,7 +35,7 @@ ]; const createOption = folder => { - axiosInstance().post('archive/create-folder', { folder }); + apiCall('archive/create-folder', { folder }); setFieldValue(name, folder); }; diff --git a/packages/web/src/formview/FormView.svelte b/packages/web/src/formview/FormView.svelte index 315c6bf3a..bb901de38 100644 --- a/packages/web/src/formview/FormView.svelte +++ b/packages/web/src/formview/FormView.svelte @@ -174,6 +174,7 @@ import FontIcon from '../icons/FontIcon.svelte'; import DictionaryLookupModal from '../modals/DictionaryLookupModal.svelte'; import { showModal } from '../modals/modalTools'; +import { apiCall } from '../utility/api'; import axiosInstance from '../utility/axiosInstance'; import { copyTextToClipboard, extractRowCopiedValue } from '../utility/clipboard'; @@ -260,7 +261,7 @@ } export async function reconnect() { - await axiosInstance().post('database-connections/refresh', { conid, database }); + await apiCall('database-connections/refresh', { conid, database }); formDisplay.reload(); } diff --git a/packages/web/src/formview/SqlFormView.svelte b/packages/web/src/formview/SqlFormView.svelte index 561120ffc..f2a30ba03 100644 --- a/packages/web/src/formview/SqlFormView.svelte +++ b/packages/web/src/formview/SqlFormView.svelte @@ -1,21 +1,19 @@ @@ -122,42 +120,6 @@ $: former = new ChangeSetFormer(rowData, changeSetState, dispatchChangeSet, formDisplay); $: if (onReferenceSourceChanged && rowData) onReferenceSourceChanged([rowData], loadedTime); - - // async function handleConfirmSql(sql) { - // const resp = await axiosInstance().request({ - // url: 'database-connections/query-data', - // method: 'post', - // params: { - // conid, - // database, - // }, - // data: { sql }, - // }); - // const { errorMessage } = resp.data || {}; - // if (errorMessage) { - // showModal(ErrorMessageModal, { title: 'Error when saving', message: errorMessage }); - // } else { - // dispatchChangeSet({ type: 'reset', value: createChangeSet() }); - // formDisplay.reload(); - // } - // } - - // function handleSave() { - // const script = changeSetToSql(changeSetState && changeSetState.value, formDisplay.dbinfo); - // const sql = scriptToSql(formDisplay.driver, script); - // showModal(ConfirmSqlModal, { - // sql, - // onConfirm: () => handleConfirmSql(sql), - // engine: formDisplay.engine, - // }); - // } - + diff --git a/packages/web/src/freetable/FreeTableGridCore.svelte b/packages/web/src/freetable/FreeTableGridCore.svelte index c58477e39..d8828a6bc 100644 --- a/packages/web/src/freetable/FreeTableGridCore.svelte +++ b/packages/web/src/freetable/FreeTableGridCore.svelte @@ -20,6 +20,7 @@ import DataGridCore from '../datagrid/DataGridCore.svelte'; import ImportExportModal from '../modals/ImportExportModal.svelte'; import { showModal } from '../modals/modalTools'; +import { apiCall } from '../utility/api'; import axiosInstance from '../utility/axiosInstance'; import { registerMenu } from '../utility/contextMenu'; import createActivator, { getActiveComponent } from '../utility/createActivator'; @@ -45,7 +46,7 @@ export async function exportGrid() { const jslid = uuidv1(); - await axiosInstance().post('jsldata/save-free-table', { jslid, data: modelState.value }); + await apiCall('jsldata/save-free-table', { jslid, data: modelState.value }); const initialValues: any = {}; initialValues.sourceStorageType = 'jsldata'; initialValues.sourceJslId = jslid; diff --git a/packages/web/src/impexp/PreviewDataGrid.svelte b/packages/web/src/impexp/PreviewDataGrid.svelte index 64905f600..5d5efe620 100644 --- a/packages/web/src/impexp/PreviewDataGrid.svelte +++ b/packages/web/src/impexp/PreviewDataGrid.svelte @@ -6,6 +6,7 @@ import RowsArrayGrider from '../datagrid/RowsArrayGrider'; import ErrorInfo from '../elements/ErrorInfo.svelte'; import LoadingInfo from '../elements/LoadingInfo.svelte'; + import { apiCall } from '../utility/api'; import axiosInstance from '../utility/axiosInstance'; export let reader; @@ -27,14 +28,16 @@ } errorMessage = null; isLoading = true; - const resp = await axiosInstance().post('runners/load-reader', sourceReader); + const resp = await apiCall('runners/load-reader', sourceReader); // @ts-ignore - model = resp.data; - grider = new RowsArrayGrider(resp.data.rows); + model = resp; + grider = new RowsArrayGrider(resp.rows); isLoading = false; } catch (err) { isLoading = false; - errorMessage = (err && err.response && err.response.data && err.response.data.error) || 'Loading failed'; + // errorMessage = (err && err.response && err.response.data && err.response.data.error) || 'Loading failed'; + // TODO API + errorMessage = 'Loading failed'; console.error(err.response); } }; diff --git a/packages/web/src/modals/ChooseConnectionColorModal.svelte b/packages/web/src/modals/ChooseConnectionColorModal.svelte index 1ed6063ad..cd1626e9b 100644 --- a/packages/web/src/modals/ChooseConnectionColorModal.svelte +++ b/packages/web/src/modals/ChooseConnectionColorModal.svelte @@ -1,5 +1,6 @@ diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte index 94c97dc15..06994ffe7 100644 --- a/packages/web/src/settings/SettingsModal.svelte +++ b/packages/web/src/settings/SettingsModal.svelte @@ -13,10 +13,11 @@ import ModalBase from '../modals/ModalBase.svelte'; import { closeCurrentModal } from '../modals/modalTools'; import { getCurrentSettings, getVisibleToolbar, getZoomKoef, visibleToolbar, zoomKoef } from '../stores'; + import { apiCall } from '../utility/api'; import axiosInstance from '../utility/axiosInstance'; function handleOk(e) { - axiosInstance().post( + apiCall( 'config/update-settings', _.omitBy(e.detail, (v, k) => k.startsWith(':')) ); diff --git a/packages/web/src/tabs/ChangelogTab.svelte b/packages/web/src/tabs/ChangelogTab.svelte index f9278c8f5..2d2d0ef1f 100644 --- a/packages/web/src/tabs/ChangelogTab.svelte +++ b/packages/web/src/tabs/ChangelogTab.svelte @@ -6,6 +6,7 @@ import { onMount } from 'svelte'; import LoadingInfo from '../elements/LoadingInfo.svelte'; import Markdown from '../elements/Markdown.svelte'; +import { apiCall } from '../utility/api'; import axiosInstance from '../utility/axiosInstance'; @@ -14,8 +15,8 @@ const handleLoad = async () => { isLoading = true; - const resp = await axiosInstance().get('config/changelog'); - text = resp.data; + const resp = await apiCall('config/changelog'); + text = resp; isLoading = false; }; diff --git a/packages/web/src/tabs/CollectionDataTab.svelte b/packages/web/src/tabs/CollectionDataTab.svelte index 7ac6ad51c..5f076de6d 100644 --- a/packages/web/src/tabs/CollectionDataTab.svelte +++ b/packages/web/src/tabs/CollectionDataTab.svelte @@ -50,6 +50,7 @@ import ChangeSetGrider from '../datagrid/ChangeSetGrider'; import { setContext } from 'svelte'; import _ from 'lodash'; +import { apiCall } from '../utility/api'; export let tabid; export let conid; @@ -91,14 +92,10 @@ // $: console.log('LOADED ROWS MONGO', loadedRows); async function handleConfirmChange(changeSet) { - const resp = await axiosInstance().request({ - url: 'database-connections/update-collection', - method: 'post', - params: { - conid, - database, - }, - data: { changeSet }, + const resp = await apiCall('database-connections/update-collection', { + conid, + database, + changeSet, }); const { errorMessage } = resp.data || {}; if (errorMessage) { diff --git a/packages/web/src/tabs/CompareModelTab.svelte b/packages/web/src/tabs/CompareModelTab.svelte index c15c62fa9..76dd63204 100644 --- a/packages/web/src/tabs/CompareModelTab.svelte +++ b/packages/web/src/tabs/CompareModelTab.svelte @@ -154,6 +154,7 @@ import SqlEditor from '../query/SqlEditor.svelte'; import useEditorData from '../query/useEditorData'; import { extensions } from '../stores'; + import { apiCall } from '../utility/api'; import axiosInstance from '../utility/axiosInstance'; import { changeTab } from '../utility/common'; import contextMenu, { getContextMenu, registerMenu } from '../utility/contextMenu'; @@ -228,7 +229,7 @@ export async function showReport() { saveFileToDisk(async filePath => { - await axiosInstance().post('database-connections/generate-db-diff-report', { + await apiCall('database-connections/generate-db-diff-report', { filePath, sourceConid: $values?.sourceConid, sourceDatabase: $values?.sourceDatabase, @@ -261,11 +262,11 @@ } export function refreshModels() { - axiosInstance().post('database-connections/sync-model', { + apiCall('database-connections/sync-model', { conid: $values?.targetConid, database: $values?.targetDatabase, }); - axiosInstance().post('database-connections/sync-model', { + apiCall('database-connections/sync-model', { conid: $values?.sourceConid, database: $values?.sourceDatabase, }); @@ -275,18 +276,13 @@ const conid = $values?.targetConid; const database = $values?.targetDatabase; - const resp = await axiosInstance().request({ - url: 'database-connections/run-script', - method: 'post', - params: { conid, database }, - data: { sql }, - }); + const resp = await apiCall('database-connections/run-script', { conid, database, sql }); const { errorMessage } = resp.data || {}; if (errorMessage) { showModal(ErrorMessageModal, { title: 'Error when saving', message: errorMessage }); } else { $values = _.omitBy($values, (v, k) => k.startsWith('isChecked_')); - await axiosInstance().post('database-connections/sync-model', { conid, database }); + await apiCall('database-connections/sync-model', { conid, database }); showSnackbarSuccess('Saved to database'); } } diff --git a/packages/web/src/tabs/FavoriteEditorTab.svelte b/packages/web/src/tabs/FavoriteEditorTab.svelte index 7d05f6f6f..9bce915a2 100644 --- a/packages/web/src/tabs/FavoriteEditorTab.svelte +++ b/packages/web/src/tabs/FavoriteEditorTab.svelte @@ -43,6 +43,7 @@ import ErrorMessageModal from '../modals/ErrorMessageModal.svelte'; import { openFavorite } from '../appobj/FavoriteFileAppObject.svelte'; import createActivator, { getActiveComponent } from '../utility/createActivator'; +import { apiCall } from '../utility/api'; export let tabid; export let savedFile; @@ -97,7 +98,7 @@ export function save() { try { const data = JSON.parse(getData()); - axiosInstance().post('files/save', { + apiCall('files/save', { file: savedFile, folder: 'favorites', format: 'json', diff --git a/packages/web/src/tabs/FreeTableTab.svelte b/packages/web/src/tabs/FreeTableTab.svelte index d67dc24f0..c7d69fdfd 100644 --- a/packages/web/src/tabs/FreeTableTab.svelte +++ b/packages/web/src/tabs/FreeTableTab.svelte @@ -41,6 +41,7 @@ import { showModal } from '../modals/modalTools'; import SaveArchiveModal from '../modals/SaveArchiveModal.svelte'; import useEditorData from '../query/useEditorData'; + import { apiCall } from '../utility/api'; import { markArchiveFileAsDataSheet } from '../utility/archiveTools'; import axiosInstance from '../utility/axiosInstance'; import { changeTab } from '../utility/common'; @@ -61,10 +62,7 @@ const { setEditorData, editorState } = useEditorData({ tabid, - loadFromArgs: - initialArgs && initialArgs.functionName - ? () => axiosInstance().post('runners/load-reader', initialArgs).then(x => x.data) - : null, + loadFromArgs: initialArgs && initialArgs.functionName ? () => apiCall('runners/load-reader', initialArgs) : null, onInitialData: value => { dispatchModel({ type: 'reset', value }); }, @@ -84,7 +82,7 @@ } const doSave = async (folder, file) => { - await axiosInstance().post('archive/save-free-table', { folder, file, data: $modelState.value }); + await apiCall('archive/save-free-table', { folder, file, data: $modelState.value }); changeTab(tabid, tab => ({ ...tab, title: file, diff --git a/packages/web/src/tabs/MarkdownViewTab.svelte b/packages/web/src/tabs/MarkdownViewTab.svelte index e162a4715..8c6fc5a7e 100644 --- a/packages/web/src/tabs/MarkdownViewTab.svelte +++ b/packages/web/src/tabs/MarkdownViewTab.svelte @@ -6,6 +6,7 @@ import { onMount } from 'svelte'; import LoadingInfo from '../elements/LoadingInfo.svelte'; import Markdown from '../elements/Markdown.svelte'; + import { apiCall } from '../utility/api'; import axiosInstance from '../utility/axiosInstance'; @@ -16,12 +17,12 @@ const handleLoad = async () => { isLoading = true; - const resp = await axiosInstance().post('files/load', { + const resp = await apiCall('files/load', { folder: 'markdown', file: savedFile, format: 'text', }); - text = resp.data; + text = resp; isLoading = false; }; diff --git a/packages/web/src/tabs/PluginTab.svelte b/packages/web/src/tabs/PluginTab.svelte index 1f7b65b9c..155fa51b5 100644 --- a/packages/web/src/tabs/PluginTab.svelte +++ b/packages/web/src/tabs/PluginTab.svelte @@ -7,6 +7,7 @@ import FormStyledButton from '../elements/FormStyledButton.svelte'; import Markdown from '../elements/Markdown.svelte'; import { extractPluginAuthor, extractPluginIcon } from '../plugins/manifestExtractors'; +import { apiCall } from '../utility/api'; import axiosInstance from '../utility/axiosInstance'; import hasPermission from '../utility/hasPermission'; @@ -27,13 +28,13 @@ $: isPackaged = $info?.isPackaged; const handleInstall = async () => { - axiosInstance().post('plugins/install', { packageName }); + apiCall('plugins/install', { packageName }); }; const handleUninstall = async () => { - axiosInstance().post('plugins/uninstall', { packageName }); + apiCall('plugins/uninstall', { packageName }); }; const handleUpgrade = async () => { - axiosInstance().post('plugins/upgrade', { packageName }); + apiCall('plugins/upgrade', { packageName }); }; $: installedFound = $installed?.find(x => x.name == packageName); diff --git a/packages/web/src/tabs/QueryDesignTab.svelte b/packages/web/src/tabs/QueryDesignTab.svelte index dbaa882d2..aa2294758 100644 --- a/packages/web/src/tabs/QueryDesignTab.svelte +++ b/packages/web/src/tabs/QueryDesignTab.svelte @@ -38,6 +38,7 @@ import QueryDesignColumns from '../elements/QueryDesignColumns.svelte'; import useTimerLabel from '../utility/useTimerLabel'; import createActivator, { getActiveComponent } from '../utility/createActivator'; +import { apiCall } from '../utility/api'; export let tabid; export let conid; @@ -105,23 +106,23 @@ let sesid = sessionId; if (!sesid) { - const resp = await axiosInstance().post('sessions/create', { + const resp = await apiCall('sessions/create', { conid, database, }); - sesid = resp.data.sesid; + sesid = resp.sesid; sessionId = sesid; } busy = true; timerLabel.start(); - await axiosInstance().post('sessions/execute-query', { + await apiCall('sessions/execute-query', { sesid, sql: sqlPreview, }); } export async function kill() { - await axiosInstance().post('sessions/kill', { + await apiCall('sessions/kill', { sesid: sessionId, }); sessionId = null; diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte index 134b3cb5b..8882c4675 100644 --- a/packages/web/src/tabs/QueryTab.svelte +++ b/packages/web/src/tabs/QueryTab.svelte @@ -69,6 +69,7 @@ import AceEditor from '../query/AceEditor.svelte'; import StatusBarTabItem from '../widgets/StatusBarTabItem.svelte'; import { showSnackbarError } from '../utility/snackbar'; +import { apiCall } from '../utility/api'; export let tabid; export let conid; @@ -150,20 +151,20 @@ let sesid = sessionId; if (!sesid) { - const resp = await axiosInstance().post('sessions/create', { + const resp = await apiCall('sessions/create', { conid, database, }); - sesid = resp.data.sesid; + sesid = resp.sesid; sessionId = sesid; } busy = true; timerLabel.start(); - await axiosInstance().post('sessions/execute-query', { + await apiCall('sessions/execute-query', { sesid, sql, }); - await axiosInstance().post('query-history/write', { + await apiCall('query-history/write', { data: { sql, conid, @@ -184,7 +185,7 @@ } export async function kill() { - await axiosInstance().post('sessions/kill', { + await apiCall('sessions/kill', { sesid: sessionId, }); sessionId = null; diff --git a/packages/web/src/tabs/ShellTab.svelte b/packages/web/src/tabs/ShellTab.svelte index 8ad4907bd..2e28c458d 100644 --- a/packages/web/src/tabs/ShellTab.svelte +++ b/packages/web/src/tabs/ShellTab.svelte @@ -48,6 +48,7 @@ import AceEditor from '../query/AceEditor.svelte'; import RunnerOutputPane from '../query/RunnerOutputPane.svelte'; import useEditorData from '../query/useEditorData'; +import { apiCall } from '../utility/api'; import axiosInstance from '../utility/axiosInstance'; import { copyTextToClipboard } from '../utility/clipboard'; import { changeTab } from '../utility/common'; @@ -140,8 +141,8 @@ } export async function copyNodeScript() { - const resp = await axiosInstance().post('runners/get-node-script', { script: getActiveScript() }); - copyTextToClipboard(resp.data); + const resp = await apiCall('runners/get-node-script', { script: getActiveScript() }); + copyTextToClipboard(resp); } // export function openWizardEnabled() { @@ -172,10 +173,10 @@ executeNumber += 1; let runid = runnerId; - const resp = await axiosInstance().post('runners/start', { + const resp = await apiCall('runners/start', { script: getActiveScript(), }); - runid = resp.data.runid; + runid = resp.runid; runnerId = runid; busy = true; timerLabel.start(); @@ -186,7 +187,7 @@ } export function kill() { - axiosInstance().post('runners/cancel', { + apiCall('runners/cancel', { runid: runnerId, }); timerLabel.stop(); diff --git a/packages/web/src/tabs/TableDataTab.svelte b/packages/web/src/tabs/TableDataTab.svelte index 6b8e947b8..f56fc2e8c 100644 --- a/packages/web/src/tabs/TableDataTab.svelte +++ b/packages/web/src/tabs/TableDataTab.svelte @@ -53,6 +53,7 @@ import openNewTab from '../utility/openNewTab'; import { getBoolSettingsValue } from '../settings/settingsTools'; import { setContext } from 'svelte'; + import { apiCall } from '../utility/api'; export let tabid; export let conid; @@ -70,16 +71,8 @@ const [changeSetStore, dispatchChangeSet] = createUndoReducer(createChangeSet()); async function handleConfirmSql(sql) { - const resp = await axiosInstance().request({ - url: 'database-connections/run-script', - method: 'post', - params: { - conid, - database, - }, - data: { sql }, - }); - const { errorMessage } = resp.data || {}; + const resp = await apiCall('database-connections/run-script', { conid, database, sql }); + const { errorMessage } = resp || {}; if (errorMessage) { showModal(ErrorMessageModal, { title: 'Error when saving', message: errorMessage }); } else { diff --git a/packages/web/src/tabs/TableStructureTab.svelte b/packages/web/src/tabs/TableStructureTab.svelte index 57b360468..1dbe38e3b 100644 --- a/packages/web/src/tabs/TableStructureTab.svelte +++ b/packages/web/src/tabs/TableStructureTab.svelte @@ -58,6 +58,7 @@ import { changeTab } from '../utility/common'; import StatusBarTabItem from '../widgets/StatusBarTabItem.svelte'; import openNewTab from '../utility/openNewTab'; + import { apiCall } from '../utility/api'; export let tabid; export let conid; @@ -130,16 +131,8 @@ } async function handleConfirmSql(sql, createTableName) { - const resp = await axiosInstance().request({ - url: 'database-connections/run-script', - method: 'post', - params: { - conid, - database, - }, - data: { sql }, - }); - const { errorMessage } = resp.data || {}; + const resp = await apiCall('database-connections/run-script', { conid, database, sql }); + const { errorMessage } = resp || {}; if (errorMessage) { showModal(ErrorMessageModal, { title: 'Error when saving', message: errorMessage }); } else { @@ -154,14 +147,14 @@ })); } - await axiosInstance().post('database-connections/sync-model', { conid, database }); + await apiCall('database-connections/sync-model', { conid, database }); showSnackbarSuccess('Saved to database'); clearEditorData(); } } export async function reset() { - await axiosInstance().post('database-connections/sync-model', { conid, database }); + await apiCall('database-connections/sync-model', { conid, database }); clearEditorData(); } diff --git a/packages/web/src/utility/alterDatabaseTools.ts b/packages/web/src/utility/alterDatabaseTools.ts index ad7dd85eb..5d1690ed1 100644 --- a/packages/web/src/utility/alterDatabaseTools.ts +++ b/packages/web/src/utility/alterDatabaseTools.ts @@ -6,6 +6,7 @@ import { getExtensions } from '../stores'; import { getConnectionInfo, getDatabaseInfo } from './metadataLoaders'; import ConfirmSqlModal from '../modals/ConfirmSqlModal.svelte'; import axiosInstance from './axiosInstance'; +import { apiCall } from './api'; export async function alterDatabaseDialog(conid, database, updateFunc) { const conn = await getConnectionInfo({ conid }); @@ -21,16 +22,8 @@ export async function alterDatabaseDialog(conid, database, updateFunc) { sql, recreates, onConfirm: async () => { - const resp = await axiosInstance().request({ - url: 'database-connections/run-script', - method: 'post', - params: { - conid, - database, - }, - data: { sql }, - }); - await axiosInstance().post('database-connections/sync-model', { conid, database }); + const resp = await apiCall('database-connections/run-script', { conid, database, sql }); + await apiCall('database-connections/sync-model', { conid, database }); }, engine: driver.engine, }); diff --git a/packages/web/src/utility/connectionsPinger.js b/packages/web/src/utility/connectionsPinger.js index 2ffe51112..7eb841d4b 100644 --- a/packages/web/src/utility/connectionsPinger.js +++ b/packages/web/src/utility/connectionsPinger.js @@ -1,16 +1,17 @@ import _ from 'lodash'; import { openedConnections, currentDatabase } from '../stores'; +import { apiCall } from './api'; import axiosInstance from './axiosInstance'; const doServerPing = value => { - axiosInstance().post('server-connections/ping', { connections: value }); + apiCall('server-connections/ping', { connections: value }); }; const doDatabasePing = value => { const database = _.get(value, 'name'); const conid = _.get(value, 'connection._id'); if (conid && database) { - axiosInstance().post('database-connections/ping', { conid, database }); + apiCall('database-connections/ping', { conid, database }); } }; diff --git a/packages/web/src/utility/exportElectronFile.ts b/packages/web/src/utility/exportElectronFile.ts index 49a2922ef..6824a05a0 100644 --- a/packages/web/src/utility/exportElectronFile.ts +++ b/packages/web/src/utility/exportElectronFile.ts @@ -4,6 +4,7 @@ import axiosInstance from '../utility/axiosInstance'; import socket from '../utility/socket'; import { showSnackbar, showSnackbarInfo, showSnackbarError, closeSnackbar } from '../utility/snackbar'; import resolveApi from './resolveApi'; +import { apiCall } from './api'; export async function exportElectronFile(dataName, reader, format) { const electron = getElectron(); @@ -28,8 +29,8 @@ export async function exportElectronFile(dataName, reader, format) { script.copyStream(sourceVar, targetVar); script.put(); - const resp = await axiosInstance().post('runners/start', { script: script.getScript() }); - const runid = resp.data.runid; + const resp = await apiCall('runners/start', { script: script.getScript() }); + const runid = resp.runid; let isCanceled = false; const snackId = showSnackbar({ @@ -40,7 +41,7 @@ export async function exportElectronFile(dataName, reader, format) { label: 'Cancel', onClick: () => { isCanceled = true; - axiosInstance().post('runners/cancel', { runid }); + apiCall('runners/cancel', { runid }); }, }, ], @@ -74,8 +75,8 @@ export async function saveFileToDisk( await filePathFunc(filePath); electron.openExternal('file:///' + filePath); } else { - const resp = await axiosInstance().get('files/generate-uploads-file'); - await filePathFunc(resp.data.filePath); - window.open(`${resolveApi()}/uploads/get?file=${resp.data.fileName}`, '_blank'); + const resp = await apiCall('files/generate-uploads-file'); + await filePathFunc(resp.filePath); + window.open(`${resolveApi()}/uploads/get?file=${resp.fileName}`, '_blank'); } } diff --git a/packages/web/src/utility/openArchiveFolder.ts b/packages/web/src/utility/openArchiveFolder.ts index 70debcf05..5728697bd 100644 --- a/packages/web/src/utility/openArchiveFolder.ts +++ b/packages/web/src/utility/openArchiveFolder.ts @@ -3,6 +3,7 @@ import getElectron from './getElectron'; import { currentArchive, extensions, selectedWidget } from '../stores'; import axiosInstance from '../utility/axiosInstance'; import { showSnackbarSuccess } from './snackbar'; +import { apiCall } from './api'; export async function openArchiveFolder() { const electron = getElectron(); @@ -12,9 +13,9 @@ export async function openArchiveFolder() { }); const linkedFolder = filePaths && filePaths[0]; if (!linkedFolder) return; - const resp = await axiosInstance().post('archive/create-link', { linkedFolder }); + const resp = await apiCall('archive/create-link', { linkedFolder }); - currentArchive.set(resp.data); + currentArchive.set(resp); selectedWidget.set('archive'); - showSnackbarSuccess(`Created link ${resp.data}`); + showSnackbarSuccess(`Created link ${resp}`); } diff --git a/packages/web/src/utility/openElectronFile.ts b/packages/web/src/utility/openElectronFile.ts index 4db8a2d30..6491adfc7 100644 --- a/packages/web/src/utility/openElectronFile.ts +++ b/packages/web/src/utility/openElectronFile.ts @@ -7,6 +7,7 @@ import { currentDatabase, extensions } from '../stores'; import { getUploadListener } from './uploadFiles'; import axiosInstance from '../utility/axiosInstance'; import { getDatabaseFileLabel } from './getConnectionLabel'; +import { apiCall } from './api'; export function canOpenByElectron(file, extensions) { if (!file) return false; @@ -21,7 +22,7 @@ export function canOpenByElectron(file, extensions) { export async function openSqliteFile(filePath) { const defaultDatabase = getDatabaseFileLabel(filePath); - const resp = await axiosInstance().post('connections/save', { + const resp = await apiCall('connections/save', { _id: undefined, databaseFile: filePath, engine: 'sqlite@dbgate-plugin-sqlite', @@ -29,7 +30,7 @@ export async function openSqliteFile(filePath) { defaultDatabase, }); currentDatabase.set({ - connection: resp.data, + connection: resp, name: getDatabaseFileLabel(filePath), }); } diff --git a/packages/web/src/utility/saveTabFile.ts b/packages/web/src/utility/saveTabFile.ts index 97a14f71e..888884f04 100644 --- a/packages/web/src/utility/saveTabFile.ts +++ b/packages/web/src/utility/saveTabFile.ts @@ -5,6 +5,7 @@ import axiosInstance from '../utility/axiosInstance'; import { changeTab } from './common'; import SaveFileModal from '../modals/SaveFileModal.svelte'; import registerCommand from '../commands/registerCommand'; +import { apiCall } from './api'; // export function saveTabEnabledStore(editorStore) { // return derived(editorStore, editor => editor != null); @@ -18,10 +19,10 @@ export default function saveTabFile(editor, saveAs, folder, format, fileExtensio const handleSave = async () => { if (savedFile) { - await axiosInstance().post('files/save', { folder: savedFolder || folder, file: savedFile, data, format }); + await apiCall('files/save', { folder: savedFolder || folder, file: savedFile, data, format }); } if (savedFilePath) { - await axiosInstance().post('files/save-as', { filePath: savedFilePath, data, format }); + await apiCall('files/save-as', { filePath: savedFilePath, data, format }); } }; diff --git a/packages/web/src/widgets/ArchiveFilesList.svelte b/packages/web/src/widgets/ArchiveFilesList.svelte index 16bf93a97..b3e2a032b 100644 --- a/packages/web/src/widgets/ArchiveFilesList.svelte +++ b/packages/web/src/widgets/ArchiveFilesList.svelte @@ -28,6 +28,7 @@ import InputTextModal from '../modals/InputTextModal.svelte'; import { showModal } from '../modals/modalTools'; import { currentArchive } from '../stores'; + import { apiCall } from '../utility/api'; import { markArchiveFileAsDataSheet } from '../utility/archiveTools'; import axiosInstance from '../utility/axiosInstance'; import { useArchiveFiles, useArchiveFolders } from '../utility/metadataLoaders'; @@ -40,7 +41,7 @@ $: files = useArchiveFiles({ folder }); const handleRefreshFiles = () => { - axiosInstance().post('archive/refresh-files', { folder }); + apiCall('archive/refresh-files', { folder }); }; function handleNewDataSheet() { @@ -49,7 +50,7 @@ label: 'New file name', header: 'Create new data sheet', onConfirm: async file => { - await axiosInstance().post('archive/save-free-table', { + await apiCall('archive/save-free-table', { folder: $currentArchive, file, data: createFreeTableModel(), diff --git a/packages/web/src/widgets/ArchiveFolderList.svelte b/packages/web/src/widgets/ArchiveFolderList.svelte index 3966b9441..d85249d34 100644 --- a/packages/web/src/widgets/ArchiveFolderList.svelte +++ b/packages/web/src/widgets/ArchiveFolderList.svelte @@ -11,6 +11,7 @@ import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte'; import SearchInput from '../elements/SearchInput.svelte'; import FontIcon from '../icons/FontIcon.svelte'; +import { apiCall } from '../utility/api'; import axiosInstance from '../utility/axiosInstance'; import { useArchiveFolders } from '../utility/metadataLoaders'; import WidgetsInnerContainer from './WidgetsInnerContainer.svelte'; @@ -20,7 +21,7 @@ $: folders = useArchiveFolders(); const handleRefreshFolders = () => { - axiosInstance().post('archive/refresh-folders', {}); + apiCall('archive/refresh-folders'); }; diff --git a/packages/web/src/widgets/ConnectionList.svelte b/packages/web/src/widgets/ConnectionList.svelte index 0243b21c7..57ab0c30a 100644 --- a/packages/web/src/widgets/ConnectionList.svelte +++ b/packages/web/src/widgets/ConnectionList.svelte @@ -16,6 +16,7 @@ import { useConnectionColorFactory } from '../utility/useConnectionColor'; import FontIcon from '../icons/FontIcon.svelte'; import CloseSearchButton from '../elements/CloseSearchButton.svelte'; + import { apiCall } from '../utility/api'; const connections = useConnectionList(); const serverStatus = useServerStatus(); @@ -29,7 +30,7 @@ const handleRefreshConnections = () => { for (const conid of $openedConnections) { - axiosInstance().post('server-connections/refresh', { conid }); + apiCall('server-connections/refresh', { conid }); } }; diff --git a/packages/web/src/widgets/QueryHistoryList.svelte b/packages/web/src/widgets/QueryHistoryList.svelte index 01ab7c101..bcd465c6a 100644 --- a/packages/web/src/widgets/QueryHistoryList.svelte +++ b/packages/web/src/widgets/QueryHistoryList.svelte @@ -11,6 +11,7 @@ import axiosInstance from '../utility/axiosInstance'; import openNewTab from '../utility/openNewTab'; import CloseSearchButton from '../elements/CloseSearchButton.svelte'; + import { apiCall } from '../utility/api'; let filter = ''; let search = ''; @@ -18,15 +19,8 @@ let historyItems = []; async function reloadItems() { - const resp = await axiosInstance().request({ - method: 'get', - url: 'query-history/read', - params: { - filter: search, - limit: 100, - }, - }); - historyItems = resp.data; + const resp = await apiCall('query-history/read', { filter: search, limit: 100 }); + historyItems = resp; } $: { diff --git a/packages/web/src/widgets/SqlObjectList.svelte b/packages/web/src/widgets/SqlObjectList.svelte index 32c242c7a..f0c9adb24 100644 --- a/packages/web/src/widgets/SqlObjectList.svelte +++ b/packages/web/src/widgets/SqlObjectList.svelte @@ -34,6 +34,7 @@ import { extensions } from '../stores'; import newQuery from '../query/newQuery'; import runCommand from '../commands/runCommand'; + import { apiCall } from '../utility/api'; export let conid; export let database; @@ -62,7 +63,7 @@ // $: objectList = generateObjectList(generateIndex); const handleRefreshDatabase = () => { - axiosInstance().post('database-connections/refresh', { conid, database }); + apiCall('database-connections/refresh', { conid, database }); }; function createAddMenu() { diff --git a/packages/web/src/widgets/StatusBar.svelte b/packages/web/src/widgets/StatusBar.svelte index 3fff2cdd8..cc91c4114 100644 --- a/packages/web/src/widgets/StatusBar.svelte +++ b/packages/web/src/widgets/StatusBar.svelte @@ -42,6 +42,7 @@ import axiosInstance from '../utility/axiosInstance'; import { findCommand } from '../commands/runCommand'; import { useConnectionColor } from '../utility/useConnectionColor'; + import { apiCall } from '../utility/api'; $: databaseName = $currentDatabase && $currentDatabase.name; $: connection = $currentDatabase && $currentDatabase.connection; @@ -64,7 +65,7 @@ async function handleSyncModel() { if (connection && databaseName) { - await axiosInstance().post('database-connections/sync-model', { conid: connection._id, database: databaseName }); + await apiCall('database-connections/sync-model', { conid: connection._id, database: databaseName }); } } From 05ea435820140106bbb54055c01a2c6e7b61b82a Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Wed, 22 Dec 2021 10:59:00 +0100 Subject: [PATCH 12/75] complete removed axiosInstance --- packages/web/src/App.svelte | 1 - .../src/appobj/ArchiveFileAppObject.svelte | 1 - .../src/appobj/ArchiveFolderAppObject.svelte | 3 +-- .../web/src/appobj/ConnectionAppObject.svelte | 1 - .../web/src/appobj/DatabaseAppObject.svelte | 1 - .../src/appobj/DatabaseObjectAppObject.svelte | 1 - .../src/appobj/FavoriteFileAppObject.svelte | 1 - .../web/src/appobj/SavedFileAppObject.svelte | 1 - packages/web/src/charts/ChartCore.svelte | 3 +-- packages/web/src/charts/chartDataLoader.ts | 1 - .../commands/changeDatabaseStatusCommand.ts | 1 - packages/web/src/commands/stdCommands.ts | 1 - .../datagrid/CollectionDataGridCore.svelte | 1 - packages/web/src/datagrid/DataGridCore.svelte | 1 - packages/web/src/datagrid/JslDataGrid.svelte | 8 ++---- .../web/src/datagrid/JslDataGridCore.svelte | 1 - .../web/src/datagrid/SqlDataGridCore.svelte | 1 - .../src/forms/FormArchiveFolderSelect.svelte | 3 +-- packages/web/src/formview/FormView.svelte | 3 +-- packages/web/src/formview/SqlFormView.svelte | 4 +-- .../src/freetable/FreeTableGridCore.svelte | 3 +-- .../web/src/impexp/PreviewDataGrid.svelte | 1 - .../modals/ChooseConnectionColorModal.svelte | 3 +-- packages/web/src/modals/CommandModal.svelte | 3 +-- .../web/src/modals/ConnectionModal.svelte | 1 - .../src/modals/DictionaryLookupModal.svelte | 1 - packages/web/src/modals/FavoriteModal.svelte | 1 - .../web/src/modals/ImportExportModal.svelte | 3 +-- packages/web/src/modals/SaveFileModal.svelte | 3 +-- .../web/src/modals/SqlGeneratorModal.svelte | 5 +--- .../web/src/modals/ValueLookupModal.svelte | 1 - .../src/plugins/AvailablePluginsList.svelte | 10 ++------ .../web/src/plugins/PluginsProvider.svelte | 3 +-- .../web/src/query/RunnerOutputFiles.svelte | 1 - .../web/src/settings/SettingsModal.svelte | 1 - packages/web/src/tabs/ChangelogTab.svelte | 4 +-- packages/web/src/tabs/ChartTab.svelte | 1 - .../web/src/tabs/CollectionDataTab.svelte | 1 - packages/web/src/tabs/CompareModelTab.svelte | 1 - .../web/src/tabs/FavoriteEditorTab.svelte | 3 +-- packages/web/src/tabs/FreeTableTab.svelte | 1 - packages/web/src/tabs/MarkdownViewTab.svelte | 2 -- packages/web/src/tabs/PluginTab.svelte | 10 ++------ packages/web/src/tabs/QueryDesignTab.svelte | 3 +-- packages/web/src/tabs/QueryTab.svelte | 3 +-- packages/web/src/tabs/ShellTab.svelte | 3 +-- packages/web/src/tabs/TableDataTab.svelte | 1 - .../web/src/tabs/TableStructureTab.svelte | 1 - .../web/src/utility/alterDatabaseTools.ts | 1 - packages/web/src/utility/api.ts | 13 ++++++++++ packages/web/src/utility/axiosInstance.js | 25 ------------------- packages/web/src/utility/connectionsPinger.js | 1 - .../web/src/utility/exportElectronFile.ts | 1 - packages/web/src/utility/getElectron.ts | 3 --- packages/web/src/utility/metadataLoaders.ts | 1 - packages/web/src/utility/openArchiveFolder.ts | 1 - packages/web/src/utility/openElectronFile.ts | 1 - packages/web/src/utility/saveTabFile.ts | 1 - packages/web/src/utility/useFetch.ts | 21 ---------------- .../web/src/widgets/ArchiveFilesList.svelte | 1 - .../web/src/widgets/ArchiveFolderList.svelte | 3 +-- .../web/src/widgets/ConnectionList.svelte | 1 - .../web/src/widgets/QueryHistoryList.svelte | 2 -- packages/web/src/widgets/SqlObjectList.svelte | 1 - packages/web/src/widgets/StatusBar.svelte | 1 - .../dbgate-plugin-excel/src/frontend/index.js | 8 +++--- 66 files changed, 41 insertions(+), 157 deletions(-) delete mode 100644 packages/web/src/utility/axiosInstance.js delete mode 100644 packages/web/src/utility/useFetch.ts diff --git a/packages/web/src/App.svelte b/packages/web/src/App.svelte index af67e62ed..b62e17da2 100644 --- a/packages/web/src/App.svelte +++ b/packages/web/src/App.svelte @@ -9,7 +9,6 @@ import Screen from './Screen.svelte'; import { loadingPluginStore, subscribeApiDependendStores } from './stores'; import { setAppLoaded } from './utility/appLoadManager'; - import axiosInstance from './utility/axiosInstance'; import ErrorHandler from './utility/ErrorHandler.svelte'; import OpenTabsOnStartup from './utility/OpenTabsOnStartup.svelte'; import { shouldWaitForElectronInitialize } from './utility/getElectron'; diff --git a/packages/web/src/appobj/ArchiveFileAppObject.svelte b/packages/web/src/appobj/ArchiveFileAppObject.svelte index 384a3690a..83e24c4a1 100644 --- a/packages/web/src/appobj/ArchiveFileAppObject.svelte +++ b/packages/web/src/appobj/ArchiveFileAppObject.svelte @@ -69,7 +69,6 @@ import { archiveFilesAsDataSheets, currentArchive, extensions, getCurrentDatabase } from '../stores'; - import axiosInstance from '../utility/axiosInstance'; import createQuickExportMenu from '../utility/createQuickExportMenu'; import { exportElectronFile } from '../utility/exportElectronFile'; import openNewTab from '../utility/openNewTab'; diff --git a/packages/web/src/appobj/ArchiveFolderAppObject.svelte b/packages/web/src/appobj/ArchiveFolderAppObject.svelte index e5ffb1e4a..1843efbdd 100644 --- a/packages/web/src/appobj/ArchiveFolderAppObject.svelte +++ b/packages/web/src/appobj/ArchiveFolderAppObject.svelte @@ -9,7 +9,6 @@ import { currentArchive, currentDatabase } from '../stores'; - import axiosInstance from '../utility/axiosInstance'; import openNewTab from '../utility/openNewTab'; import AppObjectCore from './AppObjectCore.svelte'; import newQuery from '../query/newQuery'; @@ -17,7 +16,7 @@ import ConfirmModal from '../modals/ConfirmModal.svelte'; import InputTextModal from '../modals/InputTextModal.svelte'; import ErrorMessageModal from '../modals/ErrorMessageModal.svelte'; -import { apiCall } from '../utility/api'; + import { apiCall } from '../utility/api'; export let data; diff --git a/packages/web/src/appobj/ConnectionAppObject.svelte b/packages/web/src/appobj/ConnectionAppObject.svelte index 209c208d6..afc8e0abb 100644 --- a/packages/web/src/appobj/ConnectionAppObject.svelte +++ b/packages/web/src/appobj/ConnectionAppObject.svelte @@ -17,7 +17,6 @@ import _ from 'lodash'; import AppObjectCore from './AppObjectCore.svelte'; import { currentDatabase, extensions, getCurrentConfig, getOpenedConnections, openedConnections } from '../stores'; - import axiosInstance from '../utility/axiosInstance'; import { filterName } from 'dbgate-tools'; import { showModal } from '../modals/modalTools'; import ConnectionModal from '../modals/ConnectionModal.svelte'; diff --git a/packages/web/src/appobj/DatabaseAppObject.svelte b/packages/web/src/appobj/DatabaseAppObject.svelte index fffd7a693..74eb1ca4d 100644 --- a/packages/web/src/appobj/DatabaseAppObject.svelte +++ b/packages/web/src/appobj/DatabaseAppObject.svelte @@ -171,7 +171,6 @@ pinnedDatabases, selectedWidget, } from '../stores'; - import axiosInstance from '../utility/axiosInstance'; import getElectron from '../utility/getElectron'; import openNewTab from '../utility/openNewTab'; import AppObjectCore from './AppObjectCore.svelte'; diff --git a/packages/web/src/appobj/DatabaseObjectAppObject.svelte b/packages/web/src/appobj/DatabaseObjectAppObject.svelte index e664bc154..4f690d6a6 100644 --- a/packages/web/src/appobj/DatabaseObjectAppObject.svelte +++ b/packages/web/src/appobj/DatabaseObjectAppObject.svelte @@ -408,7 +408,6 @@ import { exportElectronFile } from '../utility/exportElectronFile'; import createQuickExportMenu from '../utility/createQuickExportMenu'; import ConfirmSqlModal from '../modals/ConfirmSqlModal.svelte'; - import axiosInstance from '../utility/axiosInstance'; import { alterDatabaseDialog, renameDatabaseObjectDialog } from '../utility/alterDatabaseTools'; import ConfirmModal from '../modals/ConfirmModal.svelte'; import { apiCall } from '../utility/api'; diff --git a/packages/web/src/appobj/FavoriteFileAppObject.svelte b/packages/web/src/appobj/FavoriteFileAppObject.svelte index 8f56e9e72..f62646dcc 100644 --- a/packages/web/src/appobj/FavoriteFileAppObject.svelte +++ b/packages/web/src/appobj/FavoriteFileAppObject.svelte @@ -30,7 +30,6 @@ @@ -258,5 +256,4 @@ import { apiCall } from '../utility/api'; .dbname { color: var(--theme-font-3); } - diff --git a/packages/web/src/modals/ValueLookupModal.svelte b/packages/web/src/modals/ValueLookupModal.svelte index 7c4d3c127..55431c6a3 100644 --- a/packages/web/src/modals/ValueLookupModal.svelte +++ b/packages/web/src/modals/ValueLookupModal.svelte @@ -6,7 +6,6 @@ import { closeCurrentModal, showModal } from './modalTools'; import DefineDictionaryDescriptionModal from './DefineDictionaryDescriptionModal.svelte'; import ScrollableTableControl from '../elements/ScrollableTableControl.svelte'; - import axiosInstance from '../utility/axiosInstance'; import { getDictionaryDescription } from '../utility/dictionaryDescriptionTools'; import { onMount } from 'svelte'; import { dumpSqlSelect } from 'dbgate-sqltree'; diff --git a/packages/web/src/plugins/AvailablePluginsList.svelte b/packages/web/src/plugins/AvailablePluginsList.svelte index a0940c73f..ffe78f717 100644 --- a/packages/web/src/plugins/AvailablePluginsList.svelte +++ b/packages/web/src/plugins/AvailablePluginsList.svelte @@ -3,20 +3,14 @@ import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte'; import SearchInput from '../elements/SearchInput.svelte'; - import useFetch from '../utility/useFetch'; + import { useApiCall } from '../utility/api'; import WidgetsInnerContainer from '../widgets/WidgetsInnerContainer.svelte'; import PluginsList from './PluginsList.svelte'; let filter = ''; let search = ''; - $: plugins = useFetch({ - url: 'plugins/search', - params: { - filter: search, - }, - defaultValue: [], - }); + $: plugins = useApiCall('plugins/search', { filter: search }, []); const setDebouncedFilter = _.debounce(value => (search = value), 500); diff --git a/packages/web/src/plugins/PluginsProvider.svelte b/packages/web/src/plugins/PluginsProvider.svelte index 2e85d4d45..a5b2de25c 100644 --- a/packages/web/src/plugins/PluginsProvider.svelte +++ b/packages/web/src/plugins/PluginsProvider.svelte @@ -1,6 +1,6 @@ From 318b137490ee200698c7773de3e93b0c10a69d4b Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Wed, 22 Dec 2021 15:14:52 +0100 Subject: [PATCH 14/75] using SSE instead of socket IO --- packages/api/package.json | 1 + packages/api/src/main.js | 32 +++++++++++++++++++-- packages/api/src/utility/socket.js | 32 +++++++++++++++------ packages/web/src/utility/api.ts | 32 +++++++++++++++++---- packages/web/src/utility/metadataLoaders.ts | 9 +++--- packages/web/src/utility/socket.js | 23 --------------- yarn.lock | 5 ++++ 7 files changed, 91 insertions(+), 43 deletions(-) delete mode 100644 packages/web/src/utility/socket.js diff --git a/packages/api/package.json b/packages/api/package.json index 899c04b23..e29a4e2e0 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -35,6 +35,7 @@ "express": "^4.17.1", "express-basic-auth": "^1.2.0", "express-fileupload": "^1.2.0", + "express-sse": "^0.5.3", "fs-extra": "^9.1.0", "fs-reverse": "^0.0.3", "get-port": "^5.1.1", diff --git a/packages/api/src/main.js b/packages/api/src/main.js index 29159fca9..07f7504d0 100644 --- a/packages/api/src/main.js +++ b/packages/api/src/main.js @@ -4,7 +4,7 @@ const bodyParser = require('body-parser'); const fileUpload = require('express-fileupload'); const http = require('http'); const cors = require('cors'); -const io = require('socket.io'); +// const io = require('socket.io'); const fs = require('fs'); const getPort = require('get-port'); const childProcessChecker = require('./utility/childProcessChecker'); @@ -43,7 +43,11 @@ function start() { const app = express(); const server = http.createServer(app); - socket.set(io(server)); + + // const sse = new SSE(); + // app.get('/stream', sse.init); + // socket.set(sse); + // socket.set(io(server)); if (process.env.LOGIN && process.env.PASSWORD) { app.use( @@ -81,6 +85,30 @@ function start() { }); app.use(cors()); + + app.get('/stream', async function (req, res) { + res.set({ + 'Cache-Control': 'no-cache', + 'Content-Type': 'text/event-stream', + Connection: 'keep-alive', + }); + res.flushHeaders(); + + // Tell the client to retry every 10 seconds if connectivity is lost + res.write('retry: 10000\n\n'); + socket.set(res); + + // let count = 0; + + // while (true) { + // await new Promise((resolve) => setTimeout(resolve, 1000)); + + // console.log("Emit", ++count); + // // Emit an SSE that contains the current 'count' as a string + // res.write(`event: ping\ndata: ${JSON.stringify({ count })}\n\n`); + // } + }); + app.use(bodyParser.json({ limit: '50mb' })); app.use( diff --git a/packages/api/src/utility/socket.js b/packages/api/src/utility/socket.js index aefed81fb..b7659d7eb 100644 --- a/packages/api/src/utility/socket.js +++ b/packages/api/src/utility/socket.js @@ -1,19 +1,35 @@ -let socket = null; +let res = null; +let init = ''; module.exports = { set(value) { - socket = value; - }, - get() { - return socket; + res = value; }, + // get() { + // return socket; + // }, emit(message, data) { + if (res) { + if (init) { + res.write(init); + init = ''; + } + res.write(`event: ${message}\ndata: ${JSON.stringify(data == null ? null : data)}\n\n`); + } else { + init += res; + } + // console.log('EMIT:', message, data); - socket.emit(message, data); + // socket.emit(message, data); }, emitChanged(key) { + this.emit('clean-cache', key); + this.emit(key); // console.log('EMIT_CHANGED:', key); - socket.emit('clean-cache', key); - socket.emit(key); + // socket.emit('clean-cache', key); + // socket.emit(key); + + // socket.send(key, 'clean-cache'); + // socket.send(null, key); }, }; diff --git a/packages/web/src/utility/api.ts b/packages/web/src/utility/api.ts index a64c4bec8..b9ddc9d9b 100644 --- a/packages/web/src/utility/api.ts +++ b/packages/web/src/utility/api.ts @@ -1,6 +1,16 @@ import resolveApi, { resolveApiHeaders } from './resolveApi'; import { writable } from 'svelte/store'; -import socket from './socket'; +import { cacheClean } from './cache'; +// import socket from './socket'; + +let eventSource; + +function wantEventSource() { + if (!eventSource) { + eventSource = new EventSource(`${resolveApi()}/stream`); + eventSource.addEventListener('clean-cache', e => cacheClean(JSON.parse(e.data))); + } +} export async function apiCall(route: string, args: {} = undefined) { const resp = await fetch(`${resolveApi()}/${route}`, { @@ -15,16 +25,28 @@ export async function apiCall(route: string, args: {} = undefined) { return resp.json(); } +const apiHandlers = new WeakMap(); + export function apiOn(event: string, handler: Function) { - socket().on(event, handler); + wantEventSource(); + if (!apiHandlers.has(handler)) { + const handlerProxy = e => { + // console.log('RECEIVED', e.type, JSON.parse(e.data)); + handler(JSON.parse(e.data)); + }; + apiHandlers.set(handler, handlerProxy); + } + + eventSource.addEventListener(event, apiHandlers.get(handler)); } export function apiOff(event: string, handler: Function) { - socket().off(event, handler); + wantEventSource(); + if (apiHandlers.has(handler)) { + eventSource.removeEventListener(event, apiHandlers.get(handler)); + } } -import _ from 'lodash'; - export function useApiCall(route, args, defaultValue) { const result = writable(defaultValue); diff --git a/packages/web/src/utility/metadataLoaders.ts b/packages/web/src/utility/metadataLoaders.ts index 332d85a33..3fcf6fa6f 100644 --- a/packages/web/src/utility/metadataLoaders.ts +++ b/packages/web/src/utility/metadataLoaders.ts @@ -2,7 +2,6 @@ import _ from 'lodash'; import { cacheGet, cacheSet, getCachedPromise } from './cache'; import stableStringify from 'json-stable-stringify'; import { cacheClean } from './cache'; -import socket from './socket'; import getAsArray from './getAsArray'; import { DatabaseInfo } from 'dbgate-types'; import { derived } from 'svelte/store'; @@ -194,11 +193,11 @@ function useCore(loader, args) { } } - if (reloadTrigger && !socket) { - console.error('Socket not available, reloadTrigger not planned'); - } + // if (reloadTrigger && !socket) { + // console.error('Socket not available, reloadTrigger not planned'); + // } handleReload(); - if (reloadTrigger && socket) { + if (reloadTrigger) { for (const item of getAsArray(reloadTrigger)) { apiOn(item, handleReload); } diff --git a/packages/web/src/utility/socket.js b/packages/web/src/utility/socket.js deleted file mode 100644 index ea3be8654..000000000 --- a/packages/web/src/utility/socket.js +++ /dev/null @@ -1,23 +0,0 @@ -import io from 'socket.io-client'; -import resolveApi from './resolveApi'; -import { cacheClean } from './cache'; -import { shouldWaitForElectronInitialize } from './getElectron'; - -let socketInstance; - -function recreateSocket() { - if (shouldWaitForElectronInitialize()) return; - - socketInstance = io(resolveApi()); - socketInstance.on('clean-cache', reloadTrigger => cacheClean(reloadTrigger)); -} - -window['dbgate_recreateSocket'] = recreateSocket; - -recreateSocket(); - -function socket() { - return socketInstance; -} - -export default socket; diff --git a/yarn.lock b/yarn.lock index 482681cdc..4d094988b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4032,6 +4032,11 @@ express-fileupload@^1.2.0: dependencies: busboy "^0.3.1" +express-sse@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/express-sse/-/express-sse-0.5.3.tgz#6e6cb1a85ef7b6ec1eb658e37e923907c482bd31" + integrity sha512-DJF0nofFGq0IXJLGq95hfrryP3ZprVAVpyZUnmAk6QhHnm7zCzsHBNFP0i4FKFo2XjOf+JiYUKjT7jQhIeljpg== + express@^4.17.1: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" From 2ff9e8c4525efc66f3dd2932b0636afbe7f3778f Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Wed, 22 Dec 2021 16:34:34 +0100 Subject: [PATCH 15/75] removed unused packages --- packages/api/package.json | 2 -- packages/api/src/main.js | 16 ---------------- packages/web/package.json | 1 - patches/socket.io+2.3.0.patch | 27 --------------------------- yarn.lock | 7 +------ 5 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 patches/socket.io+2.3.0.patch diff --git a/packages/api/package.json b/packages/api/package.json index e29a4e2e0..153c977d6 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -35,7 +35,6 @@ "express": "^4.17.1", "express-basic-auth": "^1.2.0", "express-fileupload": "^1.2.0", - "express-sse": "^0.5.3", "fs-extra": "^9.1.0", "fs-reverse": "^0.0.3", "get-port": "^5.1.1", @@ -50,7 +49,6 @@ "node-ssh-forward": "^0.7.2", "portfinder": "^1.0.28", "simple-encryptor": "^4.0.0", - "socket.io": "^2.3.0", "tar": "^6.0.5", "uuid": "^3.4.0" }, diff --git a/packages/api/src/main.js b/packages/api/src/main.js index 07f7504d0..858139b74 100644 --- a/packages/api/src/main.js +++ b/packages/api/src/main.js @@ -4,7 +4,6 @@ const bodyParser = require('body-parser'); const fileUpload = require('express-fileupload'); const http = require('http'); const cors = require('cors'); -// const io = require('socket.io'); const fs = require('fs'); const getPort = require('get-port'); const childProcessChecker = require('./utility/childProcessChecker'); @@ -44,11 +43,6 @@ function start() { const server = http.createServer(app); - // const sse = new SSE(); - // app.get('/stream', sse.init); - // socket.set(sse); - // socket.set(io(server)); - if (process.env.LOGIN && process.env.PASSWORD) { app.use( basicAuth({ @@ -97,16 +91,6 @@ function start() { // Tell the client to retry every 10 seconds if connectivity is lost res.write('retry: 10000\n\n'); socket.set(res); - - // let count = 0; - - // while (true) { - // await new Promise((resolve) => setTimeout(resolve, 1000)); - - // console.log("Emit", ++count); - // // Emit an SSE that contains the current 'count' as a string - // res.write(`event: ping\ndata: ${JSON.stringify({ count })}\n\n`); - // } }); app.use(bodyParser.json({ limit: '50mb' })); diff --git a/packages/web/package.json b/packages/web/package.json index 3187a2c13..444f47fb4 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -45,7 +45,6 @@ "rollup-plugin-terser": "^7.0.0", "rollup-plugin-web-worker-loader": "^1.6.1", "sirv-cli": "^1.0.0", - "socket.io-client": "^2.3.0", "sql-formatter": "^2.3.3", "svelte": "^3.43.0", "svelte-check": "^1.0.0", diff --git a/patches/socket.io+2.3.0.patch b/patches/socket.io+2.3.0.patch deleted file mode 100644 index f8c3477a1..000000000 --- a/patches/socket.io+2.3.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/node_modules/socket.io/lib/index.js b/node_modules/socket.io/lib/index.js -index 5287e4e..2f4330d 100644 ---- a/node_modules/socket.io/lib/index.js -+++ b/node_modules/socket.io/lib/index.js -@@ -112,14 +112,14 @@ Server.prototype.serveClient = function(v){ - } - return require.resolve(file); - }; -- if (v && !clientSource) { -- clientSource = read(resolvePath( 'socket.io-client/dist/socket.io.js'), 'utf-8'); -- try { -- clientSourceMap = read(resolvePath( 'socket.io-client/dist/socket.io.js.map'), 'utf-8'); -- } catch(err) { -- debug('could not load sourcemap file'); -- } -- } -+// if (v && !clientSource) { -+// clientSource = read(resolvePath( 'socket.io-client/dist/socket.io.js'), 'utf-8'); -+// try { -+// clientSourceMap = read(resolvePath( 'socket.io-client/dist/socket.io.js.map'), 'utf-8'); -+// } catch(err) { -+// debug('could not load sourcemap file'); -+// } -+// } - return this; - }; - diff --git a/yarn.lock b/yarn.lock index 4d094988b..8534c684d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4032,11 +4032,6 @@ express-fileupload@^1.2.0: dependencies: busboy "^0.3.1" -express-sse@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/express-sse/-/express-sse-0.5.3.tgz#6e6cb1a85ef7b6ec1eb658e37e923907c482bd31" - integrity sha512-DJF0nofFGq0IXJLGq95hfrryP3ZprVAVpyZUnmAk6QhHnm7zCzsHBNFP0i4FKFo2XjOf+JiYUKjT7jQhIeljpg== - express@^4.17.1: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" @@ -9551,7 +9546,7 @@ socket.io-adapter@~1.1.0: resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== -socket.io-client@2.3.0, socket.io-client@^2.3.0: +socket.io-client@2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz#14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4" integrity sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA== From 24071ebde7d26bfbee818d9aa0576344bb68d850 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 25 Dec 2021 09:23:03 +0100 Subject: [PATCH 16/75] api running in electron main process --- app/package.json | 2 +- app/src/electron.js | 83 +++++++++++++---------- packages/api/package.json | 1 + packages/api/src/index.js | 10 +-- packages/api/src/main.js | 34 ++++++---- packages/api/src/utility/platformInfo.js | 2 + packages/api/src/utility/useController.js | 26 +++++-- packages/web/src/App.svelte | 10 +-- packages/web/src/utility/api.ts | 61 +++++++++++------ packages/web/src/utility/getElectron.ts | 43 ++++++++---- yarn.lock | 5 ++ 11 files changed, 173 insertions(+), 104 deletions(-) diff --git a/app/package.json b/app/package.json index 2d7e34b2e..550b407cb 100644 --- a/app/package.json +++ b/app/package.json @@ -90,7 +90,7 @@ }, "homepage": "./", "scripts": { - "start": "cross-env ELECTRON_START_URL=http://localhost:5000 electron .", + "start": "cross-env ELECTRON_START_URL=http://localhost:5000 ELECTRON_DEBUG=1 DEVMODE=1 electron .", "start:local": "cross-env electron .", "dist": "electron-builder", "build": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn dist", diff --git a/app/src/electron.js b/app/src/electron.js index 72b6b6e2c..affffaf11 100644 --- a/app/src/electron.js +++ b/app/src/electron.js @@ -101,25 +101,25 @@ function buildMenu() { { label: 'dbgate.org', click() { - require('electron').shell.openExternal('https://dbgate.org'); + electron.shell.openExternal('https://dbgate.org'); }, }, { label: 'DbGate on GitHub', click() { - require('electron').shell.openExternal('https://github.com/dbgate/dbgate'); + electron.shell.openExternal('https://github.com/dbgate/dbgate'); }, }, { label: 'DbGate on docker hub', click() { - require('electron').shell.openExternal('https://hub.docker.com/r/dbgate/dbgate'); + electron.shell.openExternal('https://hub.docker.com/r/dbgate/dbgate'); }, }, { label: 'Report problem or feature request', click() { - require('electron').shell.openExternal('https://github.com/dbgate/dbgate/issues/new'); + electron.shell.openExternal('https://github.com/dbgate/dbgate/issues/new'); }, }, commandItem('tabs.changelog'), @@ -182,6 +182,7 @@ function createWindow() { // enableRemoteModule: true, }, }); + mainWindow.webContents.openDevTools(); // require('@electron/remote/main').enable(mainWindow.webContents); if (store.get('winIsMaximized')) { mainWindow.maximize(); @@ -190,7 +191,7 @@ function createWindow() { mainMenu = buildMenu(); mainWindow.setMenu(mainMenu); - function loadMainWindow(initArgs) { + function loadMainWindow() { const startUrl = process.env.ELECTRON_START_URL || url.format({ @@ -198,18 +199,18 @@ function createWindow() { protocol: 'file:', slashes: true, }); - mainWindow.webContents.on('did-finish-load', function () { - mainWindow.webContents.executeJavaScript( - `runInit=()=>{ - try{ - dbgate_initializeElectron(${JSON.stringify(initArgs)}); - }catch(e){ - setTimeout(runInit,100) - } - }; - runInit()` - ); - }); + // mainWindow.webContents.on('did-finish-load', function () { + // mainWindow.webContents.executeJavaScript( + // `runInit=()=>{ + // try{ + // dbgate_initializeElectron(${JSON.stringify(initArgs)}); + // }catch(e){ + // setTimeout(runInit,100) + // } + // }; + // runInit()` + // ); + // }); mainWindow.on('close', () => { store.set('winBounds', mainWindow.getBounds()); store.set('winIsMaximized', mainWindow.isMaximized()); @@ -220,27 +221,35 @@ function createWindow() { } } - if (process.env.ELECTRON_START_URL) { - loadMainWindow({}); - } else { - const apiProcess = fork(path.join(__dirname, '../packages/api/dist/bundle.js'), [ - '--dynport', - '--is-electron-bundle', - '--native-modules', - path.join(__dirname, 'nativeModules'), - // '../../../src/nativeModules' - ]); - apiProcess.on('message', msg => { - if (msg.msgtype == 'listening') { - const { port, authorization } = msg; + const api = require(path.join( + __dirname, + process.env.ELECTRON_DEBUG ? '../../packages/api' : '../packages/api/dist/bundle.js' + )); + api.getMainModule().useAllControllers(null, electron); - loadMainWindow({ - port, - authorization, - }); - } - }); - } + loadMainWindow(); + + // if (process.env.ELECTRON_START_URL) { + // loadMainWindow({}); + // } else { + // const apiProcess = fork(path.join(__dirname, '../packages/api/dist/bundle.js'), [ + // '--dynport', + // '--is-electron-bundle', + // '--native-modules', + // path.join(__dirname, 'nativeModules'), + // // '../../../src/nativeModules' + // ]); + // apiProcess.on('message', msg => { + // if (msg.msgtype == 'listening') { + // const { port, authorization } = msg; + + // loadMainWindow({ + // port, + // authorization, + // }); + // } + // }); + // } // and load the index.html of the app. // mainWindow.loadURL('http://localhost:3000'); diff --git a/packages/api/package.json b/packages/api/package.json index 153c977d6..5e29b9aac 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -39,6 +39,7 @@ "fs-reverse": "^0.0.3", "get-port": "^5.1.1", "http": "^0.0.0", + "is-electron": "^2.2.1", "js-yaml": "^4.1.0", "json-stable-stringify": "^1.0.1", "line-reader": "^0.4.0", diff --git a/packages/api/src/index.js b/packages/api/src/index.js index 9da36f975..3e5c1ba39 100644 --- a/packages/api/src/index.js +++ b/packages/api/src/index.js @@ -8,12 +8,14 @@ if (processArgs.startProcess) { const proc = require('./proc'); const module = proc[processArgs.startProcess]; module.start(); -} else if (!module['parent'] && !processArgs.checkParent) { - const main = require('./main'); - - main.start(); } +// else if (!module['parent'] && !processArgs.checkParent) { +// const main = require('./main'); + +// main.start(); +// } + module.exports = { ...shell, getMainModule: () => require('./main'), diff --git a/packages/api/src/main.js b/packages/api/src/main.js index 858139b74..c3534cf56 100644 --- a/packages/api/src/main.js +++ b/packages/api/src/main.js @@ -102,20 +102,7 @@ function start() { }) ); - useController(app, '/connections', connections); - useController(app, '/server-connections', serverConnections); - useController(app, '/database-connections', databaseConnections); - useController(app, '/metadata', metadata); - useController(app, '/sessions', sessions); - useController(app, '/runners', runners); - useController(app, '/jsldata', jsldata); - useController(app, '/config', config); - useController(app, '/archive', archive); - useController(app, '/uploads', uploads); - useController(app, '/plugins', plugins); - useController(app, '/files', files); - useController(app, '/scheduler', scheduler); - useController(app, '/query-history', queryHistory); + useAllControllers(app, null); // if (process.env.PAGES_DIRECTORY) { // app.use('/pages', express.static(process.env.PAGES_DIRECTORY)); @@ -158,4 +145,21 @@ function start() { } } -module.exports = { start }; +function useAllControllers(app, electron) { + useController(app, electron, '/connections', connections); + useController(app, electron, '/server-connections', serverConnections); + useController(app, electron, '/database-connections', databaseConnections); + useController(app, electron, '/metadata', metadata); + useController(app, electron, '/sessions', sessions); + useController(app, electron, '/runners', runners); + useController(app, electron, '/jsldata', jsldata); + useController(app, electron, '/config', config); + useController(app, electron, '/archive', archive); + useController(app, electron, '/uploads', uploads); + useController(app, electron, '/plugins', plugins); + useController(app, electron, '/files', files); + useController(app, electron, '/scheduler', scheduler); + useController(app, electron, '/query-history', queryHistory); +} + +module.exports = { start, useAllControllers }; diff --git a/packages/api/src/utility/platformInfo.js b/packages/api/src/utility/platformInfo.js index 2025dc72b..e50f00f9c 100644 --- a/packages/api/src/utility/platformInfo.js +++ b/packages/api/src/utility/platformInfo.js @@ -2,6 +2,7 @@ const fs = require('fs'); const os = require('os'); const path = require('path'); const processArgs = require('./processArgs'); +const isElectron = require('is-electron'); const platform = process.env.OS_OVERRIDE ? process.env.OS_OVERRIDE : process.platform; const isWindows = platform === 'win32'; @@ -28,6 +29,7 @@ const platformInfo = { isLinux, isDocker, isElectronBundle, + isElectron: isElectron(), isDevMode, isNpmDist, isSnap: process.env.ELECTRON_SNAP == 'true', diff --git a/packages/api/src/utility/useController.js b/packages/api/src/utility/useController.js index e8c85566a..a1f4c0d74 100644 --- a/packages/api/src/utility/useController.js +++ b/packages/api/src/utility/useController.js @@ -4,7 +4,7 @@ const express = require('express'); /** * @param {string} route */ -module.exports = function useController(app, route, controller) { +module.exports = function useController(app, electron, route, controller) { const router = express.Router(); if (controller._init) { @@ -23,6 +23,21 @@ module.exports = function useController(app, route, controller) { const meta = controller[`${key}_meta`]; if (!meta) continue; + const routeAction = `/${_.kebabCase(key)}`; + + if (electron) { + if (meta === true) { + const handler = `${route.substring(1)}-${_.kebabCase(key)}`; + console.log('REGISTERING HANDLER', handler); + electron.ipcMain.handle(handler, async (event, args) => { + const data = await controller[key](args); + return data; + }); + } + + continue; + } + let method = 'post'; let raw = false; let rawParams = false; @@ -36,11 +51,10 @@ module.exports = function useController(app, route, controller) { rawParams = meta.rawParams; } - const route = `/${_.kebabCase(key)}`; if (raw) { - router[method](route, controller[key]); + router[method](routeAction, controller[key]); } else { - router[method](route, async (req, res) => { + router[method](routeAction, async (req, res) => { // if (controller._init && !controller._init_called) { // await controller._init(); // controller._init_called = true; @@ -58,5 +72,7 @@ module.exports = function useController(app, route, controller) { } } - app.use(route, router); + if (app) { + app.use(route, router); + } }; diff --git a/packages/web/src/App.svelte b/packages/web/src/App.svelte index b62e17da2..b77d962c6 100644 --- a/packages/web/src/App.svelte +++ b/packages/web/src/App.svelte @@ -11,7 +11,7 @@ import { setAppLoaded } from './utility/appLoadManager'; import ErrorHandler from './utility/ErrorHandler.svelte'; import OpenTabsOnStartup from './utility/OpenTabsOnStartup.svelte'; - import { shouldWaitForElectronInitialize } from './utility/getElectron'; + // import { shouldWaitForElectronInitialize } from './utility/getElectron'; import { subscribeConnectionPingers } from './utility/connectionsPinger'; import { subscribePermissionCompiler } from './utility/hasPermission'; import { apiCall } from './utility/api'; @@ -19,10 +19,10 @@ let loadedApi = false; async function loadApi() { - if (shouldWaitForElectronInitialize()) { - setTimeout(loadApi, 100); - return; - } + // if (shouldWaitForElectronInitialize()) { + // setTimeout(loadApi, 100); + // return; + // } try { // console.log('************** LOADING API'); diff --git a/packages/web/src/utility/api.ts b/packages/web/src/utility/api.ts index b9ddc9d9b..e9e20e52a 100644 --- a/packages/web/src/utility/api.ts +++ b/packages/web/src/utility/api.ts @@ -1,6 +1,7 @@ import resolveApi, { resolveApiHeaders } from './resolveApi'; import { writable } from 'svelte/store'; import { cacheClean } from './cache'; +import getElectron from './getElectron'; // import socket from './socket'; let eventSource; @@ -13,37 +14,53 @@ function wantEventSource() { } export async function apiCall(route: string, args: {} = undefined) { - const resp = await fetch(`${resolveApi()}/${route}`, { - method: 'POST', - cache: 'no-cache', - headers: { - 'Content-Type': 'application/json', - ...resolveApiHeaders(), - }, - body: JSON.stringify(args), - }); - return resp.json(); + const electron = getElectron(); + if (electron) { + const resp = await electron.invoke(route.replace('/', '-'), args); + return resp; + } else { + const resp = await fetch(`${resolveApi()}/${route}`, { + method: 'POST', + cache: 'no-cache', + headers: { + 'Content-Type': 'application/json', + ...resolveApiHeaders(), + }, + body: JSON.stringify(args), + }); + return resp.json(); + } } const apiHandlers = new WeakMap(); export function apiOn(event: string, handler: Function) { - wantEventSource(); - if (!apiHandlers.has(handler)) { - const handlerProxy = e => { - // console.log('RECEIVED', e.type, JSON.parse(e.data)); - handler(JSON.parse(e.data)); - }; - apiHandlers.set(handler, handlerProxy); - } + const electron = getElectron(); + if (electron) { + electron.addEventListener(event, handler); + } else { + wantEventSource(); + if (!apiHandlers.has(handler)) { + const handlerProxy = e => { + // console.log('RECEIVED', e.type, JSON.parse(e.data)); + handler(JSON.parse(e.data)); + }; + apiHandlers.set(handler, handlerProxy); + } - eventSource.addEventListener(event, apiHandlers.get(handler)); + eventSource.addEventListener(event, apiHandlers.get(handler)); + } } export function apiOff(event: string, handler: Function) { - wantEventSource(); - if (apiHandlers.has(handler)) { - eventSource.removeEventListener(event, apiHandlers.get(handler)); + const electron = getElectron(); + if (electron) { + electron.removeEventListener(event, handler); + } else { + wantEventSource(); + if (apiHandlers.has(handler)) { + eventSource.removeEventListener(event, apiHandlers.get(handler)); + } } } diff --git a/packages/web/src/utility/getElectron.ts b/packages/web/src/utility/getElectron.ts index 5909aedba..1f907de2b 100644 --- a/packages/web/src/utility/getElectron.ts +++ b/packages/web/src/utility/getElectron.ts @@ -1,11 +1,11 @@ class ElectronApi { - public port?: number; - public authorization?: string; + // public port?: number; + // public authorization?: string; private ipcRenderer = getIpcRenderer(); - constructor(args) { - this.port = args.port; - this.authorization = args.authorization; + constructor() { + // this.port = args.port; + // this.authorization = args.authorization; } send(msg, args = null) { @@ -30,18 +30,29 @@ class ElectronApi { async openExternal(url) { await this.ipcRenderer.invoke('openExternal', url); } -} -let apiInstance = null; + async invoke(route, args) { + const res = await this.ipcRenderer.invoke(route, args); + return res; + } -function initializeElectron(args) { - apiInstance = new ElectronApi(args); - if (window['dbgate_recreateSocket']) { - window['dbgate_recreateSocket'](); + addEventListener(channel: string, listener: Function) { + this.ipcRenderer.on(channel, listener); + } + + removeEventListener(channel: string, listener: Function) { + this.ipcRenderer.removeEventListener(channel, listener); } } -window['dbgate_initializeElectron'] = initializeElectron; +// function initializeElectron(args) { +// apiInstance = new ElectronApi(args); +// if (window['dbgate_recreateSocket']) { +// window['dbgate_recreateSocket'](); +// } +// } + +// window['dbgate_initializeElectron'] = initializeElectron; function getIpcRenderer() { if (window['require']) { @@ -51,14 +62,16 @@ function getIpcRenderer() { return null; } -export function shouldWaitForElectronInitialize() { - return !!getIpcRenderer() && !apiInstance; -} +// export function shouldWaitForElectronInitialize() { +// return !!getIpcRenderer() && !apiInstance; +// } export function isElectronAvailable() { return !!getIpcRenderer(); } +const apiInstance = isElectronAvailable() ? new ElectronApi() : null; + export default function getElectron(): ElectronApi { return apiInstance; // try { diff --git a/yarn.lock b/yarn.lock index 8534c684d..b4913e90a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5316,6 +5316,11 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2: is-data-descriptor "^1.0.0" kind-of "^6.0.2" +is-electron@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-electron/-/is-electron-2.2.1.tgz#751b1dd8a74907422faa5c35aaa0cf66d98086e9" + integrity sha512-r8EEQQsqT+Gn0aXFx7lTFygYQhILLCB+wn0WCDL5LZRINeLH/Rvw1j2oKodELLXYNImQ3CRlVsY8wW4cGOsyuw== + is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" From 6dcbb5e308596c6afa7cdc6d909e333887eeda20 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 25 Dec 2021 09:27:29 +0100 Subject: [PATCH 17/75] fix --- packages/api/src/index.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/api/src/index.js b/packages/api/src/index.js index 3e5c1ba39..9da36f975 100644 --- a/packages/api/src/index.js +++ b/packages/api/src/index.js @@ -8,14 +8,12 @@ if (processArgs.startProcess) { const proc = require('./proc'); const module = proc[processArgs.startProcess]; module.start(); +} else if (!module['parent'] && !processArgs.checkParent) { + const main = require('./main'); + + main.start(); } -// else if (!module['parent'] && !processArgs.checkParent) { -// const main = require('./main'); - -// main.start(); -// } - module.exports = { ...shell, getMainModule: () => require('./main'), From 185cfab5d8cf67af5e1fa5608971f9e01592b5d0 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 25 Dec 2021 10:52:48 +0100 Subject: [PATCH 18/75] events work in electron IPC --- app/package.json | 2 +- app/src/electron.js | 11 +++++-- packages/api/src/controllers/connections.js | 6 +++- .../src/controllers/databaseConnections.js | 2 +- packages/api/src/controllers/runners.js | 2 +- .../api/src/controllers/serverConnections.js | 2 +- packages/api/src/controllers/sessions.js | 6 +++- packages/api/src/main.js | 8 +++-- packages/api/src/utility/DatastoreProxy.js | 6 +++- packages/api/src/utility/socket.js | 32 ++++++++----------- packages/api/src/utility/useController.js | 2 +- packages/web/src/utility/api.ts | 27 ++++++++++++---- packages/web/src/utility/getElectron.ts | 2 +- 13 files changed, 68 insertions(+), 40 deletions(-) diff --git a/app/package.json b/app/package.json index 550b407cb..bb56fb555 100644 --- a/app/package.json +++ b/app/package.json @@ -90,7 +90,7 @@ }, "homepage": "./", "scripts": { - "start": "cross-env ELECTRON_START_URL=http://localhost:5000 ELECTRON_DEBUG=1 DEVMODE=1 electron .", + "start": "cross-env ELECTRON_START_URL=http://localhost:5000 DEVMODE=1 electron .", "start:local": "cross-env electron .", "dist": "electron-builder", "build": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn dist", diff --git a/app/src/electron.js b/app/src/electron.js index affffaf11..dac1c9a27 100644 --- a/app/src/electron.js +++ b/app/src/electron.js @@ -221,11 +221,14 @@ function createWindow() { } } + global.API_PACKAGE = process.env.DEVMODE ? '../packages/api/src/index' : '../packages/api/dist/bundle.js'; const api = require(path.join( __dirname, - process.env.ELECTRON_DEBUG ? '../../packages/api' : '../packages/api/dist/bundle.js' + process.env.DEVMODE ? '../../packages/api/src/index' : '../packages/api/dist/bundle.js' )); - api.getMainModule().useAllControllers(null, electron); + const main = api.getMainModule(); + main.initializeElectronSender(mainWindow.webContents); + main.useAllControllers(null, electron); loadMainWindow(); @@ -267,7 +270,9 @@ function createWindow() { } function onAppReady() { - autoUpdater.checkForUpdatesAndNotify(); + if (!process.env.DEVMODE) { + autoUpdater.checkForUpdatesAndNotify(); + } createWindow(); } diff --git a/packages/api/src/controllers/connections.js b/packages/api/src/controllers/connections.js index a132032bd..3c12816eb 100644 --- a/packages/api/src/controllers/connections.js +++ b/packages/api/src/controllers/connections.js @@ -136,7 +136,11 @@ module.exports = { raw: true, }, test(req, res) { - const subprocess = fork(process.argv[1], ['--start-process', 'connectProcess', ...process.argv.slice(3)]); + const subprocess = fork(global['API_PACKAGE'] || process.argv[1], [ + '--start-process', + 'connectProcess', + ...process.argv.slice(3), + ]); subprocess.on('message', resp => { if (handleProcessCommunication(resp, subprocess)) return; // @ts-ignore diff --git a/packages/api/src/controllers/databaseConnections.js b/packages/api/src/controllers/databaseConnections.js index 06ee9fd21..fc11aa9cf 100644 --- a/packages/api/src/controllers/databaseConnections.js +++ b/packages/api/src/controllers/databaseConnections.js @@ -74,7 +74,7 @@ module.exports = { const existing = this.opened.find(x => x.conid == conid && x.database == database); if (existing) return existing; const connection = await connections.get({ conid }); - const subprocess = fork(process.argv[1], [ + const subprocess = fork(global['API_PACKAGE'] || process.argv[1], [ '--start-process', 'databaseConnectionProcess', ...process.argv.slice(3), diff --git a/packages/api/src/controllers/runners.js b/packages/api/src/controllers/runners.js index b0f123dd7..7908f9052 100644 --- a/packages/api/src/controllers/runners.js +++ b/packages/api/src/controllers/runners.js @@ -103,7 +103,7 @@ module.exports = { stdio: ['ignore', 'pipe', 'pipe', 'ipc'], env: { ...process.env, - DBGATE_API: global['dbgateApiModulePath'] || process.argv[1], + DBGATE_API: global['API_PACKAGE'] || global['dbgateApiModulePath'] || process.argv[1], ..._.fromPairs(pluginNames.map(name => [`PLUGIN_${_.camelCase(name)}`, getPluginBackendPath(name)])), }, }); diff --git a/packages/api/src/controllers/serverConnections.js b/packages/api/src/controllers/serverConnections.js index 2afa9c416..1dd7527cd 100644 --- a/packages/api/src/controllers/serverConnections.js +++ b/packages/api/src/controllers/serverConnections.js @@ -37,7 +37,7 @@ module.exports = { const existing = this.opened.find(x => x.conid == conid); if (existing) return existing; const connection = await connections.get({ conid }); - const subprocess = fork(process.argv[1], [ + const subprocess = fork(global['API_PACKAGE'] || process.argv[1], [ '--start-process', 'serverConnectionProcess', ...process.argv.slice(3), diff --git a/packages/api/src/controllers/sessions.js b/packages/api/src/controllers/sessions.js index 9ca54d204..5fe1bf29b 100644 --- a/packages/api/src/controllers/sessions.js +++ b/packages/api/src/controllers/sessions.js @@ -65,7 +65,11 @@ module.exports = { async create({ conid, database }) { const sesid = uuidv1(); const connection = await connections.get({ conid }); - const subprocess = fork(process.argv[1], ['--start-process', 'sessionProcess', ...process.argv.slice(3)]); + const subprocess = fork(global['API_PACKAGE'] || process.argv[1], [ + '--start-process', + 'sessionProcess', + ...process.argv.slice(3), + ]); const newOpened = { conid, database, diff --git a/packages/api/src/main.js b/packages/api/src/main.js index c3534cf56..70002df08 100644 --- a/packages/api/src/main.js +++ b/packages/api/src/main.js @@ -90,7 +90,7 @@ function start() { // Tell the client to retry every 10 seconds if connectivity is lost res.write('retry: 10000\n\n'); - socket.set(res); + socket.setSseResponse(res); }); app.use(bodyParser.json({ limit: '50mb' })); @@ -162,4 +162,8 @@ function useAllControllers(app, electron) { useController(app, electron, '/query-history', queryHistory); } -module.exports = { start, useAllControllers }; +function initializeElectronSender(electronSender) { + socket.setElectronSender(electronSender); +} + +module.exports = { start, useAllControllers, initializeElectronSender }; diff --git a/packages/api/src/utility/DatastoreProxy.js b/packages/api/src/utility/DatastoreProxy.js index e7e23fe7f..dcda45405 100644 --- a/packages/api/src/utility/DatastoreProxy.js +++ b/packages/api/src/utility/DatastoreProxy.js @@ -29,7 +29,11 @@ class DatastoreProxy { async ensureSubprocess() { if (!this.subprocess) { - this.subprocess = fork(process.argv[1], ['--start-process', 'jslDatastoreProcess', ...process.argv.slice(3)]); + this.subprocess = fork(global['API_PACKAGE'] || process.argv[1], [ + '--start-process', + 'jslDatastoreProcess', + ...process.argv.slice(3), + ]); this.subprocess.on('message', message => { // @ts-ignore diff --git a/packages/api/src/utility/socket.js b/packages/api/src/utility/socket.js index b7659d7eb..928e24c53 100644 --- a/packages/api/src/utility/socket.js +++ b/packages/api/src/utility/socket.js @@ -1,35 +1,29 @@ -let res = null; +let sseResponse = null; +let electronSender = null; let init = ''; module.exports = { - set(value) { - res = value; + setSseResponse(value) { + sseResponse = value; + }, + setElectronSender(value) { + electronSender = value; }, - // get() { - // return socket; - // }, emit(message, data) { - if (res) { + if (electronSender) { + electronSender.send(message, data == null ? null : data); + } else if (sseResponse) { if (init) { - res.write(init); + sseResponse.write(init); init = ''; } - res.write(`event: ${message}\ndata: ${JSON.stringify(data == null ? null : data)}\n\n`); + sseResponse.write(`event: ${message}\ndata: ${JSON.stringify(data == null ? null : data)}\n\n`); } else { - init += res; + init += sseResponse; } - - // console.log('EMIT:', message, data); - // socket.emit(message, data); }, emitChanged(key) { this.emit('clean-cache', key); this.emit(key); - // console.log('EMIT_CHANGED:', key); - // socket.emit('clean-cache', key); - // socket.emit(key); - - // socket.send(key, 'clean-cache'); - // socket.send(null, key); }, }; diff --git a/packages/api/src/utility/useController.js b/packages/api/src/utility/useController.js index a1f4c0d74..400db650b 100644 --- a/packages/api/src/utility/useController.js +++ b/packages/api/src/utility/useController.js @@ -28,7 +28,7 @@ module.exports = function useController(app, electron, route, controller) { if (electron) { if (meta === true) { const handler = `${route.substring(1)}-${_.kebabCase(key)}`; - console.log('REGISTERING HANDLER', handler); + // console.log('REGISTERING HANDLER', handler); electron.ipcMain.handle(handler, async (event, args) => { const data = await controller[key](args); return data; diff --git a/packages/web/src/utility/api.ts b/packages/web/src/utility/api.ts index e9e20e52a..8c1d6cb04 100644 --- a/packages/web/src/utility/api.ts +++ b/packages/web/src/utility/api.ts @@ -5,11 +5,12 @@ import getElectron from './getElectron'; // import socket from './socket'; let eventSource; +let cacheCleanerRegistered; function wantEventSource() { if (!eventSource) { eventSource = new EventSource(`${resolveApi()}/stream`); - eventSource.addEventListener('clean-cache', e => cacheClean(JSON.parse(e.data))); + // eventSource.addEventListener('clean-cache', e => cacheClean(JSON.parse(e.data))); } } @@ -37,7 +38,14 @@ const apiHandlers = new WeakMap(); export function apiOn(event: string, handler: Function) { const electron = getElectron(); if (electron) { - electron.addEventListener(event, handler); + if (!apiHandlers.has(handler)) { + const handlerProxy = (e, data) => { + handler(data); + }; + apiHandlers.set(handler, handlerProxy); + } + + electron.addEventListener(event, apiHandlers.get(handler)); } else { wantEventSource(); if (!apiHandlers.has(handler)) { @@ -50,15 +58,20 @@ export function apiOn(event: string, handler: Function) { eventSource.addEventListener(event, apiHandlers.get(handler)); } + + if (!cacheCleanerRegistered) { + cacheCleanerRegistered = true; + apiOn('clean-cache', reloadTrigger => cacheClean(reloadTrigger)); + } } export function apiOff(event: string, handler: Function) { const electron = getElectron(); - if (electron) { - electron.removeEventListener(event, handler); - } else { - wantEventSource(); - if (apiHandlers.has(handler)) { + if (apiHandlers.has(handler)) { + if (electron) { + electron.removeEventListener(event, apiHandlers.get(handler)); + } else { + wantEventSource(); eventSource.removeEventListener(event, apiHandlers.get(handler)); } } diff --git a/packages/web/src/utility/getElectron.ts b/packages/web/src/utility/getElectron.ts index 1f907de2b..07cedc3b9 100644 --- a/packages/web/src/utility/getElectron.ts +++ b/packages/web/src/utility/getElectron.ts @@ -41,7 +41,7 @@ class ElectronApi { } removeEventListener(channel: string, listener: Function) { - this.ipcRenderer.removeEventListener(channel, listener); + this.ipcRenderer.removeListener(channel, listener); } } From 0e95082be6b32df31d24838073931a026062dee2 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 25 Dec 2021 11:07:40 +0100 Subject: [PATCH 19/75] updated pg package --- plugins/dbgate-plugin-postgres/package.json | 2 +- yarn.lock | 44 +++++++++------------ 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/plugins/dbgate-plugin-postgres/package.json b/plugins/dbgate-plugin-postgres/package.json index 4252c6155..7e14bf5d5 100644 --- a/plugins/dbgate-plugin-postgres/package.json +++ b/plugins/dbgate-plugin-postgres/package.json @@ -34,7 +34,7 @@ "dbgate-query-splitter": "^4.1.1", "dbgate-tools": "^4.1.1", "lodash": "^4.17.21", - "pg": "^7.17.0", + "pg": "^8.7.1", "webpack": "^4.42.0", "webpack-cli": "^3.3.11" } diff --git a/yarn.lock b/yarn.lock index b4913e90a..22df71509 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8241,25 +8241,25 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -pg-connection-string@0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7" - integrity sha1-2hhHsglA5C7hSSvq9l1J2RskXfc= +pg-connection-string@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34" + integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ== pg-int8@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== -pg-packet-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz#e45c3ae678b901a2873af1e17b92d787962ef914" - integrity sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg== +pg-pool@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.4.1.tgz#0e71ce2c67b442a5e862a9c182172c37eda71e9c" + integrity sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ== -pg-pool@^2.0.10: - version "2.0.10" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.10.tgz#842ee23b04e86824ce9d786430f8365082d81c4a" - integrity sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg== +pg-protocol@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.5.0.tgz#b5dd452257314565e2d54ab3c132adc46565a6a0" + integrity sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ== pg-types@^2.1.0: version "2.2.0" @@ -8272,19 +8272,18 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg@^7.17.0: - version "7.18.2" - resolved "https://registry.yarnpkg.com/pg/-/pg-7.18.2.tgz#4e219f05a00aff4db6aab1ba02f28ffa4513b0bb" - integrity sha512-Mvt0dGYMwvEADNKy5PMQGlzPudKcKKzJds/VbOeZJpb6f/pI3mmoXX0JksPgI3l3JPP/2Apq7F36O63J7mgveA== +pg@^8.7.1: + version "8.7.1" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.1.tgz#9ea9d1ec225980c36f94e181d009ab9f4ce4c471" + integrity sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" - pg-connection-string "0.1.3" - pg-packet-stream "^1.1.0" - pg-pool "^2.0.10" + pg-connection-string "^2.5.0" + pg-pool "^3.4.1" + pg-protocol "^1.5.0" pg-types "^2.1.0" pgpass "1.x" - semver "4.3.2" pgpass@1.x: version "1.0.4" @@ -9308,11 +9307,6 @@ semver-diff@^2.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7" - integrity sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c= - semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" From ab4aef6c7e5a96dd23e180b752c4b8477dc5009b Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 25 Dec 2021 11:29:46 +0100 Subject: [PATCH 20/75] replaced executeJavaScript with IPC event --- app/src/electron.js | 46 ++---------------------- packages/api/src/main.js | 16 ++------- packages/web/src/commands/runCommand.ts | 3 +- packages/web/src/commands/stdCommands.ts | 6 ++++ packages/web/src/utility/getElectron.ts | 13 ------- 5 files changed, 11 insertions(+), 73 deletions(-) diff --git a/app/src/electron.js b/app/src/electron.js index dac1c9a27..751f5157d 100644 --- a/app/src/electron.js +++ b/app/src/electron.js @@ -38,7 +38,7 @@ function commandItem(id) { accelerator: command ? command.keyText : undefined, enabled: command ? command.enabled : false, click() { - mainWindow.webContents.executeJavaScript(`dbgate_runCommand('${id}')`); + mainWindow.webContents.send('run-command', id); }, }; } @@ -179,11 +179,9 @@ function createWindow() { webPreferences: { nodeIntegration: true, contextIsolation: false, - // enableRemoteModule: true, }, }); - mainWindow.webContents.openDevTools(); - // require('@electron/remote/main').enable(mainWindow.webContents); + if (store.get('winIsMaximized')) { mainWindow.maximize(); } @@ -199,18 +197,6 @@ function createWindow() { protocol: 'file:', slashes: true, }); - // mainWindow.webContents.on('did-finish-load', function () { - // mainWindow.webContents.executeJavaScript( - // `runInit=()=>{ - // try{ - // dbgate_initializeElectron(${JSON.stringify(initArgs)}); - // }catch(e){ - // setTimeout(runInit,100) - // } - // }; - // runInit()` - // ); - // }); mainWindow.on('close', () => { store.set('winBounds', mainWindow.getBounds()); store.set('winIsMaximized', mainWindow.isMaximized()); @@ -232,34 +218,6 @@ function createWindow() { loadMainWindow(); - // if (process.env.ELECTRON_START_URL) { - // loadMainWindow({}); - // } else { - // const apiProcess = fork(path.join(__dirname, '../packages/api/dist/bundle.js'), [ - // '--dynport', - // '--is-electron-bundle', - // '--native-modules', - // path.join(__dirname, 'nativeModules'), - // // '../../../src/nativeModules' - // ]); - // apiProcess.on('message', msg => { - // if (msg.msgtype == 'listening') { - // const { port, authorization } = msg; - - // loadMainWindow({ - // port, - // authorization, - // }); - // } - // }); - // } - - // and load the index.html of the app. - // mainWindow.loadURL('http://localhost:3000'); - - // Open the DevTools. - // mainWindow.webContents.openDevTools(); - // Emitted when the window is closed. mainWindow.on('closed', function () { // Dereference the window object, usually you would store windows diff --git a/packages/api/src/main.js b/packages/api/src/main.js index 70002df08..71fb2cfb6 100644 --- a/packages/api/src/main.js +++ b/packages/api/src/main.js @@ -121,19 +121,7 @@ function start() { } } - if (processArgs.dynport) { - childProcessChecker(); - - authorization = crypto.randomBytes(32).toString('hex'); - - getPort().then(port => { - checkLocalhostOrigin = `localhost:${port}`; - server.listen(port, () => { - console.log(`DbGate API listening on port ${port}`); - process.send({ msgtype: 'listening', port, authorization }); - }); - }); - } else if (platformInfo.isNpmDist) { +if (platformInfo.isNpmDist) { app.use(express.static(path.join(__dirname, '../../dbgate-web/public'))); getPort({ port: 5000 }).then(port => { server.listen(port, () => { @@ -141,7 +129,7 @@ function start() { }); }); } else { - server.listen(3000); + server.listen(process.env.PORT || 3000); } } diff --git a/packages/web/src/commands/runCommand.ts b/packages/web/src/commands/runCommand.ts index 760f24c7c..627cce78d 100644 --- a/packages/web/src/commands/runCommand.ts +++ b/packages/web/src/commands/runCommand.ts @@ -18,8 +18,6 @@ export default function runCommand(id) { } } -window['dbgate_runCommand'] = runCommand; - export function runGroupCommand(group) { const commandsValue = getCommands(); const values = Object.values(commandsValue) as GlobalCommand[]; @@ -32,3 +30,4 @@ export function findCommand(id) { const command = commandsValue[id]; return command; } + diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts index 6c68e7e0a..b5b051e07 100644 --- a/packages/web/src/commands/stdCommands.ts +++ b/packages/web/src/commands/stdCommands.ts @@ -25,6 +25,7 @@ import InputTextModal from '../modals/InputTextModal.svelte'; import { removeLocalStorage } from '../utility/storageCache'; import { showSnackbarSuccess } from '../utility/snackbar'; import { apiCall } from '../utility/api'; +import runCommand from './runCommand'; function themeCommand(theme: ThemeDefinition) { return { @@ -533,3 +534,8 @@ export function registerFileCommands({ }); } } + +const electron = getElectron(); +if (electron) { + electron.addEventListener('run-command', (e, commandId) => runCommand(commandId)); +} diff --git a/packages/web/src/utility/getElectron.ts b/packages/web/src/utility/getElectron.ts index 07cedc3b9..c847a3891 100644 --- a/packages/web/src/utility/getElectron.ts +++ b/packages/web/src/utility/getElectron.ts @@ -45,15 +45,6 @@ class ElectronApi { } } -// function initializeElectron(args) { -// apiInstance = new ElectronApi(args); -// if (window['dbgate_recreateSocket']) { -// window['dbgate_recreateSocket'](); -// } -// } - -// window['dbgate_initializeElectron'] = initializeElectron; - function getIpcRenderer() { if (window['require']) { const electron = window['require']('electron'); @@ -62,10 +53,6 @@ function getIpcRenderer() { return null; } -// export function shouldWaitForElectronInitialize() { -// return !!getIpcRenderer() && !apiInstance; -// } - export function isElectronAvailable() { return !!getIpcRenderer(); } From 8e75884556b38e62f57b18db02cf73454c62e957 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 25 Dec 2021 11:31:24 +0100 Subject: [PATCH 21/75] v4.4.5-beta.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 728b23143..8634b8975 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.4", + "version": "4.4.5-beta.5", "name": "dbgate-all", "workspaces": [ "packages/*", From 568e60c52ee01a4422cb5ac80888ce7b823a19c6 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 25 Dec 2021 11:54:13 +0100 Subject: [PATCH 22/75] fix --- package.json | 1 + packages/web/src/tabs/CollectionDataTab.svelte | 2 +- packages/web/src/tabs/CompareModelTab.svelte | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8634b8975..a3b97947e 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ ], "scripts": { "start:api": "yarn workspace dbgate-api start", + "start:app": "cd app && yarn start", "start:api:portal": "yarn workspace dbgate-api start:portal", "start:api:covid": "yarn workspace dbgate-api start:covid", "start:web": "yarn workspace dbgate-web dev", diff --git a/packages/web/src/tabs/CollectionDataTab.svelte b/packages/web/src/tabs/CollectionDataTab.svelte index 7e5ab0de7..8eaf6a0a2 100644 --- a/packages/web/src/tabs/CollectionDataTab.svelte +++ b/packages/web/src/tabs/CollectionDataTab.svelte @@ -96,7 +96,7 @@ import { apiCall } from '../utility/api'; database, changeSet, }); - const { errorMessage } = resp.data || {}; + const { errorMessage } = resp || {}; if (errorMessage) { showModal(ErrorMessageModal, { title: 'Error when saving', message: errorMessage }); } else { diff --git a/packages/web/src/tabs/CompareModelTab.svelte b/packages/web/src/tabs/CompareModelTab.svelte index 6b96aea2e..e0c6cfcbd 100644 --- a/packages/web/src/tabs/CompareModelTab.svelte +++ b/packages/web/src/tabs/CompareModelTab.svelte @@ -276,7 +276,7 @@ const database = $values?.targetDatabase; const resp = await apiCall('database-connections/run-script', { conid, database, sql }); - const { errorMessage } = resp.data || {}; + const { errorMessage } = resp || {}; if (errorMessage) { showModal(ErrorMessageModal, { title: 'Error when saving', message: errorMessage }); } else { From 1f00d06588b9797905adc58ace6ba9802d775fe4 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 25 Dec 2021 12:42:32 +0100 Subject: [PATCH 23/75] try to solve binary dependencies --- app/package.json | 6 +- app/yarn.lock | 79 ++++++++--- fillNativeModules.js | 2 +- packages/api/package.json | 4 +- .../src/backend/driver.js | 4 +- yarn.lock | 126 +++++++++++------- 6 files changed, 146 insertions(+), 75 deletions(-) diff --git a/app/package.json b/app/package.json index bb56fb555..5b8cf8b85 100644 --- a/app/package.json +++ b/app/package.json @@ -5,7 +5,7 @@ "author": "Jan Prochazka ", "description": "Opensource database administration tool", "dependencies": { - "better-sqlite3-with-prebuilds": "^7.4.3", + "better-sqlite3": "^7.4.5", "electron-log": "^4.4.1", "electron-store": "^8.0.1", "electron-updater": "^4.6.1", @@ -103,10 +103,10 @@ "devDependencies": { "copyfiles": "^2.2.0", "cross-env": "^6.0.3", - "electron": "16.0.4", + "electron": "15.3.4", "electron-builder": "22.14.5" }, "optionalDependencies": { - "msnodesqlv8": "^2.4.0" + "msnodesqlv8": "^2.4.4" } } diff --git a/app/yarn.lock b/app/yarn.lock index de9be3b06..f7f4f625b 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -93,11 +93,6 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/integer@latest": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/integer/-/integer-4.0.1.tgz#022f2c77a899e383e6d3dd374142416c22a5b9df" - integrity sha512-QQojPymFcV1hrvWXA1h0pP9RmFBFNuWikZcUEjjVsS19IyKO+jqOX24lp2ZHF4A21EmkosJhJDX7CLG67F2s7A== - "@types/minimatch@*": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" @@ -327,15 +322,14 @@ base64-js@^1.3.1, base64-js@^1.5.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -better-sqlite3-with-prebuilds@^7.4.3: - version "7.4.3" - resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.4.3.tgz#2ed9c5649a8eb1cf2bece7d3f4849b184ddde038" - integrity sha512-E1MWyMz5RFZCdRNzIcR245dRVR3u1qZO2uV+8Z9Vb/PJsQ6uxOuOnSfA+rZdkuvDbVTbdpowKNL1tuO6FJyt0A== +better-sqlite3@^7.4.5: + version "7.4.5" + resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-7.4.5.tgz#acfc48d786114227f550a0a45e22ace51336e2d0" + integrity sha512-mybC3dgrtJeHkIRGP36tST7wjBlIMgTRAXhhO4bMpPZ17EG23FZxZeFcwKWy6o8mV1SKQFnQNyeAZlQpGrgheQ== dependencies: - "@types/integer" latest bindings "^1.5.0" - prebuild-install "^6.0.1" - tar "^6.1.0" + prebuild-install "^7.0.0" + tar "^6.1.11" bindings@^1.5.0: version "1.5.0" @@ -769,6 +763,13 @@ decompress-response@^4.2.0: dependencies: mimic-response "^2.0.0" +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== + dependencies: + mimic-response "^3.1.0" + deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" @@ -950,10 +951,10 @@ electron-updater@^4.6.1: lodash.isequal "^4.5.0" semver "^7.3.5" -electron@16.0.4: - version "16.0.4" - resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.4.tgz#87dfe21d17608537fc6df292c437362297566a73" - integrity sha512-IptwmowvMP1SFOmZLh6rrURwfnOxbDBXBRBcaOdfBM5I+B9mgtdNwzNC3ymFFNzEkZUwdOyg9fu3iyjAAQIQgw== +electron@15.3.4: + version "15.3.4" + resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.4.tgz#811e8872f4500b88ad49e005cbe8f93e10676f6d" + integrity sha512-GLTE+UEKw1pJehkgpLgXtsHhYqSPp6skSNY1bxnY3dDYBrsPlP3nTEO9YQY2p4eHk+uxFVTXOVy5afcu9fIZ9A== dependencies: "@electron/get" "^1.13.0" "@types/node" "^14.6.2" @@ -1630,6 +1631,11 @@ mimic-response@^2.0.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== + minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -1684,7 +1690,7 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -msnodesqlv8@^2.4.0: +msnodesqlv8@^2.4.4: version "2.4.4" resolved "https://registry.yarnpkg.com/msnodesqlv8/-/msnodesqlv8-2.4.4.tgz#1e4e10246480c486b074199d6efddf5dab8af9b9" integrity sha512-VJpurwVyq6c2mgkEFFe1S0BD1+vZSLy0vv5qbkdnJoIaeC5XBcfLSKYsjeP1V5QEc1fv4CD3oau84kcGXNk/cQ== @@ -1714,6 +1720,13 @@ node-abi@^2.21.0: dependencies: semver "^5.4.1" +node-abi@^3.3.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248" + integrity sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw== + dependencies: + semver "^7.3.5" + node-addon-api@^1.6.3: version "1.7.2" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" @@ -1895,7 +1908,7 @@ plist@^3.0.1, plist@^3.0.4: base64-js "^1.5.1" xmlbuilder "^9.0.7" -prebuild-install@^6.0.1, prebuild-install@^6.1.4: +prebuild-install@^6.1.4: version "6.1.4" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== @@ -1914,6 +1927,25 @@ prebuild-install@^6.0.1, prebuild-install@^6.1.4: tar-fs "^2.0.0" tunnel-agent "^0.6.0" +prebuild-install@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.0.tgz#3c5ce3902f1cb9d6de5ae94ca53575e4af0c1574" + integrity sha512-IvSenf33K7JcgddNz2D5w521EgO+4aMMjFt73Uk9FRzQ7P+QZPKrp7qPsDydsSwjGt3T5xRNnM1bj1zMTD5fTA== + dependencies: + detect-libc "^1.0.3" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^3.3.0" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^4.0.0" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" @@ -2175,6 +2207,15 @@ simple-get@^3.0.3: once "^1.3.1" simple-concat "^1.0.0" +simple-get@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.0.tgz#73fa628278d21de83dadd5512d2cc1f4872bd675" + integrity sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ== + dependencies: + decompress-response "^6.0.0" + once "^1.3.1" + simple-concat "^1.0.0" + slash@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" @@ -2315,7 +2356,7 @@ tar-stream@^2.1.4: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^6.1.0: +tar@^6.1.11: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== diff --git a/fillNativeModules.js b/fillNativeModules.js index d51157258..61dea66eb 100644 --- a/fillNativeModules.js +++ b/fillNativeModules.js @@ -5,7 +5,7 @@ let fillContent = ''; if (process.platform == 'win32') { fillContent += `content.msnodesqlv8 = () => require('msnodesqlv8');`; } -fillContent += `content['better-sqlite3-with-prebuilds'] = () => require('better-sqlite3-with-prebuilds');`; +fillContent += `content['better-sqlite3'] = () => require('better-sqlite3');`; const getContent = (empty) => ` // this file is generated automatically by script fillNativeModules.js, do not edit it manually diff --git a/packages/api/package.json b/packages/api/package.json index 5e29b9aac..3ad5d93b5 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -19,7 +19,7 @@ "dependencies": { "async-lock": "^1.2.4", "axios": "^0.21.1", - "better-sqlite3-with-prebuilds": "^7.4.3", + "better-sqlite3": "^7.4.5", "body-parser": "^1.19.0", "bufferutil": "^4.0.1", "byline": "^5.0.0", @@ -74,6 +74,6 @@ "webpack-cli": "^3.3.11" }, "optionalDependencies": { - "msnodesqlv8": "^2.4.0" + "msnodesqlv8": "^2.4.4" } } diff --git a/plugins/dbgate-plugin-sqlite/src/backend/driver.js b/plugins/dbgate-plugin-sqlite/src/backend/driver.js index e6a8cf215..caef44714 100644 --- a/plugins/dbgate-plugin-sqlite/src/backend/driver.js +++ b/plugins/dbgate-plugin-sqlite/src/backend/driver.js @@ -175,8 +175,8 @@ const driver = { }; driver.initialize = (dbgateEnv) => { - if (dbgateEnv.nativeModules && dbgateEnv.nativeModules['better-sqlite3-with-prebuilds']) { - Database = dbgateEnv.nativeModules['better-sqlite3-with-prebuilds'](); + if (dbgateEnv.nativeModules && dbgateEnv.nativeModules['better-sqlite3']) { + Database = dbgateEnv.nativeModules['better-sqlite3'](); } }; diff --git a/yarn.lock b/yarn.lock index 22df71509..a3b54eed4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1125,11 +1125,6 @@ dependencies: "@types/node" "*" -"@types/integer@latest": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/integer/-/integer-4.0.0.tgz#3b778715df72d2cf8ba73bad27bd9d830907f944" - integrity sha512-2U1i6bIRiqizl6O+ETkp2HhUZIxg7g+burUabh9tzGd0qcszfNaFRaY9bGNlQKgEU7DCsH5qMajRDW5QamWQbw== - "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" @@ -2061,15 +2056,14 @@ better-assert@~1.0.0: dependencies: callsite "1.0.0" -better-sqlite3-with-prebuilds@^7.4.3: - version "7.4.3" - resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.4.3.tgz#2ed9c5649a8eb1cf2bece7d3f4849b184ddde038" - integrity sha512-E1MWyMz5RFZCdRNzIcR245dRVR3u1qZO2uV+8Z9Vb/PJsQ6uxOuOnSfA+rZdkuvDbVTbdpowKNL1tuO6FJyt0A== +better-sqlite3@^7.4.5: + version "7.4.5" + resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-7.4.5.tgz#acfc48d786114227f550a0a45e22ace51336e2d0" + integrity sha512-mybC3dgrtJeHkIRGP36tST7wjBlIMgTRAXhhO4bMpPZ17EG23FZxZeFcwKWy6o8mV1SKQFnQNyeAZlQpGrgheQ== dependencies: - "@types/integer" latest bindings "^1.5.0" - prebuild-install "^6.0.1" - tar "^6.1.0" + prebuild-install "^7.0.0" + tar "^6.1.11" big.js@^5.2.2: version "5.2.2" @@ -3265,6 +3259,13 @@ decompress-response@^4.2.0: dependencies: mimic-response "^2.0.0" +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== + dependencies: + mimic-response "^3.1.0" + dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" @@ -7138,6 +7139,11 @@ mimic-response@^2.0.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== + min-indent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.0.tgz#cfc45c37e9ec0d8f0a0ec3dd4ef7f7c3abe39256" @@ -7376,14 +7382,13 @@ ms@^2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -msnodesqlv8@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/msnodesqlv8/-/msnodesqlv8-2.4.0.tgz#7815b965655a5ccb0635f2f48476b5d6d49e3343" - integrity sha512-CYecwSZS86jE1Nr7sO/cWWfmeg5F+hhFbs8gABGqOsiLWWoylFrOiPfcV3Z4jgDcVWIV6pF2eiBCE/b8KriypA== +msnodesqlv8@^2.4.4: + version "2.4.4" + resolved "https://registry.yarnpkg.com/msnodesqlv8/-/msnodesqlv8-2.4.4.tgz#1e4e10246480c486b074199d6efddf5dab8af9b9" + integrity sha512-VJpurwVyq6c2mgkEFFe1S0BD1+vZSLy0vv5qbkdnJoIaeC5XBcfLSKYsjeP1V5QEc1fv4CD3oau84kcGXNk/cQ== dependencies: - nan "^2.14.2" - node-abi "^2.30.0" - prebuild-install "^6.1.2" + nan "^2.15.0" + prebuild-install "^6.1.4" mute-stream@0.0.8: version "0.0.8" @@ -7421,6 +7426,11 @@ nan@^2.14.2: resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== +nan@^2.15.0: + version "2.15.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" + integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -7498,13 +7508,6 @@ node-abi@^2.21.0: dependencies: semver "^5.4.1" -node-abi@^2.30.0: - version "2.30.1" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" - integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== - dependencies: - semver "^5.4.1" - node-abi@^2.7.0: version "2.19.3" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.3.tgz#252f5dcab12dad1b5503b2d27eddd4733930282d" @@ -7512,6 +7515,13 @@ node-abi@^2.7.0: dependencies: semver "^5.4.1" +node-abi@^3.3.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248" + integrity sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw== + dependencies: + semver "^7.3.5" + node-cron@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/node-cron/-/node-cron-2.0.3.tgz#b9649784d0d6c00758410eef22fa54a10e3f602d" @@ -8405,27 +8415,7 @@ prebuild-install@6.0.1: tunnel-agent "^0.6.0" which-pm-runs "^1.0.0" -prebuild-install@^6.0.1: - version "6.1.2" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.2.tgz#6ce5fc5978feba5d3cbffedca0682b136a0b5bff" - integrity sha512-PzYWIKZeP+967WuKYXlTOhYBgGOvTRSfaKI89XnfJ0ansRAH7hDU45X+K+FZeI1Wb/7p/NnuctPH3g0IqKUuSQ== - dependencies: - detect-libc "^1.0.3" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^2.21.0" - noop-logger "^0.1.1" - npmlog "^4.0.1" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^3.0.3" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - -prebuild-install@^6.1.2: +prebuild-install@^6.1.4: version "6.1.4" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== @@ -8444,6 +8434,25 @@ prebuild-install@^6.1.2: tar-fs "^2.0.0" tunnel-agent "^0.6.0" +prebuild-install@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.0.tgz#3c5ce3902f1cb9d6de5ae94ca53575e4af0c1574" + integrity sha512-IvSenf33K7JcgddNz2D5w521EgO+4aMMjFt73Uk9FRzQ7P+QZPKrp7qPsDydsSwjGt3T5xRNnM1bj1zMTD5fTA== + dependencies: + detect-libc "^1.0.3" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^3.3.0" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^4.0.0" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -9312,7 +9321,7 @@ semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.1.1, semver@^7.3.2, semver@^7.3.4: +semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== @@ -9458,6 +9467,15 @@ simple-get@^3.0.3: once "^1.3.1" simple-concat "^1.0.0" +simple-get@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.0.tgz#73fa628278d21de83dadd5512d2cc1f4872bd675" + integrity sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ== + dependencies: + decompress-response "^6.0.0" + once "^1.3.1" + simple-concat "^1.0.0" + sirv-cli@^1.0.0: version "1.0.11" resolved "https://registry.yarnpkg.com/sirv-cli/-/sirv-cli-1.0.11.tgz#a3f4bed53b7c09306ed7f16ebea6e1e7be676c74" @@ -10223,6 +10241,18 @@ tar@^6.0.5: mkdirp "^1.0.3" yallist "^4.0.0" +tar@^6.1.11: + version "6.1.11" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + task-graph-runner@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/task-graph-runner/-/task-graph-runner-1.0.3.tgz#73b2cd380cef6f51b8179b0d1da4bb7c356b03bf" From fac5cdac755d13a3d866842bf26f5c3627361567 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 25 Dec 2021 12:42:54 +0100 Subject: [PATCH 24/75] v4.4.5-beta.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a3b97947e..322b95404 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.5", + "version": "4.4.5-beta.6", "name": "dbgate-all", "workspaces": [ "packages/*", From 9c21452d0bd61a1d3c9394d10195c421ce83877d Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 25 Dec 2021 13:02:22 +0100 Subject: [PATCH 25/75] upgrade to node 16 --- .github/workflows/build-app-beta.yaml | 4 ++-- .github/workflows/build-app.yaml | 4 ++-- .github/workflows/build-docker-beta.yaml | 4 ++-- .github/workflows/build-docker.yaml | 4 ++-- .github/workflows/build-npm.yaml | 4 ++-- .github/workflows/run-tests.yaml | 2 +- docker/Dockerfile | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-app-beta.yaml b/.github/workflows/build-app-beta.yaml index e7a95860b..93419f8c0 100644 --- a/.github/workflows/build-app-beta.yaml +++ b/.github/workflows/build-app-beta.yaml @@ -22,10 +22,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 - - name: Use Node.js 14.x + - name: Use Node.js 16.x uses: actions/setup-node@v1 with: - node-version: 14.x + node-version: 16.x - name: yarn install run: | yarn install diff --git a/.github/workflows/build-app.yaml b/.github/workflows/build-app.yaml index a6b6b4df6..7246a228e 100644 --- a/.github/workflows/build-app.yaml +++ b/.github/workflows/build-app.yaml @@ -26,10 +26,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 - - name: Use Node.js 14.x + - name: Use Node.js 16.x uses: actions/setup-node@v1 with: - node-version: 14.x + node-version: 16.x - name: yarn install run: | yarn install diff --git a/.github/workflows/build-docker-beta.yaml b/.github/workflows/build-docker-beta.yaml index e1f9fd35a..147d0d518 100644 --- a/.github/workflows/build-docker-beta.yaml +++ b/.github/workflows/build-docker-beta.yaml @@ -24,10 +24,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 - - name: Use Node.js 14.x + - name: Use Node.js 16.x uses: actions/setup-node@v1 with: - node-version: 14.x + node-version: 16.x - name: yarn install run: | yarn install diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index 2192863bd..5ce12cba0 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -30,10 +30,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 - - name: Use Node.js 14.x + - name: Use Node.js 16.x uses: actions/setup-node@v1 with: - node-version: 14.x + node-version: 16.x - name: yarn install run: | yarn install diff --git a/.github/workflows/build-npm.yaml b/.github/workflows/build-npm.yaml index f43184447..7214c5a9a 100644 --- a/.github/workflows/build-npm.yaml +++ b/.github/workflows/build-npm.yaml @@ -30,10 +30,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 - - name: Use Node.js 14.x + - name: Use Node.js 16.x uses: actions/setup-node@v1 with: - node-version: 14.x + node-version: 16.x - name: Configure NPM token env: diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index 8e14f7aec..375cf872c 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -8,7 +8,7 @@ on: jobs: test-runner: runs-on: ubuntu-latest - container: node:14.18 + container: node:16 steps: - name: Context diff --git a/docker/Dockerfile b/docker/Dockerfile index 59344f14b..4fd02ec83 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14-alpine +FROM node:16-alpine WORKDIR /home/dbgate-docker From 4a54dc5b6186f2384cd1b17f15988ccff57b3b8c Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 25 Dec 2021 13:02:34 +0100 Subject: [PATCH 26/75] v4.4.5-beta.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 322b95404..93f8df1bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.6", + "version": "4.4.5-beta.7", "name": "dbgate-all", "workspaces": [ "packages/*", From ed3666ca0513ef95397349e1aa626b71e768b7ec Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 25 Dec 2021 13:46:32 +0100 Subject: [PATCH 27/75] Revert "upgrade to node 16" This reverts commit 9c21452d0bd61a1d3c9394d10195c421ce83877d. --- .github/workflows/build-app-beta.yaml | 4 ++-- .github/workflows/build-app.yaml | 4 ++-- .github/workflows/build-docker-beta.yaml | 4 ++-- .github/workflows/build-docker.yaml | 4 ++-- .github/workflows/build-npm.yaml | 4 ++-- .github/workflows/run-tests.yaml | 2 +- docker/Dockerfile | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-app-beta.yaml b/.github/workflows/build-app-beta.yaml index 93419f8c0..e7a95860b 100644 --- a/.github/workflows/build-app-beta.yaml +++ b/.github/workflows/build-app-beta.yaml @@ -22,10 +22,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 - - name: Use Node.js 16.x + - name: Use Node.js 14.x uses: actions/setup-node@v1 with: - node-version: 16.x + node-version: 14.x - name: yarn install run: | yarn install diff --git a/.github/workflows/build-app.yaml b/.github/workflows/build-app.yaml index 7246a228e..a6b6b4df6 100644 --- a/.github/workflows/build-app.yaml +++ b/.github/workflows/build-app.yaml @@ -26,10 +26,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 - - name: Use Node.js 16.x + - name: Use Node.js 14.x uses: actions/setup-node@v1 with: - node-version: 16.x + node-version: 14.x - name: yarn install run: | yarn install diff --git a/.github/workflows/build-docker-beta.yaml b/.github/workflows/build-docker-beta.yaml index 147d0d518..e1f9fd35a 100644 --- a/.github/workflows/build-docker-beta.yaml +++ b/.github/workflows/build-docker-beta.yaml @@ -24,10 +24,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 - - name: Use Node.js 16.x + - name: Use Node.js 14.x uses: actions/setup-node@v1 with: - node-version: 16.x + node-version: 14.x - name: yarn install run: | yarn install diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index 5ce12cba0..2192863bd 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -30,10 +30,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 - - name: Use Node.js 16.x + - name: Use Node.js 14.x uses: actions/setup-node@v1 with: - node-version: 16.x + node-version: 14.x - name: yarn install run: | yarn install diff --git a/.github/workflows/build-npm.yaml b/.github/workflows/build-npm.yaml index 7214c5a9a..f43184447 100644 --- a/.github/workflows/build-npm.yaml +++ b/.github/workflows/build-npm.yaml @@ -30,10 +30,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 - - name: Use Node.js 16.x + - name: Use Node.js 14.x uses: actions/setup-node@v1 with: - node-version: 16.x + node-version: 14.x - name: Configure NPM token env: diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index 375cf872c..8e14f7aec 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -8,7 +8,7 @@ on: jobs: test-runner: runs-on: ubuntu-latest - container: node:16 + container: node:14.18 steps: - name: Context diff --git a/docker/Dockerfile b/docker/Dockerfile index 4fd02ec83..59344f14b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16-alpine +FROM node:14-alpine WORKDIR /home/dbgate-docker From 025209115868d461ac105b2fad1face4075fd582 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 25 Dec 2021 13:47:02 +0100 Subject: [PATCH 28/75] used sqlite with prebuilds again --- app/package.json | 2 +- fillNativeModules.js | 2 +- packages/api/package.json | 2 +- plugins/dbgate-plugin-sqlite/src/backend/driver.js | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/package.json b/app/package.json index 5b8cf8b85..45e2ee8f3 100644 --- a/app/package.json +++ b/app/package.json @@ -5,7 +5,7 @@ "author": "Jan Prochazka ", "description": "Opensource database administration tool", "dependencies": { - "better-sqlite3": "^7.4.5", + "better-sqlite3-with-prebuilds": "^7.4.3", "electron-log": "^4.4.1", "electron-store": "^8.0.1", "electron-updater": "^4.6.1", diff --git a/fillNativeModules.js b/fillNativeModules.js index 61dea66eb..d51157258 100644 --- a/fillNativeModules.js +++ b/fillNativeModules.js @@ -5,7 +5,7 @@ let fillContent = ''; if (process.platform == 'win32') { fillContent += `content.msnodesqlv8 = () => require('msnodesqlv8');`; } -fillContent += `content['better-sqlite3'] = () => require('better-sqlite3');`; +fillContent += `content['better-sqlite3-with-prebuilds'] = () => require('better-sqlite3-with-prebuilds');`; const getContent = (empty) => ` // this file is generated automatically by script fillNativeModules.js, do not edit it manually diff --git a/packages/api/package.json b/packages/api/package.json index 3ad5d93b5..b1ac4c36b 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -19,7 +19,7 @@ "dependencies": { "async-lock": "^1.2.4", "axios": "^0.21.1", - "better-sqlite3": "^7.4.5", + "better-sqlite3-with-prebuilds": "^7.4.3", "body-parser": "^1.19.0", "bufferutil": "^4.0.1", "byline": "^5.0.0", diff --git a/plugins/dbgate-plugin-sqlite/src/backend/driver.js b/plugins/dbgate-plugin-sqlite/src/backend/driver.js index caef44714..e6a8cf215 100644 --- a/plugins/dbgate-plugin-sqlite/src/backend/driver.js +++ b/plugins/dbgate-plugin-sqlite/src/backend/driver.js @@ -175,8 +175,8 @@ const driver = { }; driver.initialize = (dbgateEnv) => { - if (dbgateEnv.nativeModules && dbgateEnv.nativeModules['better-sqlite3']) { - Database = dbgateEnv.nativeModules['better-sqlite3'](); + if (dbgateEnv.nativeModules && dbgateEnv.nativeModules['better-sqlite3-with-prebuilds']) { + Database = dbgateEnv.nativeModules['better-sqlite3-with-prebuilds'](); } }; From e5404d2f298428c218e3c5d6b436b83a0f6734ff Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 25 Dec 2021 13:47:14 +0100 Subject: [PATCH 29/75] v4.4.5-beta.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 93f8df1bf..20d63d49a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.7", + "version": "4.4.5-beta.8", "name": "dbgate-all", "workspaces": [ "packages/*", From de692a34346142af038362a8306fd913f4175d72 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 25 Dec 2021 14:12:43 +0100 Subject: [PATCH 30/75] fixed sqlite with prebuilds --- app/package.json | 2 +- app/yarn.lock | 69 +++++++-------------------------- packages/api/package.json | 2 +- yarn.lock | 81 +++++++-------------------------------- 4 files changed, 30 insertions(+), 124 deletions(-) diff --git a/app/package.json b/app/package.json index 45e2ee8f3..779e69102 100644 --- a/app/package.json +++ b/app/package.json @@ -5,7 +5,7 @@ "author": "Jan Prochazka ", "description": "Opensource database administration tool", "dependencies": { - "better-sqlite3-with-prebuilds": "^7.4.3", + "better-sqlite3-with-prebuilds": "7.4.3", "electron-log": "^4.4.1", "electron-store": "^8.0.1", "electron-updater": "^4.6.1", diff --git a/app/yarn.lock b/app/yarn.lock index f7f4f625b..72ca29162 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -93,6 +93,11 @@ "@types/minimatch" "*" "@types/node" "*" +"@types/integer@latest": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/integer/-/integer-4.0.1.tgz#022f2c77a899e383e6d3dd374142416c22a5b9df" + integrity sha512-QQojPymFcV1hrvWXA1h0pP9RmFBFNuWikZcUEjjVsS19IyKO+jqOX24lp2ZHF4A21EmkosJhJDX7CLG67F2s7A== + "@types/minimatch@*": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" @@ -322,14 +327,15 @@ base64-js@^1.3.1, base64-js@^1.5.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -better-sqlite3@^7.4.5: - version "7.4.5" - resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-7.4.5.tgz#acfc48d786114227f550a0a45e22ace51336e2d0" - integrity sha512-mybC3dgrtJeHkIRGP36tST7wjBlIMgTRAXhhO4bMpPZ17EG23FZxZeFcwKWy6o8mV1SKQFnQNyeAZlQpGrgheQ== +better-sqlite3-with-prebuilds@7.4.3: + version "7.4.3" + resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.4.3.tgz#2ed9c5649a8eb1cf2bece7d3f4849b184ddde038" + integrity sha512-E1MWyMz5RFZCdRNzIcR245dRVR3u1qZO2uV+8Z9Vb/PJsQ6uxOuOnSfA+rZdkuvDbVTbdpowKNL1tuO6FJyt0A== dependencies: + "@types/integer" latest bindings "^1.5.0" - prebuild-install "^7.0.0" - tar "^6.1.11" + prebuild-install "^6.0.1" + tar "^6.1.0" bindings@^1.5.0: version "1.5.0" @@ -763,13 +769,6 @@ decompress-response@^4.2.0: dependencies: mimic-response "^2.0.0" -decompress-response@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" - integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== - dependencies: - mimic-response "^3.1.0" - deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" @@ -1631,11 +1630,6 @@ mimic-response@^2.0.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== -mimic-response@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" - integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== - minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -1720,13 +1714,6 @@ node-abi@^2.21.0: dependencies: semver "^5.4.1" -node-abi@^3.3.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248" - integrity sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw== - dependencies: - semver "^7.3.5" - node-addon-api@^1.6.3: version "1.7.2" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" @@ -1908,7 +1895,7 @@ plist@^3.0.1, plist@^3.0.4: base64-js "^1.5.1" xmlbuilder "^9.0.7" -prebuild-install@^6.1.4: +prebuild-install@^6.0.1, prebuild-install@^6.1.4: version "6.1.4" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== @@ -1927,25 +1914,6 @@ prebuild-install@^6.1.4: tar-fs "^2.0.0" tunnel-agent "^0.6.0" -prebuild-install@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.0.tgz#3c5ce3902f1cb9d6de5ae94ca53575e4af0c1574" - integrity sha512-IvSenf33K7JcgddNz2D5w521EgO+4aMMjFt73Uk9FRzQ7P+QZPKrp7qPsDydsSwjGt3T5xRNnM1bj1zMTD5fTA== - dependencies: - detect-libc "^1.0.3" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^3.3.0" - npmlog "^4.0.1" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^4.0.0" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" @@ -2207,15 +2175,6 @@ simple-get@^3.0.3: once "^1.3.1" simple-concat "^1.0.0" -simple-get@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.0.tgz#73fa628278d21de83dadd5512d2cc1f4872bd675" - integrity sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ== - dependencies: - decompress-response "^6.0.0" - once "^1.3.1" - simple-concat "^1.0.0" - slash@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" @@ -2356,7 +2315,7 @@ tar-stream@^2.1.4: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^6.1.11: +tar@^6.1.0: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== diff --git a/packages/api/package.json b/packages/api/package.json index b1ac4c36b..80002dde9 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -19,7 +19,7 @@ "dependencies": { "async-lock": "^1.2.4", "axios": "^0.21.1", - "better-sqlite3-with-prebuilds": "^7.4.3", + "better-sqlite3-with-prebuilds": "7.4.3", "body-parser": "^1.19.0", "bufferutil": "^4.0.1", "byline": "^5.0.0", diff --git a/yarn.lock b/yarn.lock index a3b54eed4..ce0ba4e17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1125,6 +1125,11 @@ dependencies: "@types/node" "*" +"@types/integer@latest": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/integer/-/integer-4.0.1.tgz#022f2c77a899e383e6d3dd374142416c22a5b9df" + integrity sha512-QQojPymFcV1hrvWXA1h0pP9RmFBFNuWikZcUEjjVsS19IyKO+jqOX24lp2ZHF4A21EmkosJhJDX7CLG67F2s7A== + "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" @@ -2056,14 +2061,15 @@ better-assert@~1.0.0: dependencies: callsite "1.0.0" -better-sqlite3@^7.4.5: - version "7.4.5" - resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-7.4.5.tgz#acfc48d786114227f550a0a45e22ace51336e2d0" - integrity sha512-mybC3dgrtJeHkIRGP36tST7wjBlIMgTRAXhhO4bMpPZ17EG23FZxZeFcwKWy6o8mV1SKQFnQNyeAZlQpGrgheQ== +better-sqlite3-with-prebuilds@7.4.3: + version "7.4.3" + resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.4.3.tgz#2ed9c5649a8eb1cf2bece7d3f4849b184ddde038" + integrity sha512-E1MWyMz5RFZCdRNzIcR245dRVR3u1qZO2uV+8Z9Vb/PJsQ6uxOuOnSfA+rZdkuvDbVTbdpowKNL1tuO6FJyt0A== dependencies: + "@types/integer" latest bindings "^1.5.0" - prebuild-install "^7.0.0" - tar "^6.1.11" + prebuild-install "^6.0.1" + tar "^6.1.0" big.js@^5.2.2: version "5.2.2" @@ -3259,13 +3265,6 @@ decompress-response@^4.2.0: dependencies: mimic-response "^2.0.0" -decompress-response@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" - integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== - dependencies: - mimic-response "^3.1.0" - dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" @@ -7139,11 +7138,6 @@ mimic-response@^2.0.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== -mimic-response@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" - integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== - min-indent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.0.tgz#cfc45c37e9ec0d8f0a0ec3dd4ef7f7c3abe39256" @@ -7515,13 +7509,6 @@ node-abi@^2.7.0: dependencies: semver "^5.4.1" -node-abi@^3.3.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248" - integrity sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw== - dependencies: - semver "^7.3.5" - node-cron@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/node-cron/-/node-cron-2.0.3.tgz#b9649784d0d6c00758410eef22fa54a10e3f602d" @@ -8415,7 +8402,7 @@ prebuild-install@6.0.1: tunnel-agent "^0.6.0" which-pm-runs "^1.0.0" -prebuild-install@^6.1.4: +prebuild-install@^6.0.1, prebuild-install@^6.1.4: version "6.1.4" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== @@ -8434,25 +8421,6 @@ prebuild-install@^6.1.4: tar-fs "^2.0.0" tunnel-agent "^0.6.0" -prebuild-install@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.0.tgz#3c5ce3902f1cb9d6de5ae94ca53575e4af0c1574" - integrity sha512-IvSenf33K7JcgddNz2D5w521EgO+4aMMjFt73Uk9FRzQ7P+QZPKrp7qPsDydsSwjGt3T5xRNnM1bj1zMTD5fTA== - dependencies: - detect-libc "^1.0.3" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^3.3.0" - npmlog "^4.0.1" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^4.0.0" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -9321,7 +9289,7 @@ semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: +semver@^7.1.1, semver@^7.3.2, semver@^7.3.4: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== @@ -9467,15 +9435,6 @@ simple-get@^3.0.3: once "^1.3.1" simple-concat "^1.0.0" -simple-get@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.0.tgz#73fa628278d21de83dadd5512d2cc1f4872bd675" - integrity sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ== - dependencies: - decompress-response "^6.0.0" - once "^1.3.1" - simple-concat "^1.0.0" - sirv-cli@^1.0.0: version "1.0.11" resolved "https://registry.yarnpkg.com/sirv-cli/-/sirv-cli-1.0.11.tgz#a3f4bed53b7c09306ed7f16ebea6e1e7be676c74" @@ -10241,18 +10200,6 @@ tar@^6.0.5: mkdirp "^1.0.3" yallist "^4.0.0" -tar@^6.1.11: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^3.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - task-graph-runner@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/task-graph-runner/-/task-graph-runner-1.0.3.tgz#73b2cd380cef6f51b8179b0d1da4bb7c356b03bf" From a686e21c074e9bc708669c28c41077ea21a8ca96 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 09:49:13 +0100 Subject: [PATCH 31/75] fixes --- app/yarn.lock | 6 +++--- packages/web/rollup.config.js | 2 +- packages/web/src/query/AceEditor.svelte | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/yarn.lock b/app/yarn.lock index 72ca29162..9218ccd7e 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -114,9 +114,9 @@ integrity sha512-eMhwJXc931Ihh4tkU+Y7GiLzT/y/DBNpNtr4yU9O2w3SYBsr9NaOPhQlLKRmoWtI54uNwuo0IOUFQjVOTZYRvw== "@types/node@^14.6.2": - version "14.18.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.0.tgz#98df2397f6936bfbff4f089e40e06fa5dd88d32a" - integrity sha512-0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ== + version "14.18.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.2.tgz#00fe4d1686d5f6cf3a2f2e9a0eef42594d06abfc" + integrity sha512-fqtSN5xn/bBzDxMT77C1rJg6CsH/R49E7qsGuvdPJa20HtV5zSTuLJPNfnlyVH3wauKnkHdLggTVkOW/xP9oQg== "@types/plist@^3.0.1": version "3.0.2" diff --git a/packages/web/rollup.config.js b/packages/web/rollup.config.js index 8d5f8db4c..edea2d170 100644 --- a/packages/web/rollup.config.js +++ b/packages/web/rollup.config.js @@ -105,6 +105,6 @@ export default { webWorkerLoader(), ], watch: { - clearScreen: false, + clearScreen: true, }, }; diff --git a/packages/web/src/query/AceEditor.svelte b/packages/web/src/query/AceEditor.svelte index 06a9df43e..952acbdbd 100644 --- a/packages/web/src/query/AceEditor.svelte +++ b/packages/web/src/query/AceEditor.svelte @@ -143,6 +143,7 @@ processParserResult(e.data); }; } catch (err) { + console.warn('WORKER ERROR, using fallback worker', err.message); queryParserWorker = 'fallback'; } } From 6a7a56886c28578b60ed3a1b30d817126a0fd928 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 10:17:58 +0100 Subject: [PATCH 32/75] worker thread - using rollup config instead of plugin --- packages/web/rollup.config.js | 156 +++++++++++++----------- packages/web/src/query/AceEditor.svelte | 8 +- 2 files changed, 93 insertions(+), 71 deletions(-) diff --git a/packages/web/rollup.config.js b/packages/web/rollup.config.js index edea2d170..cf0c345c1 100644 --- a/packages/web/rollup.config.js +++ b/packages/web/rollup.config.js @@ -7,10 +7,9 @@ import { terser } from 'rollup-plugin-terser'; import sveltePreprocess from 'svelte-preprocess'; import typescript from '@rollup/plugin-typescript'; import replace from '@rollup/plugin-replace'; -import webWorkerLoader from 'rollup-plugin-web-worker-loader'; +// import webWorkerLoader from 'rollup-plugin-web-worker-loader'; import css from 'rollup-plugin-css-only'; - const production = !process.env.ROLLUP_WATCH; function serve() { @@ -34,77 +33,98 @@ function serve() { }; } -export default { - input: 'src/main.ts', - output: { - sourcemap: true, - format: 'iife', - name: 'app', - file: 'public/build/bundle.js', +export default [ + { + input: 'src/query/QueryParserWorker.js', + output: { + sourcemap: true, + format: 'iife', + file: 'public/build/QueryParserWorker.js', + }, + plugins: [ + commonjs(), + resolve({ + browser: true, + }), + + // If we're building for production (npm run build + // instead of npm run dev), minify + production && terser(), + ], }, - plugins: [ - copy({ - targets: [ - { - src: '../../node_modules/@mdi/font/css/materialdesignicons.css', - dest: 'public/build/fonts/', + + { + input: 'src/main.ts', + output: { + sourcemap: true, + format: 'iife', + name: 'app', + file: 'public/build/bundle.js', + }, + plugins: [ + copy({ + targets: [ + { + src: '../../node_modules/@mdi/font/css/materialdesignicons.css', + dest: 'public/build/fonts/', + }, + { + src: '../../node_modules/@mdi/font/fonts/*', + dest: 'public/build/fonts/', + }, + { + src: '../../node_modules/diff2html/bundles/css/diff2html.min.css', + dest: 'public/build/', + }, + ], + }), + + replace({ + 'process.env.API_URL': JSON.stringify(process.env.API_URL), + }), + + svelte({ + preprocess: sveltePreprocess({ sourceMap: !production }), + compilerOptions: { + // enable run-time checks when not in production + dev: !production, }, - { - src: '../../node_modules/@mdi/font/fonts/*', - dest: 'public/build/fonts/', - }, - { - src: '../../node_modules/diff2html/bundles/css/diff2html.min.css', - dest: 'public/build/', - }, - ], - }), + }), + // we'll extract any component CSS out into + // a separate file - better for performance + css({ output: 'bundle.css' }), - replace({ - 'process.env.API_URL': JSON.stringify(process.env.API_URL), - }), + // 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(), + typescript({ + sourceMap: !production, + inlineSources: !production, + }), - svelte({ - preprocess: sveltePreprocess({ sourceMap: !production }), - 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 - css({ output: 'bundle.css' }), + // In dev mode, call `npm run start` once + // the bundle has been generated + !production && serve(), - // 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(), - typescript({ - sourceMap: !production, - inlineSources: !production, - }), + // Watch the `public` directory and refresh the + // browser on changes when not in production + !production && livereload('public'), - // In dev mode, call `npm run start` once - // the bundle has been generated - !production && serve(), + // If we're building for production (npm run build + // instead of npm run dev), minify + production && terser(), - // Watch the `public` directory and refresh the - // browser on changes when not in production - !production && livereload('public'), - - // If we're building for production (npm run build - // instead of npm run dev), minify - production && terser(), - - webWorkerLoader(), - ], - watch: { - clearScreen: true, + // webWorkerLoader(), + ], + watch: { + clearScreen: true, + }, }, -}; +]; diff --git a/packages/web/src/query/AceEditor.svelte b/packages/web/src/query/AceEditor.svelte index 952acbdbd..e3f702f9b 100644 --- a/packages/web/src/query/AceEditor.svelte +++ b/packages/web/src/query/AceEditor.svelte @@ -26,7 +26,7 @@ import { handleCommandKeyDown } from '../commands/CommandListener.svelte'; import resizeObserver from '../utility/resizeObserver'; // @ts-ignore - import QueryParserWorker from 'web-worker:./QueryParserWorker'; + // import QueryParserWorker from 'web-worker:./QueryParserWorker'; import queryParserWorkerFallback from './queryParserWorkerFallback'; const EDITOR_ID = `svelte-ace-editor-div:${Math.floor(Math.random() * 10000000000)}`; @@ -138,12 +138,14 @@ if (enabled) { if (!queryParserWorker) { try { - queryParserWorker = new QueryParserWorker(); + queryParserWorker = new Worker('build/QueryParserWorker.js'); + // console.log('WORKER', queryParserWorker); queryParserWorker.onmessage = e => { processParserResult(e.data); }; } catch (err) { - console.warn('WORKER ERROR, using fallback worker', err.message); + // console.error('WORKER ERROR', err); + console.log('WORKER ERROR, using fallback worker', err.message); queryParserWorker = 'fallback'; } } From 7a7d48bd0e083aebb395e01675cd93d8b8c157ba Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 10:52:27 +0100 Subject: [PATCH 33/75] removed rollup worker plugin --- packages/web/package.json | 1 - packages/web/rollup.config.js | 3 --- packages/web/src/query/AceEditor.svelte | 2 -- yarn.lock | 5 ----- 4 files changed, 11 deletions(-) diff --git a/packages/web/package.json b/packages/web/package.json index 444f47fb4..0ee67d4ea 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -43,7 +43,6 @@ "rollup-plugin-livereload": "^2.0.0", "rollup-plugin-svelte": "^7.0.0", "rollup-plugin-terser": "^7.0.0", - "rollup-plugin-web-worker-loader": "^1.6.1", "sirv-cli": "^1.0.0", "sql-formatter": "^2.3.3", "svelte": "^3.43.0", diff --git a/packages/web/rollup.config.js b/packages/web/rollup.config.js index cf0c345c1..5bfff4a9e 100644 --- a/packages/web/rollup.config.js +++ b/packages/web/rollup.config.js @@ -7,7 +7,6 @@ import { terser } from 'rollup-plugin-terser'; import sveltePreprocess from 'svelte-preprocess'; import typescript from '@rollup/plugin-typescript'; import replace from '@rollup/plugin-replace'; -// import webWorkerLoader from 'rollup-plugin-web-worker-loader'; import css from 'rollup-plugin-css-only'; const production = !process.env.ROLLUP_WATCH; @@ -120,8 +119,6 @@ export default [ // If we're building for production (npm run build // instead of npm run dev), minify production && terser(), - - // webWorkerLoader(), ], watch: { clearScreen: true, diff --git a/packages/web/src/query/AceEditor.svelte b/packages/web/src/query/AceEditor.svelte index e3f702f9b..37a1c90e5 100644 --- a/packages/web/src/query/AceEditor.svelte +++ b/packages/web/src/query/AceEditor.svelte @@ -25,8 +25,6 @@ import _ from 'lodash'; import { handleCommandKeyDown } from '../commands/CommandListener.svelte'; import resizeObserver from '../utility/resizeObserver'; - // @ts-ignore - // import QueryParserWorker from 'web-worker:./QueryParserWorker'; import queryParserWorkerFallback from './queryParserWorkerFallback'; const EDITOR_ID = `svelte-ace-editor-div:${Math.floor(Math.random() * 10000000000)}`; diff --git a/yarn.lock b/yarn.lock index ce0ba4e17..d14b343ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9119,11 +9119,6 @@ rollup-plugin-terser@^7.0.0: serialize-javascript "^4.0.0" terser "^5.0.0" -rollup-plugin-web-worker-loader@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/rollup-plugin-web-worker-loader/-/rollup-plugin-web-worker-loader-1.6.1.tgz#9d7a27575b64b0780fe4e8b3bc87470d217e485f" - integrity sha512-4QywQSz1NXFHKdyiou16mH3ijpcfLtLGOrAqvAqu1Gx+P8+zj+3gwC2BSL/VW1d+LW4nIHC8F7d7OXhs9UdR2A== - rollup-pluginutils@^2.8.2: version "2.8.2" resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e" From 07685280e4150374885d8d77ff42db5b16084a3e Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 10:55:19 +0100 Subject: [PATCH 34/75] electron version set to 12.1.0 --- app/package.json | 2 +- app/yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/package.json b/app/package.json index 779e69102..d8a7562a4 100644 --- a/app/package.json +++ b/app/package.json @@ -103,7 +103,7 @@ "devDependencies": { "copyfiles": "^2.2.0", "cross-env": "^6.0.3", - "electron": "15.3.4", + "electron": "12.1.0", "electron-builder": "22.14.5" }, "optionalDependencies": { diff --git a/app/yarn.lock b/app/yarn.lock index 9218ccd7e..ef27679af 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -15,7 +15,7 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" -"@electron/get@^1.13.0": +"@electron/get@^1.0.1": version "1.13.1" resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368" integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA== @@ -950,12 +950,12 @@ electron-updater@^4.6.1: lodash.isequal "^4.5.0" semver "^7.3.5" -electron@15.3.4: - version "15.3.4" - resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.4.tgz#811e8872f4500b88ad49e005cbe8f93e10676f6d" - integrity sha512-GLTE+UEKw1pJehkgpLgXtsHhYqSPp6skSNY1bxnY3dDYBrsPlP3nTEO9YQY2p4eHk+uxFVTXOVy5afcu9fIZ9A== +electron@12.1.0: + version "12.1.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-12.1.0.tgz#615a7f9dbb2fc79cc72361fba9f39d005c697bca" + integrity sha512-joQlYI/nTIrTUldO3GENZ2j225eKar9nTQBSEwSUSWN4h65QGDmXNQ7dbWPmLlkUQWtHhz8lXhFk30OLG9ZjLw== dependencies: - "@electron/get" "^1.13.0" + "@electron/get" "^1.0.1" "@types/node" "^14.6.2" extract-zip "^1.0.3" From a409c14b30a1ae52f6507ed81959ab315e0d43c5 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 10:55:32 +0100 Subject: [PATCH 35/75] v4.4.5-beta.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 20d63d49a..721593828 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.8", + "version": "4.4.5-beta.9", "name": "dbgate-all", "workspaces": [ "packages/*", From b941b4d621c2faabb0f1d5059c5c4a3e5f408acb Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 11:01:55 +0100 Subject: [PATCH 36/75] renamed worker output file --- packages/web/rollup.config.js | 2 +- packages/web/src/query/AceEditor.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web/rollup.config.js b/packages/web/rollup.config.js index 5bfff4a9e..f12e6b6d9 100644 --- a/packages/web/rollup.config.js +++ b/packages/web/rollup.config.js @@ -38,7 +38,7 @@ export default [ output: { sourcemap: true, format: 'iife', - file: 'public/build/QueryParserWorker.js', + file: 'public/build/query-parser-worker.js', }, plugins: [ commonjs(), diff --git a/packages/web/src/query/AceEditor.svelte b/packages/web/src/query/AceEditor.svelte index 37a1c90e5..4296806d7 100644 --- a/packages/web/src/query/AceEditor.svelte +++ b/packages/web/src/query/AceEditor.svelte @@ -136,7 +136,7 @@ if (enabled) { if (!queryParserWorker) { try { - queryParserWorker = new Worker('build/QueryParserWorker.js'); + queryParserWorker = new Worker('build/query-parser-worker.js'); // console.log('WORKER', queryParserWorker); queryParserWorker.onmessage = e => { processParserResult(e.data); From c47401fb2cac912ea8bdc3128e4e5a3e844a90a7 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 11:15:23 +0100 Subject: [PATCH 37/75] set version better-sqlite3-with-prebuilds to 7.1.8 --- app/package.json | 2 +- app/yarn.lock | 8 ++++---- packages/api/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/package.json b/app/package.json index d8a7562a4..0c8dc72fb 100644 --- a/app/package.json +++ b/app/package.json @@ -5,7 +5,7 @@ "author": "Jan Prochazka ", "description": "Opensource database administration tool", "dependencies": { - "better-sqlite3-with-prebuilds": "7.4.3", + "better-sqlite3-with-prebuilds": "7.1.8", "electron-log": "^4.4.1", "electron-store": "^8.0.1", "electron-updater": "^4.6.1", diff --git a/app/yarn.lock b/app/yarn.lock index ef27679af..2a8aaad6e 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -327,10 +327,10 @@ base64-js@^1.3.1, base64-js@^1.5.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -better-sqlite3-with-prebuilds@7.4.3: - version "7.4.3" - resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.4.3.tgz#2ed9c5649a8eb1cf2bece7d3f4849b184ddde038" - integrity sha512-E1MWyMz5RFZCdRNzIcR245dRVR3u1qZO2uV+8Z9Vb/PJsQ6uxOuOnSfA+rZdkuvDbVTbdpowKNL1tuO6FJyt0A== +better-sqlite3-with-prebuilds@7.1.8: + version "7.1.8" + resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.1.8.tgz#3090c478fe9b60e74ce053a76807b189784f62d7" + integrity sha512-trwg1qhN91cPYEB8D2K0KVHIsMsiAnxKx6/syfQ7rLrtD+zOS3fqJq4VGszMF+OuYAZJNAR4oLsikys3YW/6aA== dependencies: "@types/integer" latest bindings "^1.5.0" diff --git a/packages/api/package.json b/packages/api/package.json index 80002dde9..961df8a94 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -19,7 +19,7 @@ "dependencies": { "async-lock": "^1.2.4", "axios": "^0.21.1", - "better-sqlite3-with-prebuilds": "7.4.3", + "better-sqlite3-with-prebuilds": "7.1.8", "body-parser": "^1.19.0", "bufferutil": "^4.0.1", "byline": "^5.0.0", diff --git a/yarn.lock b/yarn.lock index d14b343ce..060cb8b90 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2061,10 +2061,10 @@ better-assert@~1.0.0: dependencies: callsite "1.0.0" -better-sqlite3-with-prebuilds@7.4.3: - version "7.4.3" - resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.4.3.tgz#2ed9c5649a8eb1cf2bece7d3f4849b184ddde038" - integrity sha512-E1MWyMz5RFZCdRNzIcR245dRVR3u1qZO2uV+8Z9Vb/PJsQ6uxOuOnSfA+rZdkuvDbVTbdpowKNL1tuO6FJyt0A== +better-sqlite3-with-prebuilds@7.1.8: + version "7.1.8" + resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.1.8.tgz#3090c478fe9b60e74ce053a76807b189784f62d7" + integrity sha512-trwg1qhN91cPYEB8D2K0KVHIsMsiAnxKx6/syfQ7rLrtD+zOS3fqJq4VGszMF+OuYAZJNAR4oLsikys3YW/6aA== dependencies: "@types/integer" latest bindings "^1.5.0" From 9a946c1eca8e852f7f80a6ab06b097ec8845c471 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 11:16:06 +0100 Subject: [PATCH 38/75] v4.4.5-beta.10 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 721593828..cb4644e64 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.9", + "version": "4.4.5-beta.10", "name": "dbgate-all", "workspaces": [ "packages/*", From ffc67572faaa36be7ca233f7e52322ae15d2b762 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 11:37:27 +0100 Subject: [PATCH 39/75] better-sqlite version --- app/package.json | 2 +- app/yarn.lock | 69 ++++++++++++---- fillNativeModules.js | 2 +- packages/api/package.json | 2 +- .../src/backend/driver.js | 4 +- yarn.lock | 81 +++++++++++++++---- 6 files changed, 127 insertions(+), 33 deletions(-) diff --git a/app/package.json b/app/package.json index 0c8dc72fb..6814b1fda 100644 --- a/app/package.json +++ b/app/package.json @@ -5,7 +5,7 @@ "author": "Jan Prochazka ", "description": "Opensource database administration tool", "dependencies": { - "better-sqlite3-with-prebuilds": "7.1.8", + "better-sqlite3": "7.4.5", "electron-log": "^4.4.1", "electron-store": "^8.0.1", "electron-updater": "^4.6.1", diff --git a/app/yarn.lock b/app/yarn.lock index 2a8aaad6e..dab726b6b 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -93,11 +93,6 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/integer@latest": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/integer/-/integer-4.0.1.tgz#022f2c77a899e383e6d3dd374142416c22a5b9df" - integrity sha512-QQojPymFcV1hrvWXA1h0pP9RmFBFNuWikZcUEjjVsS19IyKO+jqOX24lp2ZHF4A21EmkosJhJDX7CLG67F2s7A== - "@types/minimatch@*": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" @@ -327,15 +322,14 @@ base64-js@^1.3.1, base64-js@^1.5.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -better-sqlite3-with-prebuilds@7.1.8: - version "7.1.8" - resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.1.8.tgz#3090c478fe9b60e74ce053a76807b189784f62d7" - integrity sha512-trwg1qhN91cPYEB8D2K0KVHIsMsiAnxKx6/syfQ7rLrtD+zOS3fqJq4VGszMF+OuYAZJNAR4oLsikys3YW/6aA== +better-sqlite3@7.4.5: + version "7.4.5" + resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-7.4.5.tgz#acfc48d786114227f550a0a45e22ace51336e2d0" + integrity sha512-mybC3dgrtJeHkIRGP36tST7wjBlIMgTRAXhhO4bMpPZ17EG23FZxZeFcwKWy6o8mV1SKQFnQNyeAZlQpGrgheQ== dependencies: - "@types/integer" latest bindings "^1.5.0" - prebuild-install "^6.0.1" - tar "^6.1.0" + prebuild-install "^7.0.0" + tar "^6.1.11" bindings@^1.5.0: version "1.5.0" @@ -769,6 +763,13 @@ decompress-response@^4.2.0: dependencies: mimic-response "^2.0.0" +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== + dependencies: + mimic-response "^3.1.0" + deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" @@ -1630,6 +1631,11 @@ mimic-response@^2.0.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== + minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -1714,6 +1720,13 @@ node-abi@^2.21.0: dependencies: semver "^5.4.1" +node-abi@^3.3.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248" + integrity sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw== + dependencies: + semver "^7.3.5" + node-addon-api@^1.6.3: version "1.7.2" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" @@ -1895,7 +1908,7 @@ plist@^3.0.1, plist@^3.0.4: base64-js "^1.5.1" xmlbuilder "^9.0.7" -prebuild-install@^6.0.1, prebuild-install@^6.1.4: +prebuild-install@^6.1.4: version "6.1.4" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== @@ -1914,6 +1927,25 @@ prebuild-install@^6.0.1, prebuild-install@^6.1.4: tar-fs "^2.0.0" tunnel-agent "^0.6.0" +prebuild-install@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.0.tgz#3c5ce3902f1cb9d6de5ae94ca53575e4af0c1574" + integrity sha512-IvSenf33K7JcgddNz2D5w521EgO+4aMMjFt73Uk9FRzQ7P+QZPKrp7qPsDydsSwjGt3T5xRNnM1bj1zMTD5fTA== + dependencies: + detect-libc "^1.0.3" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^3.3.0" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^4.0.0" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" @@ -2175,6 +2207,15 @@ simple-get@^3.0.3: once "^1.3.1" simple-concat "^1.0.0" +simple-get@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.0.tgz#73fa628278d21de83dadd5512d2cc1f4872bd675" + integrity sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ== + dependencies: + decompress-response "^6.0.0" + once "^1.3.1" + simple-concat "^1.0.0" + slash@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" @@ -2315,7 +2356,7 @@ tar-stream@^2.1.4: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^6.1.0: +tar@^6.1.11: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== diff --git a/fillNativeModules.js b/fillNativeModules.js index d51157258..61dea66eb 100644 --- a/fillNativeModules.js +++ b/fillNativeModules.js @@ -5,7 +5,7 @@ let fillContent = ''; if (process.platform == 'win32') { fillContent += `content.msnodesqlv8 = () => require('msnodesqlv8');`; } -fillContent += `content['better-sqlite3-with-prebuilds'] = () => require('better-sqlite3-with-prebuilds');`; +fillContent += `content['better-sqlite3'] = () => require('better-sqlite3');`; const getContent = (empty) => ` // this file is generated automatically by script fillNativeModules.js, do not edit it manually diff --git a/packages/api/package.json b/packages/api/package.json index 961df8a94..c75051f33 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -19,7 +19,7 @@ "dependencies": { "async-lock": "^1.2.4", "axios": "^0.21.1", - "better-sqlite3-with-prebuilds": "7.1.8", + "better-sqlite3": "7.4.5", "body-parser": "^1.19.0", "bufferutil": "^4.0.1", "byline": "^5.0.0", diff --git a/plugins/dbgate-plugin-sqlite/src/backend/driver.js b/plugins/dbgate-plugin-sqlite/src/backend/driver.js index e6a8cf215..caef44714 100644 --- a/plugins/dbgate-plugin-sqlite/src/backend/driver.js +++ b/plugins/dbgate-plugin-sqlite/src/backend/driver.js @@ -175,8 +175,8 @@ const driver = { }; driver.initialize = (dbgateEnv) => { - if (dbgateEnv.nativeModules && dbgateEnv.nativeModules['better-sqlite3-with-prebuilds']) { - Database = dbgateEnv.nativeModules['better-sqlite3-with-prebuilds'](); + if (dbgateEnv.nativeModules && dbgateEnv.nativeModules['better-sqlite3']) { + Database = dbgateEnv.nativeModules['better-sqlite3'](); } }; diff --git a/yarn.lock b/yarn.lock index 060cb8b90..5419f3fd8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1125,11 +1125,6 @@ dependencies: "@types/node" "*" -"@types/integer@latest": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/integer/-/integer-4.0.1.tgz#022f2c77a899e383e6d3dd374142416c22a5b9df" - integrity sha512-QQojPymFcV1hrvWXA1h0pP9RmFBFNuWikZcUEjjVsS19IyKO+jqOX24lp2ZHF4A21EmkosJhJDX7CLG67F2s7A== - "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" @@ -2061,15 +2056,14 @@ better-assert@~1.0.0: dependencies: callsite "1.0.0" -better-sqlite3-with-prebuilds@7.1.8: - version "7.1.8" - resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.1.8.tgz#3090c478fe9b60e74ce053a76807b189784f62d7" - integrity sha512-trwg1qhN91cPYEB8D2K0KVHIsMsiAnxKx6/syfQ7rLrtD+zOS3fqJq4VGszMF+OuYAZJNAR4oLsikys3YW/6aA== +better-sqlite3@7.4.5: + version "7.4.5" + resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-7.4.5.tgz#acfc48d786114227f550a0a45e22ace51336e2d0" + integrity sha512-mybC3dgrtJeHkIRGP36tST7wjBlIMgTRAXhhO4bMpPZ17EG23FZxZeFcwKWy6o8mV1SKQFnQNyeAZlQpGrgheQ== dependencies: - "@types/integer" latest bindings "^1.5.0" - prebuild-install "^6.0.1" - tar "^6.1.0" + prebuild-install "^7.0.0" + tar "^6.1.11" big.js@^5.2.2: version "5.2.2" @@ -3265,6 +3259,13 @@ decompress-response@^4.2.0: dependencies: mimic-response "^2.0.0" +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== + dependencies: + mimic-response "^3.1.0" + dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" @@ -7138,6 +7139,11 @@ mimic-response@^2.0.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== + min-indent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.0.tgz#cfc45c37e9ec0d8f0a0ec3dd4ef7f7c3abe39256" @@ -7509,6 +7515,13 @@ node-abi@^2.7.0: dependencies: semver "^5.4.1" +node-abi@^3.3.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248" + integrity sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw== + dependencies: + semver "^7.3.5" + node-cron@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/node-cron/-/node-cron-2.0.3.tgz#b9649784d0d6c00758410eef22fa54a10e3f602d" @@ -8402,7 +8415,7 @@ prebuild-install@6.0.1: tunnel-agent "^0.6.0" which-pm-runs "^1.0.0" -prebuild-install@^6.0.1, prebuild-install@^6.1.4: +prebuild-install@^6.1.4: version "6.1.4" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== @@ -8421,6 +8434,25 @@ prebuild-install@^6.0.1, prebuild-install@^6.1.4: tar-fs "^2.0.0" tunnel-agent "^0.6.0" +prebuild-install@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.0.tgz#3c5ce3902f1cb9d6de5ae94ca53575e4af0c1574" + integrity sha512-IvSenf33K7JcgddNz2D5w521EgO+4aMMjFt73Uk9FRzQ7P+QZPKrp7qPsDydsSwjGt3T5xRNnM1bj1zMTD5fTA== + dependencies: + detect-libc "^1.0.3" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^3.3.0" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^4.0.0" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -9284,7 +9316,7 @@ semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.1.1, semver@^7.3.2, semver@^7.3.4: +semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== @@ -9430,6 +9462,15 @@ simple-get@^3.0.3: once "^1.3.1" simple-concat "^1.0.0" +simple-get@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.0.tgz#73fa628278d21de83dadd5512d2cc1f4872bd675" + integrity sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ== + dependencies: + decompress-response "^6.0.0" + once "^1.3.1" + simple-concat "^1.0.0" + sirv-cli@^1.0.0: version "1.0.11" resolved "https://registry.yarnpkg.com/sirv-cli/-/sirv-cli-1.0.11.tgz#a3f4bed53b7c09306ed7f16ebea6e1e7be676c74" @@ -10195,6 +10236,18 @@ tar@^6.0.5: mkdirp "^1.0.3" yallist "^4.0.0" +tar@^6.1.11: + version "6.1.11" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + task-graph-runner@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/task-graph-runner/-/task-graph-runner-1.0.3.tgz#73b2cd380cef6f51b8179b0d1da4bb7c356b03bf" From cc02540c5f503faa26abb83ada0426e97fc85db9 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 11:37:50 +0100 Subject: [PATCH 40/75] v4.4.5-beta.11 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cb4644e64..9b83bbc43 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.10", + "version": "4.4.5-beta.11", "name": "dbgate-all", "workspaces": [ "packages/*", From 9d54a8233097b7f4732e3cabe1907e3d1f2f3dfd Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 11:50:09 +0100 Subject: [PATCH 41/75] better-sqlite3 moved to optional dependencies --- app/package.json | 2 +- packages/api/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index 6814b1fda..97a32638c 100644 --- a/app/package.json +++ b/app/package.json @@ -5,7 +5,6 @@ "author": "Jan Prochazka ", "description": "Opensource database administration tool", "dependencies": { - "better-sqlite3": "7.4.5", "electron-log": "^4.4.1", "electron-store": "^8.0.1", "electron-updater": "^4.6.1", @@ -107,6 +106,7 @@ "electron-builder": "22.14.5" }, "optionalDependencies": { + "better-sqlite3": "7.4.5", "msnodesqlv8": "^2.4.4" } } diff --git a/packages/api/package.json b/packages/api/package.json index c75051f33..0cb342670 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -19,7 +19,6 @@ "dependencies": { "async-lock": "^1.2.4", "axios": "^0.21.1", - "better-sqlite3": "7.4.5", "body-parser": "^1.19.0", "bufferutil": "^4.0.1", "byline": "^5.0.0", @@ -74,6 +73,7 @@ "webpack-cli": "^3.3.11" }, "optionalDependencies": { + "better-sqlite3": "7.4.5", "msnodesqlv8": "^2.4.4" } } From 3ffe2090e50b8bf4c6d646cfecfef2555ffd1b37 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 11:50:29 +0100 Subject: [PATCH 42/75] v4.4.5-beta.12 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9b83bbc43..c2ef96e20 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.11", + "version": "4.4.5-beta.12", "name": "dbgate-all", "workspaces": [ "packages/*", From 266d7d76de36bef654fad410529a567f6c26b5a9 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 12:59:59 +0100 Subject: [PATCH 43/75] try to fix pl;ugin directories --- app/src/electron.js | 11 ++++++++++- packages/api/src/controllers/connections.js | 1 + packages/api/src/controllers/databaseConnections.js | 1 + packages/api/src/controllers/serverConnections.js | 1 + packages/api/src/controllers/sessions.js | 1 + packages/api/src/utility/DatastoreProxy.js | 1 + packages/api/src/utility/directories.js | 10 ++++++++++ packages/api/src/utility/platformInfo.js | 6 +++--- packages/api/src/utility/processArgs.js | 6 ++---- 9 files changed, 30 insertions(+), 8 deletions(-) diff --git a/app/src/electron.js b/app/src/electron.js index 751f5157d..dd95a09fe 100644 --- a/app/src/electron.js +++ b/app/src/electron.js @@ -207,11 +207,20 @@ function createWindow() { } } - global.API_PACKAGE = process.env.DEVMODE ? '../packages/api/src/index' : '../packages/api/dist/bundle.js'; + global.API_PACKAGE = path.resolve( + process.env.DEVMODE ? '../packages/api/src/index' : './packages/api/dist/bundle.js' + ); + // console.log('global.API_PACKAGE', global.API_PACKAGE); const api = require(path.join( __dirname, process.env.DEVMODE ? '../../packages/api/src/index' : '../packages/api/dist/bundle.js' )); + // console.log( + // 'REQUIRED', + // path.resolve( + // path.join(__dirname, process.env.DEVMODE ? '../../packages/api/src/index' : '../packages/api/dist/bundle.js') + // ) + // ); const main = api.getMainModule(); main.initializeElectronSender(mainWindow.webContents); main.useAllControllers(null, electron); diff --git a/packages/api/src/controllers/connections.js b/packages/api/src/controllers/connections.js index 3c12816eb..6e308bd7a 100644 --- a/packages/api/src/controllers/connections.js +++ b/packages/api/src/controllers/connections.js @@ -137,6 +137,7 @@ module.exports = { }, test(req, res) { const subprocess = fork(global['API_PACKAGE'] || process.argv[1], [ + '--is-forked-api', '--start-process', 'connectProcess', ...process.argv.slice(3), diff --git a/packages/api/src/controllers/databaseConnections.js b/packages/api/src/controllers/databaseConnections.js index fc11aa9cf..bc9c486a7 100644 --- a/packages/api/src/controllers/databaseConnections.js +++ b/packages/api/src/controllers/databaseConnections.js @@ -75,6 +75,7 @@ module.exports = { if (existing) return existing; const connection = await connections.get({ conid }); const subprocess = fork(global['API_PACKAGE'] || process.argv[1], [ + '--is-forked-api', '--start-process', 'databaseConnectionProcess', ...process.argv.slice(3), diff --git a/packages/api/src/controllers/serverConnections.js b/packages/api/src/controllers/serverConnections.js index 1dd7527cd..65a2f4f3c 100644 --- a/packages/api/src/controllers/serverConnections.js +++ b/packages/api/src/controllers/serverConnections.js @@ -38,6 +38,7 @@ module.exports = { if (existing) return existing; const connection = await connections.get({ conid }); const subprocess = fork(global['API_PACKAGE'] || process.argv[1], [ + '--is-forked-api', '--start-process', 'serverConnectionProcess', ...process.argv.slice(3), diff --git a/packages/api/src/controllers/sessions.js b/packages/api/src/controllers/sessions.js index 5fe1bf29b..b3ed69f3c 100644 --- a/packages/api/src/controllers/sessions.js +++ b/packages/api/src/controllers/sessions.js @@ -66,6 +66,7 @@ module.exports = { const sesid = uuidv1(); const connection = await connections.get({ conid }); const subprocess = fork(global['API_PACKAGE'] || process.argv[1], [ + '--is-forked-api', '--start-process', 'sessionProcess', ...process.argv.slice(3), diff --git a/packages/api/src/utility/DatastoreProxy.js b/packages/api/src/utility/DatastoreProxy.js index dcda45405..0967c829e 100644 --- a/packages/api/src/utility/DatastoreProxy.js +++ b/packages/api/src/utility/DatastoreProxy.js @@ -30,6 +30,7 @@ class DatastoreProxy { async ensureSubprocess() { if (!this.subprocess) { this.subprocess = fork(global['API_PACKAGE'] || process.argv[1], [ + '--is-forked-api', '--start-process', 'jslDatastoreProcess', ...process.argv.slice(3), diff --git a/packages/api/src/utility/directories.js b/packages/api/src/utility/directories.js index 0dd2948a1..9af898e1e 100644 --- a/packages/api/src/utility/directories.js +++ b/packages/api/src/utility/directories.js @@ -41,6 +41,10 @@ const archivedir = dirFunc('archive'); const filesdir = dirFunc('files'); function packagedPluginsDir() { + // console.log('CALL DIR FROM', new Error('xxx').stack); + // console.log('__dirname', __dirname); + // console.log('platformInfo.isElectronBundle', platformInfo.isElectronBundle); + // console.log('platformInfo.isForkedApi', platformInfo.isForkedApi); if (platformInfo.isDevMode) { return path.resolve(__dirname, '../../../../plugins'); } @@ -53,6 +57,12 @@ function packagedPluginsDir() { } if (platformInfo.isElectronBundle) { return path.resolve(__dirname, '../../plugins'); + + // if (platformInfo.isForkedApi) { + // return path.resolve(__dirname, '../plugins'); + // } else { + // return path.resolve(__dirname, '../../plugins'); + // } } return null; } diff --git a/packages/api/src/utility/platformInfo.js b/packages/api/src/utility/platformInfo.js index e50f00f9c..237584f28 100644 --- a/packages/api/src/utility/platformInfo.js +++ b/packages/api/src/utility/platformInfo.js @@ -11,6 +11,7 @@ const isLinux = platform === 'linux'; const isDocker = fs.existsSync('/home/dbgate-docker/public'); const isDevMode = process.env.DEVMODE == '1'; const isNpmDist = !!global['dbgateApiModulePath']; +const isForkedApi = processArgs.isForkedApi; // function moduleAvailable(name) { // try { @@ -21,14 +22,13 @@ const isNpmDist = !!global['dbgateApiModulePath']; // } // } -const isElectronBundle = processArgs.isElectronBundle; - const platformInfo = { isWindows, isMac, isLinux, isDocker, - isElectronBundle, + isElectronBundle: isElectron() && !isDevMode, + isForkedApi, isElectron: isElectron(), isDevMode, isNpmDist, diff --git a/packages/api/src/utility/processArgs.js b/packages/api/src/utility/processArgs.js index e93fb0b4e..3b1bfd92d 100644 --- a/packages/api/src/utility/processArgs.js +++ b/packages/api/src/utility/processArgs.js @@ -7,15 +7,13 @@ function getNamedArg(name) { } const checkParent = process.argv.includes('--checkParent'); -const dynport = process.argv.includes('--dynport'); const nativeModules = getNamedArg('--native-modules'); const startProcess = getNamedArg('--start-process'); -const isElectronBundle = process.argv.includes('--is-electron-bundle'); +const isForkedApi = process.argv.includes('--is-forked-api'); module.exports = { checkParent, nativeModules, startProcess, - dynport, - isElectronBundle, + isForkedApi, }; From 8358026a2fc7a27051daea95f95a910f5b2699f4 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 13:00:12 +0100 Subject: [PATCH 44/75] v4.4.5-beta.13 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c2ef96e20..c27599f97 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.12", + "version": "4.4.5-beta.13", "name": "dbgate-all", "workspaces": [ "packages/*", From 72c121a5c15dbe2516cb62827f016ca19d663f21 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 13:26:03 +0100 Subject: [PATCH 45/75] directories fix --- app/src/electron.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/electron.js b/app/src/electron.js index dd95a09fe..ad5d85dfa 100644 --- a/app/src/electron.js +++ b/app/src/electron.js @@ -207,14 +207,15 @@ function createWindow() { } } - global.API_PACKAGE = path.resolve( - process.env.DEVMODE ? '../packages/api/src/index' : './packages/api/dist/bundle.js' - ); - // console.log('global.API_PACKAGE', global.API_PACKAGE); - const api = require(path.join( + const apiPackage = path.join( __dirname, process.env.DEVMODE ? '../../packages/api/src/index' : '../packages/api/dist/bundle.js' - )); + ); + + global.API_PACKAGE = apiPackage; + + // console.log('global.API_PACKAGE', global.API_PACKAGE); + const api = require(apiPackage); // console.log( // 'REQUIRED', // path.resolve( From 576987ad8cec98d59f1aa9a48baccb7b97de55e9 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 13:26:16 +0100 Subject: [PATCH 46/75] v4.4.5-beta.14 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c27599f97..b34650ce5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.13", + "version": "4.4.5-beta.14", "name": "dbgate-all", "workspaces": [ "packages/*", From 22295ceef21c1be1ae86e3dad61271ca1dc649ab Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 13:37:00 +0100 Subject: [PATCH 47/75] code cleanup --- packages/api/src/main.js | 15 ++++----------- packages/web/src/utility/getElectron.ts | 4 ---- packages/web/src/utility/resolveApi.ts | 11 ----------- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/packages/api/src/main.js b/packages/api/src/main.js index 71fb2cfb6..8d352418f 100644 --- a/packages/api/src/main.js +++ b/packages/api/src/main.js @@ -4,11 +4,8 @@ const bodyParser = require('body-parser'); const fileUpload = require('express-fileupload'); const http = require('http'); const cors = require('cors'); -const fs = require('fs'); const getPort = require('get-port'); -const childProcessChecker = require('./utility/childProcessChecker'); const path = require('path'); -const crypto = require('crypto'); const useController = require('./utility/useController'); const socket = require('./utility/socket'); @@ -30,10 +27,7 @@ const queryHistory = require('./controllers/queryHistory'); const { rundir } = require('./utility/directories'); const platformInfo = require('./utility/platformInfo'); -const processArgs = require('./utility/processArgs'); -const timingSafeCheckToken = require('./utility/timingSafeCheckToken'); -let authorization = null; let checkLocalhostOrigin = null; function start() { @@ -56,9 +50,6 @@ function start() { } app.use(function (req, res, next) { - if (authorization && !timingSafeCheckToken(req.headers.authorization, authorization)) { - return res.status(403).json({ error: 'Not authorized!' }); - } if (checkLocalhostOrigin) { if ( req.headers.origin && @@ -121,7 +112,7 @@ function start() { } } -if (platformInfo.isNpmDist) { + if (platformInfo.isNpmDist) { app.use(express.static(path.join(__dirname, '../../dbgate-web/public'))); getPort({ port: 5000 }).then(port => { server.listen(port, () => { @@ -129,7 +120,9 @@ if (platformInfo.isNpmDist) { }); }); } else { - server.listen(process.env.PORT || 3000); + const port = process.env.PORT || 3000; + console.log('DbGate API listening on port', port); + server.listen(port); } } diff --git a/packages/web/src/utility/getElectron.ts b/packages/web/src/utility/getElectron.ts index c847a3891..23e6fe9ad 100644 --- a/packages/web/src/utility/getElectron.ts +++ b/packages/web/src/utility/getElectron.ts @@ -1,11 +1,7 @@ class ElectronApi { - // public port?: number; - // public authorization?: string; private ipcRenderer = getIpcRenderer(); constructor() { - // this.port = args.port; - // this.authorization = args.authorization; } send(msg, args = null) { diff --git a/packages/web/src/utility/resolveApi.ts b/packages/web/src/utility/resolveApi.ts index afc06a485..6ad8ed302 100644 --- a/packages/web/src/utility/resolveApi.ts +++ b/packages/web/src/utility/resolveApi.ts @@ -6,11 +6,6 @@ try { } catch {} export default function resolveApi() { - const electron = getElectron(); - if (electron?.port) { - return `http://localhost:${electron.port}`; - } - if (apiUrl) { return apiUrl; } @@ -20,11 +15,5 @@ export default function resolveApi() { export function resolveApiHeaders() { const electron = getElectron(); - if (electron?.authorization) { - return { - Authorization: electron.authorization, - }; - } - return {}; } From c22a6b48f1af41a0835c806427a466f1fb064a7b Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 13:49:18 +0100 Subject: [PATCH 48/75] fix --- packages/api/src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/src/index.js b/packages/api/src/index.js index 9da36f975..21ce5f68d 100644 --- a/packages/api/src/index.js +++ b/packages/api/src/index.js @@ -8,7 +8,7 @@ if (processArgs.startProcess) { const proc = require('./proc'); const module = proc[processArgs.startProcess]; module.start(); -} else if (!module['parent'] && !processArgs.checkParent) { +} else if (!processArgs.checkParent && !global['API_PACKAGE'] && !global['dbgateApiModulePath']) { const main = require('./main'); main.start(); From 991b2fd3c1be3a3a7e3d338a464ffac0af90b23a Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 14:00:37 +0100 Subject: [PATCH 49/75] fix --- packages/web/src/query/RunnerOutputFiles.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/src/query/RunnerOutputFiles.svelte b/packages/web/src/query/RunnerOutputFiles.svelte index 8b5f1e21b..c8435b6be 100644 --- a/packages/web/src/query/RunnerOutputFiles.svelte +++ b/packages/web/src/query/RunnerOutputFiles.svelte @@ -1,7 +1,7 @@ diff --git a/packages/web/src/utility/api.ts b/packages/web/src/utility/api.ts index 8c1d6cb04..f1fabec18 100644 --- a/packages/web/src/utility/api.ts +++ b/packages/web/src/utility/api.ts @@ -17,6 +17,7 @@ function wantEventSource() { export async function apiCall(route: string, args: {} = undefined) { const electron = getElectron(); if (electron) { + // console.log('CALLING API', route.replace('/', '-'), JSON.stringify(args == null ? null : args)); const resp = await electron.invoke(route.replace('/', '-'), args); return resp; } else { From 94553504a7c12e5874a3720fb415c1bfda157aef Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 14:17:02 +0100 Subject: [PATCH 51/75] v4.4.5-beta.15 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b34650ce5..4a916e607 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.14", + "version": "4.4.5-beta.15", "name": "dbgate-all", "workspaces": [ "packages/*", From 11f6b82b729550dc6e237ff05d7b4a22f67a89c3 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 14:25:03 +0100 Subject: [PATCH 52/75] handler error when loading electron store --- app/src/electron.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/electron.js b/app/src/electron.js index ad5d85dfa..872342e5a 100644 --- a/app/src/electron.js +++ b/app/src/electron.js @@ -168,7 +168,12 @@ ipcMain.handle('openExternal', async (event, url) => { }); function createWindow() { - const bounds = store.get('winBounds'); + let bounds = null; + try { + bounds = store.get('winBounds'); + } catch (err) { + console.log('Error loading bounds from electron store', err.message); + } mainWindow = new BrowserWindow({ width: 1200, @@ -182,8 +187,12 @@ function createWindow() { }, }); - if (store.get('winIsMaximized')) { - mainWindow.maximize(); + try { + if (store.get('winIsMaximized')) { + mainWindow.maximize(); + } + } catch (err) { + console.log('Error loading maximized flag from electron store', err.message); } mainMenu = buildMenu(); From 1fcd13e9ffa9350c15e6e79f9115da93c2f96365 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 14:25:17 +0100 Subject: [PATCH 53/75] v4.4.5-beta.16 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4a916e607..4dab11b56 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.15", + "version": "4.4.5-beta.16", "name": "dbgate-all", "workspaces": [ "packages/*", From b323f9c3225b416aeaa6291e5f01c0a4503a16cd Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 14:43:05 +0100 Subject: [PATCH 54/75] upgraded electron --- app/package.json | 2 +- app/yarn.lock | 12 ++++++------ packages/api/src/proc/databaseConnectionProcess.js | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/package.json b/app/package.json index 97a32638c..eef6b4449 100644 --- a/app/package.json +++ b/app/package.json @@ -102,7 +102,7 @@ "devDependencies": { "copyfiles": "^2.2.0", "cross-env": "^6.0.3", - "electron": "12.1.0", + "electron": "15.3.4", "electron-builder": "22.14.5" }, "optionalDependencies": { diff --git a/app/yarn.lock b/app/yarn.lock index dab726b6b..1ae2c853c 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -15,7 +15,7 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" -"@electron/get@^1.0.1": +"@electron/get@^1.13.0": version "1.13.1" resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368" integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA== @@ -951,12 +951,12 @@ electron-updater@^4.6.1: lodash.isequal "^4.5.0" semver "^7.3.5" -electron@12.1.0: - version "12.1.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-12.1.0.tgz#615a7f9dbb2fc79cc72361fba9f39d005c697bca" - integrity sha512-joQlYI/nTIrTUldO3GENZ2j225eKar9nTQBSEwSUSWN4h65QGDmXNQ7dbWPmLlkUQWtHhz8lXhFk30OLG9ZjLw== +electron@15.3.4: + version "15.3.4" + resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.4.tgz#811e8872f4500b88ad49e005cbe8f93e10676f6d" + integrity sha512-GLTE+UEKw1pJehkgpLgXtsHhYqSPp6skSNY1bxnY3dDYBrsPlP3nTEO9YQY2p4eHk+uxFVTXOVy5afcu9fIZ9A== dependencies: - "@electron/get" "^1.0.1" + "@electron/get" "^1.13.0" "@types/node" "^14.6.2" extract-zip "^1.0.3" diff --git a/packages/api/src/proc/databaseConnectionProcess.js b/packages/api/src/proc/databaseConnectionProcess.js index 0f7477c9c..a9f1422a8 100644 --- a/packages/api/src/proc/databaseConnectionProcess.js +++ b/packages/api/src/proc/databaseConnectionProcess.js @@ -270,6 +270,7 @@ function start() { try { await handleMessage(message); } catch (e) { + console.error('Error in DB connection', e); process.send({ msgtype: 'error', error: e.message }); } }); From e5993136ab2e39a991da32ef5648a3c5776f5f69 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 14:43:22 +0100 Subject: [PATCH 55/75] v4.4.5-beta.17 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4dab11b56..350c71165 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.16", + "version": "4.4.5-beta.17", "name": "dbgate-all", "workspaces": [ "packages/*", From 473f1b0e54bdf489ce86a3aa25ef96afd409ab91 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 16:03:23 +0100 Subject: [PATCH 56/75] removed electron-store package --- app/package.json | 1 - app/src/electron.js | 39 ++++++------ app/yarn.lock | 145 +------------------------------------------- 3 files changed, 22 insertions(+), 163 deletions(-) diff --git a/app/package.json b/app/package.json index eef6b4449..e61a58579 100644 --- a/app/package.json +++ b/app/package.json @@ -6,7 +6,6 @@ "description": "Opensource database administration tool", "dependencies": { "electron-log": "^4.4.1", - "electron-store": "^8.0.1", "electron-updater": "^4.6.1", "patch-package": "^6.4.7" }, diff --git a/app/src/electron.js b/app/src/electron.js index 872342e5a..400e556f7 100644 --- a/app/src/electron.js +++ b/app/src/electron.js @@ -1,9 +1,8 @@ const electron = require('electron'); const os = require('os'); +const fs = require('fs'); const { Menu, ipcMain } = require('electron'); -const { fork } = require('child_process'); const { autoUpdater } = require('electron-updater'); -const Store = require('electron-store'); const log = require('electron-log'); // Module to control application life. @@ -16,7 +15,15 @@ const url = require('url'); // require('@electron/remote/main').initialize(); -const store = new Store(); +const configRootPath = path.join(app.getPath('userData'), 'config-root.json'); +let initialConfig = {}; + +try { + initialConfig = JSON.parse(fs.readFileSync(configRootPath, { encoding: 'utf-8' })); +} catch (err) { + console.log('Error loading config-root:', err.message); + initialConfig = {}; +} // Keep a global reference of the window object, if you don't, the window will // be closed automatically when the JavaScript object is garbage collected. @@ -168,13 +175,7 @@ ipcMain.handle('openExternal', async (event, url) => { }); function createWindow() { - let bounds = null; - try { - bounds = store.get('winBounds'); - } catch (err) { - console.log('Error loading bounds from electron store', err.message); - } - + const bounds = initialConfig['winBounds']; mainWindow = new BrowserWindow({ width: 1200, height: 800, @@ -187,12 +188,8 @@ function createWindow() { }, }); - try { - if (store.get('winIsMaximized')) { - mainWindow.maximize(); - } - } catch (err) { - console.log('Error loading maximized flag from electron store', err.message); + if (initialConfig['winIsMaximized']) { + mainWindow.maximize(); } mainMenu = buildMenu(); @@ -207,8 +204,14 @@ function createWindow() { slashes: true, }); mainWindow.on('close', () => { - store.set('winBounds', mainWindow.getBounds()); - store.set('winIsMaximized', mainWindow.isMaximized()); + fs.writeFileSync( + configRootPath, + JSON.stringify({ + winBounds: mainWindow.getBounds(), + winIsMaximized: mainWindow.isMaximized(), + }), + 'utf-8' + ); }); mainWindow.loadURL(startUrl); if (os.platform() == 'linux') { diff --git a/app/yarn.lock b/app/yarn.lock index 1ae2c853c..3d583ab16 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -148,13 +148,6 @@ resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== -ajv-formats@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" - integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== - dependencies: - ajv "^8.0.0" - ajv-keywords@^3.4.1: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" @@ -170,16 +163,6 @@ ajv@^6.10.0, ajv@^6.12.0: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.6.3: - version "8.8.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb" - integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - ansi-align@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" @@ -307,11 +290,6 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -atomically@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/atomically/-/atomically-1.7.0.tgz#c07a0458432ea6dbc9a3506fffa424b48bccaafe" - integrity sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w== - balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -625,22 +603,6 @@ concat-stream@^1.6.2: readable-stream "^2.2.2" typedarray "^0.0.6" -conf@^10.0.3: - version "10.1.1" - resolved "https://registry.yarnpkg.com/conf/-/conf-10.1.1.tgz#ff08046d5aeeee0eaff55d57f5b4319193c3dfda" - integrity sha512-z2civwq/k8TMYtcn3SVP0Peso4otIWnHtcTuHhQ0zDZDdP4NTxqEc8owfkz4zBsdMYdn/LFcE+ZhbCeqkhtq3Q== - dependencies: - ajv "^8.6.3" - ajv-formats "^2.1.1" - atomically "^1.7.0" - debounce-fn "^4.0.0" - dot-prop "^6.0.1" - env-paths "^2.2.1" - json-schema-typed "^7.0.3" - onetime "^5.1.2" - pkg-up "^3.1.0" - semver "^7.3.5" - config-chain@^1.1.11: version "1.1.13" resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" @@ -728,13 +690,6 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -debounce-fn@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-4.0.0.tgz#ed76d206d8a50e60de0dd66d494d82835ffe61c7" - integrity sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ== - dependencies: - mimic-fn "^3.0.0" - debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -852,13 +807,6 @@ dot-prop@^5.2.0: dependencies: is-obj "^2.0.0" -dot-prop@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083" - integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA== - dependencies: - is-obj "^2.0.0" - dotenv-expand@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" @@ -929,14 +877,6 @@ electron-publish@22.14.5: lazy-val "^1.0.5" mime "^2.5.2" -electron-store@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-8.0.1.tgz#9b598c1d2edeffebee9d8c1cd957ad368c528925" - integrity sha512-ZyLvNywiqSpbwC/pp89O/AycVWY/UJIkmtyzF2Bd0Nm/rLmcFc0NTGuLdg6+LE8mS8qsiK5JMoe4PnrecLHH5w== - dependencies: - conf "^10.0.3" - type-fest "^1.0.2" - electron-updater@^4.6.1: version "4.6.1" resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.1.tgz#80ca805c4f51b2e682aac29d18fed75d6a533d32" @@ -977,7 +917,7 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -env-paths@^2.2.0, env-paths@^2.2.1: +env-paths@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== @@ -1063,13 +1003,6 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== - dependencies: - locate-path "^3.0.0" - find-yarn-workspace-root@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd" @@ -1468,16 +1401,6 @@ json-schema-traverse@^0.4.1: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - -json-schema-typed@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.3.tgz#23ff481b8b4eebcd2ca123b4fa0409e66469a2d9" - integrity sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A== - json-stringify-safe@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" @@ -1532,14 +1455,6 @@ lazy-val@^1.0.4, lazy-val@^1.0.5: resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - lodash.escaperegexp@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347" @@ -1611,16 +1526,6 @@ mime@^2.5.2: resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mimic-fn@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74" - integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ== - mimic-response@^1.0.0, mimic-response@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" @@ -1785,13 +1690,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - open@^7.4.2: version "7.4.2" resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" @@ -1810,25 +1708,6 @@ p-cancelable@^1.0.0: resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== -p-limit@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== - dependencies: - p-limit "^2.0.0" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - package-json@^6.3.0: version "6.5.0" resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" @@ -1858,11 +1737,6 @@ patch-package@^6.4.7: slash "^2.0.0" tmp "^0.0.33" -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= - path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -1893,13 +1767,6 @@ pify@^3.0.0: resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= -pkg-up@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" - integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== - dependencies: - find-up "^3.0.0" - plist@^3.0.1, plist@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe" @@ -2058,11 +1925,6 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -2446,11 +2308,6 @@ type-fest@^0.20.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== -type-fest@^1.0.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" - integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== - typedarray-to-buffer@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" From 0ff59e626e9b0dbfddac12852a463a013f92af40 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 16:03:36 +0100 Subject: [PATCH 57/75] v4.4.5-beta.18 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 350c71165..6df1cf62a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.17", + "version": "4.4.5-beta.18", "name": "dbgate-all", "workspaces": [ "packages/*", From 7126eec4f01dde27ffe32e857661ab37694a2fa0 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 20:54:51 +0100 Subject: [PATCH 58/75] pass ntive modules fix --- app/src/electron.js | 1 + packages/api/src/controllers/connections.js | 5 +++- .../src/controllers/databaseConnections.js | 4 ++- packages/api/src/controllers/runners.js | 26 ++++++++++++------- .../api/src/controllers/serverConnections.js | 4 ++- packages/api/src/controllers/sessions.js | 4 ++- packages/api/src/nativeModules.js | 12 +++++++-- packages/api/src/utility/DatastoreProxy.js | 4 ++- packages/api/src/utility/processArgs.js | 8 ++++-- 9 files changed, 50 insertions(+), 18 deletions(-) diff --git a/app/src/electron.js b/app/src/electron.js index 400e556f7..c9563cc6a 100644 --- a/app/src/electron.js +++ b/app/src/electron.js @@ -225,6 +225,7 @@ function createWindow() { ); global.API_PACKAGE = apiPackage; + global.NATIVE_MODULES = path.join(__dirname, 'nativeModules'); // console.log('global.API_PACKAGE', global.API_PACKAGE); const api = require(apiPackage); diff --git a/packages/api/src/controllers/connections.js b/packages/api/src/controllers/connections.js index 6e308bd7a..33456297c 100644 --- a/packages/api/src/controllers/connections.js +++ b/packages/api/src/controllers/connections.js @@ -9,6 +9,8 @@ const socket = require('../utility/socket'); const { encryptConnection } = require('../utility/crypting'); const { handleProcessCommunication } = require('../utility/processComm'); +const processArgs = require('../utility/processArgs'); + function getNamedArgs() { const res = {}; for (let i = 0; i < process.argv.length; i++) { @@ -140,7 +142,8 @@ module.exports = { '--is-forked-api', '--start-process', 'connectProcess', - ...process.argv.slice(3), + ...processArgs.getPassArgs(), + // ...process.argv.slice(3), ]); subprocess.on('message', resp => { if (handleProcessCommunication(resp, subprocess)) return; diff --git a/packages/api/src/controllers/databaseConnections.js b/packages/api/src/controllers/databaseConnections.js index bc9c486a7..9fb8b8ece 100644 --- a/packages/api/src/controllers/databaseConnections.js +++ b/packages/api/src/controllers/databaseConnections.js @@ -25,6 +25,7 @@ const requireEngineDriver = require('../utility/requireEngineDriver'); const generateDeploySql = require('../shell/generateDeploySql'); const { createTwoFilesPatch } = require('diff'); const diff2htmlPage = require('../utility/diff2htmlPage'); +const processArgs = require('../utility/processArgs'); module.exports = { /** @type {import('dbgate-types').OpenedDatabaseConnection[]} */ @@ -78,7 +79,8 @@ module.exports = { '--is-forked-api', '--start-process', 'databaseConnectionProcess', - ...process.argv.slice(3), + ...processArgs.getPassArgs(), + // ...process.argv.slice(3), ]); const lastClosed = this.closed[`${conid}/${database}`]; const newOpened = { diff --git a/packages/api/src/controllers/runners.js b/packages/api/src/controllers/runners.js index f1de4247d..a14bf9f39 100644 --- a/packages/api/src/controllers/runners.js +++ b/packages/api/src/controllers/runners.js @@ -8,6 +8,7 @@ const { fork } = require('child_process'); const { rundir, uploadsdir, pluginsdir, getPluginBackendPath, packagedPluginList } = require('../utility/directories'); const { extractShellApiPlugins, extractShellApiFunctionName } = require('dbgate-tools'); const { handleProcessCommunication } = require('../utility/processComm'); +const processArgs = require('../utility/processArgs'); function extractPlugins(script) { const requireRegex = /\s*\/\/\s*@require\s+([^\s]+)\s*\n/g; @@ -98,15 +99,22 @@ module.exports = { const pluginNames = _.union(fs.readdirSync(pluginsdir()), packagedPluginList); console.log(`RUNNING SCRIPT ${scriptFile}`); // const subprocess = fork(scriptFile, ['--checkParent', '--max-old-space-size=8192'], { - const subprocess = fork(scriptFile, ['--checkParent', ...process.argv.slice(3)], { - cwd: directory, - stdio: ['ignore', 'pipe', 'pipe', 'ipc'], - env: { - ...process.env, - DBGATE_API: global['API_PACKAGE'] || global['dbgateApiModulePath'] || process.argv[1], - ..._.fromPairs(pluginNames.map(name => [`PLUGIN_${_.camelCase(name)}`, getPluginBackendPath(name)])), - }, - }); + const subprocess = fork( + scriptFile, + [ + '--checkParent', // ...process.argv.slice(3) + ...processArgs.getPassArgs(), + ], + { + cwd: directory, + stdio: ['ignore', 'pipe', 'pipe', 'ipc'], + env: { + ...process.env, + DBGATE_API: global['API_PACKAGE'] || global['dbgateApiModulePath'] || process.argv[1], + ..._.fromPairs(pluginNames.map(name => [`PLUGIN_${_.camelCase(name)}`, getPluginBackendPath(name)])), + }, + } + ); const pipeDispatcher = severity => data => this.dispatchMessage(runid, { severity, message: data.toString().trim() }); diff --git a/packages/api/src/controllers/serverConnections.js b/packages/api/src/controllers/serverConnections.js index 65a2f4f3c..47f7de291 100644 --- a/packages/api/src/controllers/serverConnections.js +++ b/packages/api/src/controllers/serverConnections.js @@ -6,6 +6,7 @@ const AsyncLock = require('async-lock'); const { handleProcessCommunication } = require('../utility/processComm'); const lock = new AsyncLock(); const config = require('./config'); +const processArgs = require('../utility/processArgs'); module.exports = { opened: [], @@ -41,7 +42,8 @@ module.exports = { '--is-forked-api', '--start-process', 'serverConnectionProcess', - ...process.argv.slice(3), + ...processArgs.getPassArgs(), + // ...process.argv.slice(3), ]); const newOpened = { conid, diff --git a/packages/api/src/controllers/sessions.js b/packages/api/src/controllers/sessions.js index a866abcba..b651c37c9 100644 --- a/packages/api/src/controllers/sessions.js +++ b/packages/api/src/controllers/sessions.js @@ -5,6 +5,7 @@ const socket = require('../utility/socket'); const { fork } = require('child_process'); const jsldata = require('./jsldata'); const { handleProcessCommunication } = require('../utility/processComm'); +const processArgs = require('../utility/processArgs'); module.exports = { /** @type {import('dbgate-types').OpenedSession[]} */ @@ -69,7 +70,8 @@ module.exports = { '--is-forked-api', '--start-process', 'sessionProcess', - ...process.argv.slice(3), + ...processArgs.getPassArgs(), + // ...process.argv.slice(3), ]); const newOpened = { conid, diff --git a/packages/api/src/nativeModules.js b/packages/api/src/nativeModules.js index 649079303..02d2ddeec 100644 --- a/packages/api/src/nativeModules.js +++ b/packages/api/src/nativeModules.js @@ -1,5 +1,13 @@ const argIndex = process.argv.indexOf('--native-modules'); const redirectFile = argIndex > 0 ? process.argv[argIndex + 1] : null; -// @ts-ignore -module.exports = redirectFile ? __non_webpack_require__(redirectFile) : require('./nativeModulesContent'); +function requireDynamic(file) { + try { + // @ts-ignore + return __non_webpack_require__(redirectFile); + } catch (err) { + return require(redirectFile); + } +} + +module.exports = redirectFile ? requireDynamic(redirectFile) : require('./nativeModulesContent'); diff --git a/packages/api/src/utility/DatastoreProxy.js b/packages/api/src/utility/DatastoreProxy.js index 0967c829e..0da243170 100644 --- a/packages/api/src/utility/DatastoreProxy.js +++ b/packages/api/src/utility/DatastoreProxy.js @@ -1,6 +1,7 @@ const { fork } = require('child_process'); const uuidv1 = require('uuid/v1'); const { handleProcessCommunication } = require('./processComm'); +const processArgs = require('../utility/processArgs'); class DatastoreProxy { constructor(file) { @@ -33,7 +34,8 @@ class DatastoreProxy { '--is-forked-api', '--start-process', 'jslDatastoreProcess', - ...process.argv.slice(3), + ...processArgs.getPassArgs(), + // ...process.argv.slice(3), ]); this.subprocess.on('message', message => { diff --git a/packages/api/src/utility/processArgs.js b/packages/api/src/utility/processArgs.js index 3b1bfd92d..a98992f90 100644 --- a/packages/api/src/utility/processArgs.js +++ b/packages/api/src/utility/processArgs.js @@ -7,13 +7,17 @@ function getNamedArg(name) { } const checkParent = process.argv.includes('--checkParent'); -const nativeModules = getNamedArg('--native-modules'); const startProcess = getNamedArg('--start-process'); const isForkedApi = process.argv.includes('--is-forked-api'); +function getPassArgs() { + if (global['NATIVE_MODULES']) return ['--native-modules', global['NATIVE_MODULES']]; + return []; +} + module.exports = { checkParent, - nativeModules, startProcess, isForkedApi, + getPassArgs, }; From 8d3c8184cef8be6088cb1217ccb9c425b2e38b7f Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 26 Dec 2021 20:55:30 +0100 Subject: [PATCH 59/75] v4.4.5-beta.19 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6df1cf62a..fab61631f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.18", + "version": "4.4.5-beta.19", "name": "dbgate-all", "workspaces": [ "packages/*", From 2ade7e9a6874d912f3500515d300914d8057d95d Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Tue, 28 Dec 2021 09:03:28 +0100 Subject: [PATCH 60/75] use electron-rebuild instead of install-app-deps --- app/package.json | 6 +- app/yarn.lock | 661 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 642 insertions(+), 25 deletions(-) diff --git a/app/package.json b/app/package.json index e61a58579..ed4de8c7c 100644 --- a/app/package.json +++ b/app/package.json @@ -94,7 +94,8 @@ "build": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn dist", "build:mac": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && node setMacPlatform x64 && yarn dist && node setMacPlatform arm64 && yarn dist", "build:local": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn predist", - "postinstall": "electron-builder install-app-deps && patch-package", + "postinstall": "yarn rebuild && patch-package", + "rebuild": "electron-rebuild -f", "predist": "copyfiles ../packages/api/dist/* packages && copyfiles \"../packages/web/public/*\" packages && copyfiles \"../packages/web/public/**/*\" packages && copyfiles --up 3 \"../plugins/dist/**/*\" packages/plugins" }, "main": "src/electron.js", @@ -102,7 +103,8 @@ "copyfiles": "^2.2.0", "cross-env": "^6.0.3", "electron": "15.3.4", - "electron-builder": "22.14.5" + "electron-builder": "22.14.5", + "electron-rebuild": "^3.2.5" }, "optionalDependencies": { "better-sqlite3": "7.4.5", diff --git a/app/yarn.lock b/app/yarn.lock index 3d583ab16..cccf4b575 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -42,6 +42,11 @@ dir-compare "^2.4.0" fs-extra "^9.0.1" +"@gar/promisify@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" + integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw== + "@malept/cross-spawn-promise@^1.1.0": version "1.1.1" resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" @@ -49,6 +54,13 @@ dependencies: cross-spawn "^7.0.1" +"@malept/cross-spawn-promise@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d" + integrity sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg== + dependencies: + cross-spawn "^7.0.1" + "@malept/flatpak-bundler@^0.4.0": version "0.4.0" resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" @@ -59,11 +71,32 @@ lodash "^4.17.15" tmp-promise "^3.0.2" +"@npmcli/fs@^1.0.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.0.tgz#bec1d1b89c170d40e1b73ad6c943b0b75e7d2951" + integrity sha512-VhP1qZLXcrXRIaPoqb4YA55JQxLNF3jNR4T55IdOJa3+IFJKNYHtPvtXx8slmeMavj37vCzCfrqQM1vWLsYKLA== + dependencies: + "@gar/promisify" "^1.0.1" + semver "^7.3.5" + +"@npmcli/move-file@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" + integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== + dependencies: + mkdirp "^1.0.4" + rimraf "^3.0.2" + "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== +"@sindresorhus/is@^4.0.0": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.2.0.tgz#667bfc6186ae7c9e0b45a08960c551437176e1ca" + integrity sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw== + "@szmarczak/http-timer@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" @@ -71,6 +104,28 @@ dependencies: defer-to-connect "^1.0.1" +"@szmarczak/http-timer@^4.0.5": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" + integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w== + dependencies: + defer-to-connect "^2.0.0" + +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + +"@types/cacheable-request@^6.0.1": + version "6.0.2" + resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.2.tgz#c324da0197de0a98a2312156536ae262429ff6b9" + integrity sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA== + dependencies: + "@types/http-cache-semantics" "*" + "@types/keyv" "*" + "@types/node" "*" + "@types/responselike" "*" + "@types/debug@^4.1.6": version "4.1.7" resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" @@ -93,6 +148,18 @@ "@types/minimatch" "*" "@types/node" "*" +"@types/http-cache-semantics@*": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" + integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== + +"@types/keyv@*": + version "3.1.3" + resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.3.tgz#1c9aae32872ec1f20dcdaee89a9f3ba88f465e41" + integrity sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg== + dependencies: + "@types/node" "*" + "@types/minimatch@*": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" @@ -121,6 +188,13 @@ "@types/node" "*" xmlbuilder ">=11.0.1" +"@types/responselike@*", "@types/responselike@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" + integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== + dependencies: + "@types/node" "*" + "@types/semver@^7.3.6": version "7.3.9" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc" @@ -148,6 +222,35 @@ resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== +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== + +agent-base@6, agent-base@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +agentkeepalive@^4.1.3: + version "4.1.4" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b" + integrity sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ== + dependencies: + debug "^4.1.0" + depd "^1.1.2" + humanize-ms "^1.2.1" + +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + ajv-keywords@^3.4.1: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" @@ -235,6 +338,19 @@ aproba@^1.0.3: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + +are-we-there-yet@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" + integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + are-we-there-yet@~1.1.2: version "1.1.7" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" @@ -316,7 +432,7 @@ bindings@^1.5.0: dependencies: file-uri-to-path "1.0.0" -bl@^4.0.3: +bl@^4.0.3, bl@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== @@ -441,6 +557,35 @@ builder-util@22.14.5: stat-mode "^1.0.0" temp-file "^3.4.0" +cacache@^15.2.0: + version "15.3.0" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" + integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== + dependencies: + "@npmcli/fs" "^1.0.0" + "@npmcli/move-file" "^1.0.1" + chownr "^2.0.0" + fs-minipass "^2.0.0" + glob "^7.1.4" + infer-owner "^1.0.4" + lru-cache "^6.0.0" + minipass "^3.1.1" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.2" + mkdirp "^1.0.3" + p-map "^4.0.0" + promise-inflight "^1.0.1" + rimraf "^3.0.2" + ssri "^8.0.1" + tar "^6.0.2" + unique-filename "^1.1.1" + +cacheable-lookup@^5.0.3: + version "5.0.4" + resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" + integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== + cacheable-request@^6.0.0: version "6.1.0" resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" @@ -454,6 +599,19 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" +cacheable-request@^7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27" + integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew== + dependencies: + clone-response "^1.0.2" + get-stream "^5.1.0" + http-cache-semantics "^4.0.0" + keyv "^4.0.0" + lowercase-keys "^2.0.0" + normalize-url "^6.0.1" + responselike "^2.0.0" + camelcase@^6.2.0: version "6.2.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" @@ -501,11 +659,28 @@ ci-info@^3.2.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + cli-boxes@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== +cli-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" + integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== + dependencies: + restore-cursor "^3.1.0" + +cli-spinners@^2.5.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" + integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== + cli-truncate@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" @@ -530,6 +705,11 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" +clone@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" + integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= + code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" @@ -559,11 +739,21 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +color-support@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + colors@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= +colors@^1.3.3: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -623,7 +813,7 @@ configstore@^5.0.1: write-file-atomic "^3.0.0" xdg-basedir "^4.0.0" -console-control-strings@^1.0.0, console-control-strings@~1.1.0: +console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= @@ -690,6 +880,13 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + dependencies: + ms "2.1.2" + debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -697,13 +894,6 @@ debug@^2.6.8, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: - version "4.3.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== - dependencies: - ms "2.1.2" - decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" @@ -730,11 +920,23 @@ deep-extend@^0.6.0: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== +defaults@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" + integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= + dependencies: + clone "^1.0.2" + 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== +defer-to-connect@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" + integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== + define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -752,6 +954,11 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= +depd@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + detect-libc@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" @@ -877,6 +1084,26 @@ electron-publish@22.14.5: lazy-val "^1.0.5" mime "^2.5.2" +electron-rebuild@^3.2.5: + version "3.2.5" + resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-3.2.5.tgz#a9e82b4259aac33ad449f6959de68ded2c5679f8" + integrity sha512-U9dKi10V9w/BdIVB8a8dTKYLK3Q1d2WZ+Yo5qfM3XX/O4jI7KpnwgvWgGoVv0jTWPC2NlebF00ffWS/8NfUAtA== + dependencies: + "@malept/cross-spawn-promise" "^2.0.0" + colors "^1.3.3" + debug "^4.1.1" + detect-libc "^1.0.3" + fs-extra "^10.0.0" + got "^11.7.0" + lzma-native "^8.0.1" + node-abi "^3.0.0" + node-api-version "^0.1.4" + node-gyp "^8.4.0" + ora "^5.1.0" + semver "^7.3.5" + tar "^6.0.5" + yargs "^17.0.1" + electron-updater@^4.6.1: version "4.6.1" resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.1.tgz#80ca805c4f51b2e682aac29d18fed75d6a533d32" @@ -910,6 +1137,13 @@ encodeurl@^1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= +encoding@^0.1.12: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" + end-of-stream@^1.1.0, end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -922,6 +1156,11 @@ env-paths@^2.2.0: resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + es6-error@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" @@ -1073,6 +1312,21 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +gauge@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.0.tgz#afba07aa0374a93c6219603b1fb83eaa2264d8f8" + integrity sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw== + dependencies: + ansi-regex "^5.0.1" + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.2" + console-control-strings "^1.0.0" + has-unicode "^2.0.1" + signal-exit "^3.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.2" + gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -1111,7 +1365,7 @@ github-from-package@0.0.0: resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= -glob@^7.0.5, glob@^7.1.3, glob@^7.1.6: +glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -1159,6 +1413,23 @@ globalthis@^1.0.1: dependencies: define-properties "^1.1.3" +got@^11.7.0: + version "11.8.3" + resolved "https://registry.yarnpkg.com/got/-/got-11.8.3.tgz#f496c8fdda5d729a90b4905d2b07dbd148170770" + integrity sha512-7gtQ5KiPh1RtGS9/Jbv1ofDpBFuq42gyfEib+ejaRBJuj/3tQFeR5+gw57e4ipaU8c/rCjvX6fkQz2lyDlGAOg== + dependencies: + "@sindresorhus/is" "^4.0.0" + "@szmarczak/http-timer" "^4.0.5" + "@types/cacheable-request" "^6.0.1" + "@types/responselike" "^1.0.0" + cacheable-lookup "^5.0.3" + cacheable-request "^7.0.2" + decompress-response "^6.0.0" + http2-wrapper "^1.0.0-beta.5.2" + lowercase-keys "^2.0.0" + p-cancelable "^2.0.0" + responselike "^2.0.0" + got@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" @@ -1176,7 +1447,7 @@ 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.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.6: version "4.2.8" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== @@ -1196,7 +1467,7 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-unicode@^2.0.0: +has-unicode@^2.0.0, has-unicode@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= @@ -1213,11 +1484,43 @@ hosted-git-info@^4.0.2: dependencies: lru-cache "^6.0.0" -http-cache-semantics@^4.0.0: +http-cache-semantics@^4.0.0, 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== +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + +http2-wrapper@^1.0.0-beta.5.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" + integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== + dependencies: + quick-lru "^5.1.1" + resolve-alpn "^1.0.0" + +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + +humanize-ms@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" + integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0= + dependencies: + ms "^2.0.0" + iconv-corefoundation@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" @@ -1248,6 +1551,16 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + +infer-owner@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" + integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -1271,6 +1584,11 @@ ini@^1.3.4, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== +ip@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= + is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -1310,6 +1628,16 @@ is-installed-globally@^0.4.0: global-dirs "^3.0.0" is-path-inside "^3.0.2" +is-interactive@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" + integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== + +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU= + is-npm@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" @@ -1335,6 +1663,11 @@ is-typedarray@^1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= +is-unicode-supported@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" + integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== + is-wsl@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" @@ -1396,6 +1729,11 @@ json-buffer@3.0.0: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= +json-buffer@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" + integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== + json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -1436,6 +1774,13 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" +keyv@^4.0.0: + version "4.0.4" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.0.4.tgz#f040b236ea2b06ed15ed86fbef8407e1a1c8e376" + integrity sha512-vqNHbAc8BBsxk+7QBYLW0Y219rWcClspR6WSeoHYKG5mnsSoOH+BL1pWq02DDCVdvvuUny5rkBlzMRzoqc+GIg== + dependencies: + json-buffer "3.0.1" + klaw-sync@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" @@ -1470,6 +1815,14 @@ lodash@^4.17.10, lodash@^4.17.15: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== +log-symbols@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== + dependencies: + chalk "^4.1.0" + is-unicode-supported "^0.1.0" + lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" @@ -1487,6 +1840,15 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lzma-native@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.1.tgz#8569e2f88de461a9a2469ac9d8183637c387d682" + integrity sha512-Ryr9X3yDVZhRYOxR8QhUBCNe6GdEfy9BvFDIFtUvEkocvSvnrYt9lRm6FR1z0eQn0QSMenrgrDIJRMgUf9zsKQ== + dependencies: + node-addon-api "^3.1.0" + node-gyp-build "^4.2.1" + readable-stream "^3.6.0" + make-dir@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" @@ -1494,6 +1856,28 @@ make-dir@^3.0.0: dependencies: semver "^6.0.0" +make-fetch-happen@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968" + integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg== + dependencies: + agentkeepalive "^4.1.3" + cacache "^15.2.0" + http-cache-semantics "^4.1.0" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^6.0.0" + minipass "^3.1.3" + minipass-collect "^1.0.2" + minipass-fetch "^1.3.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.2" + promise-retry "^2.0.1" + socks-proxy-agent "^6.0.0" + ssri "^8.0.0" + matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -1526,6 +1910,11 @@ mime@^2.5.2: resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + mimic-response@^1.0.0, mimic-response@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" @@ -1553,14 +1942,53 @@ minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -minipass@^3.0.0: +minipass-collect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" + integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== + dependencies: + minipass "^3.0.0" + +minipass-fetch@^1.3.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6" + integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw== + dependencies: + minipass "^3.1.0" + minipass-sized "^1.0.3" + minizlib "^2.0.0" + optionalDependencies: + encoding "^0.1.12" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== + dependencies: + minipass "^3.0.0" + +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" + +minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: version "3.1.6" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee" integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ== dependencies: yallist "^4.0.0" -minizlib@^2.1.1: +minizlib@^2.0.0, minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -1595,6 +2023,11 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.0.0: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + msnodesqlv8@^2.4.4: version "2.4.4" resolved "https://registry.yarnpkg.com/msnodesqlv8/-/msnodesqlv8-2.4.4.tgz#1e4e10246480c486b074199d6efddf5dab8af9b9" @@ -1613,6 +2046,11 @@ napi-build-utils@^1.0.1: resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== +negotiator@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" @@ -1625,7 +2063,7 @@ node-abi@^2.21.0: dependencies: semver "^5.4.1" -node-abi@^3.3.0: +node-abi@^3.0.0, node-abi@^3.3.0: version "3.5.0" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248" integrity sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw== @@ -1637,6 +2075,39 @@ node-addon-api@^1.6.3: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== +node-addon-api@^3.1.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" + integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== + +node-api-version@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz#1ed46a485e462d55d66b5aa1fe2821720dedf080" + integrity sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g== + dependencies: + semver "^7.3.5" + +node-gyp-build@^4.2.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" + integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== + +node-gyp@^8.4.0: + version "8.4.1" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937" + integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w== + dependencies: + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.6" + make-fetch-happen "^9.1.0" + nopt "^5.0.0" + npmlog "^6.0.0" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.2" + which "^2.0.2" + noms@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/noms/-/noms-0.0.0.tgz#da8ebd9f3af9d6760919b27d9cdc8092a7332859" @@ -1645,11 +2116,23 @@ noms@0.0.0: inherits "^2.0.1" readable-stream "~1.0.31" +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + normalize-url@^4.1.0: version "4.5.1" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== +normalize-url@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== + npm-conf@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" @@ -1668,6 +2151,16 @@ npmlog@^4.0.1: gauge "~2.7.3" set-blocking "~2.0.0" +npmlog@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.0.tgz#ba9ef39413c3d936ea91553db7be49c34ad0520c" + integrity sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q== + dependencies: + are-we-there-yet "^2.0.0" + console-control-strings "^1.1.0" + gauge "^4.0.0" + set-blocking "^2.0.0" + number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" @@ -1690,6 +2183,13 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" +onetime@^5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + open@^7.4.2: version "7.4.2" resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" @@ -1698,6 +2198,21 @@ open@^7.4.2: is-docker "^2.0.0" is-wsl "^2.1.1" +ora@^5.1.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" + integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== + dependencies: + bl "^4.1.0" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-spinners "^2.5.0" + is-interactive "^1.0.0" + is-unicode-supported "^0.1.0" + log-symbols "^4.1.0" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" + os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -1708,6 +2223,18 @@ p-cancelable@^1.0.0: resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== +p-cancelable@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" + integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg== + +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + package-json@^6.3.0: version "6.5.0" resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" @@ -1828,6 +2355,19 @@ progress@^2.0.3: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== +promise-inflight@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" + integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= + +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + proto-list@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" @@ -1853,6 +2393,11 @@ pupa@^2.1.1: dependencies: escape-goat "^2.0.0" +quick-lru@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== + rc@^1.2.7, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" @@ -1887,7 +2432,7 @@ readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@~2.3.6: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.1.1, readable-stream@^3.4.0: +readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -1925,6 +2470,11 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= +resolve-alpn@^1.0.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" + integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== + responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -1932,6 +2482,26 @@ responselike@^1.0.2: dependencies: lowercase-keys "^1.0.0" +responselike@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.0.tgz#26391bcc3174f750f9a79eacc40a12a5c42d7723" + integrity sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw== + dependencies: + lowercase-keys "^2.0.0" + +restore-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" + integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= + rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" @@ -1939,7 +2509,7 @@ rimraf@^2.6.3: dependencies: glob "^7.1.3" -rimraf@^3.0.0: +rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -2021,7 +2591,7 @@ serialize-error@^7.0.1: dependencies: type-fest "^0.13.1" -set-blocking@~2.0.0: +set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= @@ -2092,11 +2662,28 @@ slice-ansi@^3.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -smart-buffer@^4.0.2: +smart-buffer@^4.0.2, smart-buffer@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== +socks-proxy-agent@^6.0.0: + version "6.1.1" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87" + integrity sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew== + dependencies: + agent-base "^6.0.2" + debug "^4.3.1" + socks "^2.6.1" + +socks@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e" + integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA== + dependencies: + ip "^1.1.5" + smart-buffer "^4.1.0" + source-map-support@^0.5.19: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" @@ -2115,6 +2702,13 @@ sprintf-js@^1.1.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== +ssri@^8.0.0, ssri@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" + integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== + dependencies: + minipass "^3.1.1" + stat-mode@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" @@ -2218,7 +2812,7 @@ tar-stream@^2.1.4: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^6.1.11: +tar@^6.0.2, tar@^6.0.5, tar@^6.1.11, tar@^6.1.2: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== @@ -2320,6 +2914,20 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= +unique-filename@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" + integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== + dependencies: + unique-slug "^2.0.0" + +unique-slug@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" + integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== + dependencies: + imurmurhash "^0.1.4" + unique-string@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" @@ -2395,6 +3003,13 @@ verror@^1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +wcwidth@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" + integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= + dependencies: + defaults "^1.0.3" + which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -2402,14 +3017,14 @@ which@^1.2.9: dependencies: isexe "^2.0.0" -which@^2.0.1: +which@^2.0.1, which@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" -wide-align@^1.1.0: +wide-align@^1.1.0, wide-align@^1.1.2: version "1.1.5" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== From 8b06d3be1589f8a57c0eba86ee3ac14fb5037184 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Tue, 28 Dec 2021 09:03:51 +0100 Subject: [PATCH 61/75] v4.4.5-beta.20 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fab61631f..080588eb6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.19", + "version": "4.4.5-beta.20", "name": "dbgate-all", "workspaces": [ "packages/*", From da536adca336496bae8229f7965bee55e9258a66 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Tue, 28 Dec 2021 16:28:08 +0100 Subject: [PATCH 62/75] rebuild - try to set explicit version --- app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index ed4de8c7c..c45873c68 100644 --- a/app/package.json +++ b/app/package.json @@ -95,7 +95,7 @@ "build:mac": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && node setMacPlatform x64 && yarn dist && node setMacPlatform arm64 && yarn dist", "build:local": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn predist", "postinstall": "yarn rebuild && patch-package", - "rebuild": "electron-rebuild -f", + "rebuild": "electron-rebuild -f -v 15.3.4", "predist": "copyfiles ../packages/api/dist/* packages && copyfiles \"../packages/web/public/*\" packages && copyfiles \"../packages/web/public/**/*\" packages && copyfiles --up 3 \"../plugins/dist/**/*\" packages/plugins" }, "main": "src/electron.js", From 92d160b0775e156104b9185067350e788e5aa8cf Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Tue, 28 Dec 2021 16:28:42 +0100 Subject: [PATCH 63/75] v4.4.5-beta.21 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 080588eb6..23ce99432 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.20", + "version": "4.4.5-beta.21", "name": "dbgate-all", "workspaces": [ "packages/*", From 66cac0665deca6f46bb954877313b51d4b5ae57a Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Tue, 28 Dec 2021 16:58:22 +0100 Subject: [PATCH 64/75] handle signals #192 --- packages/api/src/main.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/api/src/main.js b/packages/api/src/main.js index 8d352418f..6b253a32e 100644 --- a/packages/api/src/main.js +++ b/packages/api/src/main.js @@ -124,6 +124,18 @@ function start() { console.log('DbGate API listening on port', port); server.listen(port); } + + function shutdown() { + console.log('\nShutting down DbGate API server'); + server.close( ()=> { + console.log('Server shut down, terminating'); + process.exit(0); + }); + } + + process.on('SIGINT', shutdown); + process.on('SIGTERM', shutdown); + process.on('SIGBREAK', shutdown); } function useAllControllers(app, electron) { From 4a495377fd031bca32d70199762520b59decd910 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Tue, 28 Dec 2021 17:41:16 +0100 Subject: [PATCH 65/75] electron - used version 13 (modules 89) as it seems to be supported by node-abi --- app/package.json | 7 +- app/yarn.lock | 673 ++--------------------------------------------- 2 files changed, 32 insertions(+), 648 deletions(-) diff --git a/app/package.json b/app/package.json index c45873c68..bacda4e3b 100644 --- a/app/package.json +++ b/app/package.json @@ -95,16 +95,15 @@ "build:mac": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && node setMacPlatform x64 && yarn dist && node setMacPlatform arm64 && yarn dist", "build:local": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn predist", "postinstall": "yarn rebuild && patch-package", - "rebuild": "electron-rebuild -f -v 15.3.4", + "rebuild": "electron-builder install-app-deps", "predist": "copyfiles ../packages/api/dist/* packages && copyfiles \"../packages/web/public/*\" packages && copyfiles \"../packages/web/public/**/*\" packages && copyfiles --up 3 \"../plugins/dist/**/*\" packages/plugins" }, "main": "src/electron.js", "devDependencies": { "copyfiles": "^2.2.0", "cross-env": "^6.0.3", - "electron": "15.3.4", - "electron-builder": "22.14.5", - "electron-rebuild": "^3.2.5" + "electron": "13.6.3", + "electron-builder": "22.14.5" }, "optionalDependencies": { "better-sqlite3": "7.4.5", diff --git a/app/yarn.lock b/app/yarn.lock index cccf4b575..c7ca69a69 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -15,7 +15,7 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" -"@electron/get@^1.13.0": +"@electron/get@^1.0.1": version "1.13.1" resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368" integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA== @@ -42,11 +42,6 @@ dir-compare "^2.4.0" fs-extra "^9.0.1" -"@gar/promisify@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" - integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw== - "@malept/cross-spawn-promise@^1.1.0": version "1.1.1" resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" @@ -54,13 +49,6 @@ dependencies: cross-spawn "^7.0.1" -"@malept/cross-spawn-promise@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d" - integrity sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg== - dependencies: - cross-spawn "^7.0.1" - "@malept/flatpak-bundler@^0.4.0": version "0.4.0" resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" @@ -71,32 +59,11 @@ lodash "^4.17.15" tmp-promise "^3.0.2" -"@npmcli/fs@^1.0.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.0.tgz#bec1d1b89c170d40e1b73ad6c943b0b75e7d2951" - integrity sha512-VhP1qZLXcrXRIaPoqb4YA55JQxLNF3jNR4T55IdOJa3+IFJKNYHtPvtXx8slmeMavj37vCzCfrqQM1vWLsYKLA== - dependencies: - "@gar/promisify" "^1.0.1" - semver "^7.3.5" - -"@npmcli/move-file@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" - integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== - dependencies: - mkdirp "^1.0.4" - rimraf "^3.0.2" - "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== -"@sindresorhus/is@^4.0.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.2.0.tgz#667bfc6186ae7c9e0b45a08960c551437176e1ca" - integrity sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw== - "@szmarczak/http-timer@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" @@ -104,28 +71,6 @@ dependencies: defer-to-connect "^1.0.1" -"@szmarczak/http-timer@^4.0.5": - version "4.0.6" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" - integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w== - dependencies: - defer-to-connect "^2.0.0" - -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== - -"@types/cacheable-request@^6.0.1": - version "6.0.2" - resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.2.tgz#c324da0197de0a98a2312156536ae262429ff6b9" - integrity sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA== - dependencies: - "@types/http-cache-semantics" "*" - "@types/keyv" "*" - "@types/node" "*" - "@types/responselike" "*" - "@types/debug@^4.1.6": version "4.1.7" resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" @@ -148,18 +93,6 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/http-cache-semantics@*": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" - integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== - -"@types/keyv@*": - version "3.1.3" - resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.3.tgz#1c9aae32872ec1f20dcdaee89a9f3ba88f465e41" - integrity sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg== - dependencies: - "@types/node" "*" - "@types/minimatch@*": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" @@ -188,13 +121,6 @@ "@types/node" "*" xmlbuilder ">=11.0.1" -"@types/responselike@*", "@types/responselike@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" - integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== - dependencies: - "@types/node" "*" - "@types/semver@^7.3.6": version "7.3.9" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc" @@ -222,35 +148,6 @@ resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== -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== - -agent-base@6, agent-base@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - -agentkeepalive@^4.1.3: - version "4.1.4" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b" - integrity sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ== - dependencies: - debug "^4.1.0" - depd "^1.1.2" - humanize-ms "^1.2.1" - -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== - dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" - ajv-keywords@^3.4.1: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" @@ -338,19 +235,6 @@ aproba@^1.0.3: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -"aproba@^1.0.3 || ^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" - integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== - -are-we-there-yet@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" - integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw== - dependencies: - delegates "^1.0.0" - readable-stream "^3.6.0" - are-we-there-yet@~1.1.2: version "1.1.7" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" @@ -432,7 +316,7 @@ bindings@^1.5.0: dependencies: file-uri-to-path "1.0.0" -bl@^4.0.3, bl@^4.1.0: +bl@^4.0.3: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== @@ -557,35 +441,6 @@ builder-util@22.14.5: stat-mode "^1.0.0" temp-file "^3.4.0" -cacache@^15.2.0: - version "15.3.0" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" - integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== - dependencies: - "@npmcli/fs" "^1.0.0" - "@npmcli/move-file" "^1.0.1" - chownr "^2.0.0" - fs-minipass "^2.0.0" - glob "^7.1.4" - infer-owner "^1.0.4" - lru-cache "^6.0.0" - minipass "^3.1.1" - minipass-collect "^1.0.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.2" - mkdirp "^1.0.3" - p-map "^4.0.0" - promise-inflight "^1.0.1" - rimraf "^3.0.2" - ssri "^8.0.1" - tar "^6.0.2" - unique-filename "^1.1.1" - -cacheable-lookup@^5.0.3: - version "5.0.4" - resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" - integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== - cacheable-request@^6.0.0: version "6.1.0" resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" @@ -599,19 +454,6 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" -cacheable-request@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27" - integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew== - dependencies: - clone-response "^1.0.2" - get-stream "^5.1.0" - http-cache-semantics "^4.0.0" - keyv "^4.0.0" - lowercase-keys "^2.0.0" - normalize-url "^6.0.1" - responselike "^2.0.0" - camelcase@^6.2.0: version "6.2.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" @@ -659,28 +501,11 @@ ci-info@^3.2.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== - cli-boxes@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== -cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== - dependencies: - restore-cursor "^3.1.0" - -cli-spinners@^2.5.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" - integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== - cli-truncate@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" @@ -705,11 +530,6 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" -clone@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" - integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= - code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" @@ -739,21 +559,11 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-support@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" - integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== - colors@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= -colors@^1.3.3: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" - integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== - combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -813,7 +623,7 @@ configstore@^5.0.1: write-file-atomic "^3.0.0" xdg-basedir "^4.0.0" -console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0: +console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= @@ -880,13 +690,6 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: - version "4.3.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== - dependencies: - ms "2.1.2" - debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -894,6 +697,13 @@ debug@^2.6.8, debug@^2.6.9: dependencies: ms "2.0.0" +debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + dependencies: + ms "2.1.2" + decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" @@ -920,23 +730,11 @@ deep-extend@^0.6.0: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== -defaults@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" - integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= - dependencies: - clone "^1.0.2" - 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== -defer-to-connect@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" - integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== - define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -954,11 +752,6 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= -depd@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= - detect-libc@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" @@ -1084,26 +877,6 @@ electron-publish@22.14.5: lazy-val "^1.0.5" mime "^2.5.2" -electron-rebuild@^3.2.5: - version "3.2.5" - resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-3.2.5.tgz#a9e82b4259aac33ad449f6959de68ded2c5679f8" - integrity sha512-U9dKi10V9w/BdIVB8a8dTKYLK3Q1d2WZ+Yo5qfM3XX/O4jI7KpnwgvWgGoVv0jTWPC2NlebF00ffWS/8NfUAtA== - dependencies: - "@malept/cross-spawn-promise" "^2.0.0" - colors "^1.3.3" - debug "^4.1.1" - detect-libc "^1.0.3" - fs-extra "^10.0.0" - got "^11.7.0" - lzma-native "^8.0.1" - node-abi "^3.0.0" - node-api-version "^0.1.4" - node-gyp "^8.4.0" - ora "^5.1.0" - semver "^7.3.5" - tar "^6.0.5" - yargs "^17.0.1" - electron-updater@^4.6.1: version "4.6.1" resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.1.tgz#80ca805c4f51b2e682aac29d18fed75d6a533d32" @@ -1118,12 +891,12 @@ electron-updater@^4.6.1: lodash.isequal "^4.5.0" semver "^7.3.5" -electron@15.3.4: - version "15.3.4" - resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.4.tgz#811e8872f4500b88ad49e005cbe8f93e10676f6d" - integrity sha512-GLTE+UEKw1pJehkgpLgXtsHhYqSPp6skSNY1bxnY3dDYBrsPlP3nTEO9YQY2p4eHk+uxFVTXOVy5afcu9fIZ9A== +electron@13.6.3: + version "13.6.3" + resolved "https://registry.yarnpkg.com/electron/-/electron-13.6.3.tgz#c0217178807d3e0b2175c49dbe33ea8dac447e73" + integrity sha512-kevgR6/RuEhchJQbgCKhHle9HvJhi2dOJlicFZJqbbqa9BVpZARqqFDlwTSatYxmUPUJwu09FvyMwJG2DMQIng== dependencies: - "@electron/get" "^1.13.0" + "@electron/get" "^1.0.1" "@types/node" "^14.6.2" extract-zip "^1.0.3" @@ -1137,13 +910,6 @@ encodeurl@^1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -encoding@^0.1.12: - version "0.1.13" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" - integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== - dependencies: - iconv-lite "^0.6.2" - end-of-stream@^1.1.0, end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -1156,11 +922,6 @@ env-paths@^2.2.0: resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== -err-code@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" - integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== - es6-error@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" @@ -1312,21 +1073,6 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -gauge@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.0.tgz#afba07aa0374a93c6219603b1fb83eaa2264d8f8" - integrity sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw== - dependencies: - ansi-regex "^5.0.1" - aproba "^1.0.3 || ^2.0.0" - color-support "^1.1.2" - console-control-strings "^1.0.0" - has-unicode "^2.0.1" - signal-exit "^3.0.0" - string-width "^4.2.3" - strip-ansi "^6.0.1" - wide-align "^1.1.2" - gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -1365,7 +1111,7 @@ github-from-package@0.0.0: resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= -glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.5, glob@^7.1.3, glob@^7.1.6: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -1413,23 +1159,6 @@ globalthis@^1.0.1: dependencies: define-properties "^1.1.3" -got@^11.7.0: - version "11.8.3" - resolved "https://registry.yarnpkg.com/got/-/got-11.8.3.tgz#f496c8fdda5d729a90b4905d2b07dbd148170770" - integrity sha512-7gtQ5KiPh1RtGS9/Jbv1ofDpBFuq42gyfEib+ejaRBJuj/3tQFeR5+gw57e4ipaU8c/rCjvX6fkQz2lyDlGAOg== - dependencies: - "@sindresorhus/is" "^4.0.0" - "@szmarczak/http-timer" "^4.0.5" - "@types/cacheable-request" "^6.0.1" - "@types/responselike" "^1.0.0" - cacheable-lookup "^5.0.3" - cacheable-request "^7.0.2" - decompress-response "^6.0.0" - http2-wrapper "^1.0.0-beta.5.2" - lowercase-keys "^2.0.0" - p-cancelable "^2.0.0" - responselike "^2.0.0" - got@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" @@ -1447,7 +1176,7 @@ 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.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.6: +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: version "4.2.8" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== @@ -1467,7 +1196,7 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-unicode@^2.0.0, has-unicode@^2.0.1: +has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= @@ -1484,43 +1213,11 @@ hosted-git-info@^4.0.2: dependencies: lru-cache "^6.0.0" -http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0: +http-cache-semantics@^4.0.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== -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== - dependencies: - "@tootallnate/once" "1" - agent-base "6" - debug "4" - -http2-wrapper@^1.0.0-beta.5.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" - integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== - dependencies: - quick-lru "^5.1.1" - resolve-alpn "^1.0.0" - -https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== - dependencies: - agent-base "6" - debug "4" - -humanize-ms@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" - integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0= - dependencies: - ms "^2.0.0" - iconv-corefoundation@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" @@ -1551,16 +1248,6 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - -infer-owner@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" - integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== - inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -1584,11 +1271,6 @@ ini@^1.3.4, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -ip@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= - is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -1628,16 +1310,6 @@ is-installed-globally@^0.4.0: global-dirs "^3.0.0" is-path-inside "^3.0.2" -is-interactive@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" - integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== - -is-lambda@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" - integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU= - is-npm@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" @@ -1663,11 +1335,6 @@ is-typedarray@^1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= -is-unicode-supported@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" - integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== - is-wsl@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" @@ -1729,11 +1396,6 @@ json-buffer@3.0.0: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= -json-buffer@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" - integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== - json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -1774,13 +1436,6 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" -keyv@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.0.4.tgz#f040b236ea2b06ed15ed86fbef8407e1a1c8e376" - integrity sha512-vqNHbAc8BBsxk+7QBYLW0Y219rWcClspR6WSeoHYKG5mnsSoOH+BL1pWq02DDCVdvvuUny5rkBlzMRzoqc+GIg== - dependencies: - json-buffer "3.0.1" - klaw-sync@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" @@ -1815,14 +1470,6 @@ lodash@^4.17.10, lodash@^4.17.15: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -log-symbols@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" - integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== - dependencies: - chalk "^4.1.0" - is-unicode-supported "^0.1.0" - lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" @@ -1840,15 +1487,6 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -lzma-native@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.1.tgz#8569e2f88de461a9a2469ac9d8183637c387d682" - integrity sha512-Ryr9X3yDVZhRYOxR8QhUBCNe6GdEfy9BvFDIFtUvEkocvSvnrYt9lRm6FR1z0eQn0QSMenrgrDIJRMgUf9zsKQ== - dependencies: - node-addon-api "^3.1.0" - node-gyp-build "^4.2.1" - readable-stream "^3.6.0" - make-dir@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" @@ -1856,28 +1494,6 @@ make-dir@^3.0.0: dependencies: semver "^6.0.0" -make-fetch-happen@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968" - integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg== - dependencies: - agentkeepalive "^4.1.3" - cacache "^15.2.0" - http-cache-semantics "^4.1.0" - http-proxy-agent "^4.0.1" - https-proxy-agent "^5.0.0" - is-lambda "^1.0.1" - lru-cache "^6.0.0" - minipass "^3.1.3" - minipass-collect "^1.0.2" - minipass-fetch "^1.3.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.4" - negotiator "^0.6.2" - promise-retry "^2.0.1" - socks-proxy-agent "^6.0.0" - ssri "^8.0.0" - matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -1910,11 +1526,6 @@ mime@^2.5.2: resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - mimic-response@^1.0.0, mimic-response@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" @@ -1942,53 +1553,14 @@ minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -minipass-collect@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" - integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== - dependencies: - minipass "^3.0.0" - -minipass-fetch@^1.3.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6" - integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw== - dependencies: - minipass "^3.1.0" - minipass-sized "^1.0.3" - minizlib "^2.0.0" - optionalDependencies: - encoding "^0.1.12" - -minipass-flush@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" - integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== - dependencies: - minipass "^3.0.0" - -minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" - integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== - dependencies: - minipass "^3.0.0" - -minipass-sized@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" - integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== - dependencies: - minipass "^3.0.0" - -minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: +minipass@^3.0.0: version "3.1.6" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee" integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ== dependencies: yallist "^4.0.0" -minizlib@^2.0.0, minizlib@^2.1.1: +minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -2023,11 +1595,6 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@^2.0.0: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - msnodesqlv8@^2.4.4: version "2.4.4" resolved "https://registry.yarnpkg.com/msnodesqlv8/-/msnodesqlv8-2.4.4.tgz#1e4e10246480c486b074199d6efddf5dab8af9b9" @@ -2046,11 +1613,6 @@ napi-build-utils@^1.0.1: resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== -negotiator@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" @@ -2063,7 +1625,7 @@ node-abi@^2.21.0: dependencies: semver "^5.4.1" -node-abi@^3.0.0, node-abi@^3.3.0: +node-abi@^3.3.0: version "3.5.0" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248" integrity sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw== @@ -2075,39 +1637,6 @@ node-addon-api@^1.6.3: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== -node-addon-api@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" - integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== - -node-api-version@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz#1ed46a485e462d55d66b5aa1fe2821720dedf080" - integrity sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g== - dependencies: - semver "^7.3.5" - -node-gyp-build@^4.2.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" - integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== - -node-gyp@^8.4.0: - version "8.4.1" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937" - integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.6" - make-fetch-happen "^9.1.0" - nopt "^5.0.0" - npmlog "^6.0.0" - rimraf "^3.0.2" - semver "^7.3.5" - tar "^6.1.2" - which "^2.0.2" - noms@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/noms/-/noms-0.0.0.tgz#da8ebd9f3af9d6760919b27d9cdc8092a7332859" @@ -2116,23 +1645,11 @@ noms@0.0.0: inherits "^2.0.1" readable-stream "~1.0.31" -nopt@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" - integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== - dependencies: - abbrev "1" - normalize-url@^4.1.0: version "4.5.1" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== -normalize-url@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" - integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== - npm-conf@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" @@ -2151,16 +1668,6 @@ npmlog@^4.0.1: gauge "~2.7.3" set-blocking "~2.0.0" -npmlog@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.0.tgz#ba9ef39413c3d936ea91553db7be49c34ad0520c" - integrity sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q== - dependencies: - are-we-there-yet "^2.0.0" - console-control-strings "^1.1.0" - gauge "^4.0.0" - set-blocking "^2.0.0" - number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" @@ -2183,13 +1690,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -onetime@^5.1.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - open@^7.4.2: version "7.4.2" resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" @@ -2198,21 +1698,6 @@ open@^7.4.2: is-docker "^2.0.0" is-wsl "^2.1.1" -ora@^5.1.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" - integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== - dependencies: - bl "^4.1.0" - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-spinners "^2.5.0" - is-interactive "^1.0.0" - is-unicode-supported "^0.1.0" - log-symbols "^4.1.0" - strip-ansi "^6.0.0" - wcwidth "^1.0.1" - os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -2223,18 +1708,6 @@ p-cancelable@^1.0.0: resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== -p-cancelable@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" - integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg== - -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - package-json@^6.3.0: version "6.5.0" resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" @@ -2355,19 +1828,6 @@ progress@^2.0.3: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -promise-inflight@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= - -promise-retry@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" - integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== - dependencies: - err-code "^2.0.2" - retry "^0.12.0" - proto-list@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" @@ -2393,11 +1853,6 @@ pupa@^2.1.1: dependencies: escape-goat "^2.0.0" -quick-lru@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" - integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== - rc@^1.2.7, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" @@ -2432,7 +1887,7 @@ readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@~2.3.6: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: +readable-stream@^3.1.1, readable-stream@^3.4.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -2470,11 +1925,6 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= -resolve-alpn@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" - integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== - responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -2482,26 +1932,6 @@ responselike@^1.0.2: dependencies: lowercase-keys "^1.0.0" -responselike@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.0.tgz#26391bcc3174f750f9a79eacc40a12a5c42d7723" - integrity sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw== - dependencies: - lowercase-keys "^2.0.0" - -restore-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" - integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - -retry@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" - integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= - rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" @@ -2509,7 +1939,7 @@ rimraf@^2.6.3: dependencies: glob "^7.1.3" -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -2591,7 +2021,7 @@ serialize-error@^7.0.1: dependencies: type-fest "^0.13.1" -set-blocking@^2.0.0, set-blocking@~2.0.0: +set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= @@ -2662,28 +2092,11 @@ slice-ansi@^3.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -smart-buffer@^4.0.2, smart-buffer@^4.1.0: +smart-buffer@^4.0.2: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== -socks-proxy-agent@^6.0.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87" - integrity sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew== - dependencies: - agent-base "^6.0.2" - debug "^4.3.1" - socks "^2.6.1" - -socks@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e" - integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA== - dependencies: - ip "^1.1.5" - smart-buffer "^4.1.0" - source-map-support@^0.5.19: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" @@ -2702,13 +2115,6 @@ sprintf-js@^1.1.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== -ssri@^8.0.0, ssri@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" - integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== - dependencies: - minipass "^3.1.1" - stat-mode@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" @@ -2812,7 +2218,7 @@ tar-stream@^2.1.4: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^6.0.2, tar@^6.0.5, tar@^6.1.11, tar@^6.1.2: +tar@^6.1.11: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== @@ -2914,20 +2320,6 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -unique-filename@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" - integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== - dependencies: - unique-slug "^2.0.0" - -unique-slug@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" - integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== - dependencies: - imurmurhash "^0.1.4" - unique-string@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" @@ -3003,13 +2395,6 @@ verror@^1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -wcwidth@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" - integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= - dependencies: - defaults "^1.0.3" - which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -3017,14 +2402,14 @@ which@^1.2.9: dependencies: isexe "^2.0.0" -which@^2.0.1, which@^2.0.2: +which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" -wide-align@^1.1.0, wide-align@^1.1.2: +wide-align@^1.1.0: version "1.1.5" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== From fd54c176eb149773e18f26f5446cf0d8959acd88 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Tue, 28 Dec 2021 17:41:54 +0100 Subject: [PATCH 66/75] v4.4.5-beta.22 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 23ce99432..6e796e09e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.21", + "version": "4.4.5-beta.22", "name": "dbgate-all", "workspaces": [ "packages/*", From 1e59182fdaa55ad0de2eb128d7ebed15cb7a53d7 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Tue, 28 Dec 2021 17:59:05 +0100 Subject: [PATCH 67/75] server stop timeout --- packages/api/src/main.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/api/src/main.js b/packages/api/src/main.js index 6b253a32e..5cb5ec46e 100644 --- a/packages/api/src/main.js +++ b/packages/api/src/main.js @@ -127,10 +127,14 @@ function start() { function shutdown() { console.log('\nShutting down DbGate API server'); - server.close( ()=> { + server.close(() => { console.log('Server shut down, terminating'); process.exit(0); }); + setTimeout(() => { + console.log('Server close timeout, terminating'); + process.exit(0); + }, 1000); } process.on('SIGINT', shutdown); From c0779f12606db0dd6f9fe7f84b1a2729f8c174db Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Wed, 29 Dec 2021 08:30:31 +0100 Subject: [PATCH 68/75] #201 fixed DB url for docker mongo installation --- packages/api/.env-portal | 12 +++++++++++- packages/api/src/controllers/connections.js | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/api/.env-portal b/packages/api/.env-portal index 824ef8b29..fff5cd187 100644 --- a/packages/api/.env-portal +++ b/packages/api/.env-portal @@ -1,6 +1,6 @@ DEVMODE=1 -CONNECTIONS=mysql,postgres +CONNECTIONS=mysql,postgres,mongo,mongo2 LABEL_mysql=MySql localhost SERVER_mysql=localhost @@ -15,3 +15,13 @@ USER_postgres=postgres PASSWORD_postgres=test PORT_postgres=5433 ENGINE_postgres=postgres@dbgate-plugin-postgres + +LABEL_mongo=Mongo URL +URL_mongo=mongodb://localhost:27017 +ENGINE_mongo=mongo@dbgate-plugin-mongo + +LABEL_mongo2=Mongo Server +SERVER_mongo2=localhost +ENGINE_mongo2=mongo@dbgate-plugin-mongo + +# docker run -p 3000:3000 -e CONNECTIONS=mongo -e URL_mongo=mongodb://localhost:27017 -e ENGINE_mongo=mongo@dbgate-plugin-mongo -e LABEL_mongo=mongo dbgate/dbgate:beta diff --git a/packages/api/src/controllers/connections.js b/packages/api/src/controllers/connections.js index 33456297c..cedbd7838 100644 --- a/packages/api/src/controllers/connections.js +++ b/packages/api/src/controllers/connections.js @@ -47,6 +47,7 @@ function getPortalCollections() { password: process.env[`PASSWORD_${id}`], port: process.env[`PORT_${id}`], databaseUrl: process.env[`URL_${id}`], + useDatabaseUrl: !!process.env[`URL_${id}`], databaseFile: process.env[`FILE_${id}`], defaultDatabase: process.env[`DATABASE_${id}`], singleDatabase: !!process.env[`DATABASE_${id}`], From e07e35c104f761059c5c30ce16e05dc8504feef4 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 30 Dec 2021 09:08:59 +0100 Subject: [PATCH 69/75] native modules fix --- packages/api/src/nativeModules.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/src/nativeModules.js b/packages/api/src/nativeModules.js index 02d2ddeec..954acbaa0 100644 --- a/packages/api/src/nativeModules.js +++ b/packages/api/src/nativeModules.js @@ -1,5 +1,5 @@ const argIndex = process.argv.indexOf('--native-modules'); -const redirectFile = argIndex > 0 ? process.argv[argIndex + 1] : null; +const redirectFile = global['NATIVE_MODULES'] || (argIndex > 0 ? process.argv[argIndex + 1] : null); function requireDynamic(file) { try { From 379166c66ced81c938c47e2a4c37c8c940031e4d Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 30 Dec 2021 09:10:55 +0100 Subject: [PATCH 70/75] v4.4.5-beta.23 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6e796e09e..7be476233 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.22", + "version": "4.4.5-beta.23", "name": "dbgate-all", "workspaces": [ "packages/*", From 15de3600c33308af05714fc758b74bc6fe91ef45 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 30 Dec 2021 09:11:21 +0100 Subject: [PATCH 71/75] v4.4.5-alpha.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7be476233..9f435418d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-beta.23", + "version": "4.4.5-alpha.1", "name": "dbgate-all", "workspaces": [ "packages/*", From 88469e7366ce438484783897c074ad735297e97b Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 30 Dec 2021 09:57:24 +0100 Subject: [PATCH 72/75] fixed test connection for electron + better logging --- packages/api/src/controllers/connections.js | 35 +++++++++++-------- packages/api/src/proc/connectProcess.js | 10 +----- packages/api/src/utility/crypting.js | 11 ++++++ .../api/src/utility/requireEngineDriver.js | 5 +-- .../web/src/modals/ConnectionModal.svelte | 4 +-- 5 files changed, 37 insertions(+), 28 deletions(-) diff --git a/packages/api/src/controllers/connections.js b/packages/api/src/controllers/connections.js index cedbd7838..05368d01a 100644 --- a/packages/api/src/controllers/connections.js +++ b/packages/api/src/controllers/connections.js @@ -39,7 +39,7 @@ function getDatabaseFileLabel(databaseFile) { function getPortalCollections() { if (process.env.CONNECTIONS) { - return _.compact(process.env.CONNECTIONS.split(',')).map(id => ({ + const connections = _.compact(process.env.CONNECTIONS.split(',')).map(id => ({ _id: id, engine: process.env[`ENGINE_${id}`], server: process.env[`SERVER_${id}`], @@ -53,6 +53,14 @@ function getPortalCollections() { singleDatabase: !!process.env[`DATABASE_${id}`], displayName: process.env[`LABEL_${id}`], })); + const noengine = connections.filter(x => !x.engine); + if (noengine.length > 0) { + console.log( + 'Warning: Invalid CONNECTIONS configutation, missing ENGINE for connection ID:', + noengine.map(x => x._id) + ); + } + return connections; } const args = getNamedArgs(); @@ -134,11 +142,8 @@ module.exports = { return portalConnections || this.datastore.find(); }, - test_meta: { - method: 'post', - raw: true, - }, - test(req, res) { + test_meta: true, + test(connection) { const subprocess = fork(global['API_PACKAGE'] || process.argv[1], [ '--is-forked-api', '--start-process', @@ -146,15 +151,17 @@ module.exports = { ...processArgs.getPassArgs(), // ...process.argv.slice(3), ]); - subprocess.on('message', resp => { - if (handleProcessCommunication(resp, subprocess)) return; - // @ts-ignore - const { msgtype } = resp; - if (msgtype == 'connected' || msgtype == 'error') { - res.json(resp); - } + subprocess.send(connection); + return new Promise(resolve => { + subprocess.on('message', resp => { + if (handleProcessCommunication(resp, subprocess)) return; + // @ts-ignore + const { msgtype } = resp; + if (msgtype == 'connected' || msgtype == 'error') { + resolve(resp); + } + }); }); - subprocess.send(req.body); }, save_meta: true, diff --git a/packages/api/src/proc/connectProcess.js b/packages/api/src/proc/connectProcess.js index 5e6041441..be08ab51a 100644 --- a/packages/api/src/proc/connectProcess.js +++ b/packages/api/src/proc/connectProcess.js @@ -2,17 +2,9 @@ const childProcessChecker = require('../utility/childProcessChecker'); const requireEngineDriver = require('../utility/requireEngineDriver'); const connectUtility = require('../utility/connectUtility'); const { handleProcessCommunication } = require('../utility/processComm'); +const { pickSafeConnectionInfo } = require('../utility/crypting'); const _ = require('lodash'); -function pickSafeConnectionInfo(connection) { - return _.mapValues(connection, (v, k) => { - if (k == 'engine' || k == 'port' || k == 'authType' || k == 'sshMode' || k == 'passwordMode') return v; - if (v === null || v === true || v === false) return v; - if (v) return '***'; - return undefined; - }); -} - const formatErrorDetail = (e, connection) => `${e.stack} Error JSON: ${JSON.stringify(e, undefined, 2)} diff --git a/packages/api/src/utility/crypting.js b/packages/api/src/utility/crypting.js index d7428df77..64ab3debb 100644 --- a/packages/api/src/utility/crypting.js +++ b/packages/api/src/utility/crypting.js @@ -2,6 +2,7 @@ const crypto = require('crypto'); const simpleEncryptor = require('simple-encryptor'); const fs = require('fs'); const path = require('path'); +const _ = require('lodash'); const { datadir } = require('./directories'); @@ -81,8 +82,18 @@ function decryptConnection(connection) { return connection; } +function pickSafeConnectionInfo(connection) { + return _.mapValues(connection, (v, k) => { + if (k == 'engine' || k == 'port' || k == 'authType' || k == 'sshMode' || k == 'passwordMode') return v; + if (v === null || v === true || v === false) return v; + if (v) return '***'; + return undefined; + }); +} + module.exports = { loadEncryptionKey, encryptConnection, decryptConnection, + pickSafeConnectionInfo, }; diff --git a/packages/api/src/utility/requireEngineDriver.js b/packages/api/src/utility/requireEngineDriver.js index dabdf2be0..2b42ed1bc 100644 --- a/packages/api/src/utility/requireEngineDriver.js +++ b/packages/api/src/utility/requireEngineDriver.js @@ -1,5 +1,6 @@ const _ = require('lodash'); const requirePlugin = require('../shell/requirePlugin'); +const { pickSafeConnectionInfo } = require('./crypting'); /** @returns {import('dbgate-types').EngineDriver} */ function requireEngineDriver(connection) { @@ -10,14 +11,14 @@ function requireEngineDriver(connection) { engine = connection.engine; } if (!engine) { - throw new Error('Could not get driver from connection'); + throw new Error(`Could not get driver from connection ${JSON.stringify(pickSafeConnectionInfo(connection))}`); } if (engine.includes('@')) { const [shortName, packageName] = engine.split('@'); const plugin = requirePlugin(packageName); return plugin.drivers.find(x => x.engine == engine); } - throw new Error(`Could not found engine driver ${engine}`); + throw new Error(`Could not find engine driver ${engine}`); } module.exports = requireEngineDriver; diff --git a/packages/web/src/modals/ConnectionModal.svelte b/packages/web/src/modals/ConnectionModal.svelte index 773be6259..f853e5af8 100644 --- a/packages/web/src/modals/ConnectionModal.svelte +++ b/packages/web/src/modals/ConnectionModal.svelte @@ -20,7 +20,7 @@ import { extensions } from '../stores'; import _ from 'lodash'; import { getDatabaseFileLabel } from '../utility/getConnectionLabel'; -import { apiCall } from '../utility/api'; + import { apiCall } from '../utility/api'; export let connection; @@ -73,7 +73,6 @@ import { apiCall } from '../utility/api'; apiCall('connections/save', connection); closeCurrentModal(); } - @@ -156,5 +155,4 @@ import { apiCall } from '../utility/api'; .error-result { white-space: normal; } - From 5dc5c34af33ed146077ec353ffacb8d167be6313 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 30 Dec 2021 10:01:20 +0100 Subject: [PATCH 73/75] more logging --- packages/api/src/controllers/connections.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/api/src/controllers/connections.js b/packages/api/src/controllers/connections.js index 05368d01a..c984e07c8 100644 --- a/packages/api/src/controllers/connections.js +++ b/packages/api/src/controllers/connections.js @@ -8,6 +8,7 @@ const { datadir, filesdir } = require('../utility/directories'); const socket = require('../utility/socket'); const { encryptConnection } = require('../utility/crypting'); const { handleProcessCommunication } = require('../utility/processComm'); +const { pickSafeConnectionInfo } = require('../utility/crypting'); const processArgs = require('../utility/processArgs'); @@ -53,6 +54,8 @@ function getPortalCollections() { singleDatabase: !!process.env[`DATABASE_${id}`], displayName: process.env[`LABEL_${id}`], })); + console.log('Using connections from ENV variables:'); + console.log(JSON.stringify(connections.map(pickSafeConnectionInfo), undefined, 2)); const noengine = connections.filter(x => !x.engine); if (noengine.length > 0) { console.log( From c2e652adfc0974c853457094795a08ae39eb8a74 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 30 Dec 2021 10:02:08 +0100 Subject: [PATCH 74/75] v4.4.5-beta.24 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9f435418d..cfddcdb52 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.4.5-alpha.1", + "version": "4.4.5-beta.24", "name": "dbgate-all", "workspaces": [ "packages/*", From ed616130b86d1d8b3b1575fedc96c197c70937c9 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 30 Dec 2021 11:04:26 +0100 Subject: [PATCH 75/75] fixes --- packages/api/src/controllers/connections.js | 2 +- packages/api/src/controllers/databaseConnections.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/api/src/controllers/connections.js b/packages/api/src/controllers/connections.js index c984e07c8..5ec9873d2 100644 --- a/packages/api/src/controllers/connections.js +++ b/packages/api/src/controllers/connections.js @@ -214,7 +214,7 @@ module.exports = { get_meta: true, async get({ conid }) { - if (portalConnections) return portalConnections.find(x => x._id == conid); + if (portalConnections) return portalConnections.find(x => x._id == conid) || null; const res = await this.datastore.find({ _id: conid }); return res[0] || null; }, diff --git a/packages/api/src/controllers/databaseConnections.js b/packages/api/src/controllers/databaseConnections.js index 9fb8b8ece..d0911adc9 100644 --- a/packages/api/src/controllers/databaseConnections.js +++ b/packages/api/src/controllers/databaseConnections.js @@ -252,6 +252,7 @@ module.exports = { serverVersion_meta: true, async serverVersion({ conid, database }) { + if (!conid) return null; const opened = await this.ensureOpened(conid, database); return opened.serverVersion || null; },