@jetshop/template-trend 6.1.0-alpha.60f2f3f7 → 6.1.0-alpha.ae06a609

package/cypress/integration/essentials.spec.js

@@ -17,7 +17,10 @@ describe('Category page', () => {
   it('links to products', () => {
     cy.visit(CATEGORY_PAGE);
     const url = cy.url();
-    cy.findAllByTestId('product').first().click();
+    cy.findByTestId('product').click({
+      force: true
+    });
+
     cy.url().should('not.be', url);
   });
 });
@@ -44,7 +47,8 @@ describe('Cart', () => {
     cy.visit(PRODUCT_PAGE);
     cy.findByTestId('add-to-cart').click();
     cy.findByTestId('cart-button').click();
-    cy.findByTestId('checkout-button').click();
-    cy.url().should('contain', '/checkout');
+    cy.findByTestId('checkout-button')
+      .should('have.attr', 'href')
+      .and('include', 'checkout');
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetshop/template-trend",
-  "version": "6.1.0-alpha.60f2f3f7",
+  "version": "6.1.0-alpha.ae06a609",
   "license": "MIT",
   "scripts": {
     "build": "react-scripts build",
@@ -45,11 +45,11 @@
     ]
   },
   "dependencies": {
-    "@jetshop/core": "^6.1.0-alpha.60f2f3f7",
+    "@jetshop/core": "^6.1.0-alpha.ae06a609",
     "@jetshop/flight-shortcodes": "^2.0.10",
-    "@jetshop/intl": "^6.1.0-alpha.60f2f3f7",
-    "@jetshop/react-scripts": "^6.1.0-alpha.60f2f3f7",
-    "@jetshop/ui": "^6.1.0-alpha.60f2f3f7",
+    "@jetshop/intl": "^6.1.0-alpha.ae06a609",
+    "@jetshop/react-scripts": "^6.1.0-alpha.ae06a609",
+    "@jetshop/ui": "^6.1.0-alpha.ae06a609",
     "@react-google-maps/api": "~2.18.1",
     "prop-types": "^15.6.2",
     "react": "^18",
@@ -71,6 +71,7 @@
     "yargs": "16.0.3"
   },
   "resolutions": {
-    "format-message-estree-util": "npm:@jetshop/format-message-estree-util"
+    "format-message-estree-util": "npm:@jetshop/format-message-estree-util",
+    "**/@babel/helper-module-transforms": "7.22.5"
   }
 }

package/src/components/Auth/LogInPage.js

@@ -1,5 +1,5 @@
 import LogInFormProvider from '@jetshop/ui/Auth/LogInFormProvider';
-import t from 'format-message';
+import t from '@jetshop/intl';
 import React from 'react';
 import { styled } from 'linaria/react';
 import { css, cx } from 'linaria';
@@ -76,8 +76,18 @@ function LogInPage() {
                 {t('Not yet a member? Sign Up')}
               </TextLink>
             </header>
-            <Input type="email" name="email" label={t('E-mail address')} />
-            <Input type="password" name="password" label={t('Password')} />
+            <Input
+              data-testid="email"
+              type="email"
+              name="email"
+              label={t('E-mail address')}
+            />
+            <Input
+              data-testid="password"
+              type="password"
+              name="password"
+              label={t('Password')}
+            />
 
             {globalError && (
               <GlobalError style={{ marginBottom: '2em' }}>

package/src/components/StartPage/Content/StartPageHero.js

@@ -77,17 +77,19 @@ const StartPageHero = ({
   <StartPageHeroWrapper>
     <Image
       fillAvailableSpace={true}
-      src={imageSrc.value}
+      src={imageSrc?.value}
       className={heroStyles}
       critical={isAboveFold?.value}
-      focalPointY={imageSrc.value?.focalPointY}
-      focalPointX={imageSrc.value?.focalPointX}
+      focalPointY={imageSrc?.value?.focalPointY}
+      focalPointX={imageSrc?.value?.focalPointX}
       aspect={'2:1'}
     >
       <Container>
-        <Title>{header.value}</Title>
-        <Description>{text.value}</Description>
-        <StyledButton to={buttonLink.value}>{buttonText.value}</StyledButton>
+        <Title>{header?.value}</Title>
+        <Description>{text?.value}</Description>
+        <StyledButton to={buttonLink?.value ?? '/'}>
+          {buttonText?.value}
+        </StyledButton>
       </Container>
     </Image>
   </StartPageHeroWrapper>

package/src/server.js

@@ -3,4 +3,14 @@ import { createApp } from '@jetshop/core/boot/server';
 import Shop from './components/Shop';
 import config from './shop.config';
 
-export default createApp(<Shop />, config);
+import createFacebookTracker from '@jetshop/core/server/tracking/facebook';
+
+export default createApp(<Shop />, {
+  ...config,
+  serverTrackers: [
+    createFacebookTracker({
+      pixelId: process.env.FACEBOOK_PIXEL_ID,
+      token: process.env.FACEBOOK_CAPI_TOKEN
+    })
+  ]
+});

package/src/shop.config.js

@@ -7,7 +7,6 @@ import {
   LoadableWindowedCategoryPage
 } from './components/CategoryPage/CategoryPage';
 import { theme } from './components/Theme';
-import createFacebookTracker from '@jetshop/core/server/tracking/facebook';
 import ProductPage from './components/ProductPage/ProductPage.loadable';
 import ContentPage from './components/ContentPage/ContentPage.loadable';
 
@@ -57,12 +56,6 @@ const config = {
     disableDefaultProductData: false
   },
   trackers: [],
-  serverTrackers: [
-    createFacebookTracker({
-      pixelId: process.env.FACEBOOK_PIXEL_ID,
-      token: process.env.FACEBOOK_CAPI_TOKEN
-    })
-  ],
   googleMapsApiKey: process.env.REACT_APP_GOOGLE_MAPS_API_KEY || '',
   loginPath: '/login',
   pathsWithNoAuthRequired: ['/login', '/reset-password', '/forgot-password'],

package/translations/default.json

@@ -191,6 +191,9 @@
   "forgot_password_69eea15b": {
     "message": "Forgot password"
   },
+  "forgot_password_7232790f": {
+    "message": "Forgot password?"
+  },
   "free_for_your_order_34aba239": {
     "message": "Free for your order"
   },
@@ -353,6 +356,9 @@
   "not_available_487d3648": {
     "message": "Not available"
   },
+  "not_yet_a_member_sign_up_5454936d": {
+    "message": "Not yet a member? Sign Up"
+  },
   "note_if_you_were_directed_here_via_a_link_we_are_g_47b83052": {
     "message": "NOTE! If you were directed here via a link we are grateful if you inform us as to which link it was so that we can resolve the problem."
   },
@@ -404,6 +410,9 @@
   "package_discount_66e25640": {
     "message": "Package Discount"
   },
+  "password_8a271b1c": {
+    "message": "Password"
+  },
   "payment_method_84a444f1": {
     "message": "Payment method"
   },

package/translations/index.js

@@ -1,17 +1,34 @@
-export const cs = () => import('./cs.json');
-export const da = () => import('./da.json');
-export const de = () => import('./de.json');
-export const en = () => import('./en.json');
-export const es = () => import('./es.json');
-export const et = () => import('./et.json');
-export const fi = () => import('./fi.json');
-export const fr = () => import('./fr.json');
-export const it = () => import('./it.json');
-export const lv = () => import('./lv.json');
-export const nb = () => import('./nb.json');
-export const nl = () => import('./nl.json');
-export const pl = () => import('./pl.json');
-export const ru = () => import('./ru.json');
-export const sk = () => import('./sk.json');
-export const sr = () => import('./sr.json');
-export const sv = () => import('./sv.json');
+export const cs = () =>
+  import(/* webpackChunkName: "translations-cs" */ './cs.json');
+export const da = () =>
+  import(/* webpackChunkName: "translations-da" */ './da.json');
+export const de = () =>
+  import(/* webpackChunkName: "translations-de" */ './de.json');
+export const en = () =>
+  import(/* webpackChunkName: "translations-en" */ './en.json');
+export const es = () =>
+  import(/* webpackChunkName: "translations-es" */ './es.json');
+export const et = () =>
+  import(/* webpackChunkName: "translations-et" */ './et.json');
+export const fi = () =>
+  import(/* webpackChunkName: "translations-fi" */ './fi.json');
+export const fr = () =>
+  import(/* webpackChunkName: "translations-fr" */ './fr.json');
+export const it = () =>
+  import(/* webpackChunkName: "translations-it" */ './it.json');
+export const lv = () =>
+  import(/* webpackChunkName: "translations-lv" */ './lv.json');
+export const nb = () =>
+  import(/* webpackChunkName: "translations-nb" */ './nb.json');
+export const nl = () =>
+  import(/* webpackChunkName: "translations-nl" */ './nl.json');
+export const pl = () =>
+  import(/* webpackChunkName: "translations-pl" */ './pl.json');
+export const ru = () =>
+  import(/* webpackChunkName: "translations-ru" */ './ru.json');
+export const sk = () =>
+  import(/* webpackChunkName: "translations-sk" */ './sk.json');
+export const sr = () =>
+  import(/* webpackChunkName: "translations-sr" */ './sr.json');
+export const sv = () =>
+  import(/* webpackChunkName: "translations-sv" */ './sv.json');