Merge branch 'main' into dsw-000-uncontrolled-form-react

Author: siggerzz

nextjs-app-v14/package.json

@@ -14,10 +14,9 @@
     "upgrade-pie-packages": "npx npm-check-updates \"@justeattakeaway/pie-*\" -u"
   },
   "dependencies": {
-    "@justeattakeaway/pie-cookie-banner": "0.26.5",
     "@justeattakeaway/pie-css": "0.13.0",
     "@justeattakeaway/pie-icons-webc": "0.25.1",
-    "@justeattakeaway/pie-webc": "0.5.42",
+    "@justeattakeaway/pie-webc": "0.5.53",
     "@lit-labs/nextjs": "0.2.0",
     "@lit/react": "1.0.5",
     "next": "14.2.3",

nextjs-app-v14/src/app/components/cookie-banner/cookie-banner.tsx

@@ -2,16 +2,14 @@
 
 import NavigationLayout from "@/app/layout/navigation";
 import { PieCookieBanner } from '@justeattakeaway/pie-webc/react/cookie-banner.js';
-// TODO: Remove this comment as soon as we provide the TS declaration for locales
-// @ts-ignore: missing declaration for locales
-import daDK from '@justeattakeaway/pie-cookie-banner/locales/da-dk.json';
 
 export default function CookieBanner() {
     return (
         <NavigationLayout title="Cookie Banner">
         <PieCookieBanner
             defaultPreferences={{functional: true, personalized: true, analytical: true}}
-            locale={daDK}
+            language="da"
+            country="dk"
             hasPrimaryActionsOnly
             cookieTechnologiesLink="https://justeattakeaway.com"
             cookieStatementLink="https://justeattakeaway.com" />

nuxt-app/package.json

@@ -19,10 +19,9 @@
     "sass": "1.70.0"
   },
   "dependencies": {
-    "@justeattakeaway/pie-cookie-banner": "0.26.5",
     "@justeattakeaway/pie-css": "0.13.0",
     "@justeattakeaway/pie-icons-webc": "0.25.1",
-    "@justeattakeaway/pie-webc": "0.5.42",
+    "@justeattakeaway/pie-webc": "0.5.53",
     "just-kebab-case": "4.2.0",
     "nuxt-ssr-lit": "1.6.16"
   },

nuxt-app/pages/components/cookie-banner.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pie-cookie-banner hasPrimaryActionsOnly :locale="daDK" cookieTechnologiesLink="https://justeattakeaway.com"
+    <pie-cookie-banner hasPrimaryActionsOnly language="da" country="dk" cookieTechnologiesLink="https://justeattakeaway.com"
       cookieStatementLink="https://justeattakeaway.com">
     </pie-cookie-banner>
   </div>
@@ -14,7 +14,4 @@ definePageMeta({
     title: 'Cookie Banner',
 });
 
-// TODO: DSW-1710 - Update this to use the TS declaration for locales.
-// Currently importing the JSON file directly as a workaround as Nuxt wants import assertions.
-import daDK from '@justeattakeaway/pie-cookie-banner/locales/da-dk.json';
 </script>

turbo.json

@@ -3,6 +3,7 @@
     "pipeline": {
       "preview": {
         "cache": false,
+        "persistent": true,
         "dependsOn": ["build"]
       },
       "test:ssr": {

vanilla-app/js/cookie-banner.js

@@ -1,11 +1,11 @@
 import '@justeattakeaway/pie-webc/components/cookie-banner.js';
-import daDK from '@justeattakeaway/pie-cookie-banner/locales/da-dk.json';
 import './utils/navigation.js';
 import './shared.js';
 
 document.querySelector('#app').innerHTML = `
     <pie-cookie-banner
-        locale='${JSON.stringify(daDK)}'
+        language="da"
+        country="dk"
         hasPrimaryActionsOnly
         cookieTechnologiesLink="https://justeattakeaway.com"
         cookieStatementLink="https://justeattakeaway.com"></pie-cookie-banner>`;

vanilla-app/package.json

@@ -18,10 +18,9 @@
     "vite-plugin-html-inject": "1.1.2"
   },
   "dependencies": {
-    "@justeattakeaway/pie-cookie-banner": "0.26.5",
     "@justeattakeaway/pie-css": "0.13.0",
     "@justeattakeaway/pie-icons-webc": "0.25.1",
-    "@justeattakeaway/pie-webc": "0.5.42"
+    "@justeattakeaway/pie-webc": "0.5.53"
   },
   "installConfig": {
     "hoistingLimits": "workspaces"

wdio.conf.js

@@ -11,7 +11,7 @@ const capabilities = [
     createCapability("Windows", "11", "Firefox", "127"),
     createCapability(null, "18", "Safari", null, "iPhone 16"),
     createCapability(null, "16", "Safari", null, "iPhone 14"),
-    createCapability(null, "14.0", "Chrome", null, "Google Pixel 9"),
+    createCapability(null, "15.0", "Chrome", null, "Google Pixel 9"),
     createCapability(null, "11.0", "Chrome", null, "Google Pixel 6")
 ];