adminforth 1.0.74 → 1.0.76

package/dist/modules/codeInjector.js

@@ -163,7 +163,10 @@ class CodeInjector {
                 yield Promise.all(filesUpdated.map((file) => __awaiter(this, void 0, void 0, function* () {
                     const src = path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa', file);
                     const dest = path.join(CodeInjector.SPA_TMP_PATH, file);
-                    yield fsExtra.copy(src, dest);
+                    yield fsExtra.copy(src, dest, {
+                        overwrite: true,
+                        dereference: true, // needed to dereference types
+                    });
                     if (process.env.HEAVY_DEBUG) {
                         console.log('🪲 await fsExtra.copy filtering', src, dest);
                     }

package/dist/servers/express.js

@@ -11,6 +11,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
 import CodeInjector from '../modules/codeInjector.js';
+import fetch from 'node-fetch';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 function replaceAtStart(string, substring) {
@@ -21,13 +22,9 @@ function replaceAtStart(string, substring) {
 }
 function proxyTo(url, res) {
     return __awaiter(this, void 0, void 0, function* () {
-        const r = yield fetch(url);
-        const body = yield r.text();
-        res.status(r.status);
-        r.headers.forEach((value, name) => {
-            res.setHeader(name, value);
-        });
-        res.send(body);
+        const actual = yield fetch(url);
+        actual.headers.forEach((v, n) => res.setHeader(n, v));
+        actual.body.pipe(res);
     });
 }
 function parseExpressCookie(req) {
@@ -93,11 +90,12 @@ class ExpressServer {
         const slashedPrefix = prefix.endsWith('/') ? prefix : `${prefix}/`;
         if (this.adminforth.runningHotReload) {
             const handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
-                // proxy using fetch to webpack dev server
+                // proxy using fetch to webpack dev server 
                 try {
                     yield proxyTo(`http://localhost:5173${req.url}`, res);
                 }
                 catch (e) {
+                    // console.log('Failed to proxy', e);
                     res.status(500).send(respondNoServer('AdminForth SPA is not ready yet', 'Vite is still starting up. Please wait a moment...'));
                     return;
                 }

package/dist/spa/spa/src/main.ts

@@ -9,7 +9,7 @@ import router from './router'
 const app = createApp(App)
 /* IMPORTANT:ADMINFORTH COMPONENT REGISTRATIONS */
 
-
+ 
 app.use(createPinia())
 app.use(router)
 

package/dist/spa/spa/src/views/LoginView.vue

@@ -8,10 +8,7 @@
     }: {}"
     >
 
-    {{ coreStore.config?.brandLogo }}
-    <img 
-     :src="loadFile('@@/logo2.png')" class="w-40 h-40" alt="logo" />
-   <!-- Main modal -->
+    <!-- Main modal -->
     <div id="authentication-modal" tabindex="-1" class=" overflow-y-auto overflow-x-hidden z-50 min-w-[400px] justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
         <div class="relative p-4 w-full max-w-md max-h-full">
             <!-- Modal content -->
@@ -82,13 +79,14 @@
 
 <script setup>
 
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, watchEffect } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
 import { callAdminForthApi, loadFile } from '@/utils';
 import { useRouter } from 'vue-router';
 import { initFlowbite } from 'flowbite'
 
+
 const router = useRouter();
 const inProgress = ref(false);
 

package/modules/codeInjector.ts

@@ -176,7 +176,11 @@ class CodeInjector {
       await Promise.all(filesUpdated.map(async (file) => {
         const src = path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa', file);
         const dest = path.join(CodeInjector.SPA_TMP_PATH, file);
-        await fsExtra.copy(src, dest);
+ 
+        await fsExtra.copy(src, dest, {
+          overwrite: true,
+          dereference: true, // needed to dereference types
+        });
         if (process.env.HEAVY_DEBUG) {
           console.log('🪲 await fsExtra.copy filtering', src, dest);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.0.74",
+  "version": "1.0.76",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,9 @@
     "fs-extra": "^11.2.0",
     "jsonwebtoken": "^9.0.2",
     "mongodb": "6.6",
+    "node-fetch": "^3.3.2",
     "pg": "^8.11.5",
+    "request": "^2.88.2",
     "uuid": "^9.0.1"
   },
   "devDependencies": {

package/servers/express.ts

@@ -5,6 +5,7 @@ import fs from 'fs';
 import CodeInjector from '../modules/codeInjector.js';
 import AdminForth from '../index.js';
 import { Express } from 'express';
+import fetch from 'node-fetch';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -19,13 +20,9 @@ function replaceAtStart(string, substring) {
 }
 
 async function proxyTo(url, res) {
-  const r = await fetch(url);
-  const body = await r.text();
-  res.status(r.status);
-  r.headers.forEach((value, name) => {
-    res.setHeader(name, value);
-  });
-  res.send(body);
+  const actual = await fetch(url);
+  actual.headers.forEach((v, n) => res.setHeader(n, v));
+  actual.body.pipe(res);
 }
 
 async function parseExpressCookie(req) {
@@ -99,13 +96,14 @@ class ExpressServer {
 
     if (this.adminforth.runningHotReload) {
       const handler = async (req, res) => {
-        // proxy using fetch to webpack dev server
+        // proxy using fetch to webpack dev server 
         try {
           await proxyTo(`http://localhost:5173${req.url}`, res);
         } catch (e) {
+          // console.log('Failed to proxy', e);
           res.status(500).send(respondNoServer('AdminForth SPA is not ready yet', 'Vite is still starting up. Please wait a moment...'));
           return;
-      }
+        }
       }
       this.expressApp.get(`${slashedPrefix}assets/*`, handler);
       this.expressApp.get(`${prefix}*`, handler);

package/spa/src/main.ts

@@ -9,7 +9,7 @@ import router from './router'
 const app = createApp(App)
 /* IMPORTANT:ADMINFORTH COMPONENT REGISTRATIONS */
 
-
+ 
 app.use(createPinia())
 app.use(router)
 

package/spa/src/views/LoginView.vue

@@ -8,10 +8,7 @@
     }: {}"
     >
 
-    {{ coreStore.config?.brandLogo }}
-    <img 
-     :src="loadFile('@@/logo2.png')" class="w-40 h-40" alt="logo" />
-   <!-- Main modal -->
+    <!-- Main modal -->
     <div id="authentication-modal" tabindex="-1" class=" overflow-y-auto overflow-x-hidden z-50 min-w-[400px] justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
         <div class="relative p-4 w-full max-w-md max-h-full">
             <!-- Modal content -->
@@ -82,13 +79,14 @@
 
 <script setup>
 
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, watchEffect } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
 import { callAdminForthApi, loadFile } from '@/utils';
 import { useRouter } from 'vue-router';
 import { initFlowbite } from 'flowbite'
 
+
 const router = useRouter();
 const inProgress = ref(false);