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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 4 commits into from
Jan 18, 2022
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d473d2a
refactor navigation and singletons
pixelmund Jan 16, 2022
c4b7266
Update .changeset/brown-mangos-tie.md
Rich-Harris Jan 17, 2022
5d6bae0
address comment
benmccann Jan 18, 2022
1b77e71
Update .changeset/brown-mangos-tie.md
benmccann Jan 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/brown-mangos-tie.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

[fix] refactor navigation singletons
benmccann marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 1 addition & 3 deletions packages/kit/src/runtime/app/navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions packages/kit/src/runtime/client/singletons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/** @type {import('./router').Router?} */
/** @type {import('./router').Router} */
benmccann marked this conversation as resolved.
Show resolved Hide resolved
export let router;

/** @type {import('./renderer').Renderer} */
Expand All @@ -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;
}