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.

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

[fix] refactor navigation singletons to avoid storing undefined reference #3374

Merged
merged 4 commits into from Jan 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/brown-mangos-tie.md
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

[fix] refactor navigation singletons to avoid storing undefined reference
4 changes: 1 addition & 3 deletions 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
*/
Expand Down
7 changes: 5 additions & 2 deletions 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} */
Expand All @@ -11,6 +14,6 @@ export let renderer;
* }} opts
*/
export function init(opts) {
router = opts.router;
router = /** @type {import('../client/router').Router} */ (opts.router);
renderer = opts.renderer;
}