From d2f04815e0e1ece25057334f8486a9e680096278 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 00:38:06 +0000 Subject: [PATCH 1/2] Bump broadcast-channel from 5.1.0 to 7.0.0 Bumps [broadcast-channel](https://github.com/pubkey/broadcast-channel) from 5.1.0 to 7.0.0. - [Release notes](https://github.com/pubkey/broadcast-channel/releases) - [Changelog](https://github.com/pubkey/broadcast-channel/blob/master/CHANGELOG.md) - [Commits](https://github.com/pubkey/broadcast-channel/commits) --- updated-dependencies: - dependency-name: broadcast-channel dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 43 +++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 35ab8d568e..6930dc16d9 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "@toast-ui/editor": "^2.3.1", "ajv": "^8.12.0", "axios": "^1.6.2", - "broadcast-channel": "^5.1.0", + "broadcast-channel": "^7.0.0", "codemirror": "5.58.2", "core-js": "^3.35.0", "dexie": "^3.2.6", diff --git a/yarn.lock b/yarn.lock index 03c006baba..6ecbaba59f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1732,12 +1732,12 @@ resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@7.21.0", "@babel/runtime@^7.11.2", "@babel/runtime@^7.14.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673" - integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw== +"@babel/runtime@7.23.4", "@babel/runtime@^7.11.2", "@babel/runtime@^7.14.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.4.tgz#36fa1d2b36db873d25ec631dcc4923fdc1cf2e2e" + integrity sha512-2Yv65nlWnWlSpe3fXEyX5i7fx5kIKo4Qbcj+hMO0odwaneFjfXw5fdum+4yL20O0QiaHpia0cYQ9xpNMqrBwHg== dependencies: - regenerator-runtime "^0.13.11" + regenerator-runtime "^0.14.0" "@babel/template@^7.16.7", "@babel/template@^7.3.3": version "7.16.7" @@ -4178,15 +4178,14 @@ braces@^3.0.2, braces@~3.0.2: dependencies: fill-range "^7.0.1" -broadcast-channel@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/broadcast-channel/-/broadcast-channel-5.1.0.tgz#d75c83ed9e6e5c0ac0795229ea341a6ee08742fd" - integrity sha512-wAbP+mtQ28N+iX3scX6Q97UN39ER5jRWOtM3r1BNPLWFOMt3AGmwN9kS3fqwgaUW0tbWHRSfTpsT+pAvrzQz0Q== +broadcast-channel@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/broadcast-channel/-/broadcast-channel-7.0.0.tgz#715823823a9c6eb4ade02abc26b9767d7cc1d075" + integrity sha512-a2tW0Ia1pajcPBOGUF2jXlDnvE9d5/dg6BG9h60OmRUcZVr/veUrU8vEQFwwQIhwG3KVzYwSk3v2nRRGFgQDXQ== dependencies: - "@babel/runtime" "7.21.0" - oblivious-set "1.1.1" + "@babel/runtime" "7.23.4" + oblivious-set "1.4.0" p-queue "6.6.2" - rimraf "3.0.2" unload "2.4.1" browser-process-hrtime@^1.0.0: @@ -10262,10 +10261,10 @@ object.values@^1.1.6: define-properties "^1.1.4" es-abstract "^1.20.4" -oblivious-set@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/oblivious-set/-/oblivious-set-1.1.1.tgz#d9d38e9491d51f27a5c3ec1681d2ba40aa81e98b" - integrity sha512-Oh+8fK09mgGmAshFdH6hSVco6KZmd1tTwNFWj35OvzdmJTMZtAkbn05zar2iG3v6sDs1JLEtOiBGNb6BHwkb2w== +oblivious-set@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/oblivious-set/-/oblivious-set-1.4.0.tgz#1ee7c90f0605bb2a182fbcc8fffbe324d9994b43" + integrity sha512-szyd0ou0T8nsAqHtprRcP3WidfsN1TnAR5yWXf2mFCEr5ek3LEOkT6EZ/92Xfs74HIdyhG5WkGxIssMU0jBaeg== obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" @@ -11355,16 +11354,16 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regenerator-runtime@^0.13.11: - version "0.13.11" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" - integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== - regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.5: version "0.13.9" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== +regenerator-runtime@^0.14.0: + version "0.14.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" + integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== + regenerator-transform@^0.15.0: version "0.15.0" resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537" @@ -11595,7 +11594,7 @@ rimraf@2.6.3, rimraf@~2.6.2: dependencies: glob "^7.1.3" -rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: +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== From 9ff131332b55e101277417e0358edfc9e7ea02b7 Mon Sep 17 00:00:00 2001 From: Richard Tibbles Date: Fri, 22 Mar 2024 16:11:32 -0700 Subject: [PATCH 2/2] Cleanup unused broadcast-channel dependency. --- .../frontend/shared/data/broadcastChannel.js | 15 ------- .../globalMocks/broadcastChannelMock.js | 5 --- jest_config/jest.conf.js | 1 - package.json | 5 +-- yarn.lock | 39 +------------------ 5 files changed, 4 insertions(+), 61 deletions(-) delete mode 100644 contentcuration/contentcuration/frontend/shared/data/broadcastChannel.js delete mode 100644 jest_config/globalMocks/broadcastChannelMock.js diff --git a/contentcuration/contentcuration/frontend/shared/data/broadcastChannel.js b/contentcuration/contentcuration/frontend/shared/data/broadcastChannel.js deleted file mode 100644 index 6d42c42811..0000000000 --- a/contentcuration/contentcuration/frontend/shared/data/broadcastChannel.js +++ /dev/null @@ -1,15 +0,0 @@ -import { APP_ID } from './constants'; - -const { BroadcastChannel } = require('broadcast-channel'); - -// N.B. channels do not subscribe to messages that -// they send, so if you want to listen to all messages -// sent on a channel, even from the same window -// you have to create a new channel object instance. -export function createChannel(id = APP_ID) { - return new BroadcastChannel(id); -} - -const channel = createChannel(); - -export default channel; diff --git a/jest_config/globalMocks/broadcastChannelMock.js b/jest_config/globalMocks/broadcastChannelMock.js deleted file mode 100644 index 6fd584b845..0000000000 --- a/jest_config/globalMocks/broadcastChannelMock.js +++ /dev/null @@ -1,5 +0,0 @@ -export class BroadcastChannel { - addEventListener() {} - removeEventListener() {} - postMessage() {} -}; diff --git a/jest_config/jest.conf.js b/jest_config/jest.conf.js index 88a490ebb2..fd99eaf0e6 100644 --- a/jest_config/jest.conf.js +++ b/jest_config/jest.conf.js @@ -14,7 +14,6 @@ module.exports = { __dirname, './globalMocks/fileMock.js' ), - 'broadcast-channel$': path.resolve(__dirname, './globalMocks/broadcastChannelMock.js'), '\\.worker.min.js': path.resolve(__dirname, './globalMocks/fileMock.js'), 'shared/client': path.resolve(__dirname, './globalMocks/client.js'), 'shared/urls': path.resolve(__dirname, './globalMocks/urls.js'), diff --git a/package.json b/package.json index 6930dc16d9..86113d84e9 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,6 @@ "@toast-ui/editor": "^2.3.1", "ajv": "^8.12.0", "axios": "^1.6.2", - "broadcast-channel": "^7.0.0", "codemirror": "5.58.2", "core-js": "^3.35.0", "dexie": "^3.2.6", @@ -117,8 +116,8 @@ "npm-run-all": "^4.1.3", "stylus": "^0.62.0", "stylus-loader": "^7.1.3", - "workbox-webpack-plugin": "^7.0.0", - "web-streams-polyfill": "^3.2.1" + "web-streams-polyfill": "^3.2.1", + "workbox-webpack-plugin": "^7.0.0" }, "false": {}, "peerDependencies": {}, diff --git a/yarn.lock b/yarn.lock index 6ecbaba59f..9765041801 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1732,7 +1732,7 @@ resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@7.23.4", "@babel/runtime@^7.11.2", "@babel/runtime@^7.14.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.11.2", "@babel/runtime@^7.14.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.4.tgz#36fa1d2b36db873d25ec631dcc4923fdc1cf2e2e" integrity sha512-2Yv65nlWnWlSpe3fXEyX5i7fx5kIKo4Qbcj+hMO0odwaneFjfXw5fdum+4yL20O0QiaHpia0cYQ9xpNMqrBwHg== @@ -4178,16 +4178,6 @@ braces@^3.0.2, braces@~3.0.2: dependencies: fill-range "^7.0.1" -broadcast-channel@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/broadcast-channel/-/broadcast-channel-7.0.0.tgz#715823823a9c6eb4ade02abc26b9767d7cc1d075" - integrity sha512-a2tW0Ia1pajcPBOGUF2jXlDnvE9d5/dg6BG9h60OmRUcZVr/veUrU8vEQFwwQIhwG3KVzYwSk3v2nRRGFgQDXQ== - dependencies: - "@babel/runtime" "7.23.4" - oblivious-set "1.4.0" - p-queue "6.6.2" - unload "2.4.1" - browser-process-hrtime@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" @@ -6029,7 +6019,7 @@ event-emitter@^0.3.5: d "1" es5-ext "~0.10.14" -eventemitter3@^4.0.0, eventemitter3@^4.0.4: +eventemitter3@^4.0.0: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== @@ -10261,11 +10251,6 @@ object.values@^1.1.6: define-properties "^1.1.4" es-abstract "^1.20.4" -oblivious-set@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/oblivious-set/-/oblivious-set-1.4.0.tgz#1ee7c90f0605bb2a182fbcc8fffbe324d9994b43" - integrity sha512-szyd0ou0T8nsAqHtprRcP3WidfsN1TnAR5yWXf2mFCEr5ek3LEOkT6EZ/92Xfs74HIdyhG5WkGxIssMU0jBaeg== - obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" @@ -10371,14 +10356,6 @@ p-map@^4.0.0: dependencies: aggregate-error "^3.0.0" -p-queue@6.6.2: - version "6.6.2" - resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426" - integrity sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ== - dependencies: - eventemitter3 "^4.0.4" - p-timeout "^3.2.0" - p-retry@^4.5.0: version "4.6.2" resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16" @@ -10387,13 +10364,6 @@ p-retry@^4.5.0: "@types/retry" "0.12.0" retry "^0.13.1" -p-timeout@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe" - integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg== - dependencies: - p-finally "^1.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" @@ -13297,11 +13267,6 @@ universalify@^2.0.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== -unload@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/unload/-/unload-2.4.1.tgz#b0c5b7fb44e17fcbf50dcb8fb53929c59dd226a5" - integrity sha512-IViSAm8Z3sRBYA+9wc0fLQmU9Nrxb16rcDmIiR6Y9LJSZzI7QY5QsDhqPpKOjAn0O9/kfK1TfNEMMAGPTIraPw== - unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"