Remove circular dependencies in framework.

build_number

@@ -1 +1 @@
-777
+778

frontend/framework/js/i18n.mjs

@@ -2,7 +2,6 @@
  * (C) 2018-2021 TekMonks. All rights reserved.
  * License: See enclosed LICENSE file.
  */
-import {router} from "/framework/js/router.mjs";
 import {session} from "/framework/js/session.mjs";
 
 const i18n_SESSION_KEY = "__org_monkshu_i18n_session_key__", APP_PATHS_SESSION_KEY = "__org_monkshu_i18n_app_paths";
@@ -20,8 +19,10 @@ const addPath = additionalPath => {
 	_setI18NSessionObject(i18nObject);	/* need to recache */
 }
 
-const getRendered = async (key, data, language=getSessionLang(), refresh=false) => (await router.getMustache()).render(
-	await get(key, language, refresh), data);
+const getRendered = async (key, data, language=getSessionLang(), refresh=false) => {
+	const {router} = await import("/framework/js/router.mjs");
+	return (await router.getMustache()).render(await get(key, language, refresh), data); 
+}
 
 async function get(key, language=getSessionLang(), refresh=false) {
 	try {

frontend/framework/js/pwasupport.mjs

@@ -4,7 +4,6 @@
  * License: See enclosed LICENSE file.
  */
 import {util} from "./util.mjs";
-import {router} from "./router.mjs";
 import {blackboard} from "/framework/js/blackboard.mjs";
 
 const FRAMEWORK_FILELIST = `/framework/${$$.MONKSHU_CONSTANTS.CACHELIST_SUFFIX}`, 
@@ -125,6 +124,7 @@ async function _versionChecker(appName, manifestOld, manifestNew, listOfFilesToC
         serviceWorker.postMessage({id: $$.MONKSHU_CONSTANTS.CACHEWORKER_MSG, op: "unserveAllVersionsExcept", 
             appName, except_version: manifestNew.version});
 
+        const {router} = await import("/framework/js/router.mjs");
         if (postSwitchActions.length) for (const action of postSwitchActions) action();
         else setTimeout(router.hardreload, PAGE_RELOAD_ON_UPGRADE_INTERVAL);    // else hard reload in 0.5 seconds - this gives time to the service worker to switch cache and request handlers
     });