From 7aa8b614900e56d16179c451707efe8ca1eff59f Mon Sep 17 00:00:00 2001 From: David Mattia Date: Tue, 5 Dec 2023 14:57:12 -0600 Subject: [PATCH] Use newer browser versions in tests --- karma.browserstack.js | 24 ++++++++++----- package.json | 9 ------ yarn.lock | 70 ++++++++++++++++++++++++++++++++++--------- 3 files changed, 72 insertions(+), 31 deletions(-) diff --git a/karma.browserstack.js b/karma.browserstack.js index cbbd5aa6..fbbf838d 100644 --- a/karma.browserstack.js +++ b/karma.browserstack.js @@ -11,16 +11,22 @@ module.exports = (config) => { bs_chrome_mac: { base: 'BrowserStack', browser: 'Chrome', - browser_version: '104.0', + browser_version: '118.0', os: 'OS X', - os_version: 'Big Sur', + os_version: 'Sonoma', + local: "false", + networkLogs: "true", + seleniumVersion: "3.14.0", }, bs_safari_mac: { base: 'BrowserStack', browser: 'Safari', - browser_version: '15.6', + browser_version: '17.0', os: 'OS X', - os_version: 'Monterey', + os_version: 'Sonoma', + local: 'false', + networkLogs: "true", + seleniumVersion: "3.14.0", }, // TODO: https://github.com/transcend-io/penumbra/issues/249 // bs_firefox_pc: { @@ -33,9 +39,12 @@ module.exports = (config) => { bs_edge_pc: { base: 'BrowserStack', browser: 'Edge', - browser_version: '108.0', + browser_version: '118.0', os: 'Windows', os_version: '11', + local: 'false', + networkLogs: "true", + seleniumVersion: "3.14.0", }, }; @@ -54,9 +63,8 @@ module.exports = (config) => { username: 'benjaminbrook3', project: 'Penumbra', video: true, - build: `penumbra@${packageJson.version} - ${short()} - ${ - process.env.GITHUB_RUN_ID ? `CI: ${process.env.GITHUB_RUN_ID}` : 'Local' - }`, + build: `penumbra@${packageJson.version} - ${short()} - ${process.env.GITHUB_RUN_ID ? `CI: ${process.env.GITHUB_RUN_ID}` : 'Local' + }`, // TODO - https://github.com/transcend-io/penumbra/issues/249 // // A secure context must be used for `crypto.subtle` to be defined // acceptInsecureCerts: 'true', diff --git a/package.json b/package.json index b3caf7c6..76877786 100644 --- a/package.json +++ b/package.json @@ -7,15 +7,6 @@ "directories": { "example": "example" }, - "resolutions": { - "follow-redirects": "1.14.8", - "ajv": "6.12.3", - "ansi-regex": "5.0.1", - "lodash": "4.17.21", - "glob-parent": "5.1.2", - "path-parse": "1.0.7", - "elliptic": "6.5.4" - }, "scripts": { "prepare": "yarn build", "####### Linting #######": "", diff --git a/yarn.lock b/yarn.lock index 479f65dc..f60a521e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2905,15 +2905,15 @@ __metadata: languageName: node linkType: hard -"ajv@npm:6.12.3": - version: 6.12.3 - resolution: "ajv@npm:6.12.3" +"ajv@npm:^6.1.0, ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.12.0, ajv@npm:^6.12.4": + version: 6.12.6 + resolution: "ajv@npm:6.12.6" dependencies: fast-deep-equal: ^3.1.1 fast-json-stable-stringify: ^2.0.0 json-schema-traverse: ^0.4.1 uri-js: ^4.2.2 - checksum: ca559d34710e6969d33bc1316282e1ece4d4d99ff5fdca4bfe31947740f8f90e7824238cdc2954e499cf75b2432e3e6c56b32814ebe04fccf8abcc3fbf36b348 + checksum: 874972efe5c4202ab0a68379481fbd3d1b5d0a7bd6d3cc21d40d3536ebff3352a2a1fabb632d4fd2cc7fe4cbdcd5ed6782084c9bbf7f32a1536d18f9da5007d4 languageName: node linkType: hard @@ -2924,7 +2924,14 @@ __metadata: languageName: node linkType: hard -"ansi-regex@npm:5.0.1": +"ansi-regex@npm:^4.1.0": + version: 4.1.1 + resolution: "ansi-regex@npm:4.1.1" + checksum: b1a6ee44cb6ecdabaa770b2ed500542714d4395d71c7e5c25baa631f680fb2ad322eb9ba697548d498a6fd366949fc8b5bfcf48d49a32803611f648005b01888 + languageName: node + linkType: hard + +"ansi-regex@npm:^5.0.0, ansi-regex@npm:^5.0.1": version: 5.0.1 resolution: "ansi-regex@npm:5.0.1" checksum: 2aa4bb54caf2d622f1afdad09441695af2a83aa3fe8b8afa581d205e57ed4261c183c4d3877cee25794443fde5876417d859c108078ab788d6af7e4fe52eb66b @@ -4747,7 +4754,7 @@ __metadata: languageName: node linkType: hard -"elliptic@npm:6.5.4": +"elliptic@npm:^6.5.3": version: 6.5.4 resolution: "elliptic@npm:6.5.4" dependencies: @@ -5638,13 +5645,13 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:1.14.8": - version: 1.14.8 - resolution: "follow-redirects@npm:1.14.8" +"follow-redirects@npm:^1.0.0": + version: 1.15.3 + resolution: "follow-redirects@npm:1.15.3" peerDependenciesMeta: debug: optional: true - checksum: 40c67899c2e3149a27e8b6498a338ff27f39fe138fde8d7f0756cb44b073ba0bfec3d52af28f20c5bdd67263d564d0d8d7b5efefd431de95c18c42f7b4aef457 + checksum: 584da22ec5420c837bd096559ebfb8fe69d82512d5585004e36a3b4a6ef6d5905780e0c74508c7b72f907d1fa2b7bd339e613859e9c304d0dc96af2027fd0231 languageName: node linkType: hard @@ -5893,7 +5900,17 @@ __metadata: languageName: node linkType: hard -"glob-parent@npm:5.1.2": +"glob-parent@npm:^3.1.0": + version: 3.1.0 + resolution: "glob-parent@npm:3.1.0" + dependencies: + is-glob: ^3.1.0 + path-dirname: ^1.0.0 + checksum: 653d559237e89a11b9934bef3f392ec42335602034c928590544d383ff5ef449f7b12f3cfa539708e74bc0a6c28ab1fe51d663cc07463cdf899ba92afd85a855 + languageName: node + linkType: hard + +"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2": version: 5.1.2 resolution: "glob-parent@npm:5.1.2" dependencies: @@ -5902,6 +5919,15 @@ __metadata: languageName: node linkType: hard +"glob-parent@npm:^6.0.1": + version: 6.0.2 + resolution: "glob-parent@npm:6.0.2" + dependencies: + is-glob: ^4.0.3 + checksum: c13ee97978bef4f55106b71e66428eb1512e71a7466ba49025fc2aec59a5bfb0954d5abd58fc5ee6c9b076eef4e1f6d3375c2e964b88466ca390da4419a786a8 + languageName: node + linkType: hard + "glob@npm:^7.0.0, glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6": version: 7.1.6 resolution: "glob@npm:7.1.6" @@ -6741,7 +6767,7 @@ __metadata: languageName: node linkType: hard -"is-extglob@npm:^2.1.1": +"is-extglob@npm:^2.1.0, is-extglob@npm:^2.1.1": version: 2.1.1 resolution: "is-extglob@npm:2.1.1" checksum: df033653d06d0eb567461e58a7a8c9f940bd8c22274b94bf7671ab36df5719791aae15eef6d83bbb5e23283967f2f984b8914559d4449efda578c775c4be6f85 @@ -6762,6 +6788,15 @@ __metadata: languageName: node linkType: hard +"is-glob@npm:^3.1.0": + version: 3.1.0 + resolution: "is-glob@npm:3.1.0" + dependencies: + is-extglob: ^2.1.0 + checksum: 9d483bca84f16f01230f7c7c8c63735248fe1064346f292e0f6f8c76475fd20c6f50fc19941af5bec35f85d6bf26f4b7768f39a48a5f5fdc72b408dc74e07afc + languageName: node + linkType: hard + "is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:~4.0.1": version: 4.0.1 resolution: "is-glob@npm:4.0.1" @@ -7646,7 +7681,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:4.17.21": +"lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 @@ -8726,6 +8761,13 @@ __metadata: languageName: node linkType: hard +"path-dirname@npm:^1.0.0": + version: 1.0.2 + resolution: "path-dirname@npm:1.0.2" + checksum: 0d2f6604ae05a252a0025318685f290e2764ecf9c5436f203cdacfc8c0b17c24cdedaa449d766beb94ab88cc7fc70a09ec21e7933f31abc2b719180883e5e33f + languageName: node + linkType: hard + "path-exists@npm:^3.0.0": version: 3.0.0 resolution: "path-exists@npm:3.0.0" @@ -8761,7 +8803,7 @@ __metadata: languageName: node linkType: hard -"path-parse@npm:1.0.7": +"path-parse@npm:^1.0.6, path-parse@npm:^1.0.7": version: 1.0.7 resolution: "path-parse@npm:1.0.7" checksum: 49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a