From b953c44c222d10a7df50c84649d251b48e5e9bd2 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Wed, 16 Dec 2020 00:19:15 +0100
Subject: [PATCH 1/7] feat: update ufo to 0.2.0

---
 packages/config/package.json  | 2 +-
 packages/utils/package.json   | 2 +-
 packages/vue-app/package.json | 2 +-
 yarn.lock                     | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/config/package.json b/packages/config/package.json
index 86474e6c5774..047fc0e9c594 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.2.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 e79c75bfc7df..785a5985cc8f 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.2.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 282744427a0b..3fdffdc408b3 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.2.0",
     "node-fetch": "^2.6.1",
     "unfetch": "^4.2.0",
     "vue": "^2.6.12",
diff --git a/yarn.lock b/yarn.lock
index 4d3efd455478..e5acfd31c2a7 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.2.0":
+  version "0.2.0"
+  resolved "https://registry.npmjs.org/@nuxt/ufo/-/ufo-0.2.0.tgz#935b914ea9b23e0b123a0f0bb519d8eba2da3717"
+  integrity sha512-Ieh0f/I3uYxnHr63sUCDATo2dERU/VHcJU1VKhvs/UiQ0N54IsuYX//6gNd/Dt3xdy8fBj8bpVlQBGg16Ljshw==
 
 "@nuxtjs/eslint-config@^5.0.0":
   version "5.0.0"

From bb88c2871d689f73f77b481a0f46f48e9ba58b27 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Wed, 16 Dec 2020 00:19:22 +0100
Subject: [PATCH 2/7] fix: add missing dependency to vue-renderer

---
 packages/vue-renderer/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json
index 4e29f1961a44..a3dc7524ed2d 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.2.0",
     "@nuxt/utils": "2.14.11",
     "consola": "^2.15.0",
     "fs-extra": "^8.1.0",

From f336beb94b3a0e80f59f7682db3d01e61d663075 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Wed, 16 Dec 2020 10:56:32 +0100
Subject: [PATCH 3/7] update ufo to 0.3.1

---
 packages/config/package.json       | 2 +-
 packages/utils/package.json        | 2 +-
 packages/vue-app/package.json      | 2 +-
 packages/vue-renderer/package.json | 2 +-
 yarn.lock                          | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/config/package.json b/packages/config/package.json
index 047fc0e9c594..62da8cf611fb 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -10,7 +10,7 @@
     "index.d.ts"
   ],
   "dependencies": {
-    "@nuxt/ufo": "^0.2.0",
+    "@nuxt/ufo": "^0.3.1",
     "@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 785a5985cc8f..add3c395aab3 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -8,7 +8,7 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/ufo": "^0.2.0",
+    "@nuxt/ufo": "^0.3.1",
     "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 3fdffdc408b3..3768d07e2dbf 100644
--- a/packages/vue-app/package.json
+++ b/packages/vue-app/package.json
@@ -13,7 +13,7 @@
     "index.d.ts"
   ],
   "dependencies": {
-    "@nuxt/ufo": "^0.2.0",
+    "@nuxt/ufo": "^0.3.1",
     "node-fetch": "^2.6.1",
     "unfetch": "^4.2.0",
     "vue": "^2.6.12",
diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json
index a3dc7524ed2d..657d3eb2503c 100644
--- a/packages/vue-renderer/package.json
+++ b/packages/vue-renderer/package.json
@@ -9,7 +9,7 @@
   ],
   "dependencies": {
     "@nuxt/devalue": "^1.2.4",
-    "@nuxt/ufo": "^0.2.0",
+    "@nuxt/ufo": "^0.3.1",
     "@nuxt/utils": "2.14.11",
     "consola": "^2.15.0",
     "fs-extra": "^8.1.0",
diff --git a/yarn.lock b/yarn.lock
index e5acfd31c2a7..949b5602adf0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1955,10 +1955,10 @@
     rc9 "^1.2.0"
     std-env "^2.2.1"
 
-"@nuxt/ufo@^0.2.0":
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/@nuxt/ufo/-/ufo-0.2.0.tgz#935b914ea9b23e0b123a0f0bb519d8eba2da3717"
-  integrity sha512-Ieh0f/I3uYxnHr63sUCDATo2dERU/VHcJU1VKhvs/UiQ0N54IsuYX//6gNd/Dt3xdy8fBj8bpVlQBGg16Ljshw==
+"@nuxt/ufo@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.npmjs.org/@nuxt/ufo/-/ufo-0.3.1.tgz#3dd07e8ddc1c1eb1b4fe54645f936fa9484228d0"
+  integrity sha512-AJ2+LO5MDQMZ31UPRQPQUz03zIlJ/huqrR+Mc4jzsFl/UihWniiB1FyhmitvIC19+Van5vK0x0Bhk5K/tmmBgA==
 
 "@nuxtjs/eslint-config@^5.0.0":
   version "5.0.0"

From c5e93c6af839616a232326abc41934a90157486d Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Wed, 16 Dec 2020 10:57:11 +0100
Subject: [PATCH 4/7] chore: remove url polyfill

---
 packages/webpack/package.json         | 1 -
 packages/webpack/src/config/client.js | 5 -----
 yarn.lock                             | 5 -----
 3 files changed, 11 deletions(-)

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index ab2dd7909afb..d0219b1f12d2 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 7916fdd60b88..2f7e80bbc294 100644
--- a/packages/webpack/src/config/client.js
+++ b/packages/webpack/src/config/client.js
@@ -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/yarn.lock b/yarn.lock
index 949b5602adf0..e80f2d34942e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -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"

From a21abb25b4a976cf5db879d88556dc046543718c Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Wed, 16 Dec 2020 11:10:25 +0100
Subject: [PATCH 5/7] fix tests

---
 packages/webpack/src/config/client.js    | 2 +-
 test/dev/async-config.size-limit.test.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/webpack/src/config/client.js b/packages/webpack/src/config/client.js
index 2f7e80bbc294..26e3256e0d0e 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
diff --git a/test/dev/async-config.size-limit.test.js b/test/dev/async-config.size-limit.test.js
index cf7adb36be7f..a76bf055571b 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

From 7d18b06f15bcbd9f466335cc695f71177a6add6e Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Wed, 16 Dec 2020 11:24:57 +0100
Subject: [PATCH 6/7] chore: use decode from ufo for query params normalization

---
 packages/vue-app/template/router.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/vue-app/template/router.js b/packages/vue-app/template/router.js
index 260f0e2f3cad..e338ffd8b476 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])
     }
   }
 }

From f6b94d3baaf9c597132ecc742509c6c9fc53a2a0 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Wed, 16 Dec 2020 13:41:32 +0100
Subject: [PATCH 7/7] ufo ~> 0.5.0

---
 packages/config/package.json       | 2 +-
 packages/utils/package.json        | 2 +-
 packages/vue-app/package.json      | 2 +-
 packages/vue-renderer/package.json | 2 +-
 yarn.lock                          | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/config/package.json b/packages/config/package.json
index 62da8cf611fb..6dd5226faf81 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -10,7 +10,7 @@
     "index.d.ts"
   ],
   "dependencies": {
-    "@nuxt/ufo": "^0.3.1",
+    "@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 add3c395aab3..36fa7e5f40a0 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -8,7 +8,7 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/ufo": "^0.3.1",
+    "@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 3768d07e2dbf..437c92727896 100644
--- a/packages/vue-app/package.json
+++ b/packages/vue-app/package.json
@@ -13,7 +13,7 @@
     "index.d.ts"
   ],
   "dependencies": {
-    "@nuxt/ufo": "^0.3.1",
+    "@nuxt/ufo": "^0.5.0",
     "node-fetch": "^2.6.1",
     "unfetch": "^4.2.0",
     "vue": "^2.6.12",
diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json
index 657d3eb2503c..59b9572dcecf 100644
--- a/packages/vue-renderer/package.json
+++ b/packages/vue-renderer/package.json
@@ -9,7 +9,7 @@
   ],
   "dependencies": {
     "@nuxt/devalue": "^1.2.4",
-    "@nuxt/ufo": "^0.3.1",
+    "@nuxt/ufo": "^0.5.0",
     "@nuxt/utils": "2.14.11",
     "consola": "^2.15.0",
     "fs-extra": "^8.1.0",
diff --git a/yarn.lock b/yarn.lock
index e80f2d34942e..6ef9d84f813a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1955,10 +1955,10 @@
     rc9 "^1.2.0"
     std-env "^2.2.1"
 
-"@nuxt/ufo@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.npmjs.org/@nuxt/ufo/-/ufo-0.3.1.tgz#3dd07e8ddc1c1eb1b4fe54645f936fa9484228d0"
-  integrity sha512-AJ2+LO5MDQMZ31UPRQPQUz03zIlJ/huqrR+Mc4jzsFl/UihWniiB1FyhmitvIC19+Van5vK0x0Bhk5K/tmmBgA==
+"@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"