.eslintrc.js

@@ -1,15 +1,15 @@
 module.exports = {
   root: true,
   extends: [
-    '@nuxtjs/eslint-config-typescript',
+    '@nuxtjs/eslint-config-typescript'
   ],
   plugins: [
-    'jest',
+    'jest'
   ],
   rules: {
     'arrow-parens': 'off',
     'vue/html-closing-bracket-newline': 'off',
     'vue/multiline-html-element-content-newline': 'off',
-    'vue/singleline-html-element-content-newline': 'off',
-  },
+    'vue/singleline-html-element-content-newline': 'off'
+  }
 }

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,6 +11,23 @@ assignees: ''
 nuxt-i18n: <!-- ex: 5.9.0 -->
 nuxt: <!-- ex: 2.0.0 -->
 
+### Nuxt configuration
+#### [mode](https://nuxtjs.org/api/configuration-mode): <!--universal is the default -->
+ - [ ] universal
+ - [ ] spa
+
+### Nuxt-i18n configuration
+<!--
+    If relevant, please include the configuration you are using for this module.
+    For example:
+```
+i18n: {
+    strategy: 'prefix',
+    ...
+}
+```
+-->
+
 ### Reproduction Link
 <!-- A minimal test case on https://template.nuxtjs.org/ or GitHub reprository that can reproduce the bug. -->
 

.github/stale.yml

@@ -6,8 +6,9 @@ daysUntilClose: 7
 exemptLabels:
   - pinned
   - security
+exemptAssignees: true
 # Label to use when marking an issue as stale
-staleLabel: wontfix
+staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had

CHANGELOG.md

