From d3e2abddf45bd0cc0a8f2629e1603f216625c99e Mon Sep 17 00:00:00 2001
From: Sidharth Vinod <sidharthv96@gmail.com>
Date: Fri, 21 May 2021 10:52:48 +0530
Subject: [PATCH 1/4] Add favicon to skeleton template

---
 .../templates/skeleton/static/favicon.ico        | Bin 0 -> 1150 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 packages/create-svelte/templates/skeleton/static/favicon.ico

diff --git a/packages/create-svelte/templates/skeleton/static/favicon.ico b/packages/create-svelte/templates/skeleton/static/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..d75d248ef0b15096a95054643a4d97f5d9b60846
GIT binary patch
literal 1150
zcmaKqSxA*Z7>4KMS_;~x;8i!JU{-`tpyx!I(n2NFMU)w2L{WiMS3#Lcp@vrpA*5Yp
zSy6|`AkYfDD<i0E#V`++Z6*?!>(e{`n8yX0pLf20X1@3RmKkGw`Vte3=0)aUq%ldx
zm^49K+Hw0b#^`KboP)QXJOwbuVUFxlAs{RfqJ+twGylWfOp{Hc$s#253LlN1nsFVc
zKa>40?h5(7PTC6ltDx)(Y&Ze2xggCq(kK?<y<8^e<6=jMdpU6v+;{||V|e5D0Ms=>
zTA`;gAfKD!+uFjpxc_A3+Ma(L28W=z4Gvs@r*ECk`;c45=S#;=oA|abt`f&j5&uJO
z3Dn+&^gZ%h4JidsaTR{{!_Y8PUx(-%PosPy2gi@qIvBMMYz;e3L1{f~mrd9RdB>pZ
zD}4R|sk_C`;=cT&r)c=8u>7h9)u32*SbL`xiq3(pq5C^5-sSOw;<|fv@nfXfl&U`2
z81K5ExDp;bf#DISW%IY%k&2-noShOoz-;kb(u?5RFX-ro?87j3GZdCXrFc8bTx}jd
zz_n@djWnxc*TbbCjEq80FPyG}1zQwvjq7R6ZSWuQ@_#A*LN5n<3$BI?X}q%iD!B-s
zdSFcNp!EgpJr6C<U|<k(bVthdxj6Hu@vTm#H17HQ3@zUW4b6^YJ7BdMAG-UHPpy1s
zP4L4xSd9eXsA6=)<w3zo)vq^js2Y;DdA)1b`LZco_mbS~YVqmZ)>AK?klug4>=)Tv
z+F#{yt>6EK)3NU=L&y_W3UNaC?Tg=6YE0)^V;(0Mb0$WJ7>7@Lg0~+3x9d)!Pd<O-
HJ0{LwWbpi$

literal 0
HcmV?d00001


From 7d2f668c0325a2b879e528c27dc3d62ea68ea471 Mon Sep 17 00:00:00 2001
From: Sidharth Vinod <sidharthv96@gmail.com>
Date: Sat, 22 May 2021 20:56:59 +0530
Subject: [PATCH 2/4] chore: Add changeset for favicon

---
 .changeset/hot-kings-confess.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/hot-kings-confess.md

diff --git a/.changeset/hot-kings-confess.md b/.changeset/hot-kings-confess.md
new file mode 100644
index 000000000000..c69552e75dec
--- /dev/null
+++ b/.changeset/hot-kings-confess.md
@@ -0,0 +1,5 @@
+---
+'create-svelte': patch
+---
+
+Add favicon to skeleton template

From 9dabbe0f21a9b3dab064fe2499219b8fa9ddb118 Mon Sep 17 00:00:00 2001
From: Sidharth Vinod <sidharthv96@gmail.com>
Date: Sat, 29 May 2021 18:17:25 +0530
Subject: [PATCH 3/4] Fix redirection issue #1583

---
 packages/kit/src/runtime/client/router.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/src/runtime/client/router.js b/packages/kit/src/runtime/client/router.js
index 45189ada92f6..9d3d9286c406 100644
--- a/packages/kit/src/runtime/client/router.js
+++ b/packages/kit/src/runtime/client/router.js
@@ -242,7 +242,7 @@ export class Router {
 
 			if (incorrect) {
 				info.path = has_trailing_slash ? info.path.slice(0, -1) : info.path + '/';
-				history.replaceState({}, '', `${info.path}${location.search}`);
+				history.replaceState({}, '', `${this.base}${info.path}${location.search}`);
 			}
 		}
 

From aa3cfbdd6a7469f02e6e7d6b604cbf88a4a31ea4 Mon Sep 17 00:00:00 2001
From: Sidharth Vinod <sidharthv96@gmail.com>
Date: Sat, 29 May 2021 18:51:01 +0530
Subject: [PATCH 4/4] Revert "Fix redirection issue #1583"

This reverts commit 9dabbe0f21a9b3dab064fe2499219b8fa9ddb118.
---
 packages/kit/src/runtime/client/router.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/src/runtime/client/router.js b/packages/kit/src/runtime/client/router.js
index 9d3d9286c406..45189ada92f6 100644
--- a/packages/kit/src/runtime/client/router.js
+++ b/packages/kit/src/runtime/client/router.js
@@ -242,7 +242,7 @@ export class Router {
 
 			if (incorrect) {
 				info.path = has_trailing_slash ? info.path.slice(0, -1) : info.path + '/';
-				history.replaceState({}, '', `${this.base}${info.path}${location.search}`);
+				history.replaceState({}, '', `${info.path}${location.search}`);
 			}
 		}