From 3b87c9be53b196ff862881c8fdbe6ef9fdf658a8 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Thu, 4 Jul 2024 17:08:06 +0100 Subject: [PATCH] Cleaned up websockets experiment (#20547) no issue - we're no longer making use of the websockets experiment so it's just bloat - this is the whole feature in a single commit in case we need to revive it at some point --- .../settings/advanced/labs/AlphaFeatures.tsx | 4 - ghost/admin/app/components/websockets.hbs | 8 -- ghost/admin/app/components/websockets.js | 31 ----- ghost/admin/app/controllers/websockets.js | 13 -- ghost/admin/app/router.js | 3 - ghost/admin/app/routes/websockets.js | 18 --- ghost/admin/app/services/feature.js | 1 - ghost/admin/app/templates/websockets.hbs | 29 ----- ghost/admin/config/environment.js | 4 - ghost/admin/package.json | 1 - ghost/core/core/boot.js | 4 - .../core/server/services/websockets/index.js | 1 - .../server/services/websockets/service.js | 38 ------ ghost/core/core/shared/labs.js | 1 - ghost/core/package.json | 1 - yarn.lock | 116 +----------------- 16 files changed, 4 insertions(+), 269 deletions(-) delete mode 100644 ghost/admin/app/components/websockets.hbs delete mode 100644 ghost/admin/app/components/websockets.js delete mode 100644 ghost/admin/app/controllers/websockets.js delete mode 100644 ghost/admin/app/routes/websockets.js delete mode 100644 ghost/admin/app/templates/websockets.hbs delete mode 100644 ghost/core/core/server/services/websockets/index.js delete mode 100644 ghost/core/core/server/services/websockets/service.js diff --git a/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx b/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx index 9226aa0a7e..f23705753d 100644 --- a/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx +++ b/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx @@ -15,10 +15,6 @@ const features = [{ title: 'Webmentions', description: 'Allows viewing received mentions on the dashboard.', flag: 'webmentions' -},{ - title: 'Websockets', - description: <>Test out Websockets functionality at /ghost/#/websockets., - flag: 'websockets' },{ title: 'Stripe Automatic Tax (private beta)', description: 'Use Stripe Automatic Tax at Stripe Checkout. Needs to be enabled in Stripe', diff --git a/ghost/admin/app/components/websockets.hbs b/ghost/admin/app/components/websockets.hbs deleted file mode 100644 index ff7065798d..0000000000 --- a/ghost/admin/app/components/websockets.hbs +++ /dev/null @@ -1,8 +0,0 @@ -
-
-

Counter

-

Current counter value: {{this.counter}}

-

This counter will reset when Ghost reboots.

-
- -
\ No newline at end of file diff --git a/ghost/admin/app/components/websockets.js b/ghost/admin/app/components/websockets.js deleted file mode 100644 index 5dc9a025fe..0000000000 --- a/ghost/admin/app/components/websockets.js +++ /dev/null @@ -1,31 +0,0 @@ -import Component from '@glimmer/component'; -import {action} from '@ember/object'; -import {inject as service} from '@ember/service'; -import {tracked} from '@glimmer/tracking'; - -export default class Websockets extends Component { - @service('socket-io') socketIOService; - - constructor(...args) { - super(...args); - // initialize connection - - // TODO: ensure this works with subdirectories - let origin = window.location.origin; // this gives us host:port - let socket = this.socketIOService.socketFor(origin); - // add listener - socket.on('addCount', (value) => { - this.counter = value; - }); - } - - // button counter - @tracked counter = 0; - - // handle button/event - @action handleClick() { - let socket = this.socketIOService.socketFor(origin); - this.counter = 1 + this.counter; - socket.emit('addCount', this.counter); - } -} diff --git a/ghost/admin/app/controllers/websockets.js b/ghost/admin/app/controllers/websockets.js deleted file mode 100644 index 148a720962..0000000000 --- a/ghost/admin/app/controllers/websockets.js +++ /dev/null @@ -1,13 +0,0 @@ -import Controller from '@ember/controller'; -/* eslint-disable ghost/ember/alias-model-in-controller */ -import classic from 'ember-classic-decorator'; -import {inject as service} from '@ember/service'; - -@classic -export default class WebsocketsController extends Controller { - @service feature; - - init() { - super.init(...arguments); - } -} \ No newline at end of file diff --git a/ghost/admin/app/router.js b/ghost/admin/app/router.js index 07ba4f1da8..758f09ebb6 100644 --- a/ghost/admin/app/router.js +++ b/ghost/admin/app/router.js @@ -60,9 +60,6 @@ Router.map(function () { this.route('activitypub-x', {path: '/*sub'}); }); - // testing websockets - this.route('websockets'); - this.route('explore', function () { // actual Ember route, not rendered in iframe this.route('connect'); diff --git a/ghost/admin/app/routes/websockets.js b/ghost/admin/app/routes/websockets.js deleted file mode 100644 index a01ad7a824..0000000000 --- a/ghost/admin/app/routes/websockets.js +++ /dev/null @@ -1,18 +0,0 @@ -import AuthenticatedRoute from './authenticated'; -import {inject as service} from '@ember/service'; - -// need this to be authenticated -export default class WebsocketRoute extends AuthenticatedRoute { - @service session; - @service router; - - beforeModel() { - super.beforeModel(...arguments); - - const user = this.session.user; - - if (!user.isAdmin) { - return this.router.transitionTo('settings-x.settings-x', `staff/${user.slug}`); - } - } -} diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js index b0a2312e5f..d6c1f790d0 100644 --- a/ghost/admin/app/services/feature.js +++ b/ghost/admin/app/services/feature.js @@ -63,7 +63,6 @@ export default class FeatureService extends Service { @feature('lexicalMultiplayer') lexicalMultiplayer; @feature('audienceFeedback') audienceFeedback; @feature('webmentions') webmentions; - @feature('websockets') websockets; @feature('stripeAutomaticTax') stripeAutomaticTax; @feature('emailCustomization') emailCustomization; @feature('i18n') i18n; diff --git a/ghost/admin/app/templates/websockets.hbs b/ghost/admin/app/templates/websockets.hbs deleted file mode 100644 index 28189cc583..0000000000 --- a/ghost/admin/app/templates/websockets.hbs +++ /dev/null @@ -1,29 +0,0 @@ -
- -
-

- Testing Websockets -

-
- - {{#if (feature 'websockets')}} -
-

{{svg-jar "idea"}}This is a testing ground for new or experimental features. They - may change, break or inexplicably disappear at any time.

-
-

Secrets

-
-
- -
-
-
-
- {{else}} -
-

{{svg-jar "warning-stroke"}}This is a testing ground for new or experimental features. You need developer experiments - enabled to see the content here. -

-
- {{/if}} -
\ No newline at end of file diff --git a/ghost/admin/config/environment.js b/ghost/admin/config/environment.js index b27c65eab4..5deea6c31e 100644 --- a/ghost/admin/config/environment.js +++ b/ghost/admin/config/environment.js @@ -35,10 +35,6 @@ module.exports = function (environment) { 'ember-simple-auth': { }, - 'ember-websockets': { - socketIO: true - }, - '@sentry/ember': { disablePerformance: true, sentry: {} diff --git a/ghost/admin/package.json b/ghost/admin/package.json index 7512a513b0..bd8f44bafa 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -121,7 +121,6 @@ "ember-test-selectors": "6.0.0", "ember-tooltips": "3.6.0", "ember-truth-helpers": "3.1.1", - "ember-websockets": "10.2.1", "eslint-plugin-babel": "5.3.1", "flexsearch": "0.7.43", "fs-extra": "11.2.0", diff --git a/ghost/core/core/boot.js b/ghost/core/core/boot.js index 6c9c83ed74..683d3342b6 100644 --- a/ghost/core/core/boot.js +++ b/ghost/core/core/boot.js @@ -559,10 +559,6 @@ async function bootGhost({backend = true, frontend = true, server = true} = {}) // TODO: move this to the correct place once we figure out where that is if (ghostServer) { - // NOTE: changes in this labs setting requires server reboot since we don't re-init services after changes a labs flag - const websockets = require('./server/services/websockets'); - await websockets.init(ghostServer); - const lexicalMultiplayer = require('./server/services/lexical-multiplayer'); await lexicalMultiplayer.init(ghostServer); await lexicalMultiplayer.enable(); diff --git a/ghost/core/core/server/services/websockets/index.js b/ghost/core/core/server/services/websockets/index.js deleted file mode 100644 index 18113736f4..0000000000 --- a/ghost/core/core/server/services/websockets/index.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('./service'); \ No newline at end of file diff --git a/ghost/core/core/server/services/websockets/service.js b/ghost/core/core/server/services/websockets/service.js deleted file mode 100644 index 9dced3572b..0000000000 --- a/ghost/core/core/server/services/websockets/service.js +++ /dev/null @@ -1,38 +0,0 @@ -const {Server} = require('socket.io'); -const debug = require('@tryghost/debug')('websockets'); -const logging = require('@tryghost/logging'); - -const labs = require('../../../shared/labs'); - -module.exports = { - async init(ghostServer) { - debug(`[Websockets] Is labs set? ${labs.isSet('websockets')}`); - - if (labs.isSet('websockets')) { - logging.info(`Starting websockets service`); - - const io = new Server(ghostServer.httpServer); - let count = 0; - - io.on(`connection`, (socket) => { - logging.info(`Websockets client connected (id: ${socket.id})`); - - // on connect, send current value - socket.emit('addCount', count); - // listen to to changes in value from client - socket.on('addCount', () => { - count = count + 1; - debug(`[Websockets] received addCount from client, count is now ${count}`); - socket.broadcast.emit('addCount', count); - }); - }); - - ghostServer.registerCleanupTask(async () => { - logging.warn(`Stopping websockets service`); - await new Promise((resolve) => { - io.close(resolve); - }); - }); - } - } -}; diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js index f1cdb61e72..f96d91b349 100644 --- a/ghost/core/core/shared/labs.js +++ b/ghost/core/core/shared/labs.js @@ -44,7 +44,6 @@ const ALPHA_FEATURES = [ 'NestPlayground', 'urlCache', 'lexicalMultiplayer', - 'websockets', 'emailCustomization', 'mailEvents', 'collectionsCard', diff --git a/ghost/core/package.json b/ghost/core/package.json index 061ccf3a4a..066a4626cd 100644 --- a/ghost/core/package.json +++ b/ghost/core/package.json @@ -223,7 +223,6 @@ "rss": "1.2.2", "sanitize-html": "2.13.0", "semver": "7.6.2", - "socket.io": "4.7.5", "stoppable": "1.1.0", "uuid": "9.0.1", "ws": "8.18.0", diff --git a/yarn.lock b/yarn.lock index ee45a55e47..857ae2932a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8353,11 +8353,6 @@ resolved "https://registry.yarnpkg.com/@types/common-tags/-/common-tags-1.8.4.tgz#3b31fcb5952cd326a55cabe9dbe6c5be3c1671a0" integrity sha512-S+1hLDJPjWNDhcGxsxEbepzaxWqURP/o+3cP4aa2w7yBXgdcmKGQtZzP8JbyfOd0m+33nh+8+kvxYE2UJtBDkg== -"@types/component-emitter@^1.2.10": - version "1.2.11" - resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.11.tgz#50d47d42b347253817a39709fef03ce66a108506" - integrity sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ== - "@types/connect@*", "@types/connect@3.4.36": version "3.4.36" resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.36.tgz#e511558c15a39cb29bd5357eebb57bd1459cd1ab" @@ -11119,11 +11114,6 @@ backbone@^1.1.2: dependencies: underscore ">=1.8.3" -backo2@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" - integrity sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA== - bail@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" @@ -11149,11 +11139,6 @@ base-64@^1.0.0: resolved "https://registry.yarnpkg.com/base-64/-/base-64-1.0.0.tgz#09d0f2084e32a3fd08c2475b973788eee6ae8f4a" integrity sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg== -base64-arraybuffer@0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812" - integrity sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg== - base64-js@^1.0.2, base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" @@ -13355,7 +13340,7 @@ compare-ver@2.0.2: resolved "https://registry.yarnpkg.com/compare-ver/-/compare-ver-2.0.2.tgz#8ecb8eb9dbf23ff2d87c56e74cbbb2cb7ffd9d7a" integrity sha512-VeznF8KOp4C6rSg22tvnk8vgAveEMxVVgOVuCzqYIzGyzD2hQ4Zm/O5RKfOECcTqmn0BAAkyJKAN0eqkgUvsEA== -component-emitter@^1.2.1, component-emitter@^1.3.0, component-emitter@~1.3.0: +component-emitter@^1.2.1, component-emitter@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== @@ -14976,7 +14961,7 @@ ember-assign-polyfill@^2.6.0: ember-cli-babel "^7.20.5" ember-cli-version-checker "^2.0.0" -ember-auto-import@2.7.4, "ember-auto-import@^1.12.1 || ^2.4.3", ember-auto-import@^2.2.3, ember-auto-import@^2.4.1: +ember-auto-import@2.7.4, "ember-auto-import@^1.12.1 || ^2.4.3", ember-auto-import@^2.2.3: version "2.7.4" resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.7.4.tgz#ca99570eb3d6165968df797a4750aa58073852b5" integrity sha512-6CdXSegJJc8nwwK7+1lIcBUnMVrJRNd4ZdMgcKbCAwPvcGxMgRVBddSzrX/+q/UuflvTEO26Dk1g7Z6KHMXUhw== @@ -16383,19 +16368,6 @@ ember-truth-helpers@3.1.1, "ember-truth-helpers@^2.1.0 || ^3.0.0", ember-truth-h dependencies: ember-cli-babel "^7.22.1" -ember-websockets@10.2.1: - version "10.2.1" - resolved "https://registry.yarnpkg.com/ember-websockets/-/ember-websockets-10.2.1.tgz#172637ee572edf74557a813ca6c35eb7ecb0215a" - integrity sha512-Iy99U60Y+DWcrELjxdaQ5SP5YyI2MtAtSaESyrhfyXT/bDJDll5vYtCD3d8LZi4vhmcSRqGL4Ej18UOBxYiUOw== - dependencies: - ember-auto-import "^2.4.1" - ember-cli-babel "^7.26.11" - ember-cli-htmlbars "^6.0.1" - glob "^8.0.3" - morgan "^1.9.0" - socket.io-client "^3.1.3" - urijs "^1.19.11" - emits@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/emits/-/emits-3.0.0.tgz#32752bba95e1707b219562384ab9bb8b1fd62f70" @@ -16435,29 +16407,6 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -engine.io-client@~4.1.0: - version "4.1.4" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-4.1.4.tgz#0bda5ba4bd87bced2ad00b93c67e133d0fb981ba" - integrity sha512-843fqAdKeUMFqKi1sSjnR11tJ4wi8sIefu6+JC1OzkkJBmjtc/gM/rZ53tJfu5Iae/3gApm5veoS+v+gtT0+Fg== - dependencies: - base64-arraybuffer "0.1.4" - component-emitter "~1.3.0" - debug "~4.3.1" - engine.io-parser "~4.0.1" - has-cors "1.1.0" - parseqs "0.0.6" - parseuri "0.0.6" - ws "~7.4.2" - xmlhttprequest-ssl "~1.6.2" - yeast "0.1.2" - -engine.io-parser@~4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.3.tgz#83d3a17acfd4226f19e721bb22a1ee8f7662d2f6" - integrity sha512-xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA== - dependencies: - base64-arraybuffer "0.1.4" - engine.io-parser@~5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.1.tgz#9f213c77512ff1a6cc0c7a86108a7ffceb16fcfb" @@ -19120,11 +19069,6 @@ has-bigints@^1.0.1, has-bigints@^1.0.2: resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== -has-cors@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" - integrity sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA== - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -23542,7 +23486,7 @@ moo@^0.5.0, moo@^0.5.1: resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c" integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q== -morgan@^1.10.0, morgan@^1.9.0: +morgan@^1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== @@ -24900,16 +24844,6 @@ parseley@^0.7.0: moo "^0.5.1" nearley "^2.20.1" -parseqs@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" - integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w== - -parseuri@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a" - integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow== - parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -28672,28 +28606,6 @@ socket.io-adapter@~2.5.2: dependencies: ws "~8.11.0" -socket.io-client@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-3.1.3.tgz#57ddcefea58cfab71f0e94c21124de8e3c5aa3e2" - integrity sha512-4sIGOGOmCg3AOgGi7EEr6ZkTZRkrXwub70bBB/F0JSkMOUFpA77WsL87o34DffQQ31PkbMUIadGOk+3tx1KGbw== - dependencies: - "@types/component-emitter" "^1.2.10" - backo2 "~1.0.2" - component-emitter "~1.3.0" - debug "~4.3.1" - engine.io-client "~4.1.0" - parseuri "0.0.6" - socket.io-parser "~4.0.4" - -socket.io-parser@~4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.5.tgz#cb404382c32324cc962f27f3a44058cf6e0552df" - integrity sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig== - dependencies: - "@types/component-emitter" "^1.2.10" - component-emitter "~1.3.0" - debug "~4.3.1" - socket.io-parser@~4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83" @@ -28702,7 +28614,7 @@ socket.io-parser@~4.2.4: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" -socket.io@4.7.5, socket.io@^4.5.4: +socket.io@^4.5.4: version "4.7.5" resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.7.5.tgz#56eb2d976aef9d1445f373a62d781a41c7add8f8" integrity sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA== @@ -30841,11 +30753,6 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -urijs@^1.19.11: - version "1.19.11" - resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc" - integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ== - urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" @@ -31779,11 +31686,6 @@ ws@^7.4.6: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== -ws@~7.4.2: - version "7.4.6" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" - integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== - ws@~8.11.0: version "8.11.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" @@ -31814,11 +31716,6 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xmlhttprequest-ssl@~1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz#03b713873b01659dfa2c1c5d056065b27ddc2de6" - integrity sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q== - xregexp@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" @@ -31963,11 +31860,6 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -yeast@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" - integrity sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg== - yjs@13.6.18: version "13.6.18" resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.6.18.tgz#d1575203478bc99ad1b89c098e7d4bacb7f91c3b"