@@ -1,3 +1,10 @@
+### [6.11.1](https://github.com/nuxt-community/nuxt-i18n/compare/v6.11.0...v6.11.1) (2020-05-10)
+
+
+### Bug Fixes
+
+* NavigationDuplicated error on loading 404 page in SPA ([#705](https://github.com/nuxt-community/nuxt-i18n/issues/705)) ([6bd80da](https://github.com/nuxt-community/nuxt-i18n/commit/6bd80da4ee21918abb551629720723dc82d69fc0)), closes [#702](https://github.com/nuxt-community/nuxt-i18n/issues/702)
+
 ## [6.11.0](https://github.com/nuxt-community/nuxt-i18n/compare/v6.10.1...v6.11.0) (2020-04-30)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-i18n",
-  "version": "6.11.0",
+  "version": "6.11.1",
   "description": "i18n for Nuxt",
   "license": "MIT",
   "contributors": [
@@ -54,7 +54,8 @@
     },
     "github": {
       "release": true,
-      "releaseName": "${version}"
+      "releaseName": "${version}",
+      "releaseNotes": "echo \"${changelog}\" | sed 1,2d"
     },
     "plugins": {
       "@release-it/conventional-changelog": {
@@ -89,27 +90,27 @@
     "vue-i18n": "^8.17.3"
   },
   "devDependencies": {
-    "@babel/core": "7.9.0",
-    "@babel/preset-env": "7.9.5",
-    "@babel/runtime": "7.9.2",
-    "@nuxt/types": "0.7.4",
+    "@babel/core": "7.9.6",
+    "@babel/preset-env": "7.9.6",
+    "@babel/runtime": "7.9.6",
+    "@nuxt/types": "0.7.5",
     "@nuxtjs/eslint-config-typescript": "1.0.2",
     "@nuxtjs/module-test-utils": "1.6.1",
-    "@release-it/conventional-changelog": "1.1.3",
+    "@release-it/conventional-changelog": "1.1.4",
     "@types/jest": "25.2.1",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.1.0",
     "chromedriver": "81.0.0",
     "codecov": "3.6.5",
     "core-js": "3.6.5",
-    "eslint": "6.8.0",
+    "eslint": "7.0.0",
     "geckodriver": "1.19.1",
-    "jest": "25.4.0",
+    "jest": "26.0.1",
     "jsdom": "16.2.2",
     "messageformat": "2.3.0",
     "nuxt": "2.12.2",
-    "puppeteer-core": "3.0.1",
-    "release-it": "13.5.5",
+    "puppeteer-core": "3.0.4",
+    "release-it": "13.5.8",
     "selenium-webdriver": "4.0.0-alpha.7",
     "tib": "0.7.4",
     "typescript": "3.8.3",

src/templates/plugin.main.js

@@ -85,7 +85,9 @@ export default async (context) => {
 
     await syncVuex(store, newLocale, app.i18n.getLocaleMessage(newLocale), { vuex })
 
-    const redirectPath = getRedirectPathForLocale(newLocale)
+    // Must retrieve from context as it might have changed since plugin initialization.
+    const { route } = context
+    const redirectPath = getRedirectPathForLocale(route, newLocale)
 
     if (initialSetup) {
       // Redirect will be delayed until middleware runs as redirecting from plugin does not
@@ -100,25 +102,24 @@ export default async (context) => {
     }
   }
 
-  const getRedirectPathForLocale = locale => {
+  const getRedirectPathForLocale = (route, locale) => {
     if (!locale || app.i18n.differentDomains || strategy === STRATEGIES.NO_PREFIX) {
-      return
+      return ''
     }
 
-    // Must retrieve from context as it might have changed since plugin initialization.
-    const { route } = context
-    const routeLocale = getLocaleFromRoute(route)
-
-    if (routeLocale === locale) {
-      return
+    if (getLocaleFromRoute(route) === locale) {
+      return ''
     }
 
-    // At this point we are left with route that either no or different locale.
+    // At this point we are left with route that either has no or different locale.
     let redirectPath = app.switchLocalePath(locale)
 
     if (!redirectPath) {
-      // Could be a 404 route in which case we should attemp to find matching route for given locale.
-      redirectPath = app.localePath(route.path, locale)
+      // Current route could be 404 in which case attempt to find matching route for given locale.
+      redirectPath = app.localePath(route.fullPath, locale)
+      if (redirectPath === route.fullPath) {
+        return ''
+      }
     }
 
     return redirectPath

test/browser.test.js

@@ -10,7 +10,10 @@ async function createDefaultBrowser () {
     staticServer: false,
     extendPage (page) {
       return {
-        navigate: createNavigator(page)
+        navigate: createNavigator(page),
+        getRouteFullPath () {
+          return page.runScript(() => window.$nuxt.$route.fullPath)
+        }
       }
     }
   })
@@ -244,6 +247,46 @@ describe(`${browserString} (no fallbackLocale, browser language not supported)`,
   })
 })
 
+describe(`${browserString} (SPA)`, () => {
+  let nuxt
+  let browser
+  let page
+
+  beforeAll(async () => {
+    const overrides = {
+      mode: 'spa'
+    }
+
+    nuxt = (await setup(loadConfig(__dirname, 'basic', overrides, { merge: true }))).nuxt
+    browser = await createDefaultBrowser()
+  })
+
+  afterAll(async () => {
+    if (browser) {
+      await browser.close()
+    }
+
+    await nuxt.close()
+  })
+
+  test('renders existing page', async () => {
+    page = await browser.page(url('/'))
+    expect(await page.getText('body')).toContain('locale: en')
+  })
+
+  test('renders 404 page', async () => {
+    page = await browser.page(url('/nopage'))
+    expect(await page.getText('body')).toContain('page could not be found')
+  })
+
+  test('preserves the URL on 404 page', async () => {
+    const path = '/nopage?a#h'
+    page = await browser.page(url(path))
+    expect(await page.getText('body')).toContain('page could not be found')
+    expect(await page.getRouteFullPath()).toBe(path)
+  })
+})
+
 describe(`${browserString} (SPA with router in hash mode)`, () => {
   let nuxt
   let browser