Skip to content

Commit

Permalink
chore(deps): update all non-major dependencies (#1209)
Browse files Browse the repository at this point in the history
Co-authored-by: Renovate Bot <bot@renovateapp.com>
  • Loading branch information
rchl and renovate-bot committed Jun 23, 2021
1 parent d2dd400 commit 22acb6e
Show file tree
Hide file tree
Showing 3 changed files with 989 additions and 1,869 deletions.
26 changes: 13 additions & 13 deletions package.json
Expand Up @@ -87,8 +87,8 @@
]
},
"dependencies": {
"@babel/parser": "^7.14.5",
"@babel/traverse": "^7.14.5",
"@babel/parser": "^7.14.7",
"@babel/traverse": "^7.14.7",
"@intlify/vue-i18n-extensions": "^1.0.2",
"@intlify/vue-i18n-loader": "^1.1.0",
"cookie": "^0.4.1",
Expand All @@ -98,13 +98,13 @@
"klona": "^2.0.4",
"lodash.merge": "^4.6.2",
"ufo": "^0.7.5",
"vue-i18n": "^8.24.4"
"vue-i18n": "^8.24.5"
},
"devDependencies": {
"@babel/core": "7.14.5",
"@babel/preset-env": "7.14.5",
"@babel/runtime": "7.14.5",
"@nuxt/types": "2.15.4",
"@babel/core": "7.14.6",
"@babel/preset-env": "7.14.7",
"@babel/runtime": "7.14.6",
"@nuxt/types": "2.15.7",
"@nuxtjs/composition-api": "0.24.4",
"@nuxtjs/eslint-config-typescript": "6.0.1",
"@nuxtjs/module-test-utils": "1.6.3",
Expand All @@ -123,18 +123,18 @@
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "10.1.0",
"codecov": "3.8.2",
"core-js": "3.14.0",
"eslint": "7.28.0",
"core-js": "3.15.1",
"eslint": "7.29.0",
"express": "4.17.1",
"husky": "4.3.8",
"jest": "27.0.4",
"jest": "27.0.5",
"jest-dev-server": "5.0.3",
"jsdom": "16.6.0",
"messageformat": "2.3.0",
"nuxt": "2.15.4",
"nuxt": "2.15.7",
"playwright-chromium": "1.12.2",
"release-it": "14.9.0",
"release-it": "14.10.0",
"serve-static": "1.14.1",
"typescript": "^4.2.4"
"typescript": "^4.3.4"
}
}
12 changes: 6 additions & 6 deletions test/browser.test.js
Expand Up @@ -225,7 +225,7 @@ describe(`${browserString} (generate, with router base)`, () => {
page = await browser.newPage({ locale: 'fr' })
await page.goto(server.getUrl('/'))
// Trailing slash added by the server.
expect(page.url()).toBe(server.getUrl('/fr/'))
expect(page.url()).toBe(server.getUrl('/fr'))
// Need to delay a bit due to vue-meta batching with 10ms timeout.
await page.waitForTimeout(20)
expect(await page.title()).toBe('Accueil')
Expand Down Expand Up @@ -388,11 +388,11 @@ for (const target of ['server', 'static']) {
test('redirects to saved locale on re-visiting the root path', async () => {
page = await browser.newPage()
await page.goto(server.getUrl('/fr'))
expect(page.url()).toBe(server.getUrl('/fr/'))
expect(page.url()).toBe(server.getUrl('/fr'))
expect(await (await page.$('body'))?.textContent()).toContain('locale: fr')

await page.goto(server.getUrl('/'))
expect(page.url()).toBe(server.getUrl('/fr/'))
expect(page.url()).toBe(server.getUrl('/fr'))
expect(await (await page.$('body'))?.textContent()).toContain('locale: fr')
})
})
Expand Down Expand Up @@ -445,8 +445,7 @@ describe(`${browserString} (generate with detectBrowserLanguage.fallbackLocale)`
test('redirects to browser locale', async () => {
page = await browser.newPage({ locale: 'fr' })
await page.goto(server.getUrl('/'))
// Trailing slash added by the server.
expect(page.url()).toBe(server.getUrl('/fr/'))
expect(page.url()).toBe(server.getUrl('/fr'))
expect(await (await page.$('body'))?.textContent()).toContain('locale: fr')
})
})
Expand Down Expand Up @@ -1058,7 +1057,8 @@ describe(`${browserString} (onlyOnRoot + prefix_except_default)`, () => {
const page = await browser.newPage({ locale: 'en' })
await page.goto(url('/fr/'))
expect(await (await page.$('#current-page'))?.textContent()).toContain('page: Accueil')
expect(await getRouteFullPath(page)).toBe('/fr/')
// Nuxt implicitly normalizes the trailing slash on initial reloading by calling router.replace(route).
expect(await getRouteFullPath(page)).toBe('/fr')
})

test('does not detect locale and redirect on prefixed, non-root path', async () => {
Expand Down

0 comments on commit 22acb6e

Please sign in to comment.