From 57dfae0cc7d45b60062287b1e467d7c734656c35 Mon Sep 17 00:00:00 2001 From: jamesmisson Date: Mon, 22 Apr 2024 12:17:45 +0100 Subject: [PATCH 1/8] fix issue 990: https://github.com/UniversalViewer/universalviewer/issues/990 --- jest-puppeteer.config.js | 3 ++ package-lock.json | 70 +++++++++++----------------------------- 2 files changed, 21 insertions(+), 52 deletions(-) diff --git a/jest-puppeteer.config.js b/jest-puppeteer.config.js index 8980f1ba2..01477f2ce 100644 --- a/jest-puppeteer.config.js +++ b/jest-puppeteer.config.js @@ -1,3 +1,5 @@ +const { mapSeries } = require("async"); + module.exports = { launch: { headless: process.env.CI === 'true', @@ -5,6 +7,7 @@ module.exports = { server: { command: 'npm run e2eserve', port: 4444, + launchTimeout: 10000, }, setupFilesAfterEnv: [ './jest.setup.js' diff --git a/package-lock.json b/package-lock.json index 4ba795f2e..f126b86bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1756,7 +1756,7 @@ "babylon": "^6.18.0", "convert-source-map": "^1.5.1", "debug": "^2.6.9", - "json5": "^0.5.1", + "json5": "^2.2.2", "lodash": "^4.17.4", "minimatch": "^3.0.4", "path-is-absolute": "^1.0.1", @@ -9986,12 +9986,14 @@ "dev": true }, "node_modules/json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==", - "dev": true, + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "bin": { "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" } }, "node_modules/jsonc-parser": { @@ -10295,23 +10297,12 @@ "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", - "json5": "^2.1.2" + "json5": "^2.2.2" }, "engines": { "node": ">=8.9.0" } }, - "node_modules/loader-utils/node_modules/json5": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", - "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/localforage": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz", @@ -10729,6 +10720,7 @@ "version": "1.2.7", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -17803,17 +17795,6 @@ "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0" } }, - "node_modules/worker-loader/node_modules/json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dependencies": { - "minimist": "^1.2.0" - }, - "bin": { - "json5": "lib/cli.js" - } - }, "node_modules/worker-loader/node_modules/loader-utils": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", @@ -17821,7 +17802,7 @@ "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", - "json5": "^1.0.1" + "json5": "^2.2.2" }, "engines": { "node": ">=4.0.0" @@ -19552,7 +19533,7 @@ "babylon": "^6.18.0", "convert-source-map": "^1.5.1", "debug": "^2.6.9", - "json5": "^0.5.1", + "json5": "^2.2.2", "lodash": "^4.17.4", "minimatch": "^3.0.4", "path-is-absolute": "^1.0.1", @@ -26123,10 +26104,9 @@ "dev": true }, "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==", - "dev": true + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" }, "jsonc-parser": { "version": "3.2.0", @@ -26366,14 +26346,7 @@ "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", - "json5": "^2.1.2" - }, - "dependencies": { - "json5": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", - "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==" - } + "json5": "^2.2.2" } }, "localforage": { @@ -26723,7 +26696,8 @@ "minimist": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==" + "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", + "dev": true }, "mixin-deep": { "version": "1.3.2", @@ -32294,14 +32268,6 @@ "schema-utils": "^0.4.0" }, "dependencies": { - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "requires": { - "minimist": "^1.2.0" - } - }, "loader-utils": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", @@ -32309,7 +32275,7 @@ "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", - "json5": "^1.0.1" + "json5": "^2.2.2" } }, "schema-utils": { From ea0a6f2455af1cf3b3e23445ee8550580eac9561 Mon Sep 17 00:00:00 2001 From: jamesmisson Date: Mon, 22 Apr 2024 12:22:57 +0100 Subject: [PATCH 2/8] fix issue 990 --- jest-puppeteer.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/jest-puppeteer.config.js b/jest-puppeteer.config.js index 01477f2ce..14deae8e7 100644 --- a/jest-puppeteer.config.js +++ b/jest-puppeteer.config.js @@ -7,7 +7,6 @@ module.exports = { server: { command: 'npm run e2eserve', port: 4444, - launchTimeout: 10000, }, setupFilesAfterEnv: [ './jest.setup.js' From c9175a77f4a2f4aca00b446910d585e3b642f019 Mon Sep 17 00:00:00 2001 From: jamesmisson Date: Mon, 22 Apr 2024 15:00:41 +0100 Subject: [PATCH 3/8] update browserify-sign --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index f126b86bc..fc82f6728 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2239,8 +2239,8 @@ } }, "node_modules/browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", "dependencies": { "bn.js": "^5.1.1", @@ -3277,7 +3277,7 @@ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", "dependencies": { "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", + "browserify-sign": "^4.2.2", "create-ecdh": "^4.0.0", "create-hash": "^1.1.0", "create-hmac": "^1.1.0", @@ -19972,8 +19972,8 @@ } }, "browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", "requires": { "bn.js": "^5.1.1", @@ -20805,7 +20805,7 @@ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", "requires": { "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", + "browserify-sign": "^4.2.2", "create-ecdh": "^4.0.0", "create-hash": "^1.1.0", "create-hmac": "^1.1.0", From 3304f32bd79eb9d95ba0785e25f7bd9780fde6ce Mon Sep 17 00:00:00 2001 From: jamesmisson Date: Mon, 22 Apr 2024 15:53:58 +0100 Subject: [PATCH 4/8] correct integrity hash for browserify-sign --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index fc82f6728..6e7608f3b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2241,7 +2241,7 @@ "node_modules/browserify-sign": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==", "dependencies": { "bn.js": "^5.1.1", "browserify-rsa": "^4.0.1", @@ -19974,7 +19974,7 @@ "browserify-sign": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==", "requires": { "bn.js": "^5.1.1", "browserify-rsa": "^4.0.1", From e44b4ab6abfaba7d685c1d5d6d95c390ded1bfc4 Mon Sep 17 00:00:00 2001 From: jamesmisson Date: Mon, 22 Apr 2024 17:02:33 +0100 Subject: [PATCH 5/8] update node-forge --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e7608f3b..d3b8e66f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11030,8 +11030,8 @@ } }, "node_modules/node-forge": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz", "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", "dev": true, "engines": { @@ -13768,7 +13768,7 @@ "integrity": "sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA==", "dev": true, "dependencies": { - "node-forge": "^0.10.0" + "node-forge": "^1.3.0" } }, "node_modules/semver": { @@ -26956,8 +26956,8 @@ } }, "node-forge": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz", "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", "dev": true }, @@ -29099,7 +29099,7 @@ "integrity": "sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA==", "dev": true, "requires": { - "node-forge": "^0.10.0" + "node-forge": "^1.3.0" } }, "semver": { From a8a892194f48f80d0a87fe69bde59096708fda53 Mon Sep 17 00:00:00 2001 From: jamesmisson Date: Mon, 22 Apr 2024 17:06:46 +0100 Subject: [PATCH 6/8] correct node-forge integrity hash --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index d3b8e66f0..184c51aeb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11032,7 +11032,7 @@ "node_modules/node-forge": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz", - "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", + "integrity": "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==", "dev": true, "engines": { "node": ">= 6.0.0" From bd0087bf3fbdd40593fe6cd23000323c53fe8ab0 Mon Sep 17 00:00:00 2001 From: jamesmisson Date: Tue, 23 Apr 2024 14:55:23 +0100 Subject: [PATCH 7/8] update merge to 2.1.1 --- jest-puppeteer.config.js | 1 - package-lock.json | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/jest-puppeteer.config.js b/jest-puppeteer.config.js index 14deae8e7..2a46608f6 100644 --- a/jest-puppeteer.config.js +++ b/jest-puppeteer.config.js @@ -1,5 +1,4 @@ const { mapSeries } = require("async"); - module.exports = { launch: { headless: process.env.CI === 'true', diff --git a/package-lock.json b/package-lock.json index 184c51aeb..995766c8a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4726,7 +4726,7 @@ "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==", "dev": true, "dependencies": { - "merge": "^1.2.0" + "merge": "^2.1.1" } }, "node_modules/execa": { @@ -10565,8 +10565,8 @@ } }, "node_modules/merge": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz", "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==", "dev": true }, @@ -21886,7 +21886,7 @@ "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==", "dev": true, "requires": { - "merge": "^1.2.0" + "merge": "^2.1.1" } }, "execa": { @@ -26573,8 +26573,8 @@ } }, "merge": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz", "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==", "dev": true }, @@ -26958,7 +26958,7 @@ "node-forge": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz", - "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", + "integrity": "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==", "dev": true }, "node-int64": { From c1d7a4c6b26fefaf15570a7628abe8af376bae4f Mon Sep 17 00:00:00 2001 From: jamesmisson Date: Tue, 23 Apr 2024 15:06:13 +0100 Subject: [PATCH 8/8] correct integrity hash --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 995766c8a..4fd7e7191 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10567,7 +10567,7 @@ "node_modules/merge": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz", - "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==", + "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==", "dev": true }, "node_modules/merge-deep": {