From a25bdd622d06d9b3ee2fc28cce39f1b5cb7a3d06 Mon Sep 17 00:00:00 2001 From: pooya parsa Date: Wed, 16 Dec 2020 14:12:16 +0100 Subject: [PATCH] fix: fix issues with url handling (#8494) --- packages/config/package.json | 2 +- packages/utils/package.json | 2 +- packages/vue-app/package.json | 2 +- packages/vue-app/template/router.js | 4 ++-- packages/vue-renderer/package.json | 1 + packages/webpack/package.json | 1 - packages/webpack/src/config/client.js | 7 +------ test/dev/async-config.size-limit.test.js | 4 ++-- yarn.lock | 13 ++++--------- 9 files changed, 13 insertions(+), 23 deletions(-) diff --git a/packages/config/package.json b/packages/config/package.json index 86474e6c57..6dd5226faf 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -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", diff --git a/packages/utils/package.json b/packages/utils/package.json index e79c75bfc7..36fa7e5f40 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -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", diff --git a/packages/vue-app/package.json b/packages/vue-app/package.json index 282744427a..437c927278 100644 --- a/packages/vue-app/package.json +++ b/packages/vue-app/package.json @@ -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", diff --git a/packages/vue-app/template/router.js b/packages/vue-app/template/router.js index 260f0e2f3c..e338ffd8b4 100644 --- a/packages/vue-app/template/router.js +++ b/packages/vue-app/template/router.js @@ -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' @@ -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]) } } } diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json index 4e29f1961a..59b9572dce 100644 --- a/packages/vue-renderer/package.json +++ b/packages/vue-renderer/package.json @@ -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", diff --git a/packages/webpack/package.json b/packages/webpack/package.json index ab2dd7909a..d0219b1f12 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -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", diff --git a/packages/webpack/src/config/client.js b/packages/webpack/src/config/client.js index 7916fdd60b..26e3256e0d 100644 --- a/packages/webpack/src/config/client.js +++ b/packages/webpack/src/config/client.js @@ -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)[\\/]/, chunks: 'all', name: true, priority: 10 @@ -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( diff --git a/test/dev/async-config.size-limit.test.js b/test/dev/async-config.size-limit.test.js index cf7adb36be..a76bf05557 100644 --- a/test/dev/async-config.size-limit.test.js +++ b/test/dev/async-config.size-limit.test.js @@ -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 expect(legacyResourcesSize.gzip).toBeWithinSize(LEGACY_JS_RESOURCES_GZIP_KB_SIZE) const LEGACY_JS_RESOURCES_BROTLI_KB_SIZE = 64 @@ -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 diff --git a/yarn.lock b/yarn.lock index 4d3efd4554..6ef9d84f81 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" @@ -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"