From 2b3e53206a73e786c08c70ea5572eb8dd950fc0f Mon Sep 17 00:00:00 2001 From: Fabian Krutsch <45216083+Krutsch@users.noreply.github.com> Date: Sat, 22 May 2021 19:09:06 +0100 Subject: [PATCH] fix async behaviour --- .gitignore | 3 ++- dist/router.js | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- src/router.ts | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 3091757..1a66cd4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules -coverage \ No newline at end of file +coverage +src/bundle.js \ No newline at end of file diff --git a/dist/router.js b/dist/router.js index 24f5251..29bc6a8 100644 --- a/dist/router.js +++ b/dist/router.js @@ -108,7 +108,7 @@ export default class Router { setReuseElements(false); const parent = route.isChildOf; if (parent.templateUrl) { - handleTemplate(parent, outletSelector); + await handleTemplate(parent, outletSelector); } else if (parent.element) { render(html `
${parent.element}
`, outletSelector, false); @@ -116,7 +116,7 @@ export default class Router { setReuseElements(true); } if (route?.templateUrl) { - handleTemplate(route, $(outletSelector).querySelector(outletSelector) ?? outletSelector); + await handleTemplate(route, $(outletSelector).querySelector(outletSelector) ?? outletSelector); } else if (route?.element) { render(html `
${route?.element}
`, $(outletSelector).querySelector(outletSelector) ?? outletSelector, false); diff --git a/package-lock.json b/package-lock.json index 6aa311e..1cf4c10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "router-dom", - "version": "2.1.0", + "version": "2.1.1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "2.1.0", + "version": "2.1.1", "license": "MIT", "dependencies": { "hydro-js": "^1.4.1", diff --git a/package.json b/package.json index 18c4a4e..cc8544f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "router-dom", - "version": "2.1.0", + "version": "2.1.1", "description": "A lightweight router for everyone", "type": "module", "main": "dist/router.js", diff --git a/src/router.ts b/src/router.ts index d86c4a8..a33b63b 100644 --- a/src/router.ts +++ b/src/router.ts @@ -134,7 +134,7 @@ export default class Router { setReuseElements(false); const parent = route.isChildOf!; if (parent.templateUrl) { - handleTemplate(parent, outletSelector); + await handleTemplate(parent, outletSelector); } else if (parent.element) { render( html`
${parent.element}
`, @@ -146,7 +146,7 @@ export default class Router { } if (route?.templateUrl) { - handleTemplate( + await handleTemplate( route, $(outletSelector)!.querySelector(outletSelector) ?? outletSelector );