Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-23 14:15:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

v2.14.10 [hotfix]

Browse Source
This commit is contained in:
Pooya Parsa 2020-12-07 11:37:14 +01:00
commit 85bb97906c
32 changed files with 256 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
distributions/nuxt-start/package.json
View File

@ -1,6 +1,6 @@
{
"name": "nuxt-start",
"version": "2.14.9",
"version": "2.14.10",
"description": "Starts Nuxt Application in production mode",
"keywords": [
"nuxt",
@ -55,9 +55,9 @@
"dist"
],
"dependencies": {
"@nuxt/cli": "2.14.9",
"@nuxt/core": "2.14.9",
"@nuxt/telemetry": "^1.2.3",
"@nuxt/cli": "2.14.10",
"@nuxt/core": "2.14.10",
"@nuxt/telemetry": "^1.3.0",
"node-fetch": "^2.6.1",
"vue": "^2.6.12",
"vue-client-only": "^2.0.0",

14
distributions/nuxt/package.json
View File

@ -1,6 +1,6 @@
{
"name": "nuxt",
"version": "2.14.9",
"version": "2.14.10",
"description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
"keywords": [
"nuxt",
@ -58,15 +58,15 @@
"postinstall": "opencollective || exit 0"
},
"dependencies": {
"@nuxt/builder": "2.14.9",
"@nuxt/cli": "2.14.9",
"@nuxt/builder": "2.14.10",
"@nuxt/cli": "2.14.10",
"@nuxt/components": "^1.2.1",
"@nuxt/core": "2.14.9",
"@nuxt/generator": "2.14.9",
"@nuxt/core": "2.14.10",
"@nuxt/generator": "2.14.10",
"@nuxt/loading-screen": "^2.0.3",
"@nuxt/opencollective": "^0.3.2",
"@nuxt/telemetry": "^1.2.3",
"@nuxt/webpack": "2.14.9"
"@nuxt/telemetry": "^1.3.0",
"@nuxt/webpack": "2.14.10"
},
"engines": {
"node": ">=10.13.0",

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "2.14.9",
"version": "2.14.10",
"npmClient": "yarn",
"useWorkspaces": true,
"conventionalCommits": true,

2
packages/babel-preset-app/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nuxt/babel-preset-app",
"version": "2.14.9",
"version": "2.14.10",
"description": "babel-preset-app for nuxt",
"repository": "nuxt/nuxt.js",
"license": "MIT",

8
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nuxt/builder",
"version": "2.14.9",
"version": "2.14.10",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/builder.js",
@ -9,9 +9,9 @@
],
"dependencies": {
"@nuxt/devalue": "^1.2.4",
"@nuxt/utils": "2.14.9",
"@nuxt/vue-app": "2.14.9",
"@nuxt/webpack": "2.14.9",
"@nuxt/utils": "2.14.10",
"@nuxt/vue-app": "2.14.10",
"@nuxt/webpack": "2.14.10",
"chalk": "^4.1.0",
"chokidar": "^3.4.3",
"consola": "^2.15.0",

6
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nuxt/cli",
"version": "2.14.9",
"version": "2.14.10",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/cli.js",
@ -12,8 +12,8 @@
"dist"
],
"dependencies": {
"@nuxt/config": "2.14.9",
"@nuxt/utils": "2.14.9",
"@nuxt/config": "2.14.10",
"@nuxt/utils": "2.14.10",
"boxen": "^4.2.0",
"chalk": "^4.1.0",
"compression": "^1.7.4",

5
packages/config/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nuxt/config",
"version": "2.14.9",
"version": "2.14.10",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/config.js",
@ -10,7 +10,8 @@
"index.d.ts"
],
"dependencies": {
"@nuxt/utils": "2.14.9",
"@nuxt/ufo": "^0.0.3",
"@nuxt/utils": "2.14.10",
"consola": "^2.15.0",
"create-require": "^1.1.1",
"defu": "^3.2.2",

3
packages/config/src/options.js
View File

@ -7,6 +7,7 @@ import uniq from 'lodash/uniq'
import consola from 'consola'
import destr from 'destr'
import { TARGETS, MODES, guardDir, isNonEmptyString, isPureObject, isUrl, getMainModule, urlJoin, getPKG } from '@nuxt/utils'
import { normalizeURL } from '@nuxt/ufo'
import { defaultNuxtConfigFile, getDefaultNuxtConfig } from './config'
export function getNuxtConfig (_options) {
@ -126,7 +127,7 @@ export function getNuxtConfig (_options) {
if (!/\/$/.test(options.router.base)) {
options.router.base += '/'
}
options.router.base = encodeURI(decodeURI(options.router.base))
options.router.base = normalizeURL(options.router.base)
// Legacy support for export
if (options.export) {

10
packages/core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nuxt/core",
"version": "2.14.9",
"version": "2.14.10",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/core.js",
@ -8,11 +8,11 @@
"dist"
],
"dependencies": {
"@nuxt/config": "2.14.9",
"@nuxt/config": "2.14.10",
"@nuxt/devalue": "^1.2.4",
"@nuxt/server": "2.14.9",
"@nuxt/utils": "2.14.9",
"@nuxt/vue-renderer": "2.14.9",
"@nuxt/server": "2.14.10",
"@nuxt/utils": "2.14.10",
"@nuxt/vue-renderer": "2.14.10",
"consola": "^2.15.0",
"debug": "^4.2.0",
"esm": "^3.2.25",

4
packages/generator/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nuxt/generator",
"version": "2.14.9",
"version": "2.14.10",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/generator.js",
@ -8,7 +8,7 @@
"dist"
],
"dependencies": {
"@nuxt/utils": "2.14.9",
"@nuxt/utils": "2.14.10",
"chalk": "^4.1.0",
"consola": "^2.15.0",
"devalue": "^2.0.1",

8
packages/server/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nuxt/server",
"version": "2.14.9",
"version": "2.14.10",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/server.js",
@ -8,9 +8,9 @@
"dist"
],
"dependencies": {
"@nuxt/config": "2.14.9",
"@nuxt/utils": "2.14.9",
"@nuxt/vue-renderer": "2.14.9",
"@nuxt/config": "2.14.10",
"@nuxt/utils": "2.14.10",
"@nuxt/vue-renderer": "2.14.10",
"@nuxtjs/youch": "^4.2.3",
"chalk": "^4.1.0",
"compression": "^1.7.4",

12
packages/server/src/server.js
View File

@ -162,12 +162,16 @@ export default class Server {
}))
// DX: redirect if router.base in development
if (this.options.dev && this.nuxt.options.router.base !== '/') {
const routerBase = this.nuxt.options.router.base
if (this.options.dev && routerBase !== '/') {
this.useMiddleware({
prefix: false,
handler: (req, res) => {
const to = urlJoin(this.nuxt.options.router.base, req.url)
consola.info(`[Development] Redirecting from \`${decodeURI(req.url)}\` to \`${decodeURI(to)}\` (router.base specified).`)
handler: (req, res, next) => {
if (decodeURI(req.url).startsWith(decodeURI(routerBase))) {
return next()
}
const to = urlJoin(routerBase, req.url)
consola.info(`[Development] Redirecting from \`${decodeURI(req.url)}\` to \`${decodeURI(to)}\` (router.base specified)`)
res.writeHead(302, {
Location: to
})

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nuxt/types",
"version": "2.14.9",
"version": "2.14.10",
"description": "Nuxt types",
"repository": "nuxt/nuxt.js",
"license": "MIT",

3
packages/utils/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nuxt/utils",
"version": "2.14.9",
"version": "2.14.10",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/utils.js",
@ -8,6 +8,7 @@
"dist"
],
"dependencies": {
"@nuxt/ufo": "^0.0.3",
"consola": "^2.15.0",
"fs-extra": "^9.0.1",
"hash-sum": "^2.0.0",

8
packages/utils/src/route.js
View File

@ -1,7 +1,7 @@
import path from 'path'
import get from 'lodash/get'
import consola from 'consola'
import { normalizeURL } from '@nuxt/ufo'
import { r } from './resolve'
const routeChildren = function (route) {
@ -201,10 +201,8 @@ export const createRoutes = function createRoutes ({
} else if (key === 'index' && i + 1 === keys.length) {
route.path += i > 0 ? '' : '/'
} else {
const isDynamic = key.startsWith('_')
route.path += '/' + getRoutePathExtension(isDynamic ? key : encodeURIComponent(decodeURIComponent(key)))
if (isDynamic && key.length > 1) {
route.path += normalizeURL(getRoutePathExtension(key))
if (key.startsWith('_') && key.length > 1) {
route.path += '?'
}
}

3
packages/vue-app/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nuxt/vue-app",
"version": "2.14.9",
"version": "2.14.10",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/vue-app.js",
@ -13,6 +13,7 @@
"index.d.ts"
],
"dependencies": {
"@nuxt/ufo": "^0.0.3",
"node-fetch": "^2.6.1",
"unfetch": "^4.2.0",
"vue": "^2.6.12",

20
packages/vue-app/template/router.js
View File

@ -1,5 +1,6 @@
import Vue from 'vue'
import Router from 'vue-router'
import { normalizeURL } from '@nuxt/ufo'
import { interopDefault } from './utils'<%= isTest ? '// eslint-disable-line no-unused-vars' : '' %>
import scrollBehavior from './router.scrollBehavior.js'
@ -105,16 +106,27 @@ export const routerOptions = {
fallback: <%= router.fallback %>
}
function decodeObj(obj) {
for (const key in obj) {
if (typeof obj[key] === 'string') {
obj[key] = decodeURIComponent(obj[key])
}
}
}
export function createRouter () {
const router = new Router(routerOptions)
const resolve = router.resolve.bind(router)
// encodeURI(decodeURI()) ~> support both encoded and non-encoded urls
const resolve = router.resolve.bind(router)
router.resolve = (to, current, append) => {
if (typeof to === 'string') {
to = encodeURI(decodeURI(to))
to = normalizeURL(to)
}
return resolve(to, current, append)
const r = resolve(to, current, append)
if (r && r.resolved && r.resolved.query) {
decodeObj(r.resolved.query)
}
return r
}
return router

5
packages/vue-app/template/server.js
View File

@ -1,5 +1,6 @@
import { stringify } from 'querystring'
import Vue from 'vue'
import { normalizeURL } from '@nuxt/ufo'
<% if (fetch.server) { %>import fetch from 'node-fetch'<% } %>
<% if (features.middleware) { %>import middleware from './middleware.js'<% } %>
import {
@ -50,12 +51,12 @@ const createNext = ssrContext => (opts) => {
opts.path = urlJoin(routerBase, opts.path)
}
// Avoid loop redirect
if (encodeURI(decodeURI(opts.path)) === ssrContext.url) {
if (decodeURI(opts.path) === decodeURI(ssrContext.url)) {
ssrContext.redirected = false
return
}
ssrContext.res.writeHead(opts.status, {
Location: opts.path
Location: normalizeURL(opts.path)
})
ssrContext.res.end()
}

4
packages/vue-app/template/utils.js
View File

@ -1,4 +1,5 @@
import Vue from 'vue'
import { normalizeURL } from '@nuxt/ufo'
// window.{{globals.loadedCallback}} hook
// Useful for jsdom testing or plugins (https://github.com/tmpvar/jsdom#dealing-with-asynchronous-script-loading)
@ -309,7 +310,7 @@ export function getLocation (base, mode) {
const fullPath = (path || '/') + window.location.search + window.location.hash
return encodeURI(fullPath)
return normalizeURL(fullPath)
}
// Imported from path-to-regexp
@ -692,3 +693,4 @@ export function setScrollRestoration (newVal) {
window.history.scrollRestoration = newVal;
} catch(e) {}
}

4
packages/vue-renderer/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nuxt/vue-renderer",
"version": "2.14.9",
"version": "2.14.10",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/vue-renderer.js",
@ -9,7 +9,7 @@
],
"dependencies": {
"@nuxt/devalue": "^1.2.4",
"@nuxt/utils": "2.14.9",
"@nuxt/utils": "2.14.10",
"consola": "^2.15.0",
"fs-extra": "^9.0.1",
"lru-cache": "^5.1.1",

3
packages/vue-renderer/src/renderer.js
View File

@ -3,6 +3,7 @@ import fs from 'fs-extra'
import consola from 'consola'
import template from 'lodash/template'
import { TARGETS, isModernRequest, waitFor } from '@nuxt/utils'
import { normalizeURL } from '@nuxt/ufo'
import SPARenderer from './renderers/spa'
import SSRRenderer from './renderers/ssr'
@ -274,7 +275,7 @@ export default class VueRenderer {
consola.debug(`Rendering url ${url}`)
// Add url to the renderContext
renderContext.url = encodeURI(decodeURI(url))
renderContext.url = normalizeURL(url)
// Add target to the renderContext
renderContext.target = this.options.target

6
packages/webpack/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nuxt/webpack",
"version": "2.14.9",
"version": "2.14.10",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/webpack.js",
@ -9,9 +9,9 @@
],
"dependencies": {
"@babel/core": "^7.12.9",
"@nuxt/babel-preset-app": "2.14.9",
"@nuxt/babel-preset-app": "2.14.10",
"@nuxt/friendly-errors-webpack-plugin": "^2.5.0",
"@nuxt/utils": "2.14.9",
"@nuxt/utils": "2.14.10",
"babel-loader": "^8.2.2",
"cache-loader": "^4.1.0",
"caniuse-lite": "^1.0.30001165",

1
packages/webpack/src/config/base.js
View File

@ -73,6 +73,7 @@ export default class WebpackBaseConfig {
return [
/\.vue\.js/i, // include SFCs in node_modules
/consola\/src/,
/@nuxt[/\\]ufo/, // exports modern syntax for browser field
...this.normalizeTranspile({ pathNormalize: true })
]
}

2
test/dev/async-config.size-limit.test.js
View File

@ -20,7 +20,7 @@ describe('nuxt basic resources size limit', () => {
it('should stay within the size limit range in legacy mode', async () => {
const legacyResourcesSize = await getResourcesSize(distDir, 'client', { gzip: true, brotli: true })
const LEGACY_JS_RESOURCES_KB_SIZE = 200
const LEGACY_JS_RESOURCES_KB_SIZE = 201
expect(legacyResourcesSize.uncompressed).toBeWithinSize(LEGACY_JS_RESOURCES_KB_SIZE)
const LEGACY_JS_RESOURCES_GZIP_KB_SIZE = 70

18
test/dev/dynamic-routes.test.js
View File

@ -5,20 +5,9 @@ import { promisify } from 'util'
const readFile = promisify(fs.readFile)
describe('dynamic routes', () => {
test('Check .nuxt/router.js', () => {
return readFile(
resolve(__dirname, '..', 'fixtures/dynamic-routes/.nuxt/router.js'),
'utf-8'
).then((routerFile) => {
routerFile = routerFile
.slice(routerFile.indexOf('routes: ['))
.replace('routes: [', '[')
.replace(/ _[0-9A-Za-z]+,/g, ' "",')
routerFile = routerFile.substr(
routerFile.indexOf('['),
routerFile.lastIndexOf(']') + 1
)
const routes = eval('( ' + routerFile + ')') // eslint-disable-line no-eval
test('Check .nuxt/routes.json', async () => {
const routesFile = await readFile(resolve(__dirname, '..', 'fixtures/dynamic-routes/.nuxt/routes.json'), 'utf-8')
const routes = JSON.parse(routesFile)
// pages/test/index.vue
expect(routes[0].path).toBe('/parent')
expect(routes[0].name).toBeFalsy() // parent route has no name
@ -99,4 +88,3 @@ describe('dynamic routes', () => {
expect(routes[15].name).toBe('all')
})
})
})

12
test/dev/encoding.test.js
View File

@ -21,6 +21,18 @@ describe('encoding', () => {
expect(response).toContain('Unicode base works!')
})
test('/ö/dynamic?q=food,coffee (encodeURIComponent)', async () => {
const { body: response } = await rp(url('/ö/dynamic?q=food%252Ccoffee'))
expect(response).toContain('food,coffee')
})
test('/ö/@about', async () => {
const { body: response } = await rp(url('/ö/@about'))
expect(response).toContain('About')
})
// Close server and ask nuxt to stop listening to file changes
afterAll(async () => {
await nuxt.close()

19
test/dev/route-name-splitter.test.js
View File

@ -5,21 +5,9 @@ import { promisify } from 'util'
const readFile = promisify(fs.readFile)
describe('route-name-splitter', () => {
test('Check routes names', () => {
return readFile(
resolve(__dirname, '..', 'fixtures/route-name-splitter/.nuxt/router.js'),
'utf-8'
).then((routerFile) => {
routerFile = routerFile
.slice(routerFile.indexOf('routes: ['))
.replace('routes: [', '[')
.replace(/ _[0-9A-Za-z]+,/g, ' "",')
routerFile = routerFile.substr(
routerFile.indexOf('['),
routerFile.lastIndexOf(']') + 1
)
const routes = eval('( ' + routerFile + ')') // eslint-disable-line no-eval
test('Check routes names', async () => {
const routesFile = await readFile(resolve(__dirname, '..', 'fixtures/route-name-splitter/.nuxt/routes.json'), 'utf-8')
const routes = JSON.parse(routesFile)
expect(routes[0].name).toBe('parent')
expect(routes[1].name).toBe('posts')
expect(routes[1].children[0].name).toBe('posts/id')
@ -30,4 +18,3 @@ describe('route-name-splitter', () => {
expect(routes[6].name).toBe('all')
})
})
})

39
test/fixtures/encoding/layouts/default.vue vendored
View File

@ -1,24 +1,41 @@
<template>
<div>
<div>
<NLink to="/тест">
/тест
<ul>
<li v-for="link in links" :key="link">
<NLink :to="link">
{{ link }}
</NLink>
<NLink :to="encodeURI('/тест')">
/тест (encoded)
</NLink>
<br>
<NLink to="/тест?spa">
/тест (SPA)
</NLink>
<NLink :to="encodeURI('/тест?spa')">
/тест (SPA encoded)
<NLink :to="link.includes('?') ? link.replace('?', '?spa&') : (link + '?spa')">
(spa)
</NLink>
<a :href="encodeURI('/ö') + link">(direct)</a>
</li>
</ul>
</div>
<Nuxt />
</div>
</template>
<script>
export default {
computed: {
links () {
return [
'/redirect',
'/@about',
'/тест',
encodeURI('/тест'),
'/dynamic/سلام چطوری?q=cofee,food,دسر',
encodeURI('/dynamic/سلام چطوری?q=cofee,food,دسر'),
// Using encodeURIComponent on each segment
'/dynamic/%D8%B3%D9%84%D8%A7%D9%85%20%DA%86%D8%B7%D9%88%D8%B1%DB%8C?q=cofee%2Cfood%2C%D8%AF%D8%B3%D8%B1'
]
}
}
}
</script>
<style scoped>
a {
color: grey;

5
test/fixtures/encoding/pages/@about.vue vendored Normal file
View File

@ -0,0 +1,5 @@
<template>
<div>
About
</div>
</template>

17
test/fixtures/encoding/pages/dynamic/_id.vue vendored Normal file
View File

@ -0,0 +1,17 @@
<template>
<div>
<div>Query (SSR): <pre v-text="q" /> </div>
<div>Params (SSR): <pre v-text="p" /> </div>
</div>
</template>
<script>
export default {
asyncData ({ route }) {
return {
q: JSON.stringify(route.query),
p: JSON.stringify(route.params)
}
}
}
</script>

13
test/fixtures/encoding/pages/redirect.vue vendored Normal file
View File

@ -0,0 +1,13 @@
<template>
<div>
Redirecting...
</div>
</template>
<script>
export default {
asyncData ({ redirect }) {
return redirect('/dynamic/重新导向?foo bar')
}
}
</script>

7
yarn.lock
View File

@ -1938,7 +1938,7 @@
consola "^2.15.0"
node-fetch "^2.6.1"
"@nuxt/telemetry@^1.2.3":
"@nuxt/telemetry@^1.3.0":
version "1.3.0"
resolved "https://registry.npmjs.org/@nuxt/telemetry/-/telemetry-1.3.0.tgz#0c6595c786c4fcb060ea8508aaf6285dce8201e0"
integrity sha512-anAhyccoVyy/RetkqVsIxpJKdAu/GHyLl79ZtH0oOCbYcC85k8d+LC1S10WcqXyeqyUKifLxGR6yPqSPmQCCtg==
@ -1962,6 +1962,11 @@
rc9 "^1.2.0"
std-env "^2.2.1"
"@nuxt/ufo@^0.0.3":
version "0.0.3"
resolved "https://registry.npmjs.org/@nuxt/ufo/-/ufo-0.0.3.tgz#7673a54b81c020e7aea3a9e01e09a58c494a1eca"
integrity sha512-LQkuVafVNB9+ggRF7443AX1V1rEWRs32Frk7F2qnRLf8j/SzRzxEZ99jiZqxVho72zU7NcWQ6Jy62m4fkZC6Wg==
"@nuxtjs/eslint-config@^5.0.0":
version "5.0.0"
resolved "https://registry.npmjs.org/@nuxtjs/eslint-config/-/eslint-config-5.0.0.tgz#d66143ee4ada9d944de0bfbe2d7e4693a2e20d60"