@olenbetong/appframe-vite 2.2.4 → 2.2.6

package/lib/devServer.js

@@ -19,7 +19,7 @@ async function getUserSession() {
     let client = new Client(hostname);
     await client.login(username, password);
     let userResult = await client.afFetch("/api/system/usersession", {
-        timeout: 5000
+        timeout: 5000,
     });
     userSession = await userResult.json();
     return userSession;
@@ -48,13 +48,13 @@ export function createProxyMiddleware() {
         "/exec/*",
         "/report/*",
         "/rowcount/*",
-        "/lib/*"
+        "/lib/*",
     ];
     if (appframe.proxy?.routes) {
         proxyRoutes.push(...appframe.proxy.routes);
     }
     const router = express.Router();
-    proxyRoutes.forEach(route => {
+    proxyRoutes.forEach((route) => {
         router.use(route, proxy);
     });
     return router;
@@ -64,7 +64,15 @@ export function createHtmlTransformer() {
         let isPartner = appPkg.appframe?.article?.hostname === "partner.olenbetong.no";
         let userSession = await getUserSession();
         return html
-            .replace("<!-- {Appframe} -->", `<script>
+            .replace("<!-- {Appframe} -->", `<script src="/lib/@olenbetong/appframe-core/2.0.4/dist/iife/af.common.js"></script>
+<script src="/lib/@olenbetong/appframe-data/0.3.0/dist/iife/af.data.js"></script>
+<script>
+af = globalThis.af ?? {};
+af.userSession = ${JSON.stringify(userSession)};
+</script>
+<script src="/file/article/static-script/${appframe.article.id}.js"></script>
+<script>
+var l = window.af?.common?.getLocalizedString ?? (s) => s;
 var SkipToConfig =  {
   'settings': {
     'skipTo': {
@@ -73,34 +81,27 @@ var SkipToConfig =  {
       colorTheme: 'default',
       displayOption: "popup",
       positionLeft: "0",
-      buttonLabel: af?.common?.getLocalizedString("Skip to Content") ?? "Hopp til innhold",
-      buttonTooltipAccesskey: af?.common?.getLocalizedString('Accesskey is "$key"') ?? "Tastatursnarvei er '$key'",
-      menuLabel: af?.common?.getLocalizedString('Landmarks and Headings') ?? "Landemerker og overskrifter",
-      landmarkGroupLabel: af?.common?.getLocalizedString('Landmarks') ?? "Landemerker",
-      headingGroupLabel: af?.common?.getLocalizedString('Headings') ?? "Overskrifter",
-      mofnGroupLabel: af?.common?.getLocalizedString('$m of $n') ?? "$m av $n",
-      headingLevelLabel: af?.common?.getLocalizedString('Heading level') ?? "Overskriftsnivå",
-      mainLabel: af?.common?.getLocalizedString('main') ?? "main",
-      searchLabel: af?.common?.getLocalizedString('search') ?? "søk",
-      navLabel: af?.common?.getLocalizedString('navigation') ?? "navigasjon",
-      asideLabel: af?.common?.getLocalizedString('aside') ?? "aside",
-      footerLabel: af?.common?.getLocalizedString('footer') ?? "footer",
-      headerLabel: af?.common?.getLocalizedString('header') ?? "header",
-      formLabel: af?.common?.getLocalizedString('form') ?? "skjema",
-      msgNoLandmarksFound: af?.common?.getLocalizedString('No landmarks to skip to') ?? "Ingen landemerker å hoppe til",
-      msgNoHeadingsFound: af?.common?.getLocalizedString('No main headings to skip to') ?? "Ingen overskrifter å hoppe til"
+      buttonLabel: l("Skip to Content") ?? "Hopp til innhold",
+      buttonTooltipAccesskey: l('Accesskey is "$key"') ?? "Tastatursnarvei er '$key'",
+      menuLabel: l('Landmarks and Headings') ?? "Landemerker og overskrifter",
+      landmarkGroupLabel: l('Landmarks') ?? "Landemerker",
+      headingGroupLabel: l('Headings') ?? "Overskrifter",
+      mofnGroupLabel: l('$m of $n') ?? "$m av $n",
+      headingLevelLabel: l('Heading level') ?? "Overskriftsnivå",
+      mainLabel: l('main') ?? "main",
+      searchLabel: l('search') ?? "søk",
+      navLabel: l('navigation') ?? "navigasjon",
+      asideLabel: l('aside') ?? "aside",
+      footerLabel: l('footer') ?? "footer",
+      headerLabel: l('header') ?? "header",
+      formLabel: l('form') ?? "skjema",
+      msgNoLandmarksFound: l('No landmarks to skip to') ?? "Ingen landemerker å hoppe til",
+      msgNoHeadingsFound: l('No main headings to skip to') ?? "Ingen overskrifter å hoppe til"
     }
   }
 };
 </script>
-<script src="/lib/paypal-skipto/downloads/js/skipto.min.js" async></script>
-<script src="/lib/@olenbetong/appframe-core/2.0.2/dist/iife/af.common.js"></script>
-<script src="/lib/@olenbetong/appframe-data/0.2.3/dist/iife/af.data.js"></script>
-<script>
-af = globalThis.af ?? {};
-af.userSession = ${JSON.stringify(userSession)};
-</script>
-<script src="/file/article/static-script/${appframe.article.id}.js"></script>`)
+<script src="/lib/paypal-skipto/downloads/js/skipto.min.js" async></script>`)
             .replace(`<!-- {Theme} -->`, isPartner
             ? `          <link rel="stylesheet" href="/file/site/style/ob.application.min.css" />
           <link rel="stylesheet" href="/file/site/style/ob.theme.base.less" />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olenbetong/appframe-vite",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "description": "Tools to use and deploy Vite applications to Appframe",
   "main": "./lib/index.js",
   "type": "module",
@@ -19,7 +19,7 @@
   "author": "Bjørnar Vister Hansen <bvh@olenbetong.no>",
   "license": "MIT",
   "dependencies": {
-    "@olenbetong/appframe-data": "^0.2.3",
+    "@olenbetong/appframe-data": "^0.3.0",
     "dotenv": "^16.0.1",
     "rollup-plugin-visualizer": "^5.8.0",
     "vite-plugin-externals": "^0.5.0"
@@ -39,5 +39,5 @@
     "open": "^8.4.0",
     "tcp-port-used": "^1.0.2"
   },
-  "gitHead": "e8336d87d843ac989b1d63e5910e3b8e27e3ba52"
+  "gitHead": "54a3113954ea43225436b2179f2343bb0ae37b96"
 }