From 9ba4e3215245097d0dd99e39f0185d315e1643eb Mon Sep 17 00:00:00 2001 From: Piotr Wysocki <86244209+piwysocki@users.noreply.github.com> Date: Tue, 21 Feb 2023 19:59:49 +0100 Subject: [PATCH 1/4] Bump file-saver to v2 --- package-lock.json | 28 ++++++++++++++-------------- package.json | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7ed54567b..c9cbdd87b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "d3": "4.13.0", "d3-dsv": "2.0.0", "express": "4.17.3", - "file-saver": "1.3.3", + "file-saver": "2.0.5", "fs-extra": "11.1.0", "helmet": "6.0.0", "highlight.js": "11.4.0", @@ -68,7 +68,7 @@ "@types/enzyme": "3.10.12", "@types/express": "4.11.1", "@types/express-session": "1.15.6", - "@types/file-saver": "1.3.0", + "@types/file-saver": "2.0.3", "@types/fs-extra": "9.0.13", "@types/geojson": "7946.0.0", "@types/js-yaml": "3.10.1", @@ -3322,9 +3322,9 @@ } }, "node_modules/@types/file-saver": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-1.3.0.tgz", - "integrity": "sha512-fC12hKtEzVkrV/ZRcrmqvpHG/TMYDZtgpAmgMUA4F7KneDaQeFMwmPz8AfygKKJMqsdTi8bL+E+fciaaMLxUhg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.3.tgz", + "integrity": "sha512-MBIou8pd/41jkff7s97B47bc9+p0BszqqDJsO51yDm49uUxeKzrfuNl5fSLC6BpLEWKA8zlwyqALVmXrFwoBHQ==", "dev": true }, "node_modules/@types/fs-extra": { @@ -10564,9 +10564,9 @@ } }, "node_modules/file-saver": { - "version": "1.3.3", - "resolved": "http://registry.npmjs.org/file-saver/-/file-saver-1.3.3.tgz", - "integrity": "sha1-zdTETTqiZOrC9o7BZbx5HDSvEjI=" + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" }, "node_modules/file-uri-to-path": { "version": "1.0.0", @@ -26616,9 +26616,9 @@ } }, "@types/file-saver": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-1.3.0.tgz", - "integrity": "sha512-fC12hKtEzVkrV/ZRcrmqvpHG/TMYDZtgpAmgMUA4F7KneDaQeFMwmPz8AfygKKJMqsdTi8bL+E+fciaaMLxUhg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.3.tgz", + "integrity": "sha512-MBIou8pd/41jkff7s97B47bc9+p0BszqqDJsO51yDm49uUxeKzrfuNl5fSLC6BpLEWKA8zlwyqALVmXrFwoBHQ==", "dev": true }, "@types/fs-extra": { @@ -32406,9 +32406,9 @@ } }, "file-saver": { - "version": "1.3.3", - "resolved": "http://registry.npmjs.org/file-saver/-/file-saver-1.3.3.tgz", - "integrity": "sha1-zdTETTqiZOrC9o7BZbx5HDSvEjI=" + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" }, "file-uri-to-path": { "version": "1.0.0", diff --git a/package.json b/package.json index cf2afd54c..143f9238e 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "d3": "4.13.0", "d3-dsv": "2.0.0", "express": "4.17.3", - "file-saver": "1.3.3", + "file-saver": "2.0.5", "fs-extra": "11.1.0", "helmet": "6.0.0", "highlight.js": "11.4.0", @@ -109,7 +109,7 @@ "@types/enzyme": "3.10.12", "@types/express": "4.11.1", "@types/express-session": "1.15.6", - "@types/file-saver": "1.3.0", + "@types/file-saver": "2.0.3", "@types/fs-extra": "9.0.13", "@types/geojson": "7946.0.0", "@types/js-yaml": "3.10.1", From 52d0b46c136feec760c90a8935a1f63aacb2a641 Mon Sep 17 00:00:00 2001 From: Piotr Wysocki <86244209+piwysocki@users.noreply.github.com> Date: Tue, 21 Feb 2023 20:23:21 +0100 Subject: [PATCH 2/4] test fix --- src/client/utils/test-utils/jsdom-setup.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client/utils/test-utils/jsdom-setup.ts b/src/client/utils/test-utils/jsdom-setup.ts index 23d68db2f..d0b762949 100644 --- a/src/client/utils/test-utils/jsdom-setup.ts +++ b/src/client/utils/test-utils/jsdom-setup.ts @@ -25,6 +25,7 @@ const kickstart = () => { g.navigator = { userAgent: "testing" }; + g.HTMLAnchorElement = window.HTMLAnchorElement; }; const cleanup = () => { @@ -32,6 +33,7 @@ const cleanup = () => { delete g.document; delete g.window; delete g.navigator; + delete g.HTMLAnchorElement; }; // Initial kickstart is neede because of required modules From 8d2bed40f3ac5a01f839ec79fe7a35e7f520d029 Mon Sep 17 00:00:00 2001 From: Piotr Wysocki <86244209+piwysocki@users.noreply.github.com> Date: Thu, 16 Mar 2023 19:56:20 +0100 Subject: [PATCH 3/4] merge --- package-lock.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 49b5d3cf4..185ed2099 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "d3": "4.13.0", "d3-dsv": "2.0.0", "express": "4.18.2", - "file-saver": "1.3.8", + "file-saver": "2.0.5", "fs-extra": "11.1.0", "helmet": "6.0.0", "highlight.js": "11.7.0", @@ -67,7 +67,7 @@ "@types/d3-dsv": "2.0.1", "@types/enzyme": "3.10.9", "@types/express": "4.17.13", - "@types/file-saver": "1.3.1", + "@types/file-saver": "2.0.3", "@types/fs-extra": "9.0.6", "@types/js-yaml": "4.0.2", "@types/jsdom": "2.0.34", @@ -3318,9 +3318,9 @@ } }, "node_modules/@types/file-saver": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-1.3.1.tgz", - "integrity": "sha512-A+lNc0nnhtX3iTLEYd/DisKTZdNKTf1bN0aSfQD/fG8bQ6SfUe5u8Fm2ab8qQHaMY5GVZumAXLnYptwX+mmQgg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.3.tgz", + "integrity": "sha512-MBIou8pd/41jkff7s97B47bc9+p0BszqqDJsO51yDm49uUxeKzrfuNl5fSLC6BpLEWKA8zlwyqALVmXrFwoBHQ==", "dev": true }, "node_modules/@types/fs-extra": { @@ -10564,9 +10564,9 @@ } }, "node_modules/file-saver": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.8.tgz", - "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==" + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" }, "node_modules/file-uri-to-path": { "version": "1.0.0", @@ -26418,9 +26418,9 @@ } }, "@types/file-saver": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-1.3.1.tgz", - "integrity": "sha512-A+lNc0nnhtX3iTLEYd/DisKTZdNKTf1bN0aSfQD/fG8bQ6SfUe5u8Fm2ab8qQHaMY5GVZumAXLnYptwX+mmQgg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.3.tgz", + "integrity": "sha512-MBIou8pd/41jkff7s97B47bc9+p0BszqqDJsO51yDm49uUxeKzrfuNl5fSLC6BpLEWKA8zlwyqALVmXrFwoBHQ==", "dev": true }, "@types/fs-extra": { @@ -32197,9 +32197,9 @@ } }, "file-saver": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.8.tgz", - "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==" + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" }, "file-uri-to-path": { "version": "1.0.0", From aa39f2deac6bcd3f437a27f5985fcea613e36a7b Mon Sep 17 00:00:00 2001 From: Piotr Wysocki <86244209+piwysocki@users.noreply.github.com> Date: Sun, 19 Mar 2023 09:01:17 +0100 Subject: [PATCH 4/4] merge --- package-lock.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index ecc9cec82..db6f7f8d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "d3": "4.13.0", "d3-dsv": "2.0.0", "express": "4.18.2", - "file-saver": "1.3.8", + "file-saver": "2.0.5", "fs-extra": "11.1.0", "helmet": "6.0.0", "highlight.js": "11.7.0", @@ -67,7 +67,7 @@ "@types/d3-dsv": "2.0.1", "@types/enzyme": "3.10.9", "@types/express": "4.17.13", - "@types/file-saver": "1.3.1", + "@types/file-saver": "2.0.3", "@types/fs-extra": "9.0.6", "@types/js-yaml": "4.0.2", "@types/jsdom": "2.0.34", @@ -3315,9 +3315,9 @@ } }, "node_modules/@types/file-saver": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-1.3.1.tgz", - "integrity": "sha512-A+lNc0nnhtX3iTLEYd/DisKTZdNKTf1bN0aSfQD/fG8bQ6SfUe5u8Fm2ab8qQHaMY5GVZumAXLnYptwX+mmQgg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.3.tgz", + "integrity": "sha512-MBIou8pd/41jkff7s97B47bc9+p0BszqqDJsO51yDm49uUxeKzrfuNl5fSLC6BpLEWKA8zlwyqALVmXrFwoBHQ==", "dev": true }, "node_modules/@types/fs-extra": { @@ -10579,9 +10579,9 @@ } }, "node_modules/file-saver": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.8.tgz", - "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==" + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" }, "node_modules/file-uri-to-path": { "version": "1.0.0", @@ -26433,9 +26433,9 @@ } }, "@types/file-saver": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-1.3.1.tgz", - "integrity": "sha512-A+lNc0nnhtX3iTLEYd/DisKTZdNKTf1bN0aSfQD/fG8bQ6SfUe5u8Fm2ab8qQHaMY5GVZumAXLnYptwX+mmQgg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.3.tgz", + "integrity": "sha512-MBIou8pd/41jkff7s97B47bc9+p0BszqqDJsO51yDm49uUxeKzrfuNl5fSLC6BpLEWKA8zlwyqALVmXrFwoBHQ==", "dev": true }, "@types/fs-extra": { @@ -32232,9 +32232,9 @@ } }, "file-saver": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.8.tgz", - "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==" + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" }, "file-uri-to-path": { "version": "1.0.0",