From 7aa8a5600d0bb44949749893e0bbc630c06e62be Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Thu, 30 Dec 2021 23:11:08 +0100 Subject: test: Silence logging in preload tests --- package.json | 6 +- .../src/contextBridge/SophieRendererImpl.ts | 9 +- .../__tests__/SophieRendererImpl.spec.ts | 3 + yarn.lock | 115 ++++++++++++++++++++- 4 files changed, 127 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 620c9cc..22748f7 100644 --- a/package.json +++ b/package.json @@ -53,5 +53,9 @@ "typescript": "^4.5.4", "vite": "^2.7.9" }, - "packageManager": "yarn@3.1.1" + "packageManager": "yarn@3.1.1", + "dependencies": { + "loglevel": "^1.8.0", + "preload": "^0.1.0" + } } diff --git a/packages/preload/src/contextBridge/SophieRendererImpl.ts b/packages/preload/src/contextBridge/SophieRendererImpl.ts index 4c24b74..f3c07c5 100644 --- a/packages/preload/src/contextBridge/SophieRendererImpl.ts +++ b/packages/preload/src/contextBridge/SophieRendererImpl.ts @@ -19,6 +19,7 @@ */ import { ipcRenderer } from 'electron'; +import log from 'loglevel'; import type { IJsonPatch } from 'mobx-state-tree'; import { Action, @@ -41,7 +42,7 @@ class SophieRendererImpl implements SophieRenderer { // `mobx-state-tree` will validate the patch, so we can safely cast here. this.listener?.onPatch(patch as IJsonPatch); } catch (err) { - console.error('Shared store listener onPatch failed', err); + log.error('Shared store listener onPatch failed', err); this.listener = null; } }); @@ -58,7 +59,7 @@ class SophieRendererImpl implements SophieRenderer { snapshot = await ipcRenderer.invoke(RendererToMainIpcMessage.GetSharedStoreSnapshot); success = true; } catch (err) { - console.error('Failed to get initial shared store snapshot', err); + log.error('Failed to get initial shared store snapshot', err); } if (success) { if (sharedStore.is(snapshot)) { @@ -66,7 +67,7 @@ class SophieRendererImpl implements SophieRenderer { this.listener = listener; return; } - console.error('Got invalid initial shared store snapshot', snapshot); + log.error('Got invalid initial shared store snapshot', snapshot); } throw new Error('Failed to connect to shared store'); } @@ -80,7 +81,7 @@ class SophieRendererImpl implements SophieRenderer { } catch (err) { // Do not leak IPC failure details into the main world. const message = 'Failed to dispatch action'; - console.error(message, actionToDispatch, err); + log.error(message, actionToDispatch, err); throw new Error(message); } } diff --git a/packages/preload/src/contextBridge/__tests__/SophieRendererImpl.spec.ts b/packages/preload/src/contextBridge/__tests__/SophieRendererImpl.spec.ts index e40dcf5..41937c2 100644 --- a/packages/preload/src/contextBridge/__tests__/SophieRendererImpl.spec.ts +++ b/packages/preload/src/contextBridge/__tests__/SophieRendererImpl.spec.ts @@ -20,6 +20,7 @@ import { describe, it, jest } from '@jest/globals'; import { mocked } from 'jest-mock'; +import log from 'loglevel'; import type { IJsonPatch } from 'mobx-state-tree'; import { Action, @@ -66,6 +67,8 @@ const invalidAction = { action: 'not-a-valid-action', } as unknown as Action; +log.disableAll(); + describe('createSophieRenderer', () => { it('registers a shared store patch listener', () => { createSophieRenderer(false); diff --git a/yarn.lock b/yarn.lock index 3275576..15e8ac9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2809,6 +2809,13 @@ __metadata: languageName: node linkType: hard +"deep-equal@npm:~0.0.0": + version: 0.0.0 + resolution: "deep-equal@npm:0.0.0" + checksum: 024cf06cfe917e2f2debf531891537fa21a859a8e5696085d97aefc89e20c66ac20f98dd472fcbe0001f235a3b978a1f5bbbfd661ca795d87e5832b3831bd01a + languageName: node + linkType: hard + "deep-extend@npm:^0.6.0": version: 0.6.0 resolution: "deep-extend@npm:0.6.0" @@ -2846,6 +2853,13 @@ __metadata: languageName: node linkType: hard +"defined@npm:~0.0.0": + version: 0.0.0 + resolution: "defined@npm:0.0.0" + checksum: 037f80bb4d8b92e72ca99f1b24d1d9d683741b28b9cb9c7b5f4a4c913826fd7f4b103440a623a3882f2218ec3d87649fbf86c65c45e6999cf1124b9a8924fca5 + languageName: node + linkType: hard + "delayed-stream@npm:~1.0.0": version: 1.0.0 resolution: "delayed-stream@npm:1.0.0" @@ -4144,6 +4158,16 @@ __metadata: languageName: node linkType: hard +"global@npm:~2.0.7": + version: 2.0.7 + resolution: "global@npm:2.0.7" + dependencies: + min-document: ~0.2.2 + process: ~0.5.1 + checksum: f2ae2bfd251c014cd8273680b4be221f4c20eb07ad9bfce21f6de7bddbcb5d58b393488e8ebf119ede54addb561c648aa47b2407a630c3a69188c8d11c5b0d75 + languageName: node + linkType: hard + "globals@npm:^11.1.0": version: 11.12.0 resolution: "globals@npm:11.12.0" @@ -4446,7 +4470,7 @@ __metadata: languageName: node linkType: hard -"inherits@npm:2, inherits@npm:^2.0.3, inherits@npm:~2.0.3": +"inherits@npm:2, inherits@npm:^2.0.3, inherits@npm:~2.0.1, inherits@npm:~2.0.3": version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1 @@ -4467,6 +4491,13 @@ __metadata: languageName: node linkType: hard +"insert-css@npm:0.0.0": + version: 0.0.0 + resolution: "insert-css@npm:0.0.0" + checksum: d0441ad656674fe971a594dcf6f53f53cdb8d469668344a7dd15dfa7f2805829d553f3cf799d967256cead4d960f884ffcd27e45df9732916a3c8b7763a16f7b + languageName: node + linkType: hard + "ip@npm:^1.1.5": version: 1.1.5 resolution: "ip@npm:1.1.5" @@ -5424,6 +5455,13 @@ __metadata: languageName: node linkType: hard +"jsonify@npm:~0.0.0": + version: 0.0.0 + resolution: "jsonify@npm:0.0.0" + checksum: d8d4ed476c116e6987a460dcb82f22284686caae9f498ac87b0502c1765ac1522f4f450a4cad4cc368d202fd3b27a3860735140a82867fc6d558f5f199c38bce + languageName: node + linkType: hard + "jszip@npm:^3.1.0": version: 3.7.1 resolution: "jszip@npm:3.7.1" @@ -5717,6 +5755,15 @@ __metadata: languageName: node linkType: hard +"min-document@npm:~0.2.2": + version: 0.2.8 + resolution: "min-document@npm:0.2.8" + dependencies: + tape: ~1.0.2 + checksum: 6f861c6169d5b89c8592dafb1247e962319491099b676276e07663be7d4e30d17fc7bcd3576e18dd4e08c5ea6a3a87db33317d813303bdecba0b562a3fb70adc + languageName: node + linkType: hard + "minimatch@npm:3.0.4, minimatch@npm:^3.0.4": version: 3.0.4 resolution: "minimatch@npm:3.0.4" @@ -6036,6 +6083,20 @@ __metadata: languageName: node linkType: hard +"once@npm:~1.1.1": + version: 1.1.1 + resolution: "once@npm:1.1.1" + checksum: c5384f8fc8b973476afe84433ed7202cc5fdbf749abc06908716d706caca1ab951209de38f008ce8f5abca8896edec8aff83c97438a7b6808b5582e01b12864f + languageName: node + linkType: hard + +"once@npm:~1.2.0": + version: 1.2.0 + resolution: "once@npm:1.2.0" + checksum: 4e0b4908bd34dd1db7c83a262e66bcfd077ac4eff94d0499b52878346d1371770147d4d9ae6cc47f0f3a3370570b6b79289daee9ea4cfad143d19caf04849259 + languageName: node + linkType: hard + "onetime@npm:^5.1.2": version: 5.1.2 resolution: "onetime@npm:5.1.2" @@ -6261,6 +6322,18 @@ __metadata: languageName: node linkType: hard +"preload@npm:^0.1.0": + version: 0.1.0 + resolution: "preload@npm:0.1.0" + dependencies: + inherits: ~2.0.1 + insert-css: 0.0.0 + once: ~1.2.0 + xhr: ~1.2.3 + checksum: 992aa3b9f6c3b4bd40c87bfbdac389337b046d877258d6fc7e4cfc674b60d72eb3fe83ead47665bc76787c6c2ed1a41ff1dedb073f890f098607df1877e5b639 + languageName: node + linkType: hard + "prelude-ls@npm:^1.2.1": version: 1.2.1 resolution: "prelude-ls@npm:1.2.1" @@ -6301,6 +6374,13 @@ __metadata: languageName: node linkType: hard +"process@npm:~0.5.1": + version: 0.5.2 + resolution: "process@npm:0.5.2" + checksum: 613505ec6d518654fc9c677881c6b8c871179dbf4bfe23f5a7a15defdb58efb1b75bfc96576adc118ba0bca1b76c359687a13f7d43950af0b7d5caa27efbe9e3 + languageName: node + linkType: hard + "progress@npm:^2.0.0, progress@npm:^2.0.3": version: 2.0.3 resolution: "progress@npm:2.0.3" @@ -6930,6 +7010,8 @@ __metadata: esbuild: ^0.14.9 eslint: ^8.5.0 jest: ^27.4.5 + loglevel: ^1.8.0 + preload: ^0.1.0 rimraf: ^3.0.2 rollup: ^2.62.0 ts-jest: ^27.1.2 @@ -7151,6 +7233,20 @@ __metadata: languageName: node linkType: hard +"tape@npm:~1.0.2": + version: 1.0.4 + resolution: "tape@npm:1.0.4" + dependencies: + deep-equal: ~0.0.0 + defined: ~0.0.0 + jsonify: ~0.0.0 + through: ~2.3.4 + bin: + tape: ./bin/tape + checksum: c8a3e7b0dbb8450d3b18bf8d82a5ac393d0d25ed26a3fa5c1f3205e263f8828b744c6a61cd7d35fa93c4948d2da88232994bf41451186cd9caf77ed87e47871d + languageName: node + linkType: hard + "tar@npm:^6.0.2, tar@npm:^6.1.2": version: 6.1.11 resolution: "tar@npm:6.1.11" @@ -7210,6 +7306,13 @@ __metadata: languageName: node linkType: hard +"through@npm:~2.3.4": + version: 2.3.8 + resolution: "through@npm:2.3.8" + checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd + languageName: node + linkType: hard + "tmp-promise@npm:^3.0.2": version: 3.0.3 resolution: "tmp-promise@npm:3.0.3" @@ -7821,6 +7924,16 @@ __metadata: languageName: node linkType: hard +"xhr@npm:~1.2.3": + version: 1.2.4 + resolution: "xhr@npm:1.2.4" + dependencies: + global: ~2.0.7 + once: ~1.1.1 + checksum: 55840633fc96bfee99a9c7c839aa8db670f061fc13c45a4056f66c1194b0525f511dbcb5f01ba6ea2f02908f600fd19af13e6d24622ba26b168afbfd94f9211a + languageName: node + linkType: hard + "xml-name-validator@npm:^3.0.0": version: 3.0.0 resolution: "xml-name-validator@npm:3.0.0" -- cgit v1.2.3-54-g00ecf