@olenbetong/appframe-vite 1.0.2 → 1.0.5

package/lib/devServer.d.ts

@@ -1,6 +1,6 @@
 import { Application, RequestHandler, Router } from "express";
 import { ViteDevServer } from "vite";
 export declare function createProxyMiddleware(): Promise<Router>;
-export declare function createHtmlTransformer(): Promise<(html: string) => string>;
-export declare function createDevMiddleware(vite: ViteDevServer): Promise<RequestHandler>;
+export declare function createHtmlTransformer(): (html: string) => Promise<string>;
+export declare function createDevMiddleware(vite: ViteDevServer): RequestHandler;
 export declare function startDevServer(app: Application): Promise<void>;

package/lib/devServer.js

@@ -11,10 +11,16 @@ dotenv.config();
 let appPkg = await importJson("./package.json", true);
 let { appframe } = appPkg;
 let userSession = null;
-async function getUserSession(hostname, username, password) {
+async function getUserSession() {
+    var _a, _b, _c, _d;
     if (userSession) {
         return userSession;
     }
+    const hostname = (_d = (_b = (_a = appframe.proxy) === null || _a === void 0 ? void 0 : _a.hostname) !== null && _b !== void 0 ? _b : (_c = appframe.deploy) === null || _c === void 0 ? void 0 : _c.hostname) !== null && _d !== void 0 ? _d : "dev.obet.no";
+    const { APPFRAME_LOGIN: username, APPFRAME_PWD: password } = process.env;
+    if (!username || !password) {
+        throw new Error("Your Appframe credentials are not set in the environment variables. Username should be set in APPFRAME_LOGIN and password in APPFRAME_PWD.");
+    }
     let client = new Client(hostname);
     await client.login(username, password);
     let userResult = await client.afFetch("/api/system/usersession", {
@@ -55,16 +61,11 @@ export async function createProxyMiddleware() {
     });
     return router;
 }
-export async function createHtmlTransformer() {
-    var _a, _b, _c, _d, _e, _f;
-    const hostname = (_d = (_b = (_a = appframe.proxy) === null || _a === void 0 ? void 0 : _a.hostname) !== null && _b !== void 0 ? _b : (_c = appframe.deploy) === null || _c === void 0 ? void 0 : _c.hostname) !== null && _d !== void 0 ? _d : "dev.obet.no";
-    const { APPFRAME_LOGIN: username, APPFRAME_PWD: password } = process.env;
-    let isPartner = ((_f = (_e = appPkg.appframe) === null || _e === void 0 ? void 0 : _e.article) === null || _f === void 0 ? void 0 : _f.hostname) === "partner.olenbetong.no";
-    if (!username || !password) {
-        throw new Error("Your Appframe credentials are not set in the environment variables. Username should be set in APPFRAME_LOGIN and password in APPFRAME_PWD.");
-    }
-    let userSession = await getUserSession(hostname, username, password);
-    return (html) => {
+export function createHtmlTransformer() {
+    return async (html) => {
+        var _a, _b;
+        let isPartner = ((_b = (_a = appPkg.appframe) === null || _a === void 0 ? void 0 : _a.article) === null || _b === void 0 ? void 0 : _b.hostname) === "partner.olenbetong.no";
+        let userSession = await getUserSession();
         return html
             .replace("<!-- {Appframe} -->", `<script>
 af = globalThis.af ?? {};
@@ -88,14 +89,14 @@ af.userSession = ${JSON.stringify(userSession)};
       <link rel="stylesheet" href="/file/site/style/ob.es.application.min.css" />`);
     };
 }
-export async function createDevMiddleware(vite) {
-    let transformer = await createHtmlTransformer();
+export function createDevMiddleware(vite) {
     return async (req, res, next) => {
+        let transformer = createHtmlTransformer();
         const url = req.originalUrl;
         try {
             let template = await fs.readFile(path.resolve(process.cwd(), "index.html"), "utf-8");
             template = await vite.transformIndexHtml(url, template);
-            let html = transformer(template);
+            let html = await transformer(template);
             res.status(200).set({ "Content-Type": "text/html" }).end(html);
         }
         catch (error) {

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import { Plugin } from "vite";
 import { addAppframeBuildConfig } from "./build.js";
 import { createDevMiddleware, createProxyMiddleware, startDevServer } from "./devServer.js";
-export default function appframe(): Promise<Plugin>;
+export default function appframe(): Plugin;
 export { addAppframeBuildConfig };
 export { createDevMiddleware, createProxyMiddleware, startDevServer };

package/lib/index.js

@@ -1,7 +1,7 @@
 import { addAppframeBuildConfig } from "./build.js";
 import { createDevMiddleware, createHtmlTransformer, createProxyMiddleware, startDevServer } from "./devServer.js";
-export default async function appframe() {
-    let transformIndexHtml = await createHtmlTransformer();
+export default function appframe() {
+    let transformIndexHtml = createHtmlTransformer();
     return {
         name: "appframe",
         async config(_, { command }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olenbetong/appframe-vite",
-  "version": "1.0.2",
+  "version": "1.0.5",
   "description": "Tools to use and deploy Vite applications to Appframe",
   "main": "./lib/index.js",
   "type": "module",