Merge pull request #64 from wiziple/versions/0.2.8

Versions/0.2.8

Author: wiziple

examples/gatsby-starter-default-intl/package.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "gatsby": "2.13.39",
     "gatsby-image": "^2.2.6",
-    "gatsby-plugin-intl": "^0.2.7",
+    "gatsby-plugin-intl": "^0.2.8",
     "gatsby-plugin-manifest": "^2.2.4",
     "gatsby-plugin-offline": "^2.2.4",
     "gatsby-plugin-react-helmet": "^3.1.2",

examples/gatsby-starter-default-intl/yarn.lock

@@ -4956,10 +4956,10 @@ gatsby-page-utils@^0.0.5:
     micromatch "^3.1.10"
     slash "^1.0.0"
 
-gatsby-plugin-intl@^0.2.7:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/gatsby-plugin-intl/-/gatsby-plugin-intl-0.2.7.tgz#69e49cd09c3ed29f2d78b1e2c0d7ea6e197cf154"
-  integrity sha512-vbX6bM58gAidX+bDk1EczfQdrHgqEEhGrDDOymR+943HSZWKpnzAZwOaZAsFt2UjI2zvVYDdkzC5MmQDPlmabA==
+gatsby-plugin-intl@^0.2.8:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/gatsby-plugin-intl/-/gatsby-plugin-intl-0.2.8.tgz#d6393c77475e28c64a048416ff4bb389a0410292"
+  integrity sha512-m2fK8hKk0b0u7mRbz0DSik6qWvtYiKVm/wtabHOrl/g0vuytqWqqdRcaBAowUhhM5k9R8y/NrcsbNu9GiDJnKA==
   dependencies:
     "@babel/runtime" "^7.4.5"
     browser-lang "^0.1.0"

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "gatsby-plugin-intl",
   "description": "Gatsby plugin to add react-intl onto a site",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "author": "Daewoong Moon <wiziple@gmail.com>",
   "bugs": {
     "url": "https://github.com/wiziple/gatsby-plugin-intl"

package.json

@@ -84,7 +84,8 @@ exports.onCreatePage = async ({ page, actions }, pluginOptions) => {
 
   languages.forEach(language => {
     const localePage = generatePage(true, language)
-    if (localePage.path.includes(`/404/`)) {
+    const regexp = new RegExp("/404/?$")
+    if (regexp.test(localePage.path)) {
       localePage.matchPath = `/${language}/*`
     }
     createPage(localePage)

src/gatsby-node.js

@@ -55,6 +55,15 @@ export const changeLocale = (language, to) => {
   }
   const { routed } = window.___gatsbyIntl
 
+  const removePrefix = pathname => {
+    const base =
+      typeof __BASE_PATH__ !== `undefined` ? __BASE_PATH__ : __PATH_PREFIX__
+    if (base && pathname.indexOf(base) === 0) {
+      pathname = pathname.slice(base.length)
+    }
+    return pathname
+  }
+
   const removeLocalePart = pathname => {
     if (!routed) {
       return pathname
@@ -63,7 +72,8 @@ export const changeLocale = (language, to) => {
     return pathname.substring(i)
   }
 
-  const pathname = to || removeLocalePart(window.location.pathname)
+  const pathname =
+    to || removeLocalePart(removePrefix(window.location.pathname))
   // TODO: check slash
   const link = `/${language}${pathname}${window.location.search}`
   localStorage.setItem("gatsby-intl-language", language)

src/link.js

@@ -43,7 +43,7 @@ export default ({ element, props }) => {
 
   const { pageContext, location } = props
   const { intl } = pageContext
-  const { language, languages, redirect, routed } = intl
+  const { language, languages, redirect, routed, originalPath } = intl
 
   if (typeof window !== "undefined") {
     window.___gatsbyIntl = intl
@@ -52,7 +52,7 @@ export default ({ element, props }) => {
   const isRedirect = redirect && !routed
 
   if (isRedirect) {
-    const { pathname, search } = location
+    const { search } = location
 
     // Skip build, Browsers only
     if (typeof window !== "undefined") {
@@ -68,7 +68,7 @@ export default ({ element, props }) => {
       }
 
       const queryParams = search || ""
-      const newUrl = withPrefix(`/${detected}${pathname}${queryParams}`)
+      const newUrl = withPrefix(`/${detected}${originalPath}${queryParams}`)
       window.localStorage.setItem("gatsby-intl-language", detected)
       window.location.replace(newUrl)
     }