Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

hotfix: fix issues with url handling #8494

Merged
merged 7 commits into from Dec 16, 2020
Merged

hotfix: fix issues with url handling #8494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b953c44
feat: update ufo to 0.2.0
pi0 Dec 15, 2020
bb88c28
fix: add missing dependency to vue-renderer
pi0 Dec 15, 2020
f336beb
update ufo to 0.3.1
pi0 Dec 16, 2020
c5e93c6
chore: remove url polyfill
pi0 Dec 16, 2020
a21abb2
fix tests
pi0 Dec 16, 2020
7d18b06
chore: use decode from ufo for query params normalization
pi0 Dec 16, 2020
f6b94d3
ufo ~> 0.5.0
pi0 Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/config/package.json
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
"index.d.ts"
],
"dependencies": {
"@nuxt/ufo": "^0.1.0",
"@nuxt/ufo": "^0.5.0",
"@nuxt/utils": "2.14.11",
"consola": "^2.15.0",
"create-require": "^1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/utils/package.json
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
"dist"
],
"dependencies": {
"@nuxt/ufo": "^0.1.0",
"@nuxt/ufo": "^0.5.0",
"consola": "^2.15.0",
"fs-extra": "^8.1.0",
"hash-sum": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-app/package.json
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
"index.d.ts"
],
"dependencies": {
"@nuxt/ufo": "^0.1.0",
"@nuxt/ufo": "^0.5.0",
"node-fetch": "^2.6.1",
"unfetch": "^4.2.0",
"vue": "^2.6.12",
Expand Down
4 changes: 2 additions & 2 deletions packages/vue-app/template/router.js
View file
Open in desktop
@@ -1,6 +1,6 @@
import Vue from 'vue'
import Router from 'vue-router'
import { normalizeURL } from '@nuxt/ufo'
import { normalizeURL, decode } from '@nuxt/ufo'
import { interopDefault } from './utils'<%= isTest ? '// eslint-disable-line no-unused-vars' : '' %>
import scrollBehavior from './router.scrollBehavior.js'

Expand Down Expand Up @@ -109,7 +109,7 @@ export const routerOptions = {
function decodeObj(obj) {
for (const key in obj) {
if (typeof obj[key] === 'string') {
obj[key] = decodeURIComponent(obj[key])
obj[key] = decode(obj[key])
}
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/vue-renderer/package.json
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@
],
"dependencies": {
"@nuxt/devalue": "^1.2.4",
"@nuxt/ufo": "^0.5.0",
"@nuxt/utils": "2.14.11",
"consola": "^2.15.0",
"fs-extra": "^8.1.0",
Expand Down
1 change: 0 additions & 1 deletion packages/webpack/package.json
View file
Open in desktop
Expand Up @@ -43,7 +43,6 @@
"thread-loader": "^2.1.3",
"time-fix-plugin": "^2.0.7",
"url-loader": "^2.3.0",
"url-polyfill": "^1.1.12",
"vue-loader": "^15.9.5",
"webpack": "^4.44.2",
"webpack-bundle-analyzer": "^3.9.0",
Expand Down
7 changes: 1 addition & 6 deletions packages/webpack/src/config/client.js
View file
Open in desktop
Expand Up @@ -63,7 +63,7 @@ export default class WebpackClientConfig extends WebpackBaseConfig {
cacheGroups.commons === undefined
) {
cacheGroups.commons = {
test: /node_modules[\\/](vue|vue-loader|vue-router|vuex|vue-meta|core-js|@babel\/runtime|axios|webpack|setimmediate|timers-browserify|process|regenerator-runtime|cookie|js-cookie|is-buffer|dotprop|url-polyfill|nuxt\.js)[\\/]/,
test: /node_modules[\\/](vue|vue-loader|vue-router|vuex|vue-meta|core-js|@babel\/runtime|axios|webpack|setimmediate|timers-browserify|process|regenerator-runtime|cookie|js-cookie|is-buffer|dotprop|url-polyfill|@nuxt[\\/]ufo|ufo|nuxt\.js)[\\/]/,
pi0 marked this conversation as resolved.
Show resolved Hide resolved
chunks: 'all',
name: true,
priority: 10
Expand Down Expand Up @@ -205,11 +205,6 @@ export default class WebpackClientConfig extends WebpackBaseConfig {
)
}

// Add URL polyfill for IE11 support with ufo
if (!this.isModern && !this.isServer) {
config.entry.app.unshift(require.resolve('url-polyfill/url-polyfill.min.js'))
}

// Add friendly error plugin
if (this.dev && !quiet && friendlyErrors) {
config.plugins.push(
Expand Down
4 changes: 2 additions & 2 deletions test/dev/async-config.size-limit.test.js
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ describe('nuxt basic resources size limit', () => {
const LEGACY_JS_RESOURCES_KB_SIZE = 217
expect(legacyResourcesSize.uncompressed).toBeWithinSize(LEGACY_JS_RESOURCES_KB_SIZE)

const LEGACY_JS_RESOURCES_GZIP_KB_SIZE = 70
const LEGACY_JS_RESOURCES_GZIP_KB_SIZE = 75
pi0 marked this conversation as resolved.
Show resolved Hide resolved
expect(legacyResourcesSize.gzip).toBeWithinSize(LEGACY_JS_RESOURCES_GZIP_KB_SIZE)

const LEGACY_JS_RESOURCES_BROTLI_KB_SIZE = 64
Expand All @@ -36,7 +36,7 @@ describe('nuxt basic resources size limit', () => {
const MODERN_JS_RESOURCES_KB_SIZE = 180
expect(modernResourcesSize.uncompressed).toBeWithinSize(MODERN_JS_RESOURCES_KB_SIZE)

const MODERN_JS_RESOURCES_GZIP_KB_SIZE = 60
const MODERN_JS_RESOURCES_GZIP_KB_SIZE = 64
expect(modernResourcesSize.gzip).toBeWithinSize(MODERN_JS_RESOURCES_GZIP_KB_SIZE)

const MODERN_JS_RESOURCES_BROTLI_KB_SIZE = 55
Expand Down
13 changes: 4 additions & 9 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -1955,10 +1955,10 @@
rc9 "^1.2.0"
std-env "^2.2.1"

"@nuxt/ufo@^0.1.0":
version "0.1.0"
resolved "https://registry.npmjs.org/@nuxt/ufo/-/ufo-0.1.0.tgz#4943741c4300b73e4f1de09cad684ed4e9235502"
integrity sha512-7az26cl4TaNejTFlgwcGRIGPFH6tD8dLh1t+Q+BWIM8UQqqV9o2DH9yKcVlboP+LdocLBUC+OTOiZc0RSZh0bA==
"@nuxt/ufo@^0.5.0":
version "0.5.0"
resolved "https://registry.npmjs.org/@nuxt/ufo/-/ufo-0.5.0.tgz#a84d5ce9dedee25b81fbbb4b44fef5ca2987af39"
integrity sha512-0My2z3nfJ8KTyz49/kyRBh0naoArsItDgfQP7qf38BfY8HAoiujFIANZyjpnq433UOU0wZqv0djHkydQX56FmQ==

"@nuxtjs/eslint-config@^5.0.0":
version "5.0.0"
Expand Down Expand Up @@ -13205,11 +13205,6 @@ url-loader@^2.3.0:
mime "^2.4.4"
schema-utils "^2.5.0"

url-polyfill@^1.1.12:
version "1.1.12"
resolved "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.12.tgz#6cdaa17f6b022841b3aec0bf8dbd87ac0cd33331"
integrity sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A==

url@^0.11.0:
version "0.11.0"
resolved "https://registry.npmjs.org/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
Expand Down