diff --git a/package.json b/package.json index 1ba1867f..972149a6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "raven-reader", "productName": "Raven Reader", - "version": "1.0.70", + "version": "1.0.71", "author": "Hello Efficiency Inc. ", "description": "Simple desktop RSS Reader", "license": "MIT", @@ -21,14 +21,14 @@ }, "main": "background.js", "dependencies": { - "@cliqz/adblocker-electron": "^1.20.0", + "@cliqz/adblocker-electron": "^1.23.6", "@panter/vue-i18next": "^0.15.2", "@postlight/mercury-parser": "^2.2.0", - "axios": "^0.25.0", + "axios": "^0.26.0", "bootstrap": "^4.6.1", "bootstrap-vue": "^2.16.0", "btoa": "^1.2.1", - "core-js": "^3.13.1", + "core-js": "^3.21.1", "cross-fetch": "^3.1.3-alpha.6", "crypto-js": "^4.0.0", "dayjs": "^1.8.31", @@ -37,12 +37,12 @@ "electron-store": "^8.0.0", "electron-updater": "^4.6.2", "electron-util": "^0.17.0", - "fast-xml-parser": "^4.0.2", + "fast-xml-parser": "^4.0.3", "feather-icons": "^4.28.0", "form-data": "^4.0.0", "fuse.js": "^6.4.1", - "global-agent": "^2.1.12", - "i18next": "^21.2.4", + "global-agent": "^3.0.0", + "i18next": "^21.6.12", "i18next-browser-languagedetector": "^6.0.1", "i18next-electron-fs-backend": "^2.0.0", "i18next-electron-language-detector": "^0.0.10", @@ -51,7 +51,7 @@ "js-yaml": "^4.1.0", "lovefield": "^2.1.12", "md5": "^2.3.0", - "node-fetch": "^3.1.1", + "node-fetch": "^2.6.7", "node-schedule": "^2.0.0", "normalize-url": "^6.0.1", "opml-generator": "^1.1.1", @@ -63,7 +63,7 @@ "rss-parser": "^3.10.0", "sanitize-html": "^2.4.0", "sass-rem": "^3.0.0", - "splitpanes": "^2.3.6", + "splitpanes": "^2.3.0", "ssri": "^8.0.1", "tough-cookie": "^4.0.0", "uuid-by-string": "^3.0.2", @@ -87,7 +87,7 @@ "@vue/cli-service": "^4.4.0", "@vue/eslint-config-standard": "^6.0.0", "babel-eslint": "^10.1.0", - "electron": "^17.0.0", + "electron": "^17.1.0", "electron-builder": "^22.14.13", "electron-builder-notarize": "^1.2.0", "electron-devtools-installer": "^3.1.0", @@ -99,7 +99,7 @@ "eslint-plugin-promise": "^5.1.0", "eslint-plugin-standard": "^5.0.0", "eslint-plugin-vue": "^7.1.0", - "sass": "^1.26.5", + "sass": "^1.49.9", "sass-loader": "^10.0.5", "vue-cli-plugin-electron-builder": "^2.0.0-rc.4", "vue-template-compiler": "^2.6.11" @@ -120,6 +120,7 @@ "@postlight/mercury-parser/**/nth-check": "2.0.1", "vue-cli-plugin-electron-builder/**/minimist": "0.2.1", "vue-cli-plugin-electron-builder/electron-builder": "22.10.5", - "**/glob-parent": "^5.1.2" + "**/glob-parent": "^5.1.2", + "@postlight/mercury-parser/**/node-fetch": "2.6.7" } } diff --git a/src/background.js b/src/background.js index 9a0febf9..73349652 100644 --- a/src/background.js +++ b/src/background.js @@ -72,9 +72,7 @@ async function createWindow () { // Use pluginOptions.nodeIntegration, leave this alone // See nklayman.github.io/vue-cli-plugin-electron-builder/guide/security.html#node-integration for more info webviewTag: true, - enableRemoteModule: false, contextIsolation: true, - worldSafeExecuteJavaScript: true, nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION, preload: path.join(__dirname, 'preload.js'), disableBlinkFeatures: 'Auxclick' diff --git a/src/bridge/rss.js b/src/bridge/rss.js index 6c0c561c..c1c5601d 100644 --- a/src/bridge/rss.js +++ b/src/bridge/rss.js @@ -2,8 +2,8 @@ import RssParser from 'rss-parser' import rssFinder from 'rss-finder' import normalizeUrl from 'normalize-url' import { - validate, - parse + XMLValidator, + XMLParser } from 'fast-xml-parser' import fetch from 'node-fetch' @@ -17,12 +17,7 @@ const parser = new RssParser({ 'User-Agent': 'Raven Reader' }, customFields: { - item: [ - 'media:group', - 'media:title', - 'media:content', - 'media:description' - ] + item: ['media:group', 'media:title', 'media:content', 'media:description'] } }) @@ -35,11 +30,23 @@ export default { redirect: 'follow' }) const data = await content.text() - const validateXml = validate(data) + const validateXml = XMLValidator.validate(data, { + allowBooleanAttributes: true + }) return validateXml === true }, async parseRssUrl (url) { - return await parser.parseURL(url) + const content = await fetch( + normalizeUrl(url, { stripWWW: false, removeTrailingSlash: false }), + { + cors: 'no-cors', + referrer: '', + credentials: 'omit', + redirect: 'follow' + } + ) + const data = await content.text() + return await parser.parseString(data) }, async findRss (url) { return await rssFinder({ @@ -54,7 +61,11 @@ export default { }) }, async fetchRss (url) { - const response = await fetch(url) + const options = { + ignoreAttributes: false + } + const parse = new XMLParser(options) + const response = await fetch(normalizeUrl(url, { stripWWW: false, removeTrailingSlash: false })) const responseData = await response.text() return parse(responseData) } diff --git a/src/components/SubscribeModal.vue b/src/components/SubscribeModal.vue index a02c288e..4c4a9c82 100755 --- a/src/components/SubscribeModal.vue +++ b/src/components/SubscribeModal.vue @@ -157,6 +157,7 @@ export default { }, async parseXmlData (url) { try { + console.log(window.rss) const rssData = await window.rss.fetchRss(url) const keys = Object.keys(rssData) const rssItem = rssData[keys[0]] @@ -183,6 +184,7 @@ export default { } } catch (err) { if (err) { + console.error(err) window.log.info(err) } this.showError() diff --git a/src/main.js b/src/main.js index 4cf1dc20..aec6cfc1 100644 --- a/src/main.js +++ b/src/main.js @@ -26,19 +26,19 @@ dayjs.locale(window.electron.currentLocale()) Vue.config.productionTip = false // // nodejs global proxy -const proxy = window.electronstore.getProxySettings() -if (proxy) { - if (proxy.http) { - process.env.http_proxy = proxy.http - } - if (proxy.https) { - process.env.https_proxy = proxy.https - } - window.globalagent.createGlobalProxyAgent({ - environmentVariableNamespace: '', - forceGlobalAgent: true - }) -} +// const proxy = window.electronstore.getProxySettings() +// if (proxy) { +// if (proxy.http) { +// process.env.http_proxy = proxy.http +// } +// if (proxy.https) { +// process.env.https_proxy = proxy.https +// } +// // window.globalagent.createGlobalProxyAgent({ +// // environmentVariableNamespace: '', +// // forceGlobalAgent: true +// // }) +// } // ignore ssl error process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0' diff --git a/src/parsers/feed.js b/src/parsers/feed.js index 9d4a159a..72f5f8f7 100755 --- a/src/parsers/feed.js +++ b/src/parsers/feed.js @@ -24,6 +24,7 @@ export async function parseFeed (feedUrl, category = null) { try { feed = await window.rss.parseRssUrl(feedUrl) } catch (e) { + console.error(e) window.log.info(e) } diff --git a/src/preload.js b/src/preload.js index 33ae0818..6e9af147 100644 --- a/src/preload.js +++ b/src/preload.js @@ -51,7 +51,6 @@ contextBridge.exposeInMainWorld('fs', require('fs')) contextBridge.exposeInMainWorld('electronstore', electronStore) contextBridge.exposeInMainWorld('rss', rssService) contextBridge.exposeInMainWorld('electron', electronService) -contextBridge.exposeInMainWorld('globalagent', require('global-agent')) contextBridge.exposeInMainWorld('mercury', parseService) contextBridge.exposeInMainWorld('instapaper', instapaperService) contextBridge.exposeInMainWorld('pocket', pocketService) diff --git a/yarn.lock b/yarn.lock index 14c0dd83..1a1eb3ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -977,41 +977,41 @@ "@babel/helper-validator-identifier" "^7.15.7" to-fast-properties "^2.0.0" -"@cliqz/adblocker-content@^1.23.5": - version "1.23.5" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.23.5.tgz#8682c65f18817bec74227f205e1a2fc81ae346f1" - integrity sha512-G4en+LRuo4QKjfqrhoOz8BWbJYf252Z2dUsKLkisSI4cn49Bw1cGI53AnNtpklnxLDa3jJToXtlsXQnXFwxQcA== +"@cliqz/adblocker-content@^1.23.6": + version "1.23.6" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.23.6.tgz#649c32143b3338d1d2206540bb0ea307aa073d90" + integrity sha512-rzFAtp8nGc6bbQoSjN6Xo0l1OHzqS9Z86nlyFD3yLsd9g2d/CLnx0WFDVsk6iE+N9yu2UpHbgWT+siShF0rHqw== dependencies: - "@cliqz/adblocker-extended-selectors" "^1.23.5" + "@cliqz/adblocker-extended-selectors" "^1.23.6" -"@cliqz/adblocker-electron-preload@^1.23.5": - version "1.23.5" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.23.5.tgz#55b1b8ce047d10f77c566d45fe0344aed152d308" - integrity sha512-rP7ebCJKnibCLy34he6ytw/8JCf0tmJe5u0U8AWXOsQS0Q3CkAr0uOEW/Dla5S0lcwRawjC3SWeRRr5lncrGkg== +"@cliqz/adblocker-electron-preload@^1.23.6": + version "1.23.6" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.23.6.tgz#7f8db3df95afb385917df00ec5300847448437d1" + integrity sha512-xVBrIqfvcuh2Y07ZkEogzgkyqJuZvOqhRoFnuTyW2q97AmWAGLT6IjEGjl/vX7vMP0Y1b8wubdjI3VHnKvNKDg== dependencies: - "@cliqz/adblocker-content" "^1.23.5" + "@cliqz/adblocker-content" "^1.23.6" -"@cliqz/adblocker-electron@^1.20.0": - version "1.23.5" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.23.5.tgz#1ed7afcfcf0cb66b6a593c3eae0f9e68b090a04b" - integrity sha512-1g/oCy+X0bmY45MRcS65HVDFF2xVzLNa/z2j8FhYx+P4+QTR6cS7F3m9hGFVDmzypvVdxRatJVu8GFmVCCLC8g== +"@cliqz/adblocker-electron@^1.23.6": + version "1.23.6" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.23.6.tgz#e550f2ffa2b5d0404d0090c3870d0a849d3cd5d8" + integrity sha512-wzkCfBCo5RvRanzsVOu65xHW9GAUDqsg+tP8GYld6/hgMMb96KJZJVpvrvwvsneAm9T55QE4ef1utZbIIwltqA== dependencies: - "@cliqz/adblocker" "^1.23.5" - "@cliqz/adblocker-electron-preload" "^1.23.5" + "@cliqz/adblocker" "^1.23.6" + "@cliqz/adblocker-electron-preload" "^1.23.6" tldts-experimental "^5.6.21" -"@cliqz/adblocker-extended-selectors@^1.23.5": - version "1.23.5" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.23.5.tgz#ecfa186d76682ee09c1faad957a0f667418a8e80" - integrity sha512-1o5ikBWmXdgv3fFAULu/Wq3a7m+kiYvfoHOgajJuuTwyFyADsRBuipMv+mbVbNxG85KgO83MymTLVfCWJUFdig== +"@cliqz/adblocker-extended-selectors@^1.23.6": + version "1.23.6" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.23.6.tgz#fed9c3973553751f1ecae2397ceff60d364a6e11" + integrity sha512-qnn2LrE/0YswjL4399M1ldKityLxDT9r/b9MUOPboz+4EiE/ew6hTl35yNg2g8nZU3tXSzrnvAYcqLw607kSYg== -"@cliqz/adblocker@^1.23.5": - version "1.23.5" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.23.5.tgz#633a640da5f52d74b77bd4e1af2faf7bec577048" - integrity sha512-N4CXItT1+a9nc4cpGpMTC9ABYXBVvbCJQ860dR2lDPHFVnro9beMVDZ0+mHYvjuPTPJaJMzBg6Tap57gBEZMvg== +"@cliqz/adblocker@^1.23.6": + version "1.23.6" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.23.6.tgz#741ee9a1fde2e75920204c120200704252932e02" + integrity sha512-+Ojm25XwIkiD0THvf+WHZ3+zq65DuES7B6XlsMpbYC0JD8J9crpswLHsAmj97o0KVN+vmK2fYrqa2DgOUnFzYg== dependencies: - "@cliqz/adblocker-content" "^1.23.5" - "@cliqz/adblocker-extended-selectors" "^1.23.5" + "@cliqz/adblocker-content" "^1.23.6" + "@cliqz/adblocker-extended-selectors" "^1.23.6" "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" @@ -2873,12 +2873,12 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== -axios@^0.25.0: - version "0.25.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a" - integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g== +axios@^0.26.0: + version "0.26.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.0.tgz#9a318f1c69ec108f8cd5f3c3d390366635e13928" + integrity sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og== dependencies: - follow-redirects "^1.14.7" + follow-redirects "^1.14.8" babel-eslint@^10.1.0: version "10.1.0" @@ -4192,10 +4192,10 @@ core-js@^3.10.1, core-js@^3.20.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.20.2.tgz#46468d8601eafc8b266bd2dd6bf9dee622779581" integrity sha512-nuqhq11DcOAbFBV4zCbKeGbKQsUDRqTX0oqx7AttUBuqe3h20ixsE039QHelbL6P4h+9kytVqyEtyZ6gsiwEYw== -core-js@^3.13.1: - version "3.21.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.0.tgz#f479dbfc3dffb035a0827602dd056839a774aa71" - integrity sha512-YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ== +core-js@^3.21.1: + version "3.21.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.1.tgz#f2e0ddc1fc43da6f904706e8e955bc19d06a0d94" + integrity sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig== core-util-is@1.0.2: version "1.0.2" @@ -4534,11 +4534,6 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -data-uri-to-buffer@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b" - integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA== - data-urls@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe" @@ -5251,10 +5246,10 @@ electron-util@^0.17.0: electron-is-dev "^1.1.0" new-github-issue-url "^0.2.1" -electron@^17.0.0: - version "17.0.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-17.0.0.tgz#60f00f3e3c657020e807a519700213943468b4d1" - integrity sha512-3UXcBQMwbMWdPvGHaSdPMluHrd+/bc+K143MyvE5zVZ+S1XCHt4sau7dj6svJHns5llN0YG/c6h/vRfadIp8Zg== +electron@^17.1.0: + version "17.1.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-17.1.0.tgz#7539937d294413af8efba69dc370cf7d2b0cdc72" + integrity sha512-X/qdldmQ8lA15NmeraubWCTtMeTO8K9Ser0wtSCgOXVh53Sr1Ea0VQQ7Q9LuGgWRVz4qtr40cntuEdM8icdmTw== dependencies: "@electron/get" "^1.13.0" "@types/node" "^14.6.2" @@ -5954,10 +5949,10 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -fast-xml-parser@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.0.2.tgz#23f5da4393d9f4142e26792c1e675ddbafe7029a" - integrity sha512-3GOSbMTZxxrPPQ+aURM7Wia10bi71HBbiG/3mOEEkRSAkRtg4m7UhMSnB2rzOhBeRHyJUWsllOfyNnjTT1b85w== +fast-xml-parser@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.0.3.tgz#ad1ebfa53a447369634454073f7952f171ed4aba" + integrity sha512-xhQbg3a/EYNHwK0cxIG1nZmVkHX/0tWihamn5pU4Mhd9KEVE2ga8ZJiqEUgB2sApElvAATOdMTLjgqIpvYDUkQ== dependencies: strnum "^1.0.5" @@ -6005,14 +6000,6 @@ feedparser@^2.2.9: readable-stream "^2.3.7" sax "^1.2.4" -fetch-blob@^3.1.2, fetch-blob@^3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.1.4.tgz#e8c6567f80ad7fc22fd302e7dcb72bafde9c1717" - integrity sha512-Eq5Xv5+VlSrYWEqKrusxY1C3Hm/hjeAsCGVG3ft7pZahlUAChpGZT/Ms1WmSLnEAisEXszjzu/s+ce6HZB2VHA== - dependencies: - node-domexception "^1.0.0" - web-streams-polyfill "^3.0.3" - figgy-pudding@^3.5.1: version "3.5.2" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" @@ -6180,11 +6167,16 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@^1.0.0, follow-redirects@^1.14.7: +follow-redirects@^1.0.0: version "1.14.8" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== +follow-redirects@^1.14.8: + version "1.14.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" + integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== + for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -6213,13 +6205,6 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" -formdata-polyfill@^4.0.10: - version "4.0.10" - resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423" - integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g== - dependencies: - fetch-blob "^3.1.2" - forwarded@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" @@ -6450,19 +6435,6 @@ glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" -global-agent@^2.1.12: - version "2.2.0" - resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz#566331b0646e6bf79429a16877685c4a1fbf76dc" - integrity sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg== - dependencies: - boolean "^3.0.1" - core-js "^3.6.5" - es6-error "^4.1.1" - matcher "^3.0.0" - roarr "^2.15.3" - semver "^7.3.2" - serialize-error "^7.0.1" - global-agent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" @@ -7072,10 +7044,10 @@ i18next-fs-backend@^1.0.8: resolved "https://registry.yarnpkg.com/i18next-fs-backend/-/i18next-fs-backend-1.1.4.tgz#d0e9b9ed2fa7a0f11002d82b9fa69c3c3d6482da" integrity sha512-/MfAGMP0jHonV966uFf9PkWWuDjPYLIcsipnSO3NxpNtAgRUKLTwvm85fEmsF6hGeu0zbZiCQ3W74jwO6K9uXA== -i18next@^21.2.4: - version "21.6.11" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.6.11.tgz#de6d649221e02474cc701d152606bf3e61e37bcd" - integrity sha512-tJ2+o0lVO+fhi8bPkCpBAeY1SgkqmQm5NzgPWCQssBrywJw98/o+Kombhty5nxQOpHtvMmsxcOopczUiH6bJxQ== +i18next@^21.6.12: + version "21.6.12" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.6.12.tgz#5080a611af98f4104062a88452b30704b29fa924" + integrity sha512-xlGTPdu2g5PZEUIE6TA1mQ9EIAAv9nMFONzgwAIrKL/KTmYYWufQNGgOmp5Og1PvgUji+6i1whz0rMdsz1qaKw== dependencies: "@babel/runtime" "^7.12.0" @@ -8965,34 +8937,13 @@ 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-domexception@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" - integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== - -node-fetch@2.6.7, node-fetch@^2.6.1: +node-fetch@2.6.7, node-fetch@^2.3.0, node-fetch@^2.6.1, node-fetch@^2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== dependencies: whatwg-url "^5.0.0" -node-fetch@^2.3.0: - version "2.6.6" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89" - integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA== - dependencies: - whatwg-url "^5.0.0" - -node-fetch@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.2.0.tgz#59390db4e489184fa35d4b74caf5510e8dfbaf3b" - integrity sha512-8xeimMwMItMw8hRrOl3C9/xzU49HV/yE6ORew/l+dxWimO5A4Ra8ld2rerlJvc/O7et5Z1zrWsPX43v1QBjCxw== - dependencies: - data-uri-to-buffer "^4.0.0" - fetch-blob "^3.1.4" - formdata-polyfill "^4.0.10" - node-forge@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" @@ -11052,10 +11003,10 @@ sass-rem@^3.0.0: resolved "https://registry.yarnpkg.com/sass-rem/-/sass-rem-3.0.0.tgz#82a700b69ca4ea725befdf8ed9844f5dfb71b55b" integrity sha512-tgK/2ojS/z4OjlJT6J/Gc3TgN97W/4tTWuEdVXO1/P46L/Ud4iG3t+s007KTHP+BX9tqLgFPl3fgstUsva5rtg== -sass@^1.26.5: - version "1.49.7" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.7.tgz#22a86a50552b9b11f71404dfad1b9ff44c6b0c49" - integrity sha512-13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ== +sass@^1.49.9: + version "1.49.9" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.9.tgz#b15a189ecb0ca9e24634bae5d1ebc191809712f9" + integrity sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -11518,10 +11469,10 @@ split2@^3.0.0: dependencies: readable-stream "^3.0.0" -splitpanes@^2.3.6: - version "2.3.8" - resolved "https://registry.yarnpkg.com/splitpanes/-/splitpanes-2.3.8.tgz#371655e5c8c6356d76bbf2f6f22d5564927b5bb4" - integrity sha512-eM/qZ1v7U5BMV8FQR7oeqVlllz3sTGTm0//g/eJMa0hZ4s+A1VK68j26FWzcaVlw2P5+dCXk7/X6ZRjjwcbrgw== +splitpanes@^2.3.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/splitpanes/-/splitpanes-2.4.1.tgz#c165db8b1ed307b81831e890ce96912670cb6d02" + integrity sha512-kpEo1WuMXuc6QfdQdO2V/fl/trONlkUKp+pputsLTiW9RMtwEvjb4/aYGm2m3+KAzjmb+zLwr4A4SYZu74+pgQ== sprintf-js@^1.1.2: version "1.1.2" @@ -12807,11 +12758,6 @@ wcwidth@^1.0.1: dependencies: defaults "^1.0.3" -web-streams-polyfill@^3.0.3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz#a6b74026b38e4885869fb5c589e90b95ccfc7965" - integrity sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA== - webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"