adminforth 2.4.0-next.45 → 2.4.0-next.47

package/commands/callTsProxy.js

@@ -3,18 +3,28 @@ import { spawn } from "child_process";
 import path from "path";
 import fs from "fs";
 import chalk from "chalk";
+import dotenv from "dotenv";
 
 const currentFilePath = import.meta.url;
 const currentFileFolder = path.dirname(currentFilePath).replace("file:", "");
 
 export function callTsProxy(tsCode, silent=false) {
 
+  const currentDirectory = process.cwd();
+  const envPath = path.resolve(currentDirectory, ".env");
+  const envLocalPath = path.resolve(currentDirectory, ".env.local");
+  if (fs.existsSync(envLocalPath)) {
+    dotenv.config({ path: envLocalPath, override: true });
+  }
+  if (fs.existsSync(envPath)) {
+    dotenv.config({ path: envPath, override: true });
+  }
+
   process.env.HEAVY_DEBUG && console.log("🌐 Calling tsproxy with code:", path.join(currentFileFolder, "proxy.ts"));
   return new Promise((resolve, reject) => {
-    const child = spawn("tsx", [
-      path.join(currentFileFolder, "proxy.ts")
-    ]);
-
+    const child = spawn("tsx", [path.join(currentFileFolder, "proxy.ts")], {
+      env: process.env,
+    });
     let stdout = "";
     let stderr = "";
 

package/commands/createApp/templates/index.ts.hbs

@@ -3,7 +3,7 @@ import AdminForth from 'adminforth';
 import usersResource from "./resources/adminuser.js";
 import { fileURLToPath } from 'url';
 import path from 'path';
-
+ 
 const ADMIN_BASE_URL = '';
 
 export const admin = new AdminForth({

package/dist/spa/src/afcl/JsonViewer.vue

@@ -5,15 +5,21 @@
     :expandDepth="expandDepth"
     copyable
     sort
+    :theme="currentTheme"
   />
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue'
 import { JsonViewer } from 'vue3-json-viewer'
+import { useCoreStore } from '@/stores/core'
 
 defineProps<{
   value: any
   expandDepth?: number
 }>()
 
+const coreStore = useCoreStore()
+
+const currentTheme = computed(() => (coreStore.theme === 'dark' ? 'dark' : 'light'))
 </script>

package/dist/spa/src/types/Back.ts

@@ -92,16 +92,16 @@ export interface IExpressHttpServer extends IHttpServer {
    * Adds adminUser to request object if user is authorized. Drops request with 401 status if user is not authorized.
    * @param callable : Function which will be called if user is authorized.
    * 
-   * Example:
    * 
+   * @example
    * ```ts
-   * expressApp.get('/myApi', authorize((req, res) => \{
+   * expressApp.get('/myApi', authorize((req, res) => {
    *  console.log('User is authorized', req.adminUser);
-   *  res.json(\{ message: 'Hello World' \});
-   * \}));
+   *  res.json({ message: 'Hello World' });
+   * }));
    * ```
    * 
-   */
+   */  
   authorize(callable: Function): void;
 }
 

package/dist/types/Back.d.ts

@@ -62,13 +62,13 @@ export interface IExpressHttpServer extends IHttpServer {
      * Adds adminUser to request object if user is authorized. Drops request with 401 status if user is not authorized.
      * @param callable : Function which will be called if user is authorized.
      *
-     * Example:
      *
+     * @example
      * ```ts
-     * expressApp.get('/myApi', authorize((req, res) => \{
+     * expressApp.get('/myApi', authorize((req, res) => {
      *  console.log('User is authorized', req.adminUser);
-     *  res.json(\{ message: 'Hello World' \});
-     * \}));
+     *  res.json({ message: 'Hello World' });
+     * }));
      * ```
      *
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "2.4.0-next.45",
+  "version": "2.4.0-next.47",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",