Merge branch 'master' of github.com:okbel/e-comm-example

package.json

@@ -21,10 +21,6 @@
   "dependencies": {
     "@headlessui/react": "^0.2.0",
     "@tailwindcss/ui": "^0.6.2",
-    "@types/bunyan": "^1.8.6",
-    "@types/bunyan-prettystream": "^0.1.31",
-    "@types/classnames": "^2.2.10",
-    "@types/react-swipeable-views": "^0.13.0",
     "animate.css": "^4.1.1",
     "bunyan": "^1.8.14",
     "bunyan-prettystream": "^0.1.3",
@@ -32,7 +28,12 @@
     "cookie": "^0.4.1",
     "js-cookie": "^2.2.1",
     "lodash.debounce": "^4.0.8",
+<<<<<<< HEAD
     "next": "^9.5.5",
+=======
+    "lodash.random": "^3.2.0",
+    "next": "^9.5.6-canary.4",
+>>>>>>> 0922c87621a6a34986bf811a1f2e55ed0bc7edf4
     "next-seo": "^4.11.0",
     "next-themes": "^0.0.4",
     "nextjs-progressbar": "^0.0.6",
@@ -53,11 +54,16 @@
     "@graphql-codegen/typescript": "^1.17.10",
     "@graphql-codegen/typescript-operations": "^1.17.8",
     "@manifoldco/swagger-to-ts": "^2.1.0",
+    "@types/bunyan": "^1.8.6",
+    "@types/bunyan-prettystream": "^0.1.31",
+    "@types/classnames": "^2.2.10",
     "@types/cookie": "^0.4.0",
     "@types/js-cookie": "^2.2.6",
     "@types/lodash.debounce": "^4.0.6",
+    "@types/lodash.random": "^3.2.6",
     "@types/node": "^14.11.2",
     "@types/react": "^16.9.49",
+    "@types/react-swipeable-views": "^0.13.0",
     "graphql": "^15.3.0",
     "postcss-flexbugs-fixes": "^4.2.1",
     "postcss-preset-env": "^6.7.0",