Removed unrequired code

src/core/Layout.js

@@ -1,6 +1,5 @@
 import { PureComponent, useCallback, useEffect, useState } from 'react'
 import propTypes from 'prop-types'
-import { withRouter } from 'next/router'
 import classNames from 'classnames'
 import { ThemeProvider, createGlobalStyle } from 'styled-components'
 import Pagination from './pages/Pagination'
@@ -132,12 +131,9 @@ class Layout extends PureComponent {
     }
 
     render() {
-        const { showPagination, location, pageContext, router } = this.props
+        const { showPagination, location, pageContext } = this.props
         const { showSidebar } = this.state
-        const context = mergePageContext(
-            { ...pageContext, ...this.state, currentPath: router.asPath },
-            location
-        )
+        const context = mergePageContext({ ...pageContext, ...this.state }, location)
 
         return (
             <PageContextProvider value={context}>
@@ -156,7 +152,7 @@ class Layout extends PureComponent {
     }
 }
 
-export default withRouter(Layout)
+export default Layout
 
 const GlobalStyle = createGlobalStyle`
     body {

src/core/components/Head.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import Helmet from 'react-helmet'
 import { usePageContext } from 'core/helpers/pageContext'
-import { getPageSocialMeta, getPageMeta } from 'core/helpers/pageHelpers'
+import { usePageSocialMeta, usePageMeta } from 'core/helpers/pageHelpers'
 import { useI18n } from 'core/i18n/i18nContext'
 import { useTools } from 'core/helpers/toolsContext'
 import { websiteTitle } from 'core/constants.js'
@@ -17,8 +17,8 @@ const Head = () => {
         overrides.title = `${websiteTitle}: ${toolName}`
     }
 
-    const meta = getPageMeta(context, translate, overrides)
-    const socialMeta = getPageSocialMeta(context, translate, overrides)
+    const meta = usePageMeta(translate, overrides)
+    const socialMeta = usePageSocialMeta(translate, overrides)
     const description = translate(`general.description`)
 
     const mergedMeta = [

src/core/helpers/pageHelpers.js

@@ -1,6 +1,9 @@
+import { useRouter } from 'next/router'
 import { getToolName } from 'core/helpers/tools'
 import { websiteTitle } from 'core/constants.js'
+import { usePageContext } from './pageContext'
 
+const HOST = 'https://2019.stateofjs.com'
 const WEBSITE_TITLE = websiteTitle
 
 export const getTranslationValuesFromContext = (context, translate) => {
@@ -46,41 +49,40 @@ export const getPageLabel = (
  * example:
  *   http://2018.stateofjs.com/images/captures/front-end_overview.png
  */
-export const getPageImageUrl = context => {
-    const baseUrl = `${context.host}/images/`
-
-    let imageUrl
-    if (context.block !== undefined) {
-        imageUrl = `${baseUrl}captures/${context.block.id}.png`
-        // imageUrl = `${baseUrl}captures/${context.basePath
-        //     .replace(/^\//, '')
-        //     .replace(/\/$/, '')
-        //     .replace(/\//g, '_')}_${context.block.id}.png`
-    } else {
-        imageUrl = `${baseUrl}stateofjs-socialmedia.png`
-    }
-
-    return imageUrl
+export const getPageImageUrl = () => {
+    // const baseUrl = `${context.host}/images/`
+
+    // let imageUrl
+    // if (context.block !== undefined) {
+    //     imageUrl = `${baseUrl}captures/${context.block.id}.png`
+    //     // imageUrl = `${baseUrl}captures/${context.basePath
+    //     //     .replace(/^\//, '')
+    //     //     .replace(/\/$/, '')
+    //     //     .replace(/\//g, '_')}_${context.block.id}.png`
+    // } else {
+    //     imageUrl = `${baseUrl}stateofjs-socialmedia.png`
+    // }
+
+    return `${HOST}/images/stateofjs-socialmedia.png`
 }
 
-export const getPageMeta = (context, translate, overrides = {}) => {
-    const url = `${context.host}${context.localePath}${context.basePath}`
-    const imageUrl = getPageImageUrl(context)
-    const isRoot = context.path === '/' || context.basePath === '/'
+export const usePageMeta = (translate, overrides = {}) => {
+    const context = usePageContext()
+    const { query, asPath } = useRouter()
+    const imageUrl = getPageImageUrl()
+    const currentPath = query.lang ? asPath.replace(new RegExp(`^/${query.lang}`), '/') : asPath
+    const isRoot = currentPath === '/'
 
-    const meta = {
-        url,
+    return {
+        url: HOST + asPath,
         title: isRoot ? WEBSITE_TITLE : getPageLabel(context, translate, { includeWebsite: true }),
         imageUrl,
         ...overrides
     }
-
-    return meta
 }
 
-export const getPageSocialMeta = (context, translate, overrides = {}) => {
-    const meta = getPageMeta(context, translate, overrides)
-
+export const usePageSocialMeta = (translate, overrides = {}) => {
+    const meta = usePageMeta(translate, overrides)
     const socialMeta = [
         // facebook
         { property: 'og:type', content: 'article' },
@@ -107,14 +109,9 @@ export const mergePageContext = (pageContext, location) => {
     const isDebugEnabled =
         location && location.search ? location.search.indexOf('debug') !== -1 : false
 
-    let host = 'https://2019.stateofjs.com'
-    if (location && location.host && location.protocol) {
-        host = `${location.protocol}//${location.host}`
-    }
-
     return {
         ...pageContext,
-        host,
+        host: HOST,
         isCapturing,
         isDebugEnabled
     }

src/core/pages/PageMeta.js

@@ -1,14 +1,11 @@
 import React from 'react'
 import Helmet from 'react-helmet'
-import { usePageContext } from '../helpers/pageContext'
 import { useI18n } from '../i18n/i18nContext'
-import { getPageSocialMeta } from '../helpers/pageHelpers'
+import { usePageSocialMeta } from '../helpers/pageHelpers'
 
 const PageMeta = ({ overrides = {} }) => {
-    const context = usePageContext()
     const { translate } = useI18n()
-
-    const meta = getPageSocialMeta(context, translate, overrides)
+    const meta = usePageSocialMeta(translate, overrides)
 
     return <Helmet meta={meta} />
 }

src/core/pages/PageMetaDebug.js

@@ -2,23 +2,20 @@ import React from 'react'
 import { usePageContext } from '../helpers/pageContext'
 import { useI18n } from '../i18n/i18nContext'
 import Debug from '../components/Debug'
-import { getPageSocialMeta } from '../helpers/pageHelpers'
+import { usePageSocialMeta } from '../helpers/pageHelpers'
 import { useTools } from 'core/helpers/toolsContext'
 import { websiteTitle } from 'core/constants.js'
 
 const PageMetaDebug = ({ overrides = {} }) => {
     const context = usePageContext()
     const { translate } = useI18n()
     const { getToolName } = useTools()
-
-    if (!context.isDebugEnabled) return null
-
     const toolName = getToolName(context)
     if (toolName) {
         overrides.title = `${websiteTitle}: ${toolName}`
     }
 
-    const meta = getPageSocialMeta(context, translate, overrides)
+    const meta = usePageSocialMeta(translate, overrides)
     const metaObject = meta.reduce((acc, meta) => {
         const key = meta.property || meta.name
 
@@ -28,6 +25,8 @@ const PageMetaDebug = ({ overrides = {} }) => {
         }
     }, {})
 
+    if (!context.isDebugEnabled) return null
+
     return <Debug title="Page meta" data={metaObject} />
 }