New checkout

.jest/config.json

@@ -3,6 +3,7 @@
   "setupFiles": ["<rootDir>/.jest/register-context.js"],
   "//": "Please remove 'react-syntax-highlighter/dist/esm/(.*)' from moduleNameMapper when storybook is upgraded to v.6.0.0 or higher - there is a fix https://github.com/storybookjs/storybook/issues/9470",
   "moduleNameMapper": {
+    "@temp/([^\\.]*)$": "<rootDir>/src/$1",
     "@styles/([^\\.]*)$": "<rootDir>/src/@next/globalStyles/$1",
     "@styles": "<rootDir>/src/@next/globalStyles/index.ts",
     "@app/([^\\.]*)$": "<rootDir>/src/@next/$1",
@@ -15,6 +16,7 @@
     "@components/organisms": "<rootDir>/src/@next/components/organisms/index.ts",
     "@components/views": "<rootDir>/src/@next/components/views/index.ts",
     "@components/containers": "<rootDir>/src/@next/components/containers/index.ts",
+    "@components/templates": "<rootDir>/src/@next/components/templates/index.ts",
     "@types": "<rootDir>/src/@next/types/index.ts",
     "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
     "react-syntax-highlighter/dist/esm/(.*)": "react-syntax-highlighter/dist/cjs/$1"

.plop/templates/reactComponent.tsx.hbs

@@ -7,18 +7,16 @@ import * as S from "./styles";
 {{/if}}
 import { IProps } from "./types";
 
-export const {{> p_componentName}}: React.FC<IProps> = ({
+const {{> p_componentName}}: React.FC<IProps> = ({
   // destructure props here if needed
 }: IProps) => {
   return (
 {{#if componentHasStyles}}
-    <S.Wrapper>
-      {/* --- here --- */}
-    </S.Wrapper>
+    <S.Wrapper></S.Wrapper>
 {{else}}
-    <>
-      {/* --- here --- */}
-    </>
+    <></>
 {{/if}}
   )
 };
+
+export { {{> p_componentName}} }

.plop/templates/reactComponentTest.tsx.hbs

@@ -7,7 +7,6 @@ import React from "react";
 import { {{> p_componentName}} } from ".";
 
 describe("<{{> p_componentName}} />", () => {
-  // Example test
   it("exists", () => {
     const wrapper = shallow(<{{> p_componentName}} />);
 

babel.config.js

@@ -2,11 +2,12 @@ module.exports = {
   presets: [
     "@babel/preset-env",
     "@babel/preset-react",
-    "@babel/preset-typescript"
+    "@babel/preset-typescript",
   ],
   plugins: [
     "@babel/plugin-syntax-dynamic-import",
     "transform-class-properties",
-    "@babel/transform-runtime"
-  ]
+    "@babel/transform-runtime",
+    "@babel/plugin-proposal-optional-chaining",
+  ],
 };

cypress/integration/category/filters_and_sort_bar.js

@@ -78,8 +78,8 @@ describe("Category view - filtering and sorting", () => {
       .first()
       .invoke("text")
       .then(firstTileText => {
+        cy.get("[data-cy=dropdown-select-input]").click();
         cy.get("[data-cy=dropdown-select]")
-          .click()
           .contains("Name Decreasing")
           .click()
           .wait(10000);

cypress/integration/category/product_list.js

@@ -24,7 +24,8 @@ describe("Product list view", () => {
       },
     });
 
-    cy.get("[data-cy=main-menu__item]")
+    cy.wait(5000)
+      .get("[data-cy=main-menu__item]")
       .first()
       .click();
   });

cypress/support/account/index.js

@@ -1,5 +1,6 @@
 const openAccountMenu = testId => {
   return cy
+    .wait(10000)
     .findByTestId("user-btn", { timeout: 15000 })
     .trigger("mouseover")
     .findByTestId(testId)

cypress/support/category/index.js

@@ -7,6 +7,7 @@ const openFilterSidebar = () => {
 
 const openCategory = (index = 0) => {
   return cy
+    .wait(5000)
     .get("[data-cy=main-menu__item]")
     .eq(index)
     .click();

cypress/support/login/index.js

@@ -38,6 +38,7 @@ Cypress.Commands.add("registerUser", user =>
 Cypress.Commands.add("loginUser", user => loginOrRegisterUser("login", user));
 Cypress.Commands.add("logoutUser", () =>
   cy
+    .wait(10000)
     .findByTestId("user-btn", { timeout: 3000 })
     .trigger("mouseover")
     .findByTestId("logout-link")