@nymphjs/tilmeld-setup 1.0.0-beta.120 → 1.0.0-beta.122

package/dist/app/index.js

@@ -479,7 +479,7 @@
 	 * @param {Function} [fn]
 	 * @returns {void}
 	 */
-	function push(props, runes = false, fn) {
+	function push$1(props, runes = false, fn) {
 		component_context = {
 			p: component_context,
 			i: false,
@@ -497,7 +497,7 @@
 	 * @param {T} [component]
 	 * @returns {T}
 	 */
-	function pop(component) {
+	function pop$1(component) {
 		var context = /** @type {ComponentContext} */ (component_context);
 		var effects = context.e;
 
@@ -5794,7 +5794,7 @@
 					pending: () => {}
 				},
 				(anchor_node) => {
-					push({});
+					push$1({});
 					var ctx = /** @type {ComponentContext} */ (component_context);
 					if (context) ctx.c = context;
 
@@ -5805,7 +5805,7 @@
 					// @ts-expect-error the public typings are not what the actual function looks like
 					component = Component(anchor_node, props) || {};
 
-					pop();
+					pop$1();
 				},
 				transformError
 			);
@@ -6664,8 +6664,8 @@
 
 					if (effect.prev) effect.prev.next = effect.next;
 					if (effect.next) effect.next.prev = effect.prev;
-					link(state, prev, effect);
-					link(state, effect, next);
+					link$1(state, prev, effect);
+					link$1(state, effect, next);
 
 					move(effect, next, anchor);
 					prev = effect;
@@ -6698,9 +6698,9 @@
 							seen.delete(stashed[j]);
 						}
 
-						link(state, a.prev, b.next);
-						link(state, prev, a);
-						link(state, b, start);
+						link$1(state, a.prev, b.next);
+						link$1(state, prev, a);
+						link$1(state, b, start);
 
 						current = start;
 						prev = b;
@@ -6713,9 +6713,9 @@
 						seen.delete(effect);
 						move(effect, current, anchor);
 
-						link(state, effect.prev, effect.next);
-						link(state, effect, prev === null ? state.effect.first : prev.next);
-						link(state, prev, effect);
+						link$1(state, effect.prev, effect.next);
+						link$1(state, effect, prev === null ? state.effect.first : prev.next);
+						link$1(state, prev, effect);
 
 						prev = effect;
 					}
@@ -6876,7 +6876,7 @@
 	 * @param {Effect | null} prev
 	 * @param {Effect | null} next
 	 */
-	function link(state, prev, next) {
+	function link$1(state, prev, next) {
 		if (prev === null) {
 			state.effect.first = next;
 		} else {
@@ -8494,28 +8494,667 @@
 		((window.__svelte ??= {}).v ??= new Set()).add(PUBLIC_VERSION);
 	}
 
-	function getDefaultExportFromCjs (x) {
-		return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+	function parse(str, loose) {
+		if (str instanceof RegExp) return { keys:false, pattern:str };
+		var c, o, tmp, ext, keys=[], pattern='', arr = str.split('/');
+		arr[0] || arr.shift();
+
+		while (tmp = arr.shift()) {
+			c = tmp[0];
+			if (c === '*') {
+				keys.push('wild');
+				pattern += '/(.*)';
+			} else if (c === ':') {
+				o = tmp.indexOf('?', 1);
+				ext = tmp.indexOf('.', 1);
+				keys.push( tmp.substring(1, !!~o ? o : !!~ext ? ext : tmp.length) );
+				pattern += !!~o && !~ext ? '(?:/([^/]+?))?' : '/([^/]+?)';
+				if (!!~ext) pattern += (!!~o ? '?' : '') + '\\' + tmp.substring(ext);
+			} else {
+				pattern += '/' + tmp;
+			}
+		}
+
+		return {
+			keys: keys,
+			pattern: new RegExp('^' + pattern + ('\/?$'), 'i')
+		};
+	}
+
+	class RouterStateImpl {
+		#_loc = /** The current full location (incl. querystring) */
+		state(getLocation());
+
+		get _loc() {
+			return get(this.#_loc);
+		}
+
+		set _loc(value) {
+			set(this.#_loc, value);
+		}
+
+		#_location = user_derived(() => this._loc.location);
+
+		get _location() {
+			return get(this.#_location);
+		}
+
+		set _location(value) {
+			set(this.#_location, value);
+		}
+
+		#_querystring = user_derived(() => this._loc.querystring);
+
+		get _querystring() {
+			return get(this.#_querystring);
+		}
+
+		set _querystring(value) {
+			set(this.#_querystring, value);
+		}
+
+		#_params = state(undefined);
+
+		get _params() {
+			return get(this.#_params);
+		}
+
+		set _params(value) {
+			set(this.#_params, value);
+		}
+
+		get loc() {
+			return this._loc;
+		}
+
+		/** The current location (excluding querystring) */
+		get location() {
+			return this._location;
+		}
+
+		/** The current querystring */
+		get querystring() {
+			return this._querystring;
+		}
+
+		get params() {
+			return this._params;
+		}
+
+		constructor() {
+			if (typeof window !== "undefined") {
+				window.addEventListener("hashchange", () => {
+					this._loc = getLocation();
+				});
+			} else {
+				// eslint-disable-next-line no-console
+				console.warn("[svelte-spa-router] window 'window' is not defined, skipping initiation");
+			}
+		}
+	}
+
+	/** Router state object, containing the current location, querystring and params. */
+	const router = new RouterStateImpl();
+
+	/** Returns the current location from the hash. */
+	function getLocation() {
+		const currentHref = typeof window !== "undefined" ? window.location.href : "";
+		const hashPosition = currentHref.indexOf("#/");
+		let location = hashPosition > -1 ? currentHref.substr(hashPosition + 1) : "/";
+
+		// Check if there's a querystring
+		const qsPosition = location.indexOf("?");
+
+		let querystring = "";
+
+		if (qsPosition > -1) {
+			querystring = location.substr(qsPosition + 1);
+			location = location.substr(0, qsPosition);
+		}
+
+		return { location, querystring };
 	}
 
-	var navigo_min$1 = {exports: {}};
+	/**
+	* Navigates to a new page programmatically.
+	*
+	* @param location - Path to navigate to (must start with `/` or `#/`)
+	* @returns Promise that resolves after the page navigation has completed
+	*/
+	async function push(location) {
+		if (!location || location.length < 1 || location.charAt(0) != "/" && location.indexOf("#/") !== 0) {
+			throw Error("Invalid parameter location");
+		}
 
-	var navigo_min = navigo_min$1.exports;
+		// Execute this code when the current call stack is complete
+		await tick();
 
-	var hasRequiredNavigo_min;
+		// Note: this will include scroll state in history even when restoreScrollState is false
+		history.replaceState(
+			{
+				...history.state,
+				__svelte_spa_router_scrollX: window.scrollX,
+				__svelte_spa_router_scrollY: window.scrollY
+			},
+			""
+		);
 
-	function requireNavigo_min () {
-		if (hasRequiredNavigo_min) return navigo_min$1.exports;
-		hasRequiredNavigo_min = 1;
-		(function (module, exports) {
-			!function(t,n){module.exports=n();}("undefined"!=typeof self?self:navigo_min,(function(){return function(){var t={407:function(t,n,e){e.d(n,{default:function(){return N}});var o=/([:*])(\w+)/g,r=/\*/g,i=/\/\?/g;function a(t){return void 0===t&&(t="/"),v()?location.pathname+location.search+location.hash:t}function s(t){return t.replace(/\/+$/,"").replace(/^\/+/,"")}function c(t){return "string"==typeof t}function u(t){return t&&t.indexOf("#")>=0&&t.split("#").pop()||""}function h(t){var n=s(t).split(/\?(.*)?$/);return [s(n[0]),n.slice(1).join("")]}function f(t){for(var n={},e=t.split("&"),o=0;o<e.length;o++){var r=e[o].split("=");if(""!==r[0]){var i=decodeURIComponent(r[0]);n[i]?(Array.isArray(n[i])||(n[i]=[n[i]]),n[i].push(decodeURIComponent(r[1]||""))):n[i]=decodeURIComponent(r[1]||"");}}return n}function l(t,n){var e,a=h(s(t.currentLocationPath)),l=a[0],p=a[1],d=""===p?null:f(p),v=[];if(c(n.path)){if(e="(?:/^|^)"+s(n.path).replace(o,(function(t,n,e){return v.push(e),"([^/]+)"})).replace(r,"?(?:.*)").replace(i,"/?([^/]+|)")+"$",""===s(n.path)&&""===s(l))return {url:l,queryString:p,hashString:u(t.to),route:n,data:null,params:d}}else e=n.path;var g=new RegExp(e,""),m=l.match(g);if(m){var y=c(n.path)?function(t,n){return 0===n.length?null:t?t.slice(1,t.length).reduce((function(t,e,o){return null===t&&(t={}),t[n[o]]=decodeURIComponent(e),t}),null):null}(m,v):m.groups?m.groups:m.slice(1);return {url:s(l.replace(new RegExp("^"+t.instance.root),"")),queryString:p,hashString:u(t.to),route:n,data:y,params:d}}return  false}function p(){return !("undefined"==typeof window||!window.history||!window.history.pushState)}function d(t,n){return void 0===t[n]||true===t[n]}function v(){return "undefined"!=typeof window}function g(t,n){return void 0===t&&(t=[]),void 0===n&&(n={}),t.filter((function(t){return t})).forEach((function(t){["before","after","already","leave"].forEach((function(e){t[e]&&(n[e]||(n[e]=[]),n[e].push(t[e]));}));})),n}function m(t,n,e){var o=n||{},r=0;!function n(){t[r]?Array.isArray(t[r])?(t.splice.apply(t,[r,1].concat(t[r][0](o)?t[r][1]:t[r][2])),n()):t[r](o,(function(t){ void 0===t||true===t?(r+=1,n()):e&&e(o);})):e&&e(o);}();}function y(t,n){ void 0===t.currentLocationPath&&(t.currentLocationPath=t.to=a(t.instance.root)),t.currentLocationPath=t.instance._checkForAHash(t.currentLocationPath),n();}function _(t,n){for(var e=0;e<t.instance.routes.length;e++){var o=l(t,t.instance.routes[e]);if(o&&(t.matches||(t.matches=[]),t.matches.push(o),"ONE"===t.resolveOptions.strategy))return void n()}n();}function k(t,n){t.navigateOptions&&(void 0!==t.navigateOptions.shouldResolve&&console.warn('"shouldResolve" is deprecated. Please check the documentation.'),void 0!==t.navigateOptions.silent&&console.warn('"silent" is deprecated. Please check the documentation.')),n();}function O(t,n){ true===t.navigateOptions.force?(t.instance._setCurrent([t.instance._pathToMatchObject(t.to)]),n(false)):n();}m.if=function(t,n,e){return Array.isArray(n)||(n=[n]),Array.isArray(e)||(e=[e]),[t,n,e]};var w=v(),L=p();function b(t,n){if(d(t.navigateOptions,"updateBrowserURL")){var e=("/"+t.to).replace(/\/\//g,"/"),o=w&&t.resolveOptions&&true===t.resolveOptions.hash;L?(history[t.navigateOptions.historyAPIMethod||"pushState"](t.navigateOptions.stateObj||{},t.navigateOptions.title||"",o?"#"+e:e),location&&location.hash&&(t.instance.__freezeListening=true,setTimeout((function(){if(!o){var n=location.hash;location.hash="",location.hash=n;}t.instance.__freezeListening=false;}),1))):w&&(window.location.href=t.to);}n();}function A(t,n){var e=t.instance;e.lastResolved()?m(e.lastResolved().map((function(n){return function(e,o){if(n.route.hooks&&n.route.hooks.leave){var r=false,i=t.instance.matchLocation(n.route.path,t.currentLocationPath,false);r="*"!==n.route.path?!i:!(t.matches&&t.matches.find((function(t){return n.route.path===t.route.path}))),d(t.navigateOptions,"callHooks")&&r?m(n.route.hooks.leave.map((function(n){return function(e,o){return n((function(n){ false===n?t.instance.__markAsClean(t):o();}),t.matches&&t.matches.length>0?1===t.matches.length?t.matches[0]:t.matches:void 0)}})).concat([function(){return o()}])):o();}else o();}})),{},(function(){return n()})):n();}function P(t,n){d(t.navigateOptions,"updateState")&&t.instance._setCurrent(t.matches),n();}var R=[function(t,n){var e=t.instance.lastResolved();if(e&&e[0]&&e[0].route===t.match.route&&e[0].url===t.match.url&&e[0].queryString===t.match.queryString)return e.forEach((function(n){n.route.hooks&&n.route.hooks.already&&d(t.navigateOptions,"callHooks")&&n.route.hooks.already.forEach((function(n){return n(t.match)}));})),void n(false);n();},function(t,n){t.match.route.hooks&&t.match.route.hooks.before&&d(t.navigateOptions,"callHooks")?m(t.match.route.hooks.before.map((function(n){return function(e,o){return n((function(n){ false===n?t.instance.__markAsClean(t):o();}),t.match)}})).concat([function(){return n()}])):n();},function(t,n){d(t.navigateOptions,"callHandler")&&t.match.route.handler(t.match),t.instance.updatePageLinks(),n();},function(t,n){t.match.route.hooks&&t.match.route.hooks.after&&d(t.navigateOptions,"callHooks")&&t.match.route.hooks.after.forEach((function(n){return n(t.match)})),n();}],S=[A,function(t,n){var e=t.instance._notFoundRoute;if(e){t.notFoundHandled=true;var o=h(t.currentLocationPath),r=o[0],i=o[1],a=u(t.to);e.path=s(r);var c={url:e.path,queryString:i,hashString:a,data:null,route:e,params:""!==i?f(i):null};t.matches=[c],t.match=c;}n();},m.if((function(t){return t.notFoundHandled}),R.concat([P]),[function(t,n){t.resolveOptions&&false!==t.resolveOptions.noMatchWarning&&void 0!==t.resolveOptions.noMatchWarning||console.warn('Navigo: "'+t.currentLocationPath+"\" didn't match any of the registered routes."),n();},function(t,n){t.instance._setCurrent(null),n();}])];function E(){return (E=Object.assign||function(t){for(var n=1;n<arguments.length;n++){var e=arguments[n];for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&(t[o]=e[o]);}return t}).apply(this,arguments)}function x(t,n){var e=0;A(t,(function o(){e!==t.matches.length?m(R,E({},t,{match:t.matches[e]}),(function(){e+=1,o();})):P(t,n);}));}function H(t){t.instance.__markAsClean(t);}function j(){return (j=Object.assign||function(t){for(var n=1;n<arguments.length;n++){var e=arguments[n];for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&(t[o]=e[o]);}return t}).apply(this,arguments)}var C="[data-navigo]";function N(t,n){var e,o=n||{strategy:"ONE",hash:false,noMatchWarning:false,linksSelector:C},r=this,i="/",d=null,w=[],L=false,A=p(),P=v();function R(t){return t.indexOf("#")>=0&&(t=true===o.hash?t.split("#")[1]||"/":t.split("#")[0]),t}function E(t){return s(i+"/"+s(t))}function N(t,n,e,o){return t=c(t)?E(t):t,{name:o||s(String(t)),path:t,handler:n,hooks:g(e)}}function U(t,n){if(!r.__dirty){r.__dirty=true,t=t?s(i)+"/"+s(t):void 0;var e={instance:r,to:t,currentLocationPath:t,navigateOptions:{},resolveOptions:j({},o,n)};return m([y,_,m.if((function(t){var n=t.matches;return n&&n.length>0}),x,S)],e,H),!!e.matches&&e.matches}r.__waiting.push((function(){return r.resolve(t,n)}));}function q(t,n){if(r.__dirty)r.__waiting.push((function(){return r.navigate(t,n)}));else {r.__dirty=true,t=s(i)+"/"+s(t);var e={instance:r,to:t,navigateOptions:n||{},resolveOptions:n&&n.resolveOptions?n.resolveOptions:o,currentLocationPath:R(t)};m([k,O,_,m.if((function(t){var n=t.matches;return n&&n.length>0}),x,S),b,H],e,H);}}function F(){if(P)return (P?[].slice.call(document.querySelectorAll(o.linksSelector||C)):[]).forEach((function(t){"false"!==t.getAttribute("data-navigo")&&"_blank"!==t.getAttribute("target")?t.hasListenerAttached||(t.hasListenerAttached=true,t.navigoHandler=function(n){if((n.ctrlKey||n.metaKey)&&"a"===n.target.tagName.toLowerCase())return  false;var e=t.getAttribute("href");if(null==e)return  false;if(e.match(/^(http|https)/)&&"undefined"!=typeof URL)try{var o=new URL(e);e=o.pathname+o.search;}catch(t){}var i=function(t){if(!t)return {};var n,e=t.split(","),o={};return e.forEach((function(t){var e=t.split(":").map((function(t){return t.replace(/(^ +| +$)/g,"")}));switch(e[0]){case "historyAPIMethod":o.historyAPIMethod=e[1];break;case "resolveOptionsStrategy":n||(n={}),n.strategy=e[1];break;case "resolveOptionsHash":n||(n={}),n.hash="true"===e[1];break;case "updateBrowserURL":case "callHandler":case "updateState":case "force":o[e[0]]="true"===e[1];}})),n&&(o.resolveOptions=n),o}(t.getAttribute("data-navigo-options"));L||(n.preventDefault(),n.stopPropagation(),r.navigate(s(e),i));},t.addEventListener("click",t.navigoHandler)):t.hasListenerAttached&&t.removeEventListener("click",t.navigoHandler);})),r}function I(t,n,e){var o=w.find((function(n){return n.name===t})),r=null;if(o){if(r=o.path,n)for(var a in n)r=r.replace(":"+a,n[a]);r=r.match(/^\//)?r:"/"+r;}return r&&e&&!e.includeRoot&&(r=r.replace(new RegExp("^/"+i),"")),r}function M(t){var n=h(s(t)),o=n[0],r=n[1],i=""===r?null:f(r);return {url:o,queryString:r,hashString:u(t),route:N(o,(function(){}),[e],o),data:null,params:i}}function T(t,n,e){return "string"==typeof n&&(n=z(n)),n?(n.hooks[t]||(n.hooks[t]=[]),n.hooks[t].push(e),function(){n.hooks[t]=n.hooks[t].filter((function(t){return t!==e}));}):(console.warn("Route doesn't exists: "+n),function(){})}function z(t){return "string"==typeof t?w.find((function(n){return n.name===E(t)})):w.find((function(n){return n.handler===t}))}t?i=s(t):console.warn('Navigo requires a root path in its constructor. If not provided will use "/" as default.'),this.root=i,this.routes=w,this.destroyed=L,this.current=d,this.__freezeListening=false,this.__waiting=[],this.__dirty=false,this.__markAsClean=function(t){t.instance.__dirty=false,t.instance.__waiting.length>0&&t.instance.__waiting.shift()();},this.on=function(t,n,o){var r=this;return "object"!=typeof t||t instanceof RegExp?("function"==typeof t&&(o=n,n=t,t=i),w.push(N(t,n,[e,o])),this):(Object.keys(t).forEach((function(n){if("function"==typeof t[n])r.on(n,t[n]);else {var o=t[n],i=o.uses,a=o.as,s=o.hooks;w.push(N(n,i,[e,s],a));}})),this)},this.off=function(t){return this.routes=w=w.filter((function(n){return c(t)?s(n.path)!==s(t):"function"==typeof t?t!==n.handler:String(n.path)!==String(t)})),this},this.resolve=U,this.navigate=q,this.navigateByName=function(t,n,e){var o=I(t,n);return null!==o&&(q(o.replace(new RegExp("^/?"+i),""),e),true)},this.destroy=function(){this.routes=w=[],A&&window.removeEventListener("popstate",this.__popstateListener),this.destroyed=L=true;},this.notFound=function(t,n){return r._notFoundRoute=N("*",t,[e,n],"__NOT_FOUND__"),this},this.updatePageLinks=F,this.link=function(t){return "/"+i+"/"+s(t)},this.hooks=function(t){return e=t,this},this.extractGETParameters=function(t){return h(R(t))},this.lastResolved=function(){return d},this.generate=I,this.getLinkPath=function(t){return t.getAttribute("href")},this.match=function(t){var n={instance:r,currentLocationPath:t,to:t,resolveOptions:o};return _(n,(function(){})),!!n.matches&&n.matches},this.matchLocation=function(t,n,e){ void 0===n||void 0!==e&&!e||(n=E(n));var o={instance:r,to:n,currentLocationPath:n};return y(o,(function(){})),"string"==typeof t&&(t=void 0===e||e?E(t):t),l(o,{name:String(t),path:t,handler:function(){},hooks:{}})||false},this.getCurrentLocation=function(){return M(s(a(i)).replace(new RegExp("^"+i),""))},this.addBeforeHook=T.bind(this,"before"),this.addAfterHook=T.bind(this,"after"),this.addAlreadyHook=T.bind(this,"already"),this.addLeaveHook=T.bind(this,"leave"),this.getRoute=z,this._pathToMatchObject=M,this._clean=s,this._checkForAHash=R,this._setCurrent=function(t){return d=r.current=t},function(){A&&(this.__popstateListener=function(){r.__freezeListening||U();},window.addEventListener("popstate",this.__popstateListener));}.call(this),F.call(this);}}},n={};function e(o){if(n[o])return n[o].exports;var r=n[o]={exports:{}};return t[o](r,r.exports,e),r.exports}return e.d=function(t,n){for(var o in n)e.o(n,o)&&!e.o(t,o)&&Object.defineProperty(t,o,{enumerable:true,get:n[o]});},e.o=function(t,n){return Object.prototype.hasOwnProperty.call(t,n)},e(407)}().default}));
-			
-		} (navigo_min$1));
-		return navigo_min$1.exports;
+		window.location.hash = (location.charAt(0) == "#" ? "" : "#") + location;
 	}
 
-	var navigo_minExports = requireNavigo_min();
-	var Navigo = /*@__PURE__*/getDefaultExportFromCjs(navigo_minExports);
+	/**
+	* Navigates back in history (equivalent to pressing the browser's back button).
+	*
+	* @returns Promise that resolves after the page navigation has completed
+	*/
+	async function pop() {
+		// Execute this code when the current call stack is complete
+		await tick();
+
+		window.history.back();
+	}
+
+	/**
+	* Replaces the current page but without modifying the history stack.
+	*
+	* @param location - Path to navigate to (must start with `/` or `#/`)
+	* @returns Promise that resolves after the page navigation has completed
+	*/
+	async function replace(location) {
+		if (!location || location.length < 1 || location.charAt(0) != "/" && location.indexOf("#/") !== 0) {
+			throw Error("Invalid parameter location");
+		}
+
+		// Execute this code when the current call stack is complete
+		await tick();
+
+		const dest = (location.charAt(0) == "#" ? "" : "#") + location;
+
+		try {
+			const newState = { ...history.state };
+
+			delete newState["__svelte_spa_router_scrollX"];
+			delete newState["__svelte_spa_router_scrollY"];
+			window.history.replaceState(newState, "", dest);
+		} catch {
+			// eslint-disable-next-line no-console
+			console.warn("Caught exception while replacing the current page. If you're running this in the Svelte REPL, please note that the `replace` method might not work in this environment.");
+		}
+
+		// The method above doesn't trigger the hashchange event, so let's do that manually
+		window.dispatchEvent(new Event("hashchange"));
+	}
+
+	/**
+	* Svelte Action that enables a link element (`<a>`) to use our history management.
+	*
+	* For example:
+	*
+	* ```html
+	* <a href="/books" use:link>View books</a>
+	* ```
+	*/
+	function link(node, opts) {
+		let currentOpts = linkOpts(opts);
+
+		// Only apply to <a> tags
+		if (!node || !node.tagName || node.tagName.toLowerCase() != "a") {
+			throw Error("Action \"link\" can only be used with <a> tags");
+		}
+
+		// Set initial href
+		updateLinkHref(node, currentOpts);
+
+		// Add click handler once, using currentOpts reference
+		const clickHandler = (event) => {
+			event.preventDefault();
+
+			if (!currentOpts.disabled) {
+				const target = event.currentTarget;
+				const href = target ? target.getAttribute("href") : null;
+
+				if (href) {
+					scrollstateHistoryHandler(href);
+				}
+			}
+		};
+
+		node.addEventListener("click", clickHandler);
+
+		return {
+			update(updated) {
+				currentOpts = linkOpts(updated);
+				updateLinkHref(node, currentOpts);
+			},
+
+			destroy() {
+				node.removeEventListener("click", clickHandler);
+			}
+		};
+	}
+
+	/** Tries to restore the scroll state from the given history state. */
+	function restoreScroll(state) {
+		// If this exists, then this is a back navigation: restore the scroll position
+		if (state) {
+			window.scrollTo(state.__svelte_spa_router_scrollX || 0, state.__svelte_spa_router_scrollY || 0);
+		} else {
+			// Otherwise this is a forward navigation: scroll to top
+			window.scrollTo(0, 0);
+		}
+	}
+
+	// Internal function used by the link function to update href attribute
+	function updateLinkHref(node, opts) {
+		let href = opts.href || node.getAttribute("href");
+
+		// Destination must start with '/' or '#/'
+		if (href && href.charAt(0) == "/") {
+			// Add # to the href attribute
+			href = "#" + href;
+		} else if (!href || href.length < 2 || href.slice(0, 2) != "#/") {
+			throw Error("Invalid value for \"href\" attribute: " + href);
+		}
+
+		node.setAttribute("href", href);
+	}
+
+	// Internal function that ensures the argument of the link action is always an object
+	function linkOpts(val) {
+		if (typeof val == "string") {
+			return { href: val };
+		}
+
+		return val || {};
+	}
+
+	/**
+	* The handler attached to an anchor tag responsible for updating the
+	* current history state with the current scroll state.
+	*/
+	function scrollstateHistoryHandler(href) {
+		// Setting the url (3rd arg) to href will break clicking for reasons, so don't try to do that
+		history.replaceState(
+			{
+				...history.state,
+				__svelte_spa_router_scrollX: window.scrollX,
+				__svelte_spa_router_scrollY: window.scrollY
+			},
+			""
+		);
+
+		// This will force an update as desired, but this time our scroll state will be attached
+		window.location.hash = href;
+	}
+
+	function Router($$anchor, $$props) {
+		push$1($$props, true);
+
+		const routes = prop($$props, 'routes', 19, () => ({})),
+			prefix = prop($$props, 'prefix', 3, ""),
+			restoreScrollState = prop($$props, 'restoreScrollState', 3, false),
+			onConditionsFailed = prop($$props, 'onConditionsFailed', 3, () => {}),
+			onRouteLoaded = prop($$props, 'onRouteLoaded', 3, () => {}),
+			onRouteLoading = prop($$props, 'onRouteLoading', 3, () => {}),
+			onRouteEvent = prop($$props, 'onRouteEvent', 3, () => {});
+
+		/** Container for a route: path, component */
+		class RouteItem {
+			path;
+			component;
+			conditions;
+			userData;
+			props;
+			_pattern;
+			_keys;
+
+			constructor(path, component) {
+				// The _sveltesparouter marker is set by `wrap()` via Object.defineProperty and is intentionally absent from the public WrappedComponent type
+				const isWrapped = (c) => typeof c == "object" && c !== null && c._sveltesparouter === true;
+
+				if (!component || typeof component != "function" && !isWrapped(component)) {
+					throw Error("Invalid component object");
+				}
+
+				// Path must be a regular expression, or a string starting with '/' or '*'
+				if (!path || typeof path == "string" && (path.length < 1 || path.charAt(0) != "/" && path.charAt(0) != "*") || typeof path == "object" && !(path instanceof RegExp)) {
+					throw Error("Invalid value for \"path\" argument - strings must start with / or *");
+				}
+
+				const parsed = typeof path == "string" ? parse(path) : parse(path);
+
+				this.path = path;
+
+				// Check if the component is wrapped and we have conditions
+				if (isWrapped(component)) {
+					const wrapped = component;
+
+					this.component = wrapped.component;
+					this.conditions = wrapped.conditions || [];
+					this.userData = wrapped.userData;
+					this.props = wrapped.props || {};
+				} else {
+					const sync = component;
+
+					this.component = () => Promise.resolve(sync);
+					this.conditions = [];
+					this.props = {};
+				}
+
+				this._pattern = parsed.pattern;
+				this._keys = parsed.keys;
+			}
+
+			/**
+			* Checks if `path` matches the current route.
+			* Returns the list of parameters from the URL, or `null` if no match.
+			*/
+			match(path) {
+				// If there's a prefix, check if it matches the start of the path
+				// If not, bail early, else remove it before we run the matching
+				if (prefix()) {
+					if (typeof prefix() == "string") {
+						if (path.startsWith(prefix())) {
+							path = path.substr(prefix().length) || "/";
+						} else {
+							return null;
+						}
+					} else if (prefix() instanceof RegExp) {
+						const m = path.match(prefix());
+
+						if (m && m[0]) {
+							path = path.substr(m[0].length) || "/";
+						} else {
+							return null;
+						}
+					}
+				}
+
+				// Check if the pattern matches
+				const matches = this._pattern.exec(path);
+
+				if (matches === null) {
+					return null;
+				}
+
+				// If the input was a regular expression, _keys is false; return matches as is
+				if (this._keys === false) {
+					return matches;
+				}
+
+				const out = {};
+				let i = 0;
+
+				while (i < this._keys.length) {
+					// URL-decode all values
+					try {
+						out[this._keys[i]] = decodeURIComponent(matches[i + 1] || "") || null;
+					} catch {
+						out[this._keys[i]] = null;
+					}
+
+					i++;
+				}
+
+				return out;
+			}
+
+			/** Executes all conditions in order; returns false at the first failure. */
+			async checkConditions(detail) {
+				for (let i = 0; i < this.conditions.length; i++) {
+					if (!await this.conditions[i](detail)) {
+						return false;
+					}
+				}
+
+				return true;
+			}
+		}
+
+		// Set up all routes
+		const routesList = [];
+
+		// svelte-ignore state_referenced_locally
+		// routes are static, initial capture is intended
+		if (routes() instanceof Map) {
+			routes().forEach((route, path) => {
+				routesList.push(new RouteItem(path, route));
+			});
+		} else {
+			Object.keys(routes()).forEach((path) => {
+				const map = routes();
+
+				routesList.push(new RouteItem(path, map[path]));
+			});
+		}
+
+		// State declarations for the currently-rendered route
+		let component$1 = state(null);
+
+		let componentParams = state(null);
+		let routeProps = state({});
+		let previousScrollState = null;
+		let componentObj = null;
+
+		// Effects
+		user_effect(() => {
+			history.scrollRestoration = restoreScrollState() ? "manual" : "auto";
+		});
+
+		user_effect(() => {
+			if (!restoreScrollState()) {
+				return;
+			}
+
+			const popStateChanged = (event) => {
+				if (event.state && (event.state.__svelte_spa_router_scrollY || event.state.__svelte_spa_router_scrollX)) {
+					previousScrollState = event.state;
+				} else {
+					previousScrollState = null;
+				}
+			};
+
+			window.addEventListener("popstate", popStateChanged);
+
+			return () => window.removeEventListener("popstate", popStateChanged);
+		});
+
+		async function dispatchNextTick(event, detail) {
+			// Execute this code when the current call stack is complete
+			await tick();
+
+			event(detail);
+		}
+
+		user_effect(() => {
+			// React to loc changing and untrack everything else to prevent accidental dependencies
+			// Cancel operation after async work in case a new loc change happened in the meantime
+			const newLoc = router.loc;
+
+			let cancelled = false;
+
+			untrack(async () => {
+				let i = 0;
+
+				while (i < routesList.length) {
+					const match = routesList[i].match(newLoc.location);
+
+					if (!match) {
+						i++;
+
+						continue;
+					}
+
+					const matchParams = matchToParams(match);
+
+					const detail = {
+						route: routesList[i].path,
+						location: newLoc.location,
+						querystring: newLoc.querystring || "",
+						userData: routesList[i].userData,
+						params: matchParams
+					};
+
+					if (!await routesList[i].checkConditions(detail)) {
+						if (cancelled) {
+							return;
+						}
+
+						set(component$1, null);
+						componentObj = null;
+						dispatchNextTick(onConditionsFailed(), detail);
+
+						return;
+					}
+
+					if (cancelled) {
+						return;
+					}
+
+					dispatchNextTick(onRouteLoading(), { ...detail });
+
+					const obj = routesList[i].component;
+
+					if (componentObj != obj) {
+						if (obj.loading) {
+							set(component$1, obj.loading);
+							componentObj = obj;
+							set(componentParams, obj.loadingParams || null);
+							set(routeProps, {});
+
+							const comp = obj.loading;
+
+							dispatchNextTick(onRouteLoaded(), {
+								...detail,
+								component: comp,
+								name: comp.name,
+								params: obj.loadingParams || null
+							});
+						} else {
+							set(component$1, null);
+							componentObj = null;
+						}
+
+						const loaded = await obj();
+
+						if (cancelled) {
+							return;
+						}
+
+						set(component$1, loaded && typeof loaded == "object" && "default" in loaded ? loaded.default : loaded);
+						componentObj = obj;
+					}
+
+					set(componentParams, matchParams);
+					set(routeProps, routesList[i].props);
+
+					const comp = get(component$1);
+
+					if (comp) {
+						dispatchNextTick(onRouteLoaded(), {
+							...detail,
+							component: comp,
+							name: comp.name,
+							params: matchParams
+						});
+					}
+
+					router._params = matchParams;
+
+					if (restoreScrollState()) {
+						restoreScroll(previousScrollState);
+						previousScrollState = null;
+					}
+
+					return;
+				}
+
+				set(component$1, null);
+				componentObj = null;
+				router._params = undefined;
+
+				if (restoreScrollState()) {
+					restoreScroll(previousScrollState);
+					previousScrollState = null;
+				}
+			});
+
+			return () => {
+				cancelled = true;
+			};
+		});
+
+		function matchToParams(match) {
+			// Preserve all keys, including null values for unmatched optional params
+			return match && typeof match == "object" && Object.keys(match).length ? match : null;
+		}
+
+		var fragment = comment();
+		var node_1 = first_child(fragment);
+
+		{
+			var consequent_1 = ($$anchor) => {
+				const Component = user_derived(() => get(component$1));
+				var fragment_1 = comment();
+				var node_2 = first_child(fragment_1);
+
+				{
+					var consequent = ($$anchor) => {
+						var fragment_2 = comment();
+						var node_3 = first_child(fragment_2);
+
+						component(node_3, () => get(Component), ($$anchor, Component_1) => {
+							Component_1($$anchor, spread_props(
+								{
+									get params() {
+										return get(componentParams);
+									},
+
+									get onRouteEvent() {
+										return onRouteEvent();
+									}
+								},
+								() => get(routeProps)
+							));
+						});
+
+						append($$anchor, fragment_2);
+					};
+
+					var alternate = ($$anchor) => {
+						var fragment_3 = comment();
+						var node_4 = first_child(fragment_3);
+
+						component(node_4, () => get(Component), ($$anchor, Component_2) => {
+							Component_2($$anchor, spread_props(
+								{
+									get onRouteEvent() {
+										return onRouteEvent();
+									}
+								},
+								() => get(routeProps)
+							));
+						});
+
+						append($$anchor, fragment_3);
+					};
+
+					if_block(node_2, ($$render) => {
+						if (get(componentParams)) $$render(consequent); else $$render(alternate, -1);
+					});
+				}
+
+				append($$anchor, fragment_1);
+			};
+
+			if_block(node_1, ($$render) => {
+				if (get(component$1)) $$render(consequent_1);
+			});
+		}
+
+		append($$anchor, fragment);
+		pop$1();
+	}
 
 	function classMap(classObj) {
 	    return Object.entries(classObj)
@@ -8903,7 +9542,7 @@
 	var root_1$l = from_html(`<div><div class="mdc-circular-progress__determinate-container"><svg class="mdc-circular-progress__determinate-circle-graphic" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><circle class="mdc-circular-progress__determinate-track" cx="24" cy="24" r="18" stroke-width="4"></circle><circle></circle></svg></div> <div class="mdc-circular-progress__indeterminate-container"></div></div>`);
 
 	function CircularProgress($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -9096,7 +9735,7 @@
 		action(div, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, div);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	/**
@@ -10663,7 +11302,7 @@
 	var root_1$k = from_html(`<div><div><div><!> <!></div></div> <div></div></div> <!>`, 1);
 
 	function Dialog($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 		const $aboveFullscreenShown = () => store_get(aboveFullscreenShown, '$aboveFullscreenShown', $$stores);
 		const [$$stores, $$cleanup] = setup_stores();
 		const { FocusTrap } = domFocusTrap;
@@ -11132,7 +11771,7 @@
 
 		append($$anchor, fragment);
 
-		var $$pop = pop($$exports);
+		var $$pop = pop$1($$exports);
 
 		$$cleanup();
 
@@ -11151,7 +11790,7 @@
 	]);
 
 	function CommonLabel($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -11243,7 +11882,7 @@
 
 		append($$anchor, fragment);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$U = new Set([
@@ -11259,7 +11898,7 @@
 	]);
 
 	function CommonIcon($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -11348,14 +11987,14 @@
 
 		append($$anchor, fragment);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$T = new Set(['$$slots', '$$events', '$$legacy', 'use', 'tag', 'children']);
 	var root$K = from_svg(`<svg><!></svg>`);
 
 	function SmuiElement($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -11450,14 +12089,14 @@
 
 		append($$anchor, fragment);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$S = new Set(['$$slots', '$$events', '$$legacy', 'use', 'children']);
 	var root$J = from_svg(`<svg><!></svg>`);
 
 	function Svg($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		if (console && console.warn) {
 			console.warn('The @smui/common Svg component is deprecated. You can use `tag="svg"` now.');
@@ -11490,11 +12129,11 @@
 		action(svg, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, svg);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	function ContextFragment($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 		const [$$stores, $$cleanup] = setup_stores();
 
 		// svelte-ignore state_referenced_locally
@@ -11516,7 +12155,7 @@
 
 		snippet(node, () => $$props.children ?? noop);
 		append($$anchor, fragment);
-		pop();
+		pop$1();
 		$$cleanup();
 	}
 
@@ -11536,7 +12175,7 @@
 	]);
 
 	function ClassAdder($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -11661,13 +12300,13 @@
 
 		append($$anchor, fragment);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$Q = new Set(['$$slots', '$$events', '$$legacy', 'children']);
 
 	function Title$1($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let restProps = rest_props($$props, rest_excludes$Q);
 		let element;
@@ -11698,13 +12337,13 @@
 			() => element
 		);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$P = new Set(['$$slots', '$$events', '$$legacy', 'children']);
 
 	function Content$1($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let restProps = rest_props($$props, rest_excludes$P);
 		let element;
@@ -11730,13 +12369,13 @@
 			() => element
 		);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$O = new Set(['$$slots', '$$events', '$$legacy', 'children']);
 
 	function Actions($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let restProps = rest_props($$props, rest_excludes$O);
 		let element;
@@ -11773,7 +12412,7 @@
 			() => element
 		);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	const { applyPassive } = events;
@@ -12097,7 +12736,7 @@
 	var root_1$j = from_html(`<label><!></label>`);
 
 	function FloatingLabel($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -12330,7 +12969,7 @@
 
 		append($$anchor, fragment);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	/**
@@ -12451,7 +13090,7 @@
 	var root$H = from_html(`<div></div>`);
 
 	function LineRipple($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -12564,7 +13203,7 @@
 		action(div, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, div);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	/**
@@ -12689,7 +13328,7 @@
 	var root_1$i = from_html(`<div><div class="mdc-notched-outline__leading"></div> <!> <div class="mdc-notched-outline__trailing"></div></div>`);
 
 	function NotchedOutline($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -12843,7 +13482,7 @@
 		action(div, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, div);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	/**
@@ -13605,7 +14244,7 @@
 	var rest_excludes$K = new Set(['$$slots', '$$events', '$$legacy', 'children']);
 
 	function HelperLine($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let restProps = rest_props($$props, rest_excludes$K);
 		let element;
@@ -13631,13 +14270,13 @@
 			() => element
 		);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$J = new Set(['$$slots', '$$events', '$$legacy', 'children']);
 
 	function Prefix($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let restProps = rest_props($$props, rest_excludes$J);
 		let element;
@@ -13670,13 +14309,13 @@
 			() => element
 		);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$I = new Set(['$$slots', '$$events', '$$legacy', 'children']);
 
 	function Suffix($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let restProps = rest_props($$props, rest_excludes$I);
 		let element;
@@ -13709,7 +14348,7 @@
 			() => element
 		);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$H = new Set([
@@ -13733,7 +14372,7 @@
 	var root$F = from_html(`<input/>`);
 
 	function Input($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -13931,7 +14570,7 @@
 		action(input, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, input);
 
-		return pop($$exports);
+		return pop$1($$exports);
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
 		 */
@@ -13993,7 +14632,7 @@
 	var root$E = from_html(`<textarea></textarea>`);
 
 	function Textarea($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -14110,7 +14749,7 @@
 		effect(() => bind_value(textarea, value));
 		append($$anchor, textarea);
 
-		return pop($$exports);
+		return pop$1($$exports);
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
 		 */
@@ -14190,7 +14829,7 @@
 	var root_5$a = from_html(`<div><!> <!> <!> <!> <!></div>`);
 
 	function Textfield($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const { applyPassive } = events;
 		let uninitializedValue = () => {};
@@ -15321,7 +15960,7 @@
 
 		append($$anchor, fragment);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	let counter$4 = 0;
@@ -15341,7 +15980,7 @@
 	var root$C = from_html(`<div><!></div>`);
 
 	function HelperText($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -15499,7 +16138,7 @@
 		action(div, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, div);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$D = new Set([
@@ -15526,7 +16165,7 @@
 	var root_1$g = from_html(`<div class="mdc-button__ripple"></div> <!><!>`, 1);
 
 	function Button($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -15759,7 +16398,7 @@
 
 		append($$anchor, fragment);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	function preventDefault(fn) {
@@ -16028,7 +16667,7 @@
 	var root$A = from_html(`<div><input/> <div class="mdc-checkbox__background"><svg class="mdc-checkbox__checkmark" viewBox="0 0 24 24"><path class="mdc-checkbox__checkmark-path" fill="none" d="M1.73,12.91 8.1,19.28 22.79,4.59"></path></svg> <div class="mdc-checkbox__mixedmark"></div></div> <div class="mdc-checkbox__ripple"></div></div>`);
 
 	function Checkbox($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let uninitializedValue = () => {};
 
@@ -16409,7 +17048,7 @@
 
 		append($$anchor, div);
 
-		return pop($$exports);
+		return pop$1($$exports);
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
 		 */
@@ -16585,7 +17224,7 @@
 	var root$z = from_html(`<div><!> <label><!></label></div>`);
 
 	function FormField($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -16711,7 +17350,7 @@
 		action(div, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, div);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$A = new Set([
@@ -16738,7 +17377,7 @@
 	var root_5$9 = from_html(`<!> <!> <!>`, 1);
 
 	function ChangePassword($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const $user = () => store_get(user(), '$user', $$stores);
 		const [$$stores, $$cleanup] = setup_stores();
@@ -17174,7 +17813,7 @@
 		}
 
 		append($$anchor, fragment);
-		pop();
+		pop$1();
 		$$cleanup();
 	}
 
@@ -17199,7 +17838,7 @@
 	var root_4$9 = from_html(`<!> <!> <!>`, 1);
 
 	function RevokeTokens($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const $user = () => store_get(user(), '$user', $$stores);
 		const [$$stores, $$cleanup] = setup_stores();
@@ -17521,7 +18160,7 @@
 		}
 
 		append($$anchor, fragment);
-		pop();
+		pop$1();
 		$$cleanup();
 	}
 
@@ -17570,7 +18209,7 @@
 	);
 
 	function TwoFactor($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const $user = () => store_get(user(), '$user', $$stores);
 		const [$$stores, $$cleanup] = setup_stores();
@@ -18308,7 +18947,7 @@
 		}
 
 		append($$anchor, fragment);
-		pop();
+		pop$1();
 		$$cleanup();
 	}
 
@@ -18335,7 +18974,7 @@
 	var root_7$7 = from_html(`<!> <!> <!> <!>`, 1);
 
 	function Account($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const $user = () => store_get(user(), '$user', $$stores);
 		const $clientConfig = () => store_get(clientConfig(), '$clientConfig', $$stores);
@@ -18475,14 +19114,11 @@
 			}
 
 			try {
-				if (await $user().$save()) {
-					originalEmail = $user().email;
-					open(false);
-					set(usernameVerifiedMessage, undefined);
-					set(emailVerifiedMessage, undefined);
-				} else {
-					set(failureMessage, 'Error saving account changes.');
-				}
+				await $user().$save();
+				originalEmail = $user().email;
+				open(false);
+				set(usernameVerifiedMessage, undefined);
+				set(emailVerifiedMessage, undefined);
 			} catch(e) {
 				set(failureMessage, e?.message, true);
 			}
@@ -19153,7 +19789,7 @@
 		}
 
 		append($$anchor, fragment);
-		pop();
+		pop$1();
 		$$cleanup();
 	}
 
@@ -22027,7 +22663,9 @@
 	    async $delete() {
 	        this.$check();
 	        const guid = this.guid;
-	        return (await this.$nymph.deleteEntity(this)) === guid;
+	        if ((await this.$nymph.deleteEntity(this)) !== guid) {
+	            throw new Error('Failed to delete entity.');
+	        }
 	    }
 	    $equals(object) {
 	        this.$check();
@@ -22122,7 +22760,9 @@
 	        this.$check();
 	        const mdate = this.mdate;
 	        await this.$nymph.patchEntity(this);
-	        return mdate !== this.mdate;
+	        if (mdate === this.mdate) {
+	            throw new Error('Failed to patch entity.');
+	        }
 	    }
 	    /**
 	     * Check if this is a sleeping reference and throw an error if so.
@@ -22228,8 +22868,11 @@
 	            type: '&',
 	            guid: this.guid,
 	        });
+	        if (data == null) {
+	            throw new Error("The entity's data could not be refreshed.");
+	        }
 	        this.$init(data);
-	        return this.guid == null ? 0 : true;
+	        return true;
 	    }
 	    $removeTag(...tags) {
 	        this.$check();
@@ -22238,7 +22881,9 @@
 	    async $save() {
 	        this.$check();
 	        await this.$nymph.saveEntity(this);
-	        return !!this.guid;
+	        if (!this.guid) {
+	            throw new Error('Failed to save entity.');
+	        }
 	    }
 	    async $serverCall(method, params, stateless = false) {
 	        this.$check();
@@ -23076,12 +23721,12 @@
 	        });
 	        if (plural && Array.isArray(entity) && entity.length === response.length) {
 	            return entity.map((e, i) => response[i] &&
-	                typeof response[i].guid !== 'undefined' &&
+	                response[i].guid != null &&
 	                (e.guid == null || e.guid === response[i].guid)
 	                ? e.$init(response[i])
 	                : e);
 	        }
-	        else if (!Array.isArray(entity) && typeof response.guid !== 'undefined') {
+	        else if (!Array.isArray(entity) && response.guid != null) {
 	            return entity.$init(response);
 	        }
 	        throw new Error('Server error');
@@ -23920,7 +24565,7 @@
 	var root$t = from_html(`<div><input/> <div class="mdc-radio__background"><div class="mdc-radio__outer-circle"></div> <div class="mdc-radio__inner-circle"></div></div> <div class="mdc-radio__ripple"></div></div>`);
 
 	function Radio($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const binding_group = [];
 		let uninitializedValue = () => {};
@@ -24141,7 +24786,7 @@
 		action(div, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, div);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$v = new Set([
@@ -24183,7 +24828,7 @@
 	var root_10$3 = from_html(`<!> <!>`, 1);
 
 	function Recover($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const $clientConfig = () => store_get(clientConfig(), '$clientConfig', $$stores);
 		const [$$stores, $$cleanup] = setup_stores();
@@ -24907,7 +25552,7 @@
 		}
 
 		append($$anchor, fragment);
-		pop();
+		pop$1();
 		$$cleanup();
 	}
 
@@ -24950,7 +25595,7 @@
 	var root_10$2 = from_html(`<form><div><!></div> <div><!></div> <!> <!> <!> <div class="tilmeld-login-buttons svelte-1nt1tpa"><!></div> <!> <!></form>`);
 
 	function Login($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const $clientConfig = () => store_get(clientConfig(), '$clientConfig', $$stores);
 		const [$$stores, $$cleanup] = setup_stores();
@@ -25754,7 +26399,7 @@
 		}
 		action(div, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, div);
-		pop();
+		pop$1();
 		$$cleanup();
 	}
 
@@ -26202,7 +26847,7 @@
 	var root$q = from_html(`<header><!></header>`);
 
 	function TopAppBar($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let uninitializedValue = () => {};
 
@@ -26435,7 +27080,7 @@
 		action(header, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, header);
 
-		return pop($$exports);
+		return pop$1($$exports);
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
 		 */
@@ -26473,7 +27118,7 @@
 	var rest_excludes$s = new Set(['$$slots', '$$events', '$$legacy', 'children']);
 
 	function Row$1($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let restProps = rest_props($$props, rest_excludes$s);
 		let element;
@@ -26499,7 +27144,7 @@
 			() => element
 		);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$r = new Set([
@@ -26516,7 +27161,7 @@
 	var root$p = from_html(`<section><!></section>`);
 
 	function Section($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -26575,13 +27220,13 @@
 		action(section, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, section);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$q = new Set(['$$slots', '$$events', '$$legacy', 'children']);
 
 	function Title($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let restProps = rest_props($$props, rest_excludes$q);
 		let element;
@@ -26607,7 +27252,7 @@
 			() => element
 		);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	/**
@@ -28250,7 +28895,7 @@
 	var root$o = from_html(`<aside><!></aside>`);
 
 	function Drawer($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const { FocusTrap } = domFocusTrap;
 
@@ -28472,7 +29117,7 @@
 		action(aside, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, aside);
 
-		return pop($$exports);
+		return pop$1($$exports);
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
 		 */
@@ -28505,7 +29150,7 @@
 	var rest_excludes$o = new Set(['$$slots', '$$events', '$$legacy', 'children']);
 
 	function AppContent($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let restProps = rest_props($$props, rest_excludes$o);
 		let element;
@@ -28531,13 +29176,13 @@
 			() => element
 		);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$n = new Set(['$$slots', '$$events', '$$legacy', 'children']);
 
 	function Content($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let restProps = rest_props($$props, rest_excludes$n);
 		let element;
@@ -28563,7 +29208,7 @@
 			() => element
 		);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$m = new Set([
@@ -28579,7 +29224,7 @@
 	]);
 
 	function Scrim($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -28670,7 +29315,7 @@
 
 		append($$anchor, fragment);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	/**
@@ -28826,7 +29471,7 @@
 	var root_2$7 = from_html(`<div class="mdc-icon-button__ripple"></div> <!> <!><!>`, 1);
 
 	function IconButton($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let uninitializedValue = () => {};
 
@@ -29195,7 +29840,7 @@
 
 		append($$anchor, fragment);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$k = new Set([
@@ -29228,7 +29873,7 @@
 	]);
 
 	function List($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const { closest, matches } = ponyfill;
 
@@ -29775,7 +30420,7 @@
 
 		append($$anchor, fragment);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	let counter$2 = 0;
@@ -29808,7 +30453,7 @@
 	var root_1$8 = from_html(`<!><!>`, 1);
 
 	function Item($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let uninitializedValue = () => {};
 
@@ -30284,13 +30929,13 @@
 
 		append($$anchor, fragment);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$i = new Set(['$$slots', '$$events', '$$legacy', 'children']);
 
 	function Text$1($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let restProps = rest_props($$props, rest_excludes$i);
 		let element;
@@ -30316,13 +30961,13 @@
 			() => element
 		);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$h = new Set(['$$slots', '$$events', '$$legacy', 'children']);
 
 	function Meta($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		let restProps = rest_props($$props, rest_excludes$h);
 		let element;
@@ -30348,7 +30993,7 @@
 			() => element
 		);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$g = new Set([
@@ -30368,7 +31013,7 @@
 	]);
 
 	function Separator($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -30463,7 +31108,7 @@
 
 		append($$anchor, fragment);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	/**
@@ -31183,7 +31828,7 @@
 	var root$l = from_html(`<div><!></div>`);
 
 	function MenuSurface($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -31606,7 +32251,7 @@
 		action(div, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, div);
 
-		return pop($$exports);
+		return pop$1($$exports);
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
 		 */
@@ -31890,7 +32535,7 @@
 	]);
 
 	function Menu($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const { closest } = ponyfill;
 
@@ -32192,7 +32837,7 @@
 			);
 		}
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	const nymph = new Nymph(
@@ -33054,7 +33699,7 @@
 	var root$j = from_html(`<div><!></div>`);
 
 	function Paper($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -33122,7 +33767,7 @@
 		action(div, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, div);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	/**
@@ -33485,7 +34130,7 @@
 	var root_1$7 = from_html(`<div><div><table><!></table></div> <!> <!></div>`);
 
 	function DataTable($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 		const $progressClosed = () => store_get(progressClosed, '$progressClosed', $$stores);
 		const [$$stores, $$cleanup] = setup_stores();
 		const { closest } = ponyfill;
@@ -33946,7 +34591,7 @@
 		action(div, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, div);
 
-		var $$pop = pop($$exports);
+		var $$pop = pop$1($$exports);
 
 		$$cleanup();
 
@@ -33957,7 +34602,7 @@
 	var root$h = from_html(`<thead><!></thead>`);
 
 	function Head($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -34051,7 +34696,7 @@
 		action(thead, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, thead);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$a = new Set([
@@ -34066,7 +34711,7 @@
 	var root$g = from_html(`<tbody><!></tbody>`);
 
 	function Body($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -34145,7 +34790,7 @@
 		action(tbody, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, tbody);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	let counter$1 = 0;
@@ -34163,7 +34808,7 @@
 	var root$f = from_html(`<tr><!></tr>`);
 
 	function Row($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -34338,7 +34983,7 @@
 		action(tr, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, tr);
 
-		return pop($$exports);
+		return pop$1($$exports);
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
 		 */
@@ -34375,7 +35020,7 @@
 	var root_2$6 = from_html(`<td><!></td>`);
 
 	function Cell$1($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const $sort = () => store_get(sort, '$sort', $$stores);
 		const $sortDirection = () => store_get(sortDirection, '$sortDirection', $$stores);
@@ -34637,7 +35282,7 @@
 
 		append($$anchor, fragment);
 
-		var $$pop = pop($$exports);
+		var $$pop = pop$1($$exports);
 
 		$$cleanup();
 
@@ -34669,7 +35314,7 @@
 	var root_2$5 = from_html(`<div class="mdc-fab__ripple"></div> <!> <!><!>`, 1);
 
 	function Fab($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -34867,7 +35512,7 @@
 
 		append($$anchor, fragment);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var root$c = from_html(`<section><div style="display: flex; justify-content: center; align-items: center;"><!></div></section>`);
@@ -34880,13 +35525,15 @@
 	var root_7$4 = from_html(`<div class="solo-search-container solo-container"><!> <!> <!></div> <section><!> <!></section>`, 1);
 
 	function Users($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
-		const $clientConfig = () => store_get($$props.clientConfig, '$clientConfig', $$stores);
-		const $user = () => store_get($$props.user, '$user', $$stores);
+		const $clientConfig = () => store_get(clientConfig, '$clientConfig', $$stores);
+		const $user = () => store_get(user, '$user', $$stores);
 		const [$$stores, $$cleanup] = setup_stores();
-		let entitySearch = state(proxy($$props.params.query ?? ''));
+		let entitySearch = user_derived(() => $$props.params.query ?? '');
 		let failureMessage = state(void 0);
+		const clientConfig = getContext('clientConfigStore');
+		const user = getContext('userStore');
 
 		user_effect(() => {
 			if ($$props.params) {
@@ -34923,7 +35570,7 @@
 		let entities = state(void 0);
 
 		async function searchEntities() {
-			$$props.router.navigate(`/users/${encodeURIComponent(get(entitySearch))}`);
+			push(`/users/${encodeURIComponent(get(entitySearch))}`);
 		}
 
 		function entitySearchKeyDown(event) {
@@ -34950,27 +35597,34 @@
 				var div_1 = first_child(fragment_1);
 				var node_2 = child(div_1);
 
-				Fab(node_2, {
-					href: '#/users/edit/+',
-					color: 'primary',
-					mini: true,
-					class: 'solo-fab',
-					title: 'New User',
-					children: ($$anchor, $$slotProps) => {
-						CommonIcon($$anchor, {
-							tag: 'svg',
-							viewBox: '0 0 24 24',
-							children: ($$anchor, $$slotProps) => {
-								var path = root_1$4();
+				{
+					let $0 = user_derived(() => [link]);
 
-								template_effect(() => set_attribute(path, 'd', mdiPlus));
-								append($$anchor, path);
-							},
-							$$slots: { default: true }
-						});
-					},
-					$$slots: { default: true }
-				});
+					Fab(node_2, {
+						href: '/users/edit/+',
+						get use() {
+							return get($0);
+						},
+						color: 'primary',
+						mini: true,
+						class: 'solo-fab',
+						title: 'New User',
+						children: ($$anchor, $$slotProps) => {
+							CommonIcon($$anchor, {
+								tag: 'svg',
+								viewBox: '0 0 24 24',
+								children: ($$anchor, $$slotProps) => {
+									var path = root_1$4();
+
+									template_effect(() => set_attribute(path, 'd', mdiPlus));
+									append($$anchor, path);
+								},
+								$$slots: { default: true }
+							});
+						},
+						$$slots: { default: true }
+					});
+				}
 
 				var node_3 = sibling(node_2, 2);
 
@@ -35005,7 +35659,7 @@
 							},
 
 							set value($$value) {
-								set(entitySearch, $$value, true);
+								set(entitySearch, $$value);
 							}
 						});
 
@@ -35193,10 +35847,11 @@
 																	children: ($$anchor, $$slotProps) => {
 																		var a = root_6$4();
 																		var text_5 = child(a);
+																		action(a, ($$node) => link?.($$node));
 
 																		template_effect(
 																			($0) => {
-																				set_attribute(a, 'href', `#/users/edit/${$0 ?? ''}`);
+																				set_attribute(a, 'href', `/users/edit/${$0 ?? ''}`);
 																				set_text(text_5, get(curEntity).username);
 																			},
 																			[() => encodeURIComponent(get(curEntity).guid || '')]
@@ -35221,10 +35876,11 @@
 																	children: ($$anchor, $$slotProps) => {
 																		var a_1 = root_6$4();
 																		var text_6 = child(a_1);
+																		action(a_1, ($$node) => link?.($$node));
 
 																		template_effect(
 																			($0) => {
-																				set_attribute(a_1, 'href', `#/users/edit/${$0 ?? ''}`);
+																				set_attribute(a_1, 'href', `/users/edit/${$0 ?? ''}`);
 																				set_text(text_6, get(curEntity).name);
 																			},
 																			[() => encodeURIComponent(get(curEntity).guid || '')]
@@ -35251,10 +35907,11 @@
 																	children: ($$anchor, $$slotProps) => {
 																		var a_2 = root_6$4();
 																		var text_7 = child(a_2);
+																		action(a_2, ($$node) => link?.($$node));
 
 																		template_effect(
 																			($0) => {
-																				set_attribute(a_2, 'href', `#/users/edit/${$0 ?? ''}`);
+																				set_attribute(a_2, 'href', `/users/edit/${$0 ?? ''}`);
 																				set_text(text_7, get(curEntity).email);
 																			},
 																			[() => encodeURIComponent(get(curEntity).guid || '')]
@@ -35341,7 +35998,7 @@
 		}
 
 		append($$anchor, fragment);
-		pop();
+		pop$1();
 		$$cleanup();
 	}
 
@@ -35525,7 +36182,7 @@
 	var root$b = from_html(`<span><span><!></span></span>`);
 
 	function TabIndicator($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -35712,7 +36369,7 @@
 		action(span, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, span);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	/**
@@ -35882,7 +36539,7 @@
 	var root$a = from_html(`<span><!> <!></span> <!> <span class="mdc-tab__ripple"></span>`, 1);
 
 	function Tab($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const tabIndicatorSnippet = ($$anchor) => {
 			{
@@ -36209,7 +36866,7 @@
 
 		append($$anchor, fragment_2);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	/**
@@ -36851,7 +37508,7 @@
 	var root$9 = from_html(`<div><div><div><!></div></div></div>`);
 
 	function TabScroller($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const { matches } = ponyfill;
 
@@ -37121,7 +37778,7 @@
 		action(div, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, div);
 
-		return pop($$exports);
+		return pop$1($$exports);
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
 		 */
@@ -37576,7 +38233,7 @@
 	var root$8 = from_html(`<div><!></div>`);
 
 	function TabBar($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -37845,7 +38502,7 @@
 		action(div, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, div);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$2 = new Set([
@@ -37860,7 +38517,7 @@
 	var root$7 = from_html(`<div><!></div>`);
 
 	function InnerGrid($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -37895,7 +38552,7 @@
 		action(div, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, div);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes$1 = new Set([
@@ -37912,7 +38569,7 @@
 	var root$6 = from_html(`<div><!></div>`);
 
 	function LayoutGrid($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -37974,7 +38631,7 @@
 		action(div, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, div);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var rest_excludes = new Set([
@@ -37993,7 +38650,7 @@
 	var root$5 = from_html(`<div><!></div>`);
 
 	function Cell($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		/**
 		 * An array of Action or [Action, ActionProps] to be applied to the element.
@@ -38055,7 +38712,7 @@
 		action(div, ($$node, $$action_arg) => useActions?.($$node, $$action_arg), use);
 		append($$anchor, div);
 
-		return pop($$exports);
+		return pop$1($$exports);
 	}
 
 	var root$4 = from_html(`<section><div style="display: flex; justify-content: center; align-items: center;"><!></div></section>`);
@@ -38138,11 +38795,11 @@
 	);
 
 	function UserEdit($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
-		const $user = () => store_get($$props.user, '$user', $$stores);
+		const $user = () => store_get(user, '$user', $$stores);
 		const $entity = () => store_get(entity, '$entity', $$stores);
-		const $clientConfig = () => store_get($$props.clientConfig, '$clientConfig', $$stores);
+		const $clientConfig = () => store_get(clientConfig, '$clientConfig', $$stores);
 		const [$$stores, $$cleanup] = setup_stores();
 		let entity = writable(User.factorySync());
 		let sysAdmin = state(false);
@@ -38166,6 +38823,8 @@
 		let saving = state(false);
 		let success = state(void 0);
 		let loading = state(true);
+		const clientConfig = getContext('clientConfigStore');
+		const user = getContext('userStore');
 
 		user_effect(() => {
 			if ($$props.params) {
@@ -38521,24 +39180,21 @@
 			const newEntity = $entity().guid == null;
 
 			try {
-				if (await $entity().$save()) {
-					await readyEntity();
-					set(success, true);
-					set(passwordVerify, '');
-
-					if (newEntity) {
-						$$props.router.navigate(`/users/edit/${encodeURIComponent($entity().guid || '')}`, { historyAPIMethod: 'replaceState' });
-					}
+				await $entity().$save();
+				await readyEntity();
+				set(success, true);
+				set(passwordVerify, '');
 
-					setTimeout(
-						() => {
-							set(success, undefined);
-						},
-						1000
-					);
-				} else {
-					set(failureMessage, 'Error saving user.');
+				if (newEntity) {
+					replace(`/users/edit/${encodeURIComponent($entity().guid || '')}`);
 				}
+
+				setTimeout(
+					() => {
+						set(success, undefined);
+					},
+					1000
+				);
 			} catch(e) {
 				console.log('error:', e);
 				set(failureMessage, e?.message, true);
@@ -38554,11 +39210,8 @@
 				set(saving, true);
 
 				try {
-					if (await $entity().$delete()) {
-						$$props.router.navigate('', { historyAPIMethod: 'back' });
-					} else {
-						set(failureMessage, 'An error occurred.');
-					}
+					await $entity().$delete();
+					pop();
 				} catch(e) {
 					set(failureMessage, e?.message, true);
 				}
@@ -38607,7 +39260,7 @@
 
 				IconButton(node_2, {
 					title: 'Back',
-					onclick: () => $$props.router.navigate('', { historyAPIMethod: 'back' }),
+					onclick: () => pop(),
 					children: ($$anchor, $$slotProps) => {
 						CommonIcon($$anchor, {
 							tag: 'svg',
@@ -39114,6 +39767,7 @@
 										var fragment_30 = root_7$3();
 										var a_1 = first_child(fragment_30);
 										var text_7 = child(a_1);
+										action(a_1, ($$node) => link?.($$node));
 
 										var node_22 = sibling(a_1, 2);
 
@@ -39141,7 +39795,7 @@
 
 										template_effect(
 											($0, $1) => {
-												set_attribute(a_1, 'href', `#/groups/edit/${$0 ?? ''}`);
+												set_attribute(a_1, 'href', `/groups/edit/${$0 ?? ''}`);
 												set_text(text_7, $1);
 											},
 											[
@@ -39594,10 +40248,11 @@
 																	children: ($$anchor, $$slotProps) => {
 																		var a_2 = root_12$1();
 																		var text_21 = child(a_2);
+																		action(a_2, ($$node) => link?.($$node));
 
 																		template_effect(
 																			($0) => {
-																				set_attribute(a_2, 'href', `#/groups/edit/${$0 ?? ''}`);
+																				set_attribute(a_2, 'href', `/groups/edit/${$0 ?? ''}`);
 																				set_text(text_21, get(curEntity).groupname);
 																			},
 																			[() => encodeURIComponent(get(curEntity).guid || '')]
@@ -39622,10 +40277,11 @@
 																	children: ($$anchor, $$slotProps) => {
 																		var a_3 = root_12$1();
 																		var text_22 = child(a_3);
+																		action(a_3, ($$node) => link?.($$node));
 
 																		template_effect(
 																			($0) => {
-																				set_attribute(a_3, 'href', `#/groups/edit/${$0 ?? ''}`);
+																				set_attribute(a_3, 'href', `/groups/edit/${$0 ?? ''}`);
 																				set_text(text_22, get(curEntity).name);
 																			},
 																			[() => encodeURIComponent(get(curEntity).guid || '')]
@@ -39652,10 +40308,11 @@
 																	children: ($$anchor, $$slotProps) => {
 																		var a_4 = root_12$1();
 																		var text_23 = child(a_4);
+																		action(a_4, ($$node) => link?.($$node));
 
 																		template_effect(
 																			($0) => {
-																				set_attribute(a_4, 'href', `#/groups/edit/${$0 ?? ''}`);
+																				set_attribute(a_4, 'href', `/groups/edit/${$0 ?? ''}`);
 																				set_text(text_23, get(curEntity).email);
 																			},
 																			[() => encodeURIComponent(get(curEntity).guid || '')]
@@ -40951,7 +41608,7 @@
 		});
 
 		append($$anchor, fragment);
-		pop();
+		pop$1();
 		$$cleanup();
 	}
 
@@ -40965,13 +41622,15 @@
 	var root_7$2 = from_html(`<div class="solo-search-container solo-container"><!> <!> <!></div> <section><!> <!></section>`, 1);
 
 	function Groups($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
-		const $clientConfig = () => store_get($$props.clientConfig, '$clientConfig', $$stores);
-		const $user = () => store_get($$props.user, '$user', $$stores);
+		const $clientConfig = () => store_get(clientConfig, '$clientConfig', $$stores);
+		const $user = () => store_get(user, '$user', $$stores);
 		const [$$stores, $$cleanup] = setup_stores();
-		let entitySearch = state(proxy($$props.params.query ?? ''));
+		let entitySearch = user_derived(() => $$props.params.query ?? '');
 		let failureMessage = state(void 0);
+		const clientConfig = getContext('clientConfigStore');
+		const user = getContext('userStore');
 
 		user_effect(() => {
 			if ($$props.params) {
@@ -41008,7 +41667,7 @@
 		let entities = state(void 0);
 
 		async function searchEntities() {
-			$$props.router.navigate(`/groups/${encodeURIComponent(get(entitySearch))}`);
+			push(`/groups/${encodeURIComponent(get(entitySearch))}`);
 		}
 
 		function entitySearchKeyDown(event) {
@@ -41035,27 +41694,34 @@
 				var div_1 = first_child(fragment_1);
 				var node_2 = child(div_1);
 
-				Fab(node_2, {
-					href: '#/groups/edit/+',
-					color: 'primary',
-					mini: true,
-					class: 'solo-fab',
-					title: 'New Group',
-					children: ($$anchor, $$slotProps) => {
-						CommonIcon($$anchor, {
-							tag: 'svg',
-							viewBox: '0 0 24 24',
-							children: ($$anchor, $$slotProps) => {
-								var path = root_1$2();
+				{
+					let $0 = user_derived(() => [link]);
 
-								template_effect(() => set_attribute(path, 'd', mdiPlus));
-								append($$anchor, path);
-							},
-							$$slots: { default: true }
-						});
-					},
-					$$slots: { default: true }
-				});
+					Fab(node_2, {
+						href: '/groups/edit/+',
+						get use() {
+							return get($0);
+						},
+						color: 'primary',
+						mini: true,
+						class: 'solo-fab',
+						title: 'New Group',
+						children: ($$anchor, $$slotProps) => {
+							CommonIcon($$anchor, {
+								tag: 'svg',
+								viewBox: '0 0 24 24',
+								children: ($$anchor, $$slotProps) => {
+									var path = root_1$2();
+
+									template_effect(() => set_attribute(path, 'd', mdiPlus));
+									append($$anchor, path);
+								},
+								$$slots: { default: true }
+							});
+						},
+						$$slots: { default: true }
+					});
+				}
 
 				var node_3 = sibling(node_2, 2);
 
@@ -41090,7 +41756,7 @@
 							},
 
 							set value($$value) {
-								set(entitySearch, $$value, true);
+								set(entitySearch, $$value);
 							}
 						});
 
@@ -41278,10 +41944,11 @@
 																	children: ($$anchor, $$slotProps) => {
 																		var a = root_6$2();
 																		var text_5 = child(a);
+																		action(a, ($$node) => link?.($$node));
 
 																		template_effect(
 																			($0) => {
-																				set_attribute(a, 'href', `#/groups/edit/${$0 ?? ''}`);
+																				set_attribute(a, 'href', `/groups/edit/${$0 ?? ''}`);
 																				set_text(text_5, get(curEntity).groupname);
 																			},
 																			[() => encodeURIComponent(get(curEntity).guid || '')]
@@ -41306,10 +41973,11 @@
 																	children: ($$anchor, $$slotProps) => {
 																		var a_1 = root_6$2();
 																		var text_6 = child(a_1);
+																		action(a_1, ($$node) => link?.($$node));
 
 																		template_effect(
 																			($0) => {
-																				set_attribute(a_1, 'href', `#/groups/edit/${$0 ?? ''}`);
+																				set_attribute(a_1, 'href', `/groups/edit/${$0 ?? ''}`);
 																				set_text(text_6, get(curEntity).name);
 																			},
 																			[() => encodeURIComponent(get(curEntity).guid || '')]
@@ -41336,10 +42004,11 @@
 																	children: ($$anchor, $$slotProps) => {
 																		var a_2 = root_6$2();
 																		var text_7 = child(a_2);
+																		action(a_2, ($$node) => link?.($$node));
 
 																		template_effect(
 																			($0) => {
-																				set_attribute(a_2, 'href', `#/groups/edit/${$0 ?? ''}`);
+																				set_attribute(a_2, 'href', `/groups/edit/${$0 ?? ''}`);
 																				set_text(text_7, get(curEntity).email);
 																			},
 																			[() => encodeURIComponent(get(curEntity).guid || '')]
@@ -41426,7 +42095,7 @@
 		}
 
 		append($$anchor, fragment);
-		pop();
+		pop$1();
 		$$cleanup();
 	}
 
@@ -41448,11 +42117,11 @@
 	var root_15 = from_html(`<div style="display: flex; align-items: center; padding: 12px;"><!> <h2 style="margin: 0px 12px 0px;" class="mdc-typography--headline5"> </h2></div> <!> <!> <section><!> <!> <!> <!> <div style="margin-top: 36px;"><!> <!> <!></div></section>`, 1);
 
 	function GroupEdit($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const $entity = () => store_get(entity, '$entity', $$stores);
-		const $clientConfig = () => store_get($$props.clientConfig, '$clientConfig', $$stores);
-		const $user = () => store_get($$props.user, '$user', $$stores);
+		const $clientConfig = () => store_get(clientConfig, '$clientConfig', $$stores);
+		const $user = () => store_get(user, '$user', $$stores);
 		const [$$stores, $$cleanup] = setup_stores();
 		let entity = writable(Group.factorySync());
 		let activeTab = state('General');
@@ -41469,6 +42138,8 @@
 		let saving = state(false);
 		let success = state(void 0);
 		let loading = state(true);
+		const clientConfig = getContext('clientConfigStore');
+		const user = getContext('userStore');
 
 		user_effect(() => {
 			if ($$props.params) {
@@ -41691,23 +42362,20 @@
 			const newEntity = $entity().guid == null;
 
 			try {
-				if (await $entity().$save()) {
-					await readyEntity();
-					set(success, true);
-
-					if (newEntity) {
-						$$props.router.navigate(`/groups/edit/${encodeURIComponent($entity().guid || '')}`, { historyAPIMethod: 'replaceState' });
-					}
+				await $entity().$save();
+				await readyEntity();
+				set(success, true);
 
-					setTimeout(
-						() => {
-							set(success, undefined);
-						},
-						1000
-					);
-				} else {
-					set(failureMessage, 'Error saving group.');
+				if (newEntity) {
+					replace(`/groups/edit/${encodeURIComponent($entity().guid || '')}`);
 				}
+
+				setTimeout(
+					() => {
+						set(success, undefined);
+					},
+					1000
+				);
 			} catch(e) {
 				console.log('error:', e);
 				set(failureMessage, e?.message, true);
@@ -41723,11 +42391,8 @@
 				set(saving, true);
 
 				try {
-					if (await $entity().$delete()) {
-						$$props.router.navigate('', { historyAPIMethod: 'back' });
-					} else {
-						set(failureMessage, 'An error occurred.');
-					}
+					await $entity().$delete();
+					pop();
 				} catch(e) {
 					set(failureMessage, e?.message, true);
 				}
@@ -41756,7 +42421,7 @@
 
 				IconButton(node_2, {
 					title: 'Back',
-					onclick: () => $$props.router.navigate('', { historyAPIMethod: 'back' }),
+					onclick: () => pop(),
 					children: ($$anchor, $$slotProps) => {
 						CommonIcon($$anchor, {
 							tag: 'svg',
@@ -41787,10 +42452,11 @@
 							var div_2 = root_2$1();
 							var a = sibling(child(div_2));
 							var text_1 = child(a);
+							action(a, ($$node) => link?.($$node));
 
 							template_effect(
 								($0, $1) => {
-									set_attribute(a, 'href', `#/users/edit/${$0 ?? ''}`);
+									set_attribute(a, 'href', `/users/edit/${$0 ?? ''}`);
 									set_text(text_1, $1);
 								},
 								[
@@ -42344,6 +43010,7 @@
 										var fragment_37 = root_7$1();
 										var a_2 = first_child(fragment_37);
 										var text_11 = child(a_2);
+										action(a_2, ($$node) => link?.($$node));
 
 										var node_22 = sibling(a_2, 2);
 
@@ -42371,7 +43038,7 @@
 
 										template_effect(
 											($0, $1) => {
-												set_attribute(a_2, 'href', `#/groups/edit/${$0 ?? ''}`);
+												set_attribute(a_2, 'href', `/groups/edit/${$0 ?? ''}`);
 												set_text(text_11, $1);
 											},
 											[
@@ -42926,7 +43593,7 @@
 		}
 
 		append($$anchor, fragment);
-		pop();
+		pop$1();
 		$$cleanup();
 	}
 
@@ -42948,7 +43615,7 @@
 	var root_7 = from_html(`<!> <div class="drawer-container"><!> <!> <!></div>`, 1);
 
 	function App($$anchor, $$props) {
-		push($$props, true);
+		push$1($$props, true);
 
 		const $user = () => store_get(user, '$user', $$stores);
 		const $clientConfig = () => store_get(clientConfig, '$clientConfig', $$stores);
@@ -42965,6 +43632,9 @@
 		let tilmeldAdmin = state(void 0);
 		let accountOpen = state(false);
 
+		setContext('clientConfigStore', clientConfig);
+		setContext('userStore', user);
+
 		user_effect(() => {
 			if ($user()) {
 				$user().$gatekeeper('tilmeld/admin').then((value) => set(tilmeldAdmin, value, true));
@@ -42975,77 +43645,31 @@
 			}
 		});
 
-		const router = new Navigo('/', { hash: true });
-		let CurrentRoute = state(proxy(Intro));
-		let params = state(proxy({}));
-
-		router.hooks({
-			before(done, match) {
-				if (mainContent) {
-					set(drawerOpen, false);
-					mainContent.scrollTop = 0;
-				}
-
-				set(currentMatch, match, true);
-				done();
-			}
-		});
-
-		router.on({
-			'/': () => {
-				set(CurrentRoute, Intro, true);
-				set(params, {}, true);
-			},
-
-			'/users/edit/:guid': ({ data }) => {
-				set(CurrentRoute, UserEdit, true);
-				set(params, data, true);
-			},
-
-			'/users/': () => {
-				set(CurrentRoute, Users, true);
-				set(params, {}, true);
-			},
-
-			'/users/:query?': ({ data }) => {
-				set(CurrentRoute, Users, true);
-				set(params, data, true);
-			},
-
-			'/groups/edit/:guid': ({ data }) => {
-				set(CurrentRoute, GroupEdit, true);
-				set(params, data, true);
-			},
+		let currentRoute = state('/');
 
-			'/groups/': () => {
-				set(CurrentRoute, Groups, true);
-				set(params, {}, true);
-			},
-
-			'/groups/:query?': ({ data }) => {
-				set(CurrentRoute, Groups, true);
-				set(params, data, true);
-			}
-		});
+		const routes = {
+			'/': Intro,
+			'/users/edit/:guid': UserEdit,
+			'/users/:query?': Users,
+			'/groups/edit/:guid': GroupEdit,
+			'/groups/:query?': Groups,
+			'*': NotFound
+		};
 
-		router.notFound(({ hashString }) => {
-			if (hashString === '') {
-				router.navigate('/', { historyAPIMethod: 'replaceState' });
-			} else {
-				set(CurrentRoute, NotFound, true);
-				set(params, {}, true);
+		function onRouteLoaded(detail) {
+			if (mainContent) {
+				set(drawerOpen, false);
+				mainContent.scrollTop = 0;
 			}
-		});
 
-		let currentMatch = state(proxy(router.getCurrentLocation()));
-
-		router.resolve();
+			set(currentRoute, `${detail?.route ?? '/'}`);
+		}
 
 		const sections = [
 			{ name: 'Introduction', href: '/', absolute: true, indent: 0 },
 			{ name: 'sep1', separator: true },
-			{ name: 'Users', href: 'users/', indent: 0 },
-			{ name: 'Groups', href: 'groups/', indent: 0 }
+			{ name: 'Users', href: '/users/', indent: 0 },
+			{ name: 'Groups', href: '/groups/', indent: 0 }
 		];
 
 		const onLogin = (currentUser) => {
@@ -43343,36 +43967,41 @@
 
 													var alternate = ($$anchor) => {
 														{
-															let $0 = user_derived(() => !('href' in get(section)));
-															let $1 = user_derived(() => 'href' in get(section) ? `#${get(section).href}` : undefined);
+															let $0 = user_derived(() => [link]);
+															let $1 = user_derived(() => !('href' in get(section)));
+															let $2 = user_derived(() => 'href' in get(section) ? get(section).href : undefined);
 
-															let $2 = user_derived(() => get(section).absolute
-																? `${get(currentMatch).route.path}/` === get(section).href
-																: `${get(currentMatch).route.path}/`.startsWith(get(section).href ?? '!'));
+															let $3 = user_derived(() => get(section).absolute
+																? `${get(currentRoute)}` === get(section).href
+																: `${get(currentRoute)}/`.startsWith(get(section).href ?? '!'));
 
-															let $3 = user_derived(() => get(section).indent
+															let $4 = user_derived(() => get(section).indent
 																? 'margin-left: ' + get(section).indent * 25 + 'px;'
 																: '');
 
 															bind_this(
 																Item($$anchor, {
 																	tag: 'a',
-																	get nonInteractive() {
+																	get use() {
 																		return get($0);
 																	},
 
-																	get href() {
+																	get nonInteractive() {
 																		return get($1);
 																	},
 
-																	get activated() {
+																	get href() {
 																		return get($2);
 																	},
 
-																	get style() {
+																	get activated() {
 																		return get($3);
 																	},
 
+																	get style() {
+																		return get($4);
+																	},
+
 																	children: ($$anchor, $$slotProps) => {
 																		Text$1($$anchor, {
 																			class: 'mdc-theme--on-secondary',
@@ -43492,30 +44121,12 @@
 
 						{
 							var consequent_5 = ($$anchor) => {
-								var fragment_30 = comment();
-								var node_20 = first_child(fragment_30);
-
-								component(node_20, () => get(CurrentRoute), ($$anchor, CurrentRoute_1) => {
-									CurrentRoute_1($$anchor, {
-										get router() {
-											return router;
-										},
-
-										get params() {
-											return get(params);
-										},
-
-										get clientConfig() {
-											return clientConfig;
-										},
-
-										get user() {
-											return user;
-										}
-									});
+								Router($$anchor, {
+									get routes() {
+										return routes;
+									},
+									onRouteLoaded
 								});
-
-								append($$anchor, fragment_30);
 							};
 
 							var alternate_2 = ($$anchor) => {
@@ -43534,9 +44145,9 @@
 
 					var consequent_7 = ($$anchor) => {
 						var section_1 = root_4();
-						var node_21 = child(section_1);
+						var node_20 = child(section_1);
 
-						Login(node_21, {
+						Login(node_20, {
 							get User() {
 								return User;
 							},
@@ -43569,9 +44180,9 @@
 					});
 				}
 
-				var node_22 = sibling(node_18, 2);
+				var node_21 = sibling(node_18, 2);
 
-				Account(node_22, {
+				Account(node_21, {
 					get User() {
 						return User;
 					},
@@ -43598,7 +44209,7 @@
 			$$slots: { default: true }
 		});
 		append($$anchor, fragment);
-		pop();
+		pop$1();
 		$$cleanup();
 	}