From 5bf0a679d31147be3c497eeb638c74155be78750 Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Thu, 25 Apr 2024 08:58:44 +0100 Subject: [PATCH 01/15] Snyk package updates --- package.json | 4 +- .../molecules/f-searchbox/package.json | 2 +- .../molecules/f-user-message/package.json | 2 +- .../organisms/f-cookie-banner/package.json | 2 +- .../components/pages/f-checkout/package.json | 2 +- .../components/pages/f-offers/package.json | 2 +- .../pages/f-self-exclusion/package.json | 2 +- .../f-takeawaypay-activation/package.json | 2 +- packages/services/f-http/package.json | 2 +- packages/services/f-services/package.json | 2 +- yarn.lock | 105 ++++++------------ 11 files changed, 44 insertions(+), 83 deletions(-) diff --git a/package.json b/package.json index 46a6650362..57b31b9478 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "allure-commandline": "2.17.2", "axe-core": "4.3.5", "axe-reports": "1.1.11", - "axios": "0.21.4", + "axios": "0.28.1", "axios-mock-adapter": "1.19.0", "babel-core": "7.0.0-bridge.0", "babel-jest": "29.7.0", @@ -125,7 +125,7 @@ "stylelint": "16.1.0", "stylelint-scss": "3.18.0", "turbo": "1.6.0", - "vite": "2.9.16", + "vite": "2.9.18", "vue": "2.6.10", "vue-router": "3.5.2", "vue-svg-loader": "0.16.0", diff --git a/packages/components/molecules/f-searchbox/package.json b/packages/components/molecules/f-searchbox/package.json index d39dfdd5f9..84fcc74e55 100644 --- a/packages/components/molecules/f-searchbox/package.json +++ b/packages/components/molecules/f-searchbox/package.json @@ -56,7 +56,7 @@ ], "dependencies": { "@justeat/f-services": "1.x", - "axios": "0.21.2", + "axios": "0.28.1", "lodash.debounce": "4.0.8" }, "peerDependencies": { diff --git a/packages/components/molecules/f-user-message/package.json b/packages/components/molecules/f-user-message/package.json index 51f57ddaeb..b7077254ca 100644 --- a/packages/components/molecules/f-user-message/package.json +++ b/packages/components/molecules/f-user-message/package.json @@ -48,7 +48,7 @@ "dependencies": { "@justeat/f-services": "1.x", "@justeattakeaway/pie-icons-vue": "2.0.0-beta.1", - "axios": "0.21.2", + "axios": "0.28.1", "lodash-es": "4.17.21" }, "peerDependencies": { diff --git a/packages/components/organisms/f-cookie-banner/package.json b/packages/components/organisms/f-cookie-banner/package.json index b08f73355b..4fce719d45 100644 --- a/packages/components/organisms/f-cookie-banner/package.json +++ b/packages/components/organisms/f-cookie-banner/package.json @@ -70,7 +70,7 @@ "gulp-concat": "2.6.1", "gulp-rename": "2.0.0", "gulp-replace": "1.1.3", - "prerender-spa-plugin": "3.2.1", + "prerender-spa-plugin": "3.4.0", "vue-cli-plugin-prerender-spa": "1.1.6", "vue-template-compiler": "2.6.10" }, diff --git a/packages/components/pages/f-checkout/package.json b/packages/components/pages/f-checkout/package.json index 2357f87fdd..e8b8cf5f8f 100644 --- a/packages/components/pages/f-checkout/package.json +++ b/packages/components/pages/f-checkout/package.json @@ -55,7 +55,7 @@ "dependencies": { "@justeat/f-globalisation": "1.x", "@justeat/f-services": "1.x", - "axios": "1.6.0", + "axios": "1.6.8", "jwt-decode": "3.1.2", "vue-scrollto": "2.20.0", "vuelidate": "0.7.6" diff --git a/packages/components/pages/f-offers/package.json b/packages/components/pages/f-offers/package.json index 2cad18a668..94c4fd5f04 100644 --- a/packages/components/pages/f-offers/package.json +++ b/packages/components/pages/f-offers/package.json @@ -50,7 +50,7 @@ "@justeat/f-globalisation": "1.2.0", "@justeat/f-services": "1.x", "@justeattakeaway/cc-braze-adapter": "0.5.0", - "axios": "0.21.2", + "axios": "0.28.1", "jwt-decode": "3.1.2" }, "peerDependencies": { diff --git a/packages/components/pages/f-self-exclusion/package.json b/packages/components/pages/f-self-exclusion/package.json index e623b8b483..babd8c1231 100644 --- a/packages/components/pages/f-self-exclusion/package.json +++ b/packages/components/pages/f-self-exclusion/package.json @@ -54,7 +54,7 @@ "@justeat/f-form-field": "6.x", "@justeat/f-globalisation": "1.x", "@justeat/f-services": "1.x", - "axios": "0.21.2" + "axios": "0.28.1" }, "peerDependencies": { "@justeat/browserslist-config-fozzie": ">=1.2.0" diff --git a/packages/components/pages/f-takeawaypay-activation/package.json b/packages/components/pages/f-takeawaypay-activation/package.json index 6303c89a70..2f3f8368bf 100644 --- a/packages/components/pages/f-takeawaypay-activation/package.json +++ b/packages/components/pages/f-takeawaypay-activation/package.json @@ -51,7 +51,7 @@ ], "dependencies": { "@justeat/f-services": "1.x", - "axios": "0.21.2" + "axios": "0.28.1" }, "peerDependencies": { "@justeat/browserslist-config-fozzie": ">=1.2.0", diff --git a/packages/services/f-http/package.json b/packages/services/f-http/package.json index f64ce8543f..2f74e2fd54 100644 --- a/packages/services/f-http/package.json +++ b/packages/services/f-http/package.json @@ -44,7 +44,7 @@ "extends @justeat/browserslist-config-fozzie" ], "dependencies": { - "axios": "0.21.2", + "axios": "0.28.1", "axios-mock-adapter": "1.19.0" }, "volta": { diff --git a/packages/services/f-services/package.json b/packages/services/f-services/package.json index 25a8c50e83..9e579dd8b0 100644 --- a/packages/services/f-services/package.json +++ b/packages/services/f-services/package.json @@ -46,7 +46,7 @@ "window-or-global": "1.0.1" }, "peerDependencies": { - "axios": ">=0.21.1" + "axios": ">=0.28.1" }, "volta": { "extends": "../../../package.json" diff --git a/yarn.lock b/yarn.lock index f1f193874f..6b134b6e8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3812,7 +3812,7 @@ __metadata: "@justeat/f-vue-icons": 3.x "@justeat/f-wdio-utils": 1.x "@vue/cli-plugin-babel": 5.0.0 - axios: 1.6.0 + axios: 1.6.8 jwt-decode: 3.1.2 vue-scrollto: 2.20.0 vuelidate: 0.7.6 @@ -3959,7 +3959,7 @@ __metadata: gulp-concat: 2.6.1 gulp-rename: 2.0.0 gulp-replace: 1.1.3 - prerender-spa-plugin: 3.2.1 + prerender-spa-plugin: 3.4.0 vue-cli-plugin-prerender-spa: 1.1.6 vue-template-compiler: 2.6.10 peerDependencies: @@ -4119,7 +4119,7 @@ __metadata: version: 0.0.0-use.local resolution: "@justeat/f-http@workspace:packages/services/f-http" dependencies: - axios: 0.21.2 + axios: 0.28.1 axios-mock-adapter: 1.19.0 languageName: unknown linkType: soft @@ -4281,7 +4281,7 @@ __metadata: "@justeat/f-wdio-utils": 1.x "@justeattakeaway/cc-braze-adapter": 0.5.0 "@vue/cli-plugin-babel": 5.0.0 - axios: 0.21.2 + axios: 0.28.1 jwt-decode: 3.1.2 peerDependencies: "@braze/web-sdk": ">=4.5.0" @@ -4393,7 +4393,7 @@ __metadata: "@justeat/f-services": 1.x "@justeat/f-vue-icons": 3.x "@justeat/f-wdio-utils": 1.x - axios: 0.21.2 + axios: 0.28.1 lodash.debounce: 4.0.8 url-loader: 4.1.0 peerDependencies: @@ -4429,7 +4429,7 @@ __metadata: "@justeat/f-wdio-utils": 1.x "@vue/cli-plugin-babel": 5.0.0 "@vue/test-utils": 1.0.3 - axios: 0.21.2 + axios: 0.28.1 peerDependencies: "@justeat/browserslist-config-fozzie": ">=1.2.0" languageName: unknown @@ -4442,7 +4442,7 @@ __metadata: lodash-es: 4.17.21 window-or-global: 1.0.1 peerDependencies: - axios: ">=0.21.1" + axios: ">=0.28.1" languageName: unknown linkType: soft @@ -4508,7 +4508,7 @@ __metadata: "@justeat/f-services": 1.x "@justeat/f-vue-icons": 3.x "@justeat/f-wdio-utils": 1.x - axios: 0.21.2 + axios: 0.28.1 peerDependencies: "@justeat/browserslist-config-fozzie": ">=1.2.0" "@justeat/f-button": 4.x @@ -4567,7 +4567,7 @@ __metadata: "@justeat/f-services": 1.x "@justeat/f-wdio-utils": 1.x "@justeattakeaway/pie-icons-vue": 2.0.0-beta.1 - axios: 0.21.2 + axios: 0.28.1 lodash-es: 4.17.21 peerDependencies: "@justeat/eslint-config-fozzie": ">=3.3.1" @@ -6222,7 +6222,7 @@ __metadata: languageName: node linkType: hard -"@prerenderer/prerenderer@npm:^0.7.1, @prerenderer/prerenderer@npm:^0.7.2": +"@prerenderer/prerenderer@npm:^0.7.2": version: 0.7.2 resolution: "@prerenderer/prerenderer@npm:0.7.2" dependencies: @@ -6233,16 +6233,6 @@ __metadata: languageName: node linkType: hard -"@prerenderer/renderer-puppeteer@npm:^0.1.4": - version: 0.1.4 - resolution: "@prerenderer/renderer-puppeteer@npm:0.1.4" - dependencies: - promise-limit: ^2.5.0 - puppeteer: ^1.0.0 - checksum: 221e4ba8484c8376dd2f0ccf2950f744be4e1c0b41c6e656ee33a81cbc3f34f02443d8b4442e6b040de8ee4aa869311d4cebc2fd65e926df4b3187162f18655d - languageName: node - linkType: hard - "@prerenderer/renderer-puppeteer@npm:^0.2.0": version: 0.2.0 resolution: "@prerenderer/renderer-puppeteer@npm:0.2.0" @@ -10856,24 +10846,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:0.21.2": - version: 0.21.2 - resolution: "axios@npm:0.21.2" - dependencies: - follow-redirects: ^1.14.0 - checksum: 41299c21f77323e7c56ea49d2d5ed25407d24bb145a4ce3441a8db17359ae56554f9495dca6e15d343a9530e106212a684c75a4db3bedfbe19f6414a8d94378e - languageName: node - linkType: hard - -"axios@npm:0.21.4": - version: 0.21.4 - resolution: "axios@npm:0.21.4" - dependencies: - follow-redirects: ^1.14.0 - checksum: 44245f24ac971e7458f3120c92f9d66d1fc695e8b97019139de5b0cc65d9b8104647db01e5f46917728edfc0cfd88eb30fc4c55e6053eef4ace76768ce95ff3c - languageName: node - linkType: hard - "axios@npm:0.25.0": version: 0.25.0 resolution: "axios@npm:0.25.0" @@ -10883,27 +10855,18 @@ __metadata: languageName: node linkType: hard -"axios@npm:1.6.0": - version: 1.6.0 - resolution: "axios@npm:1.6.0" +"axios@npm:0.28.1": + version: 0.28.1 + resolution: "axios@npm:0.28.1" dependencies: follow-redirects: ^1.15.0 form-data: ^4.0.0 proxy-from-env: ^1.1.0 - checksum: c7c9f2ae9e0b9bad7d6f9a4dff030930b12ee667dedf54c3c776714f91681feb743c509ac0796ae5c01e12c4ab4a2bee74905068dd200fbc1ab86f9814578fb0 + checksum: 5115a38d79064d07437c5a28f15841e3607634040e3120ec06a2c4367a7d07cf213b16496eab53b6f58ebc5fb377a440ba9ed4782529b14449a1e285734bfb54 languageName: node linkType: hard -"axios@npm:^0.24.0": - version: 0.24.0 - resolution: "axios@npm:0.24.0" - dependencies: - follow-redirects: ^1.14.4 - checksum: 468cf496c08a6aadfb7e699bebdac02851e3043d4e7d282350804ea8900e30d368daa6e3cd4ab83b8ddb5a3b1e17a5a21ada13fc9cebd27b74828f47a4236316 - languageName: node - linkType: hard - -"axios@npm:^1.6.7": +"axios@npm:1.6.8, axios@npm:^1.6.7": version: 1.6.8 resolution: "axios@npm:1.6.8" dependencies: @@ -10914,6 +10877,15 @@ __metadata: languageName: node linkType: hard +"axios@npm:^0.24.0": + version: 0.24.0 + resolution: "axios@npm:0.24.0" + dependencies: + follow-redirects: ^1.14.4 + checksum: 468cf496c08a6aadfb7e699bebdac02851e3043d4e7d282350804ea8900e30d368daa6e3cd4ab83b8ddb5a3b1e17a5a21ada13fc9cebd27b74828f47a4236316 + languageName: node + linkType: hard + "babel-code-frame@npm:^6.26.0": version: 6.26.0 resolution: "babel-code-frame@npm:6.26.0" @@ -17673,7 +17645,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.4, follow-redirects@npm:^1.14.7, follow-redirects@npm:^1.15.0, follow-redirects@npm:^1.15.6": +"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.4, follow-redirects@npm:^1.14.7, follow-redirects@npm:^1.15.0, follow-redirects@npm:^1.15.6": version: 1.15.6 resolution: "follow-redirects@npm:1.15.6" peerDependenciesMeta: @@ -28199,18 +28171,7 @@ __metadata: languageName: node linkType: hard -"prerender-spa-plugin@npm:3.2.1": - version: 3.2.1 - resolution: "prerender-spa-plugin@npm:3.2.1" - dependencies: - "@prerenderer/prerenderer": ^0.7.1 - "@prerenderer/renderer-puppeteer": ^0.1.4 - html-minifier: ^3.5.16 - checksum: ee71495199bb43baba1e98bf7c588c3a0657c57b0197a00288b23707397bf9202b0ba5e7d774200298bc2295dffb322113e52618b66a0d1d056e3e8596f84ec2 - languageName: node - linkType: hard - -"prerender-spa-plugin@npm:^3.2.1": +"prerender-spa-plugin@npm:3.4.0, prerender-spa-plugin@npm:^3.2.1": version: 3.4.0 resolution: "prerender-spa-plugin@npm:3.4.0" dependencies: @@ -28805,7 +28766,7 @@ __metadata: languageName: node linkType: hard -"puppeteer@npm:^1.0.0, puppeteer@npm:^1.7.0": +"puppeteer@npm:^1.7.0": version: 1.20.0 resolution: "puppeteer@npm:1.20.0" dependencies: @@ -30381,7 +30342,7 @@ __metadata: allure-commandline: 2.17.2 axe-core: 4.3.5 axe-reports: 1.1.11 - axios: 0.21.4 + axios: 0.28.1 axios-mock-adapter: 1.19.0 babel-core: 7.0.0-bridge.0 babel-jest: 29.7.0 @@ -30422,7 +30383,7 @@ __metadata: stylelint: 16.1.0 stylelint-scss: 3.18.0 turbo: 1.6.0 - vite: 2.9.16 + vite: 2.9.18 vue: 2.6.10 vue-jest: 3.0.7 vue-router: 3.5.2 @@ -34421,9 +34382,9 @@ __metadata: languageName: node linkType: hard -"vite@npm:2.9.16": - version: 2.9.16 - resolution: "vite@npm:2.9.16" +"vite@npm:2.9.18": + version: 2.9.18 + resolution: "vite@npm:2.9.18" dependencies: esbuild: ^0.14.27 fsevents: ~2.3.2 @@ -34446,7 +34407,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: b09d899861d9266ce67bf123f4b3c9adf46bd6f9dad186237e69e08b5862d7fb38984e8503abe622f6396b1b5b6f182617292ce71e9237e1ac3c0a771d611b5a + checksum: 98e1eede70b00ddc414ae990ad61d573c8d60995738930dfa7b42bf5cdd9d218ee0c48ac4771545d68b0271742403a767539cfd42474089189e8da50570eb54e languageName: node linkType: hard From 091c8579054f53fd862239c78c4cf130ed0470a5 Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Thu, 25 Apr 2024 09:32:47 +0100 Subject: [PATCH 02/15] Versioning and changelogs --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- .../components/molecules/f-searchbox/CHANGELOG.md | 9 +++++++++ .../components/molecules/f-searchbox/package.json | 2 +- .../components/molecules/f-user-message/CHANGELOG.md | 11 ++++++++++- .../components/molecules/f-user-message/package.json | 2 +- .../components/organisms/f-cookie-banner/CHANGELOG.md | 9 +++++++++ .../components/organisms/f-cookie-banner/package.json | 2 +- packages/components/pages/f-checkout/CHANGELOG.md | 9 +++++++++ packages/components/pages/f-checkout/package.json | 2 +- packages/components/pages/f-offers/CHANGELOG.md | 9 +++++++++ packages/components/pages/f-offers/package.json | 2 +- .../components/pages/f-self-exclusion/CHANGELOG.md | 9 +++++++++ .../components/pages/f-self-exclusion/package.json | 2 +- .../pages/f-takeawaypay-activation/CHANGELOG.md | 9 +++++++++ .../pages/f-takeawaypay-activation/package.json | 2 +- packages/services/f-http/CHANGELOG.md | 9 +++++++++ packages/services/f-http/package.json | 2 +- packages/services/f-services/CHANGELOG.md | 9 +++++++++ packages/services/f-services/package.json | 2 +- 20 files changed, 101 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 505152ecee..c3bdceb4de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## v7.56.1 + +_April 25, 2024_ + +### Changed + +- Assorted security package updates. + + ## v7.56.0 _April 10, 2024_ diff --git a/package.json b/package.json index 57b31b9478..98d5de3e07 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "root", - "version": "7.56.0", + "version": "7.56.1", "private": true, "scripts": { "build": "NODE_OPTIONS=--openssl-legacy-provider cross-env-shell turbo run build --continue --token=${TURBO_TOKEN}", diff --git a/packages/components/molecules/f-searchbox/CHANGELOG.md b/packages/components/molecules/f-searchbox/CHANGELOG.md index 640ffef56b..24ff48bd51 100644 --- a/packages/components/molecules/f-searchbox/CHANGELOG.md +++ b/packages/components/molecules/f-searchbox/CHANGELOG.md @@ -3,6 +3,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## v6.9.1 + +_April 25, 2024_ + +### Changed + +- Update `axios` to latest v0 version. + + ## v6.9.0 _March 13, 2024_ diff --git a/packages/components/molecules/f-searchbox/package.json b/packages/components/molecules/f-searchbox/package.json index 84fcc74e55..bda7baf188 100644 --- a/packages/components/molecules/f-searchbox/package.json +++ b/packages/components/molecules/f-searchbox/package.json @@ -2,7 +2,7 @@ "name": "@justeat/f-searchbox", "description": "Fozzie Searchbox – Just Eat Takeaway Global Searchbox", "tag": "beta", - "version": "6.9.0", + "version": "6.9.1", "main": "dist/f-searchbox.umd.min.js", "maxBundleSize": "60kB", "files": [ diff --git a/packages/components/molecules/f-user-message/CHANGELOG.md b/packages/components/molecules/f-user-message/CHANGELOG.md index ab71aec7a3..11f7b7b061 100644 --- a/packages/components/molecules/f-user-message/CHANGELOG.md +++ b/packages/components/molecules/f-user-message/CHANGELOG.md @@ -3,6 +3,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## v4.4.1 + +_April 25, 2024_ + +### Changed + +- Update `axios` to latest v0 version. + + ## v4.4.0 _March 13, 2024_ @@ -55,7 +64,7 @@ _June 23, 2022_ ## v3.2.1 -_Jun 9, 2022_ +_June 9, 2022_ ### Changed diff --git a/packages/components/molecules/f-user-message/package.json b/packages/components/molecules/f-user-message/package.json index b7077254ca..1c1a2bfb30 100644 --- a/packages/components/molecules/f-user-message/package.json +++ b/packages/components/molecules/f-user-message/package.json @@ -1,7 +1,7 @@ { "name": "@justeat/f-user-message", "description": "Fozzie User Message – Globalised User Message Component", - "version": "4.3.0", + "version": "4.3.1", "main": "dist/f-user-message.umd.min.js", "maxBundleSize": "28kB", "files": [ diff --git a/packages/components/organisms/f-cookie-banner/CHANGELOG.md b/packages/components/organisms/f-cookie-banner/CHANGELOG.md index adc7525b2a..8b2f0cf366 100644 --- a/packages/components/organisms/f-cookie-banner/CHANGELOG.md +++ b/packages/components/organisms/f-cookie-banner/CHANGELOG.md @@ -3,6 +3,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## v4.12.1 + +_April 25, 2024_ + +### Changed + +- Update `prerender-spa-plugin` to recommended version. + + ## v4.12.0 _March 13, 2024_ diff --git a/packages/components/organisms/f-cookie-banner/package.json b/packages/components/organisms/f-cookie-banner/package.json index 4fce719d45..fa75838e7e 100644 --- a/packages/components/organisms/f-cookie-banner/package.json +++ b/packages/components/organisms/f-cookie-banner/package.json @@ -1,7 +1,7 @@ { "name": "@justeat/f-cookie-banner", "description": "Fozzie Cookie Banner - Cookie Banner", - "version": "4.12.0", + "version": "4.12.1", "main": "dist/f-cookie-banner.umd.min.js", "maxBundleSize": "92kB", "files": [ diff --git a/packages/components/pages/f-checkout/CHANGELOG.md b/packages/components/pages/f-checkout/CHANGELOG.md index 0b01ee67b7..b3ec7b1f92 100644 --- a/packages/components/pages/f-checkout/CHANGELOG.md +++ b/packages/components/pages/f-checkout/CHANGELOG.md @@ -3,6 +3,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## v4.13.1 + +_April 25, 2024_ + +### Changed + +- Update `axios` to latest version. + + ## v4.13.0 _March 13, 2024_ diff --git a/packages/components/pages/f-checkout/package.json b/packages/components/pages/f-checkout/package.json index e8b8cf5f8f..99ffc32efc 100644 --- a/packages/components/pages/f-checkout/package.json +++ b/packages/components/pages/f-checkout/package.json @@ -1,7 +1,7 @@ { "name": "@justeat/f-checkout", "description": "Fozzie Checkout - Fozzie Checkout Component", - "version": "4.13.0", + "version": "4.13.1", "main": "dist/f-checkout.umd.min.js", "maxBundleSize": "102kB", "files": [ diff --git a/packages/components/pages/f-offers/CHANGELOG.md b/packages/components/pages/f-offers/CHANGELOG.md index b42bc7d51a..9a88669dab 100644 --- a/packages/components/pages/f-offers/CHANGELOG.md +++ b/packages/components/pages/f-offers/CHANGELOG.md @@ -3,6 +3,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## v2.3.1 + +_April 25, 2024_ + +### Changed + +- Update `axios` to latest v0 version. + + ## v2.3.0 _March 13, 2024_ diff --git a/packages/components/pages/f-offers/package.json b/packages/components/pages/f-offers/package.json index 94c4fd5f04..c0ca429b9a 100644 --- a/packages/components/pages/f-offers/package.json +++ b/packages/components/pages/f-offers/package.json @@ -1,7 +1,7 @@ { "name": "@justeat/f-offers", "description": "Fozzie Offers - displays offers to the customers", - "version": "2.3.0", + "version": "2.3.1", "main": "dist/f-offers.umd.min.js", "maxBundleSize": "150kB", "files": [ diff --git a/packages/components/pages/f-self-exclusion/CHANGELOG.md b/packages/components/pages/f-self-exclusion/CHANGELOG.md index 70fd1fb304..983b52ea89 100644 --- a/packages/components/pages/f-self-exclusion/CHANGELOG.md +++ b/packages/components/pages/f-self-exclusion/CHANGELOG.md @@ -3,6 +3,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## v1.3.1 + +_April 25, 2024_ + +### Changed + +- Update `axios` to latest v0 version. + + ## v1.3.0 _March 13, 2024_ diff --git a/packages/components/pages/f-self-exclusion/package.json b/packages/components/pages/f-self-exclusion/package.json index babd8c1231..ef05948253 100644 --- a/packages/components/pages/f-self-exclusion/package.json +++ b/packages/components/pages/f-self-exclusion/package.json @@ -1,7 +1,7 @@ { "name": "@justeat/f-self-exclusion", "description": "Fozzie Self Exclusion - Customers must be able to voluntarily self-exclude or nominate themselves for self exclusion for a specified time period or permanently (includes purchasing and marketing), and their account (associated to the email address or phone number provided during self exclusions) must be blocked from purchasing alcohol and other items.", - "version": "1.3.0", + "version": "1.3.1", "main": "dist/f-self-exclusion.umd.min.js", "files": [ "dist", diff --git a/packages/components/pages/f-takeawaypay-activation/CHANGELOG.md b/packages/components/pages/f-takeawaypay-activation/CHANGELOG.md index 9a8e4d06bb..5fa534ba55 100644 --- a/packages/components/pages/f-takeawaypay-activation/CHANGELOG.md +++ b/packages/components/pages/f-takeawaypay-activation/CHANGELOG.md @@ -3,6 +3,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## v3.6.1 + +_April 25, 2024_ + +### Changed + +- Update `axios` to latest v0 version. + + ## v3.6.0 _March 13, 2024_ diff --git a/packages/components/pages/f-takeawaypay-activation/package.json b/packages/components/pages/f-takeawaypay-activation/package.json index 2f3f8368bf..80c78e5203 100644 --- a/packages/components/pages/f-takeawaypay-activation/package.json +++ b/packages/components/pages/f-takeawaypay-activation/package.json @@ -1,7 +1,7 @@ { "name": "@justeat/f-takeawaypay-activation", "description": "Fozzie TakeawayPay Activation - Handles Takeaway Pay activation for users", - "version": "3.6.0", + "version": "3.6.1", "main": "dist/f-takeawaypay-activation.umd.min.js", "maxBundleSize": "45kB", "files": [ diff --git a/packages/services/f-http/CHANGELOG.md b/packages/services/f-http/CHANGELOG.md index fdf6c232cf..163d6f8346 100644 --- a/packages/services/f-http/CHANGELOG.md +++ b/packages/services/f-http/CHANGELOG.md @@ -3,6 +3,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## v1.1.1 + +_April 25, 2024_ + +### Changed + +- Update `axios` to latest v0 version. + + ## v1.1.0 _March 13, 2024_ diff --git a/packages/services/f-http/package.json b/packages/services/f-http/package.json index 2f74e2fd54..d8f3c1091a 100644 --- a/packages/services/f-http/package.json +++ b/packages/services/f-http/package.json @@ -1,7 +1,7 @@ { "name": "@justeat/f-http", "description": "Javascript HTTP client for interacting with restful services", - "version": "1.1.0", + "version": "1.1.1", "maxBundleSize": "400kB", "main": "dist/f-http.umd.js", "module": "dist/f-http.es.js", diff --git a/packages/services/f-services/CHANGELOG.md b/packages/services/f-services/CHANGELOG.md index 449264c410..13a2e121b4 100644 --- a/packages/services/f-services/CHANGELOG.md +++ b/packages/services/f-services/CHANGELOG.md @@ -3,6 +3,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## v1.18.1 + +_April 25, 2024_ + +### Changed + +- Update `axios` to latest v0 version. + + ## v1.18.0 _March 13, 2024_ diff --git a/packages/services/f-services/package.json b/packages/services/f-services/package.json index 9e579dd8b0..439e75a605 100644 --- a/packages/services/f-services/package.json +++ b/packages/services/f-services/package.json @@ -1,7 +1,7 @@ { "name": "@justeat/f-services", "description": "Fozzie Services - Shared Services for Components and projects", - "version": "1.18.0", + "version": "1.18.1", "main": "dist/f-services.umd.js", "maxBundleSize": "21kB", "module": "dist/f-services.es.js", From 3f5593ec9889497daac500970e859c98177f9648 Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Thu, 25 Apr 2024 10:22:59 +0100 Subject: [PATCH 03/15] Update jest --- .../organisms/f-content-cards/package.json | 1 - packages/tools/fozzie/package.json | 4 +- yarn.lock | 81 +++---------------- 3 files changed, 13 insertions(+), 73 deletions(-) diff --git a/packages/components/organisms/f-content-cards/package.json b/packages/components/organisms/f-content-cards/package.json index f1bea37fbc..623a047f24 100644 --- a/packages/components/organisms/f-content-cards/package.json +++ b/packages/components/organisms/f-content-cards/package.json @@ -76,7 +76,6 @@ "crypto-js": "4.2.0", "date-fns": "^2.17.0", "http-request-mock": "^1.8.17", - "jest": "27.0.0", "jsdom-testing-mocks": "^1.6.0", "vue": "2.6.10", "xhr-mock": "2.5.1" diff --git a/packages/tools/fozzie/package.json b/packages/tools/fozzie/package.json index e35b080768..7add1428cb 100644 --- a/packages/tools/fozzie/package.json +++ b/packages/tools/fozzie/package.json @@ -57,8 +57,8 @@ "eslint-plugin-import": "2.26.0", "fontfaceobserver": "2.3.0", "glob": "8.0.3", - "jest": "29.2.2", - "jest-environment-jsdom": "29.2.2", + "jest": "29.7.0", + "jest-environment-jsdom": "29.7.0", "postcss": "8.4.31", "postcss-cli": "10.0.0", "sass": "1.55.0", diff --git a/yarn.lock b/yarn.lock index 6b134b6e8a..e4e0bc0f98 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3035,7 +3035,7 @@ __metadata: languageName: node linkType: hard -"@jest/core@npm:^27.0.0, @jest/core@npm:^27.5.1": +"@jest/core@npm:^27.5.1": version: 27.5.1 resolution: "@jest/core@npm:27.5.1" dependencies: @@ -3076,7 +3076,7 @@ __metadata: languageName: node linkType: hard -"@jest/core@npm:^29.2.2, @jest/core@npm:^29.7.0": +"@jest/core@npm:^29.7.0": version: 29.7.0 resolution: "@jest/core@npm:29.7.0" dependencies: @@ -3129,7 +3129,7 @@ __metadata: languageName: node linkType: hard -"@jest/environment@npm:^29.2.2, @jest/environment@npm:^29.7.0": +"@jest/environment@npm:^29.7.0": version: 29.7.0 resolution: "@jest/environment@npm:29.7.0" dependencies: @@ -3183,7 +3183,7 @@ __metadata: languageName: node linkType: hard -"@jest/fake-timers@npm:^29.2.2, @jest/fake-timers@npm:^29.7.0": +"@jest/fake-timers@npm:^29.7.0": version: 29.7.0 resolution: "@jest/fake-timers@npm:29.7.0" dependencies: @@ -3537,7 +3537,7 @@ __metadata: languageName: node linkType: hard -"@jest/types@npm:^29.2.1, @jest/types@npm:^29.6.3": +"@jest/types@npm:^29.6.3": version: 29.6.3 resolution: "@jest/types@npm:29.6.3" dependencies: @@ -3928,7 +3928,6 @@ __metadata: crypto-js: 4.2.0 date-fns: ^2.17.0 http-request-mock: ^1.8.17 - jest: 27.0.0 jsdom-testing-mocks: ^1.6.0 vue: 2.6.10 xhr-mock: 2.5.1 @@ -4635,8 +4634,8 @@ __metadata: fontfaceobserver: 2.3.0 glob: 8.0.3 include-media: 2.0.0 - jest: 29.2.2 - jest-environment-jsdom: 29.2.2 + jest: 29.7.0 + jest-environment-jsdom: 29.7.0 postcss: 8.4.31 postcss-cli: 10.0.0 sass: 1.55.0 @@ -21367,7 +21366,7 @@ __metadata: languageName: node linkType: hard -"jest-cli@npm:^27.0.0, jest-cli@npm:^27.5.1": +"jest-cli@npm:^27.5.1": version: 27.5.1 resolution: "jest-cli@npm:27.5.1" dependencies: @@ -21394,7 +21393,7 @@ __metadata: languageName: node linkType: hard -"jest-cli@npm:^29.2.2, jest-cli@npm:^29.7.0": +"jest-cli@npm:^29.7.0": version: 29.7.0 resolution: "jest-cli@npm:29.7.0" dependencies: @@ -21587,27 +21586,6 @@ __metadata: languageName: node linkType: hard -"jest-environment-jsdom@npm:29.2.2": - version: 29.2.2 - resolution: "jest-environment-jsdom@npm:29.2.2" - dependencies: - "@jest/environment": ^29.2.2 - "@jest/fake-timers": ^29.2.2 - "@jest/types": ^29.2.1 - "@types/jsdom": ^20.0.0 - "@types/node": "*" - jest-mock: ^29.2.2 - jest-util: ^29.2.1 - jsdom: ^20.0.0 - peerDependencies: - canvas: ^2.5.0 - peerDependenciesMeta: - canvas: - optional: true - checksum: ba612bf496a124ea58579f40b1a027cd6cfe9f4650c8131b757aed2644a2621843c2d4455079ae932416e7c1bd04fa85e362d9113442b5b8b9b2dbee1c5dcfa4 - languageName: node - linkType: hard - "jest-environment-jsdom@npm:29.7.0": version: 29.7.0 resolution: "jest-environment-jsdom@npm:29.7.0" @@ -21980,7 +21958,7 @@ __metadata: languageName: node linkType: hard -"jest-mock@npm:^29.2.2, jest-mock@npm:^29.7.0": +"jest-mock@npm:^29.7.0": version: 29.7.0 resolution: "jest-mock@npm:29.7.0" dependencies: @@ -22348,7 +22326,7 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^29.2.1, jest-util@npm:^29.7.0": +"jest-util@npm:^29.7.0": version: 29.7.0 resolution: "jest-util@npm:29.7.0" dependencies: @@ -22497,43 +22475,6 @@ __metadata: languageName: node linkType: hard -"jest@npm:27.0.0": - version: 27.0.0 - resolution: "jest@npm:27.0.0" - dependencies: - "@jest/core": ^27.0.0 - import-local: ^3.0.2 - jest-cli: ^27.0.0 - peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 - peerDependenciesMeta: - node-notifier: - optional: true - bin: - jest: bin/jest.js - checksum: cf14d31b75e3441fb1b659a4a6ce598397ba3794f844abc222aff4e135fba5d3e88cfd29ec3de62c27773c5973b77a8a814ef780507c643fe867efe7ee976f65 - languageName: node - linkType: hard - -"jest@npm:29.2.2": - version: 29.2.2 - resolution: "jest@npm:29.2.2" - dependencies: - "@jest/core": ^29.2.2 - "@jest/types": ^29.2.1 - import-local: ^3.0.2 - jest-cli: ^29.2.2 - peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 - peerDependenciesMeta: - node-notifier: - optional: true - bin: - jest: bin/jest.js - checksum: 6b4c0af3b5a0fddee46e26c9a539d70a3945700c20444ad3568e14faba27e89671f972dfaa8a02225c4e02b6d422171535660f5e167b1eb765a0922aea82533b - languageName: node - linkType: hard - "jest@npm:29.7.0": version: 29.7.0 resolution: "jest@npm:29.7.0" From 42df42c14d21c50489b6203d9b973686793a74a9 Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Thu, 25 Apr 2024 11:11:13 +0100 Subject: [PATCH 04/15] More version and changelog updates --- .../components/organisms/f-content-cards/CHANGELOG.md | 11 ++++++++++- .../components/organisms/f-content-cards/package.json | 2 +- packages/tools/fozzie/CHANGELOG.md | 11 ++++++++++- packages/tools/fozzie/package.json | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/packages/components/organisms/f-content-cards/CHANGELOG.md b/packages/components/organisms/f-content-cards/CHANGELOG.md index 067b1ac8e0..ee45ca0748 100644 --- a/packages/components/organisms/f-content-cards/CHANGELOG.md +++ b/packages/components/organisms/f-content-cards/CHANGELOG.md @@ -3,6 +3,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## v10.6.1 + +_April 25, 2024_ + +### Changed + +- Remove `jest` from dev dependencies (should come from the root). + + ## v10.6.0 _April 16, 2024_ @@ -241,7 +250,7 @@ _June 27, 2022_ ## v7.4.1 -_Jun 24, 2022_ +_June 24, 2022_ ### Changed diff --git a/packages/components/organisms/f-content-cards/package.json b/packages/components/organisms/f-content-cards/package.json index 623a047f24..dc7140be8c 100644 --- a/packages/components/organisms/f-content-cards/package.json +++ b/packages/components/organisms/f-content-cards/package.json @@ -1,7 +1,7 @@ { "name": "@justeat/f-content-cards", "description": "Fozzie Content Cards", - "version": "10.6.0", + "version": "10.6.1", "main": "dist/f-content-cards.umd.min.js", "maxBundleSize": "85kB", "files": [ diff --git a/packages/tools/fozzie/CHANGELOG.md b/packages/tools/fozzie/CHANGELOG.md index 1dfc47b91d..c8a2f8362b 100644 --- a/packages/tools/fozzie/CHANGELOG.md +++ b/packages/tools/fozzie/CHANGELOG.md @@ -3,11 +3,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) +## v11.2.1 + +_April 10, 2024_ + +### Changed + +- Update `jest` to latest version. + + ## v11.2.0 _April 10, 2024_ -### Updated +### Changed - `@justeat/pie-design-tokens` from 5.0.0 to 6.2.1 diff --git a/packages/tools/fozzie/package.json b/packages/tools/fozzie/package.json index 7add1428cb..4cefc746f4 100644 --- a/packages/tools/fozzie/package.json +++ b/packages/tools/fozzie/package.json @@ -2,7 +2,7 @@ "name": "@justeat/fozzie", "title": "Fozzie – Just Eat UI Web Framework", "description": "UI Web Framework for the Just Eat Global Platform", - "version": "11.2.0", + "version": "11.2.1", "main": "dist/js/index.js", "files": [ "dist/js", From 0af5f44694623a55873dd67626adf7d5fd53184f Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Thu, 25 Apr 2024 13:03:34 +0100 Subject: [PATCH 05/15] Update test transform --- test/utils/svgTransform.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/utils/svgTransform.js b/test/utils/svgTransform.js index 9b8858ad74..36925fdaa7 100644 --- a/test/utils/svgTransform.js +++ b/test/utils/svgTransform.js @@ -9,6 +9,8 @@ module.exports = { } }); - return `module.exports = { render: ${render} }`; + return { + code: `module.exports = { render: ${render} }` + }; } }; From 522c8fdf5bedd4dd00f7a566adb23a6a7d32a285 Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Thu, 25 Apr 2024 15:53:07 +0100 Subject: [PATCH 06/15] Change window to global.window in searchbox tests --- .../src/services/tests/general.services.test.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js index 7dc6754dbc..4915d12c22 100644 --- a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js +++ b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js @@ -221,7 +221,7 @@ describe('`general.services`', () => { }; }()); - Object.defineProperty(window, 'localStorage', { value: localStorage }); + Object.defineProperty(global.window, 'localStorage', { value: localStorage }); }); it('should exist', () => { @@ -237,7 +237,7 @@ describe('`general.services`', () => { describe('AND window.localStorage exists', () => { it('should call `setItem` with the given `key` & value', () => { // Arrange - const spy = jest.spyOn(window.localStorage, 'setItem'); + const spy = jest.spyOn(global.window.localStorage, 'setItem'); // Act generalServices.fullAddressLocalStorageService.setItem('key', { city: 'london' }); @@ -258,7 +258,7 @@ describe('`general.services`', () => { describe('AND window.localStorage exists', () => { it('should call `getItem` with the given `key`', () => { // Arrange - const spy = jest.spyOn(window.localStorage, 'getItem'); + const spy = jest.spyOn(global.window.localStorage, 'getItem'); // Act generalServices.fullAddressLocalStorageService.getItem('key'); @@ -269,7 +269,7 @@ describe('`general.services`', () => { it('should return an item when the key exists in localStorage', () => { // Arrange - jest.spyOn(window.localStorage, 'getItem'); + jest.spyOn(global.window.localStorage, 'getItem'); // Act const result = generalServices.fullAddressLocalStorageService.getItem('key'); @@ -280,7 +280,7 @@ describe('`general.services`', () => { it('should return false when the key does NOT exists in localStorage', () => { // Arrange - jest.spyOn(window.localStorage, 'getItem'); + jest.spyOn(global.window.localStorage, 'getItem'); // Act const result = generalServices.fullAddressLocalStorageService.getItem('non-existing-key'); @@ -301,7 +301,7 @@ describe('`general.services`', () => { describe('AND window.localStorage exists', () => { it('should call `removeItem` with the given `key`', () => { // Arrange - const spy = jest.spyOn(window.localStorage, 'removeItem'); + const spy = jest.spyOn(global.window.localStorage, 'removeItem'); // Act generalServices.fullAddressLocalStorageService.removeItem('key'); From c3c1635d9bc3f159609e328bbc89befc696ca963 Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Thu, 25 Apr 2024 16:25:03 +0100 Subject: [PATCH 07/15] Undo changes --- .../src/services/tests/general.services.test.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js index 4915d12c22..7dc6754dbc 100644 --- a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js +++ b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js @@ -221,7 +221,7 @@ describe('`general.services`', () => { }; }()); - Object.defineProperty(global.window, 'localStorage', { value: localStorage }); + Object.defineProperty(window, 'localStorage', { value: localStorage }); }); it('should exist', () => { @@ -237,7 +237,7 @@ describe('`general.services`', () => { describe('AND window.localStorage exists', () => { it('should call `setItem` with the given `key` & value', () => { // Arrange - const spy = jest.spyOn(global.window.localStorage, 'setItem'); + const spy = jest.spyOn(window.localStorage, 'setItem'); // Act generalServices.fullAddressLocalStorageService.setItem('key', { city: 'london' }); @@ -258,7 +258,7 @@ describe('`general.services`', () => { describe('AND window.localStorage exists', () => { it('should call `getItem` with the given `key`', () => { // Arrange - const spy = jest.spyOn(global.window.localStorage, 'getItem'); + const spy = jest.spyOn(window.localStorage, 'getItem'); // Act generalServices.fullAddressLocalStorageService.getItem('key'); @@ -269,7 +269,7 @@ describe('`general.services`', () => { it('should return an item when the key exists in localStorage', () => { // Arrange - jest.spyOn(global.window.localStorage, 'getItem'); + jest.spyOn(window.localStorage, 'getItem'); // Act const result = generalServices.fullAddressLocalStorageService.getItem('key'); @@ -280,7 +280,7 @@ describe('`general.services`', () => { it('should return false when the key does NOT exists in localStorage', () => { // Arrange - jest.spyOn(global.window.localStorage, 'getItem'); + jest.spyOn(window.localStorage, 'getItem'); // Act const result = generalServices.fullAddressLocalStorageService.getItem('non-existing-key'); @@ -301,7 +301,7 @@ describe('`general.services`', () => { describe('AND window.localStorage exists', () => { it('should call `removeItem` with the given `key`', () => { // Arrange - const spy = jest.spyOn(global.window.localStorage, 'removeItem'); + const spy = jest.spyOn(window.localStorage, 'removeItem'); // Act generalServices.fullAddressLocalStorageService.removeItem('key'); From e8c53376184505bf58b89a8efb33dad5b31205ba Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Thu, 25 Apr 2024 16:32:11 +0100 Subject: [PATCH 08/15] Try again --- .../src/services/tests/general.services.test.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js index 7dc6754dbc..4915d12c22 100644 --- a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js +++ b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js @@ -221,7 +221,7 @@ describe('`general.services`', () => { }; }()); - Object.defineProperty(window, 'localStorage', { value: localStorage }); + Object.defineProperty(global.window, 'localStorage', { value: localStorage }); }); it('should exist', () => { @@ -237,7 +237,7 @@ describe('`general.services`', () => { describe('AND window.localStorage exists', () => { it('should call `setItem` with the given `key` & value', () => { // Arrange - const spy = jest.spyOn(window.localStorage, 'setItem'); + const spy = jest.spyOn(global.window.localStorage, 'setItem'); // Act generalServices.fullAddressLocalStorageService.setItem('key', { city: 'london' }); @@ -258,7 +258,7 @@ describe('`general.services`', () => { describe('AND window.localStorage exists', () => { it('should call `getItem` with the given `key`', () => { // Arrange - const spy = jest.spyOn(window.localStorage, 'getItem'); + const spy = jest.spyOn(global.window.localStorage, 'getItem'); // Act generalServices.fullAddressLocalStorageService.getItem('key'); @@ -269,7 +269,7 @@ describe('`general.services`', () => { it('should return an item when the key exists in localStorage', () => { // Arrange - jest.spyOn(window.localStorage, 'getItem'); + jest.spyOn(global.window.localStorage, 'getItem'); // Act const result = generalServices.fullAddressLocalStorageService.getItem('key'); @@ -280,7 +280,7 @@ describe('`general.services`', () => { it('should return false when the key does NOT exists in localStorage', () => { // Arrange - jest.spyOn(window.localStorage, 'getItem'); + jest.spyOn(global.window.localStorage, 'getItem'); // Act const result = generalServices.fullAddressLocalStorageService.getItem('non-existing-key'); @@ -301,7 +301,7 @@ describe('`general.services`', () => { describe('AND window.localStorage exists', () => { it('should call `removeItem` with the given `key`', () => { // Arrange - const spy = jest.spyOn(window.localStorage, 'removeItem'); + const spy = jest.spyOn(global.window.localStorage, 'removeItem'); // Act generalServices.fullAddressLocalStorageService.removeItem('key'); From b96bec229973d84613d277b5f4299c914b8eb669 Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Thu, 25 Apr 2024 16:42:54 +0100 Subject: [PATCH 09/15] Mock JSON --- .../src/services/tests/general.services.test.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js index 4915d12c22..4c1fb5ee2a 100644 --- a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js +++ b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js @@ -221,7 +221,8 @@ describe('`general.services`', () => { }; }()); - Object.defineProperty(global.window, 'localStorage', { value: localStorage }); + Object.defineProperty(window, 'localStorage', { value: localStorage }); + Object.defineProperty(window, 'JSON', { value: JSON }); }); it('should exist', () => { @@ -237,7 +238,7 @@ describe('`general.services`', () => { describe('AND window.localStorage exists', () => { it('should call `setItem` with the given `key` & value', () => { // Arrange - const spy = jest.spyOn(global.window.localStorage, 'setItem'); + const spy = jest.spyOn(window.localStorage, 'setItem'); // Act generalServices.fullAddressLocalStorageService.setItem('key', { city: 'london' }); @@ -258,7 +259,7 @@ describe('`general.services`', () => { describe('AND window.localStorage exists', () => { it('should call `getItem` with the given `key`', () => { // Arrange - const spy = jest.spyOn(global.window.localStorage, 'getItem'); + const spy = jest.spyOn(window.localStorage, 'getItem'); // Act generalServices.fullAddressLocalStorageService.getItem('key'); @@ -269,7 +270,7 @@ describe('`general.services`', () => { it('should return an item when the key exists in localStorage', () => { // Arrange - jest.spyOn(global.window.localStorage, 'getItem'); + jest.spyOn(window.localStorage, 'getItem'); // Act const result = generalServices.fullAddressLocalStorageService.getItem('key'); @@ -280,7 +281,7 @@ describe('`general.services`', () => { it('should return false when the key does NOT exists in localStorage', () => { // Arrange - jest.spyOn(global.window.localStorage, 'getItem'); + jest.spyOn(window.localStorage, 'getItem'); // Act const result = generalServices.fullAddressLocalStorageService.getItem('non-existing-key'); @@ -301,7 +302,7 @@ describe('`general.services`', () => { describe('AND window.localStorage exists', () => { it('should call `removeItem` with the given `key`', () => { // Arrange - const spy = jest.spyOn(global.window.localStorage, 'removeItem'); + const spy = jest.spyOn(window.localStorage, 'removeItem'); // Act generalServices.fullAddressLocalStorageService.removeItem('key'); From 55958dfb26bb958f4981de9280d973cf130abb3d Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Thu, 25 Apr 2024 16:56:20 +0100 Subject: [PATCH 10/15] Use JSON instead of window.JSON --- .../molecules/f-searchbox/src/services/general.services.js | 4 ++-- .../f-searchbox/src/services/tests/general.services.test.js | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/components/molecules/f-searchbox/src/services/general.services.js b/packages/components/molecules/f-searchbox/src/services/general.services.js index 2825fd6e82..6dae9f6c7f 100644 --- a/packages/components/molecules/f-searchbox/src/services/general.services.js +++ b/packages/components/molecules/f-searchbox/src/services/general.services.js @@ -82,7 +82,7 @@ const generateFormQueryUrl = (queryString, formUrl) => { const fullAddressLocalStorageService = { setItem (key, value = {}) { if (window.localStorage) { - window.localStorage.setItem(key, window.JSON.stringify(value)); + window.localStorage.setItem(key, JSON.stringify(value)); } }, @@ -90,7 +90,7 @@ const fullAddressLocalStorageService = { if (window.localStorage) { const item = window.localStorage.getItem(key); - return item ? window.JSON.parse(item) : false; + return item ? JSON.parse(item) : false; } return false; diff --git a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js index 4c1fb5ee2a..7dc6754dbc 100644 --- a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js +++ b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js @@ -222,7 +222,6 @@ describe('`general.services`', () => { }()); Object.defineProperty(window, 'localStorage', { value: localStorage }); - Object.defineProperty(window, 'JSON', { value: JSON }); }); it('should exist', () => { From e019ae8b5b3b0d04d4cd65ad8fa05ac090e33ef1 Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Fri, 26 Apr 2024 09:03:44 +0100 Subject: [PATCH 11/15] Try jsdom statement --- .../f-searchbox/src/services/tests/general.services.test.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js index 7dc6754dbc..445986afd8 100644 --- a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js +++ b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js @@ -1,3 +1,7 @@ +/** + * @jest-environment jsdom + */ + import * as generalServices from '../general.services'; import * as helpers from '../../utils/helpers'; import { LOCATION_COOKIE_PROPS } from '../constants'; From 7393e987b181258a6bd8d2dc7246dc7c64e64c0a Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Fri, 26 Apr 2024 10:22:49 +0100 Subject: [PATCH 12/15] logging --- .../molecules/f-searchbox/src/services/general.services.js | 7 ++++++- .../src/services/tests/general.services.test.js | 4 ---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/components/molecules/f-searchbox/src/services/general.services.js b/packages/components/molecules/f-searchbox/src/services/general.services.js index 6dae9f6c7f..92bd31b898 100644 --- a/packages/components/molecules/f-searchbox/src/services/general.services.js +++ b/packages/components/molecules/f-searchbox/src/services/general.services.js @@ -87,11 +87,16 @@ const fullAddressLocalStorageService = { }, getItem (key) { + console.log('================'); + console.log('window is', window); + console.log('window.localStorage is', window.localStorage); + console.log('JSON is', JSON); if (window.localStorage) { const item = window.localStorage.getItem(key); - + console.log('item is', item); return item ? JSON.parse(item) : false; } + console.log('================'); return false; }, diff --git a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js index 445986afd8..7dc6754dbc 100644 --- a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js +++ b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js @@ -1,7 +1,3 @@ -/** - * @jest-environment jsdom - */ - import * as generalServices from '../general.services'; import * as helpers from '../../utils/helpers'; import { LOCATION_COOKIE_PROPS } from '../constants'; From 9699bb9ca91487286e5a1ae0e67932f1b0c094f3 Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Fri, 26 Apr 2024 12:02:57 +0100 Subject: [PATCH 13/15] Remove logging and set item in test --- .../f-searchbox/src/services/general.services.js | 6 ------ .../src/services/tests/general.services.test.js | 9 +++------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/packages/components/molecules/f-searchbox/src/services/general.services.js b/packages/components/molecules/f-searchbox/src/services/general.services.js index 92bd31b898..e365cc5664 100644 --- a/packages/components/molecules/f-searchbox/src/services/general.services.js +++ b/packages/components/molecules/f-searchbox/src/services/general.services.js @@ -87,16 +87,10 @@ const fullAddressLocalStorageService = { }, getItem (key) { - console.log('================'); - console.log('window is', window); - console.log('window.localStorage is', window.localStorage); - console.log('JSON is', JSON); if (window.localStorage) { const item = window.localStorage.getItem(key); - console.log('item is', item); return item ? JSON.parse(item) : false; } - console.log('================'); return false; }, diff --git a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js index 7dc6754dbc..3cc9e7f0b4 100644 --- a/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js +++ b/packages/components/molecules/f-searchbox/src/services/tests/general.services.test.js @@ -269,7 +269,7 @@ describe('`general.services`', () => { it('should return an item when the key exists in localStorage', () => { // Arrange - jest.spyOn(window.localStorage, 'getItem'); + generalServices.fullAddressLocalStorageService.setItem('key', { city: 'london' }); // Act const result = generalServices.fullAddressLocalStorageService.getItem('key'); @@ -278,11 +278,8 @@ describe('`general.services`', () => { expect(result).toEqual({ city: 'london' }); }); - it('should return false when the key does NOT exists in localStorage', () => { - // Arrange - jest.spyOn(window.localStorage, 'getItem'); - - // Act + it('should return false when the key does NOT exist in localStorage', () => { + // Arrange & Act const result = generalServices.fullAddressLocalStorageService.getItem('non-existing-key'); // Assert From 28c841bed7417842960439199bff5d824c3e5144 Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Fri, 26 Apr 2024 14:17:06 +0100 Subject: [PATCH 14/15] Improve localStorage mocking in checkout tests --- CHANGELOG.md | 2 +- .../molecules/f-searchbox/CHANGELOG.md | 2 +- .../molecules/f-user-message/CHANGELOG.md | 2 +- .../organisms/f-content-cards/CHANGELOG.md | 2 +- .../organisms/f-cookie-banner/CHANGELOG.md | 2 +- .../components/pages/f-checkout/CHANGELOG.md | 3 +- .../src/services/tests/addressService.test.js | 45 ++++++------------- .../components/pages/f-offers/CHANGELOG.md | 2 +- .../pages/f-self-exclusion/CHANGELOG.md | 2 +- .../f-takeawaypay-activation/CHANGELOG.md | 2 +- packages/services/f-http/CHANGELOG.md | 2 +- packages/services/f-services/CHANGELOG.md | 2 +- 12 files changed, 26 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3bdceb4de..f4649ad164 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## v7.56.1 -_April 25, 2024_ +_April 26, 2024_ ### Changed diff --git a/packages/components/molecules/f-searchbox/CHANGELOG.md b/packages/components/molecules/f-searchbox/CHANGELOG.md index 24ff48bd51..7da01f73be 100644 --- a/packages/components/molecules/f-searchbox/CHANGELOG.md +++ b/packages/components/molecules/f-searchbox/CHANGELOG.md @@ -5,7 +5,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## v6.9.1 -_April 25, 2024_ +_April 26, 2024_ ### Changed diff --git a/packages/components/molecules/f-user-message/CHANGELOG.md b/packages/components/molecules/f-user-message/CHANGELOG.md index 11f7b7b061..6a367fdc40 100644 --- a/packages/components/molecules/f-user-message/CHANGELOG.md +++ b/packages/components/molecules/f-user-message/CHANGELOG.md @@ -5,7 +5,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## v4.4.1 -_April 25, 2024_ +_April 26, 2024_ ### Changed diff --git a/packages/components/organisms/f-content-cards/CHANGELOG.md b/packages/components/organisms/f-content-cards/CHANGELOG.md index ee45ca0748..8ec99953a3 100644 --- a/packages/components/organisms/f-content-cards/CHANGELOG.md +++ b/packages/components/organisms/f-content-cards/CHANGELOG.md @@ -5,7 +5,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## v10.6.1 -_April 25, 2024_ +_April 26, 2024_ ### Changed diff --git a/packages/components/organisms/f-cookie-banner/CHANGELOG.md b/packages/components/organisms/f-cookie-banner/CHANGELOG.md index 8b2f0cf366..2117c4deb1 100644 --- a/packages/components/organisms/f-cookie-banner/CHANGELOG.md +++ b/packages/components/organisms/f-cookie-banner/CHANGELOG.md @@ -5,7 +5,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## v4.12.1 -_April 25, 2024_ +_April 26, 2024_ ### Changed diff --git a/packages/components/pages/f-checkout/CHANGELOG.md b/packages/components/pages/f-checkout/CHANGELOG.md index b3ec7b1f92..211bc21d25 100644 --- a/packages/components/pages/f-checkout/CHANGELOG.md +++ b/packages/components/pages/f-checkout/CHANGELOG.md @@ -5,11 +5,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## v4.13.1 -_April 25, 2024_ +_April 26, 2024_ ### Changed - Update `axios` to latest version. +- Improve localStorage mocking in tests. ## v4.13.0 diff --git a/packages/components/pages/f-checkout/src/services/tests/addressService.test.js b/packages/components/pages/f-checkout/src/services/tests/addressService.test.js index a1c5604966..a451088d4b 100644 --- a/packages/components/pages/f-checkout/src/services/tests/addressService.test.js +++ b/packages/components/pages/f-checkout/src/services/tests/addressService.test.js @@ -1,6 +1,5 @@ import { when } from 'jest-when'; import addressService from '../addressService'; -import localStorageMock from '../../../test-utils/local-storage/local-storage-mock'; import { Addresses } from '../../../stories/helpers/addresses'; const area511Line = { @@ -53,6 +52,11 @@ const australiaAddressAdditional = { }; describe('addressService', () => { + afterEach(() => { + jest.restoreAllMocks(); + window.localStorage.clear(); + }); + describe('getClosestAddress ::', () => { const ukAddressesData = { Addresses: [area511Line, bristol2Lines, london3LinesDefault] }; const auAddressesData = { Addresses: [australiaAddressDefault, australiaAddressAdditional], DefaultAddress: defaultAustraliaId }; @@ -159,15 +163,6 @@ describe('addressService', () => { describe('isAddressInLocalStorage ::', () => { describe('if localStorage exists', () => { - beforeEach(() => { - Object.defineProperty(window, 'localStorage', { value: localStorageMock }); - }); - - afterEach(() => { - window.localStorage.clear(); - jest.resetAllMocks(); - }); - describe('when the address does NOT exist in local storage', () => { it('should return false', () => { expect(addressService.isAddressInLocalStorage()).toBe(false); @@ -205,16 +200,11 @@ describe('addressService', () => { }); describe('if localStorage does NOT exist', () => { - beforeAll(() => { - Object.defineProperty(window, 'localStorage', { value: null }); - }); - - afterAll(() => { - window.localStorage.clear(); - jest.resetAllMocks(); - }); - it('should return false', () => { + // Arrange + const localStorageSpy = jest.spyOn(window, 'localStorage', 'get'); + localStorageSpy.mockReturnValue(null); + // Assert expect(addressService.isAddressInLocalStorage()).toBe(false); }); @@ -222,18 +212,9 @@ describe('addressService', () => { }); describe('getAddressFromLocalStorage ::', () => { - beforeEach(() => { - Object.defineProperty(window, 'localStorage', { value: localStorageMock }); - }); - - afterEach(() => { - window.localStorage.clear(); - jest.resetAllMocks(); - }); - describe('when the address does NOT exist in local storage', () => { it('should return null', () => { - // Assert + // Act & Assert expect(addressService.getAddressFromLocalStorage()).toBe(null); }); }); @@ -489,7 +470,9 @@ describe('addressService', () => { describe('when local storage is available', () => { it('save address in local storage correctly', () => { // Arrange - const spy = jest.spyOn(window.localStorage, 'setItem'); + const spyFn = jest.fn(); + const localStorageSpy = jest.spyOn(window, 'localStorage', 'get'); + localStorageSpy.mockReturnValue({ setItem: spyFn }); const expectedValue = JSON.stringify({ PostalCode: addressDetails.postcode, Line1: addressDetails.line1, @@ -504,7 +487,7 @@ describe('addressService', () => { addressService.setAddressInLocalStorage(addressDetails); // Assert - expect(spy).toHaveBeenCalledWith('je-full-address-details', expectedValue); + expect(spyFn).toHaveBeenCalledWith('je-full-address-details', expectedValue); }); }); }); diff --git a/packages/components/pages/f-offers/CHANGELOG.md b/packages/components/pages/f-offers/CHANGELOG.md index 9a88669dab..5088a3f10a 100644 --- a/packages/components/pages/f-offers/CHANGELOG.md +++ b/packages/components/pages/f-offers/CHANGELOG.md @@ -5,7 +5,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## v2.3.1 -_April 25, 2024_ +_April 26, 2024_ ### Changed diff --git a/packages/components/pages/f-self-exclusion/CHANGELOG.md b/packages/components/pages/f-self-exclusion/CHANGELOG.md index 983b52ea89..cc0a3c45f6 100644 --- a/packages/components/pages/f-self-exclusion/CHANGELOG.md +++ b/packages/components/pages/f-self-exclusion/CHANGELOG.md @@ -5,7 +5,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## v1.3.1 -_April 25, 2024_ +_April 26, 2024_ ### Changed diff --git a/packages/components/pages/f-takeawaypay-activation/CHANGELOG.md b/packages/components/pages/f-takeawaypay-activation/CHANGELOG.md index 5fa534ba55..0fd26f0895 100644 --- a/packages/components/pages/f-takeawaypay-activation/CHANGELOG.md +++ b/packages/components/pages/f-takeawaypay-activation/CHANGELOG.md @@ -5,7 +5,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## v3.6.1 -_April 25, 2024_ +_April 26, 2024_ ### Changed diff --git a/packages/services/f-http/CHANGELOG.md b/packages/services/f-http/CHANGELOG.md index 163d6f8346..2473e9d2fa 100644 --- a/packages/services/f-http/CHANGELOG.md +++ b/packages/services/f-http/CHANGELOG.md @@ -5,7 +5,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## v1.1.1 -_April 25, 2024_ +_April 26, 2024_ ### Changed diff --git a/packages/services/f-services/CHANGELOG.md b/packages/services/f-services/CHANGELOG.md index 13a2e121b4..6c436128ea 100644 --- a/packages/services/f-services/CHANGELOG.md +++ b/packages/services/f-services/CHANGELOG.md @@ -5,7 +5,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## v1.18.1 -_April 25, 2024_ +_April 26, 2024_ ### Changed From 8f021ea43af648e5a2325690aebb456578959841 Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Fri, 26 Apr 2024 15:08:25 +0100 Subject: [PATCH 15/15] Update chromedriver --- CHANGELOG.md | 1 + package.json | 2 +- yarn.lock | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4649ad164..e49e7dc986 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ _April 26, 2024_ ### Changed - Assorted security package updates. +- Update `chromedriver` to v124 ## v7.56.0 diff --git a/package.json b/package.json index 98d5de3e07..92fb1605c2 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "babel-jest": "29.7.0", "babel-loader": "8.1.0", "bundlewatch": "0.3.3", - "chromedriver": "122.0.6", + "chromedriver": "124.0.1", "core-js": "3.36.1", "cross-env": "7.0.2", "css-loader": "1.0.1", diff --git a/yarn.lock b/yarn.lock index e4e0bc0f98..5a8b396b98 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12640,9 +12640,9 @@ __metadata: languageName: node linkType: hard -"chromedriver@npm:122.0.6": - version: 122.0.6 - resolution: "chromedriver@npm:122.0.6" +"chromedriver@npm:124.0.1": + version: 124.0.1 + resolution: "chromedriver@npm:124.0.1" dependencies: "@testim/chrome-version": ^1.1.4 axios: ^1.6.7 @@ -12653,7 +12653,7 @@ __metadata: tcp-port-used: ^1.0.2 bin: chromedriver: bin/chromedriver - checksum: 2697467275d67fef5ea668cacaccfe60fbaba618e516743284fb6476105cc39c0e5cf173f0441dfa305e158e2e23d574ed001fe26735571520b75e88757cfe26 + checksum: 658ce0475a1b0250dda35df80a4c9b88bf7430fd0bb9ccb43af01e6e90bfde03191b641217b5e10b3b2fe4291d47eae7a4f965df5cdd6693a43e350ef7aaecfb languageName: node linkType: hard @@ -30289,7 +30289,7 @@ __metadata: babel-jest: 29.7.0 babel-loader: 8.1.0 bundlewatch: 0.3.3 - chromedriver: 122.0.6 + chromedriver: 124.0.1 core-js: 3.36.1 cross-env: 7.0.2 css-loader: 1.0.1