From 57dfae0cc7d45b60062287b1e467d7c734656c35 Mon Sep 17 00:00:00 2001 From: jamesmisson Date: Mon, 22 Apr 2024 12:17:45 +0100 Subject: [PATCH 1/2] 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/2] 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'