chore(deps-dev): Bump fake-indexeddb from 4.0.2 to 5.0.1 (#16124)

* chore(deps-dev): Bump fake-indexeddb from 4.0.2 to 5.0.1 Bumps [fake-indexeddb](https://github.com/dumbmatter/fakeIndexedDB) from 4.0.2 to 5.0.1. - [Release notes](https://github.com/dumbmatter/fakeIndexedDB/releases) - [Changelog](https://github.com/dumbmatter/fakeIndexedDB/blob/master/CHANGELOG.md) - [Commits](dumbmatter/fakeIndexedDB@v4.0.2...v5.0.1) --- updated-dependencies: - dependency-name: fake-indexeddb dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * fix structuredClone error * fixup * test improvements * implicite import of jquery --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Belin <[email protected]>
wireapp · Dec 21, 2023 · b82caa8 · b82caa8
1 parent a1c4095
commit b82caa8
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 74 deletions.
diff --git a/package.json b/package.json
@@ -111,7 +111,7 @@
     "dpdm": "3.14.0",
     "eslint": "^8.56.0",
     "eslint-plugin-prettier": "^5.0.1",
-    "fake-indexeddb": "4.0.2",
+    "fake-indexeddb": "5.0.1",
     "generate-changelog": "1.8.0",
     "html-webpack-plugin": "^5.5.4",
     "husky": "8.0.3",

diff --git a/setupTests.js b/setupTests.js
@@ -20,19 +20,22 @@
 /* eslint-disable import/order */
 
 // Polyfill for "tsyringe" dependency injection
-require('core-js/full/reflect');
-require('intersection-observer');
-require('fake-indexeddb/auto');
+import 'core-js/full/reflect';
+import 'intersection-observer';
+import 'core-js/stable/structured-clone';
+import 'fake-indexeddb/auto';
 
-require('src/script/util/test/mock/createObjectURLMock');
-require('src/script/util/test/mock/cryptoMock');
-require('src/script/util/test/mock/matchMediaMock');
-require('src/script/util/test/mock/mediaDevicesMock');
-require('src/script/util/test/mock/navigatorPermissionsMock');
-require('src/script/util/test/mock/ResponseMock');
-require('src/script/util/test/mock/SVGProviderMock');
-require('src/script/util/test/mock/WebRTCMock');
-require('src/script/util/test/mock/resizeObserver.mock');
+import 'src/script/util/test/mock/createObjectURLMock';
+import 'src/script/util/test/mock/cryptoMock';
+import 'src/script/util/test/mock/matchMediaMock';
+import 'src/script/util/test/mock/mediaDevicesMock';
+import 'src/script/util/test/mock/navigatorPermissionsMock';
+import 'src/script/util/test/mock/ResponseMock';
+import 'src/script/util/test/mock/SVGProviderMock';
+import 'src/script/util/test/mock/WebRTCMock';
+import 'src/script/util/test/mock/resizeObserver.mock';
+
+import encoding from 'text-encoding';
 
 jest.mock('axios', () => {
   return {
@@ -48,25 +51,9 @@ jest.mock('axios', () => {
   };
 });
 
-require('test/api/payloads');
-
-const encoding = require('text-encoding');
 window.TextEncoder = encoding.TextEncoder;
 window.TextDecoder = encoding.TextDecoder;
 
-const sinon = require('sinon');
-window.sinon = sinon;
-
-const ko = require('knockout');
-window.ko = ko;
-
-const {amplify} = require('amplify');
-window.amplify = amplify;
-
-const jQuery = require('jquery');
-window.jQuery = jQuery;
-window.$ = jQuery;
-
 window.wire = {
   env: {
     BACKEND_REST: 'https://test.wire.link',

diff --git a/src/script/util/UrlUtil.ts b/src/script/util/UrlUtil.ts
@@ -17,6 +17,8 @@
  *
  */
 
+import jquery from 'jquery';
+
 import {includesString} from 'Util/StringUtil';
 
 export const appendParameter = (url: string, parameter: string) => {
@@ -99,7 +101,7 @@ export const getLinksFromHtml = <T extends HTMLElement>(html: string): T[] => {
   const links = html.match(anchorTags);
 
   const hasLinks = links?.length;
-  return hasLinks ? links.map(element => $<T>(element)[0]) : [];
+  return hasLinks ? links.map(element => jquery<T>(element)[0]) : [];
 };
 
 /**

diff --git a/test/unit_tests/calling/videoGridHandlerSpec.js b/test/unit_tests/calling/videoGridHandlerSpec.js
@@ -18,6 +18,7 @@
  */
 
 import {CONV_TYPE, CALL_TYPE, VIDEO_STATE} from '@wireapp/avs';
+import ko from 'knockout';
 
 import {Call} from 'src/script/calling/Call';
 import {Participant} from 'src/script/calling/Participant';

diff --git a/test/unit_tests/conversation/ConversationServiceSpec.js b/test/unit_tests/conversation/ConversationServiceSpec.js
@@ -21,6 +21,7 @@ import {ConversationMapper} from 'src/script/conversation/ConversationMapper';
 import {StorageSchemata} from 'src/script/storage/StorageSchemata';
 
 import {TestFactory} from '../../helper/TestFactory';
+import sinon from 'sinon';
 
 describe('ConversationService', () => {
   let conversation_service = null;

diff --git a/yarn.lock b/yarn.lock
@@ -5923,13 +5923,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"base64-arraybuffer-es6@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "base64-arraybuffer-es6@npm:0.7.0"
-  checksum: 6d2fd114df49201b476cea5d470504e5d4e8c4cd42544152b312c9bdcb824313086fe83f1ffc34262e9e276b82d46aefc6e63bb85553f016932061137b355cdf
-  languageName: node
-  linkType: hard
-
 "base64-js@npm:^1.3.1":
   version: 1.5.1
   resolution: "base64-js@npm:1.5.1"
@@ -8484,12 +8477,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fake-indexeddb@npm:4.0.2":
-  version: 4.0.2
-  resolution: "fake-indexeddb@npm:4.0.2"
-  dependencies:
-    realistic-structured-clone: ^3.0.0
-  checksum: ad257e5cc6273d9ea667b4129d8b0798830d56a68c7c77ddba752b3fd0088cb33e34b9569b218d16dfc8a78733d360d325f89c2ce352b70a0587c1f46f6f881d
+"fake-indexeddb@npm:5.0.1":
+  version: 5.0.1
+  resolution: "fake-indexeddb@npm:5.0.1"
+  checksum: b9bf94003e40923513863dde1f0f852fb00faa9d31db5203e4142e7937371e9061801b68cfdd37b321df1a314b2a30788b904be909685302d8f9c37a54580cb9
   languageName: node
   linkType: hard
 
@@ -14660,17 +14651,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"realistic-structured-clone@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "realistic-structured-clone@npm:3.0.0"
-  dependencies:
-    domexception: ^1.0.1
-    typeson: ^6.1.0
-    typeson-registry: ^1.0.0-alpha.20
-  checksum: b4521b299c8dc320a5e3ef44678f80a92b0f1837901a5fbd1c7be06808110fb0b591b417114306ec55b44ef47fd17968aacca079afc9665afbe1c528026295ec
-  languageName: node
-  linkType: hard
-
 "rechoir@npm:^0.8.0":
   version: 0.8.0
   resolution: "rechoir@npm:0.8.0"
@@ -16705,17 +16685,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typeson-registry@npm:^1.0.0-alpha.20":
-  version: 1.0.0-alpha.39
-  resolution: "typeson-registry@npm:1.0.0-alpha.39"
-  dependencies:
-    base64-arraybuffer-es6: ^0.7.0
-    typeson: ^6.0.0
-    whatwg-url: ^8.4.0
-  checksum: c6b629697acf4652aecfff7be760356d764600afc9beca253278bbfc44fae0fe635b7619201b83e497cdc30645cbce7614d12a04b5726d9b8b505f73e6a3fc2a
-  languageName: node
-  linkType: hard
-
 "typeson@npm:5.18.2, typeson@npm:^5.18.2":
   version: 5.18.2
   resolution: "typeson@npm:5.18.2"
@@ -16726,13 +16695,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typeson@npm:^6.0.0, typeson@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "typeson@npm:6.1.0"
-  checksum: 00a77b03ac8f704acb103307bad9295fe47d6b304c386297f078ec3be63875c0b81e022a4815edb9dc2c7da0a72a431345411d35c755a8510af4a420e9e46cdc
-  languageName: node
-  linkType: hard
-
 "uc.micro@npm:^1.0.1, uc.micro@npm:^1.0.5":
   version: 1.0.6
   resolution: "uc.micro@npm:1.0.6"
@@ -17327,7 +17289,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^8.1.0, whatwg-url@npm:^8.4.0":
+"whatwg-url@npm:^8.1.0":
   version: 8.7.0
   resolution: "whatwg-url@npm:8.7.0"
   dependencies:
@@ -17520,7 +17482,7 @@ __metadata:
     emoji-picker-react: 4.5.16
     eslint: ^8.56.0
     eslint-plugin-prettier: ^5.0.1
-    fake-indexeddb: 4.0.2
+    fake-indexeddb: 5.0.1
     generate-changelog: 1.8.0
     highlight.js: 11.9.0
     html-webpack-plugin: ^5.5.4