@olenbetong/appframe-vite 1.0.0-alpha.0 → 1.0.2

package/lib/build.d.ts

@@ -1,8 +1,2 @@
 import { UserConfig } from "vite";
-/**
- * Node.js doesn't support JSON imports yet, so this is a simple
- * function that reads a JSON file from disk and returns the parsed
- * content.
- */
-export declare function importJson(url: string, useCwd?: boolean): Promise<any>;
 export declare function addAppframeBuildConfig(config: UserConfig): Promise<UserConfig>;

package/lib/build.js

@@ -1,16 +1,6 @@
-import { viteExternalsPlugin } from "vite-plugin-externals";
 import { visualizer } from "rollup-plugin-visualizer";
-import { readFile } from "node:fs/promises";
-/**
- * Node.js doesn't support JSON imports yet, so this is a simple
- * function that reads a JSON file from disk and returns the parsed
- * content.
- */
-export async function importJson(url, useCwd = false) {
-    let completeUrl = new URL(url, useCwd ? `file://${process.cwd()}/` : import.meta.url);
-    console.log(completeUrl);
-    return JSON.parse(await readFile(completeUrl, "utf-8"));
-}
+import { viteExternalsPlugin } from "vite-plugin-externals";
+import { importJson } from "./importJson.js";
 export async function addAppframeBuildConfig(config) {
     var _a, _b;
     let appPkg = await importJson("./package.json", true);

package/lib/devServer.d.ts

@@ -1,5 +1,6 @@
-import { Application } from "express";
+import { Application, RequestHandler, Router } from "express";
 import { ViteDevServer } from "vite";
-export declare function addProxyRoutes(app: Application): Promise<void>;
-export declare function addAppframeDevRoutes(app: Application, vite: ViteDevServer): Promise<void>;
+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 startDevServer(app: Application): Promise<void>;

package/lib/devServer.js

@@ -1,4 +1,5 @@
 import dotenv from "dotenv";
+import express from "express";
 import fs from "node:fs/promises";
 import path from "node:path";
 import open from "open";
@@ -7,7 +8,7 @@ import { Client } from "@olenbetong/data-object";
 import { importJson } from "./importJson.js";
 import { createAppframeProxy } from "./proxy.js";
 dotenv.config();
-let appPkg = await importJson("./package.json");
+let appPkg = await importJson("./package.json", true);
 let { appframe } = appPkg;
 let userSession = null;
 async function getUserSession(hostname, username, password) {
@@ -22,10 +23,11 @@ async function getUserSession(hostname, username, password) {
     userSession = await userResult.json();
     return userSession;
 }
-export async function addProxyRoutes(app) {
+export async function createProxyMiddleware() {
     var _a, _b, _c, _d, _e;
     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;
+    const router = express.Router();
     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.");
     }
@@ -49,42 +51,58 @@ export async function addProxyRoutes(app) {
         proxyRoutes.push(...appframe.proxy.routes);
     }
     proxyRoutes.forEach(route => {
-        app.use(route, proxy);
+        router.use(route, proxy);
     });
+    return router;
 }
-export async function addAppframeDevRoutes(app, vite) {
-    var _a, _b, _c, _d;
+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.");
     }
-    app.use("*", async (req, res, next) => {
-        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 userSession = await getUserSession(hostname, username, password);
-            let html = template
-                .replace("<!-- {Appframe} -->", `<script>
+    let userSession = await getUserSession(hostname, username, password);
+    return (html) => {
+        return html
+            .replace("<!-- {Appframe} -->", `<script>
 af = globalThis.af ?? {};
 af.userSession = ${JSON.stringify(userSession)};
 </script>
 <script src="/file/article/static-script/${appframe.article.id}.js"></script>`)
-                .replace(`<!-- {Theme} -->`, `<link rel="stylesheet" href="/file/site/style/ob.theme.base.less" />
+            .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" />
+          <link rel="stylesheet" href="/file/site/style/ob.theme.betongost.less" />
+          <link rel="stylesheet" href="/file/site/style/ob.theme.olenbetong.less" />
+          <link rel="stylesheet" href="/file/site/style/ob.theme.ribe.less" />
+          <link rel="stylesheet" href="/file/site/style/ob.theme.sjb.less" />
+          `
+            : `      <link rel="stylesheet" href="/file/site/style/ob.theme.base.less" />
       <link rel="stylesheet" href="/file/site/style/ob.theme.betongost.less" />
       <link rel="stylesheet" href="/file/site/style/ob.theme.forsand.less" />
       <link rel="stylesheet" href="/file/site/style/ob.theme.olenbetong.less" />
       <link rel="stylesheet" href="/file/site/style/ob.theme.ribe.less" />
       <link rel="stylesheet" href="/file/site/style/ob.theme.sjb.less" />
       <link rel="stylesheet" href="/file/site/style/ob.es.application.min.css" />`);
+    };
+}
+export async function createDevMiddleware(vite) {
+    let transformer = await createHtmlTransformer();
+    return async (req, res, next) => {
+        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);
             res.status(200).set({ "Content-Type": "text/html" }).end(html);
         }
         catch (error) {
             vite.ssrFixStacktrace(error);
             next(error);
         }
-    });
+    };
 }
 export async function startDevServer(app) {
     let port = 3000;

package/lib/index.d.ts

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

package/lib/index.js

@@ -1,2 +1,29 @@
-export * from "./build.js";
-export * from "./devServer.js";
+import { addAppframeBuildConfig } from "./build.js";
+import { createDevMiddleware, createHtmlTransformer, createProxyMiddleware, startDevServer } from "./devServer.js";
+export default async function appframe() {
+    let transformIndexHtml = await createHtmlTransformer();
+    return {
+        name: "appframe",
+        async config(_, { command }) {
+            let config = {
+                build: { target: ["chrome90", "safari14"] },
+                resolve: {
+                    alias: [{ find: "@/", replacement: "/src/" }]
+                }
+            };
+            if (command === "build") {
+                await addAppframeBuildConfig(config);
+            }
+            return config;
+        },
+        async configureServer(_server) {
+            _server.middlewares.use(await createProxyMiddleware());
+            return async () => {
+                _server.middlewares.use(await createDevMiddleware(_server));
+            };
+        },
+        transformIndexHtml
+    };
+}
+export { addAppframeBuildConfig };
+export { createDevMiddleware, createProxyMiddleware, startDevServer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olenbetong/appframe-vite",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.2",
   "description": "Tools to use and deploy Vite applications to Appframe",
   "main": "./lib/index.js",
   "type": "module",
@@ -39,4 +39,4 @@
     "open": "^8.4.0",
     "tcp-port-used": "^1.0.2"
   }
-}
+}