Skip to content

Added support for dynamic path params in client-only routes #119

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/gatsby-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ exports.onCreatePage = async ({ page, actions }, pluginOptions) => {
const newPath = routed ? `/${language}${page.path}` : page.path
return {
...page,
matchPath:
!page.matchPath && !routed && page.path.indexOf(":") >= 0
? page.path
: page.matchPath,
path: newPath,
context: {
...page.context,
Expand Down
26 changes: 22 additions & 4 deletions src/wrap-page.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
import React from "react"
import browserLang from "browser-lang"
import { withPrefix } from "gatsby"
import { navigate } from "gatsby"
import { IntlProvider } from "react-intl"
import { IntlContextProvider } from "./intl-context"

const preferDefault = m => (m && m.default) || m

const replaceParams = (path, props) => {
const regex = /\:(\w+)/g

let newPath = path
let match
while ((match = regex.exec(path)) !== null) {
newPath = newPath.replace(
new RegExp(match[0], "g"),
props[match[1]] || match[0]
)
}
return newPath
}

const polyfillIntl = language => {
const locale = language.split("-")[0]
try {
Expand All @@ -23,7 +37,7 @@ const polyfillIntl = language => {
}
}

const withIntlProvider = (intl) => children => {
const withIntlProvider = intl => children => {
polyfillIntl(intl.language)
return (
<IntlProvider
Expand Down Expand Up @@ -69,9 +83,13 @@ export default ({ element, props }, pluginOptions) => {
}

const queryParams = search || ""
const newUrl = withPrefix(`/${detected}${originalPath}${queryParams}`)
const pathWithParams = replaceParams(originalPath, props)

const newUrl = `/${detected}${pathWithParams}${queryParams}`
window.localStorage.setItem("gatsby-intl-language", detected)
window.location.replace(newUrl)
navigate(newUrl, {
replace: true,
})
}
}
const renderElement = isRedirect
Expand Down