From d473d2a7ccae013b9d5ed675d64a68dcbea1b735 Mon Sep 17 00:00:00 2001 From: pixelmund Date: Sun, 16 Jan 2022 19:04:15 +0100 Subject: [PATCH 1/4] refactor navigation and singletons --- .changeset/brown-mangos-tie.md | 5 +++++ packages/kit/src/runtime/app/navigation.js | 4 +--- packages/kit/src/runtime/client/singletons.js | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 .changeset/brown-mangos-tie.md diff --git a/.changeset/brown-mangos-tie.md b/.changeset/brown-mangos-tie.md new file mode 100644 index 000000000000..443176817004 --- /dev/null +++ b/.changeset/brown-mangos-tie.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/kit': patch +--- + +[fix] #3269 refactor navigation/singletons diff --git a/packages/kit/src/runtime/app/navigation.js b/packages/kit/src/runtime/app/navigation.js index 8b75cf27d4b9..52ee7d4397b3 100644 --- a/packages/kit/src/runtime/app/navigation.js +++ b/packages/kit/src/runtime/app/navigation.js @@ -1,8 +1,6 @@ -import { router as router_, renderer } from '../client/singletons.js'; +import { router, renderer } from '../client/singletons.js'; import { get_base_uri } from '../client/utils.js'; -const router = /** @type {import('../client/router').Router} */ (router_); - /** * @param {string} name */ diff --git a/packages/kit/src/runtime/client/singletons.js b/packages/kit/src/runtime/client/singletons.js index eb423ed202c2..bc6ccb2364a6 100644 --- a/packages/kit/src/runtime/client/singletons.js +++ b/packages/kit/src/runtime/client/singletons.js @@ -1,4 +1,4 @@ -/** @type {import('./router').Router?} */ +/** @type {import('./router').Router} */ export let router; /** @type {import('./renderer').Renderer} */ @@ -11,6 +11,6 @@ export let renderer; * }} opts */ export function init(opts) { - router = opts.router; + router = /** @type {import('../client/router').Router} */ (opts.router); renderer = opts.renderer; } From c4b726672b24f0cb70645d49b0dd650d45fa42bb Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 17 Jan 2022 08:32:36 -0500 Subject: [PATCH 2/4] Update .changeset/brown-mangos-tie.md Co-authored-by: Bjorn Lu --- .changeset/brown-mangos-tie.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/brown-mangos-tie.md b/.changeset/brown-mangos-tie.md index 443176817004..160e464c083d 100644 --- a/.changeset/brown-mangos-tie.md +++ b/.changeset/brown-mangos-tie.md @@ -2,4 +2,4 @@ '@sveltejs/kit': patch --- -[fix] #3269 refactor navigation/singletons +[fix] refactor navigation singletons From 5d6bae0909a21e68d730a89a453e4da04fbefb3d Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 18 Jan 2022 10:21:35 -0800 Subject: [PATCH 3/4] address comment --- packages/kit/src/runtime/client/singletons.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/kit/src/runtime/client/singletons.js b/packages/kit/src/runtime/client/singletons.js index bc6ccb2364a6..aa2a6ad40392 100644 --- a/packages/kit/src/runtime/client/singletons.js +++ b/packages/kit/src/runtime/client/singletons.js @@ -1,4 +1,7 @@ -/** @type {import('./router').Router} */ +/** + * The router is nullable, but not typed that way for ease-of-use + * @type {import('./router').Router} + */ export let router; /** @type {import('./renderer').Renderer} */ From 1b77e71176aa36b4a2b74ab329924ec8325913bf Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 18 Jan 2022 10:22:44 -0800 Subject: [PATCH 4/4] Update .changeset/brown-mangos-tie.md --- .changeset/brown-mangos-tie.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/brown-mangos-tie.md b/.changeset/brown-mangos-tie.md index 160e464c083d..cd87886529a8 100644 --- a/.changeset/brown-mangos-tie.md +++ b/.changeset/brown-mangos-tie.md @@ -2,4 +2,4 @@ '@sveltejs/kit': patch --- -[fix] refactor navigation singletons +[fix] refactor navigation singletons to avoid storing undefined reference