Merge branch 'master' into development_tri/implementasi_raja_ongkir

# Conflicts:
#	src/lib/checkout/components/Checkout.jsx

2 files changed, 11 insertions, 8 deletions

diff --git a/src/pages/blog/[slug].jsx b/src/pages/blog/[slug].jsx
index 9305411d..39c0bb50 100644
--- a/src/pages/blog/[slug].jsx
+++ b/src/pages/blog/[slug].jsx
@@ -1,10 +1,11 @@
 import Seo from '@/core/components/Seo'
-import Link from '@/core/components/elements/Link/Link'
 import Spinner from '@/core/components/elements/Spinner/Spinner'
-import BasicLayout from '@/core/components/layouts/BasicLayout'
-import { createSlug, getIdFromSlug } from '@/core/utils/slug'
+import { getIdFromSlug } from '@/core/utils/slug'
 import useBlog from '@/lib/blog/hooks/useBlog'
 import { useRouter } from 'next/router'
+import dynamic from 'next/dynamic'
+
+const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'))
 
 export default function BlogDetail() {
   const router = useRouter()
diff --git a/src/pages/blog/index.jsx b/src/pages/blog/index.jsx
index c65fe07d..17446935 100644
--- a/src/pages/blog/index.jsx
+++ b/src/pages/blog/index.jsx
@@ -1,12 +1,14 @@
-import BasicLayout from '@/core/components/layouts/BasicLayout'
 import Link from 'next/link'
+import { useRouter } from 'next/router'
 import { createSlug } from '@/core/utils/slug'
-import Image from '@/core/components/elements/Image/Image'
 import useBlogs from '@/lib/blog/hooks/useBlogs'
-import { useRouter } from 'next/router'
-import Pagination from '@/core/components/elements/Pagination/Pagination'
-import Spinner from '@/core/components/elements/Spinner/Spinner'
 import Seo from '@/core/components/Seo'
+import dynamic from 'next/dynamic'
+
+const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'))
+const Pagination = dynamic(() => import('@/core/components/elements/Pagination/Pagination'))
+const Spinner = dynamic(() => import('@/core/components/elements/Spinner/Spinner'))
+const Image = dynamic(() => import('@/core/components/elements/Image/Image'))
 
 export default function Blogs() {
   const router = useRouter()