@devmoods/express-extras 0.47.4 → 0.48.1

package/dist/config.d.ts

@@ -1,26 +1,8 @@
 export declare const config: {
-    extend: <T extends Record<string, unknown>>(appConfig: T) => {
-        value: {
-            CI: boolean;
-            PORT: number;
-            AUTH_TOKEN_EXPIRES_IN: number;
-            AUTH_TEMP_TOKEN_EXPIRES_IN: number;
-            AUTH_SECRET: string;
-            REDIS_URL: string;
-            POSTGRES_URL: string;
-            SENTRY_DSN: string;
-            LOG_LEVEL: string;
-            LOG_SQL: boolean;
-            NODE_ENV: string;
-            CSRF_SECRET: string;
-            READINESS_PERIOD_MS: number;
-            GRACE_PERIOD_MS: number;
-            SLACK_WEBHOOK_URL: string;
-        } & T;
-    };
     value: {
         CI: boolean;
         PORT: number;
+        PUBLIC_URL: string;
         AUTH_TOKEN_EXPIRES_IN: number;
         AUTH_TEMP_TOKEN_EXPIRES_IN: number;
         AUTH_SECRET: string;
@@ -34,5 +16,27 @@ export declare const config: {
         READINESS_PERIOD_MS: number;
         GRACE_PERIOD_MS: number;
         SLACK_WEBHOOK_URL: string;
+        VITE_USE_DEV_SERVER: boolean;
     };
 };
+export declare function extendConfig<T extends Record<string, unknown>>(appConfig: T): {
+    value: {
+        CI: boolean;
+        PORT: number;
+        PUBLIC_URL: string;
+        AUTH_TOKEN_EXPIRES_IN: number;
+        AUTH_TEMP_TOKEN_EXPIRES_IN: number;
+        AUTH_SECRET: string;
+        REDIS_URL: string;
+        POSTGRES_URL: string;
+        SENTRY_DSN: string;
+        LOG_LEVEL: string;
+        LOG_SQL: boolean;
+        NODE_ENV: string;
+        CSRF_SECRET: string;
+        READINESS_PERIOD_MS: number;
+        GRACE_PERIOD_MS: number;
+        SLACK_WEBHOOK_URL: string;
+        VITE_USE_DEV_SERVER: boolean;
+    } & T;
+};

package/dist/config.js

@@ -1,17 +1,11 @@
 import { readEnv } from './utils.js';
 function lazy(fn) {
     return { value: fn() };
-    // return {
-    //   get value() {
-    //     const value = fn();
-    //     Object.defineProperty(this, 'value', { value });
-    //     return value;
-    //   },
-    // };
 }
-const baseConfig = () => ({
+const baseConfig = {
     CI: readEnv.boolean('CI', false),
     PORT: readEnv.number('PORT', 0),
+    PUBLIC_URL: readEnv('PUBLIC_URL', ''),
     AUTH_TOKEN_EXPIRES_IN: readEnv.number('AUTH_TOKEN_EXPIRES', 3600 * 24 * 30), // 30 days
     AUTH_TEMP_TOKEN_EXPIRES_IN: readEnv.number('AUTH_TEMP_TOKEN_EXPIRES', 3600),
     AUTH_SECRET: readEnv('AUTH_JWT_SECRET', ''),
@@ -25,11 +19,9 @@ const baseConfig = () => ({
     READINESS_PERIOD_MS: readEnv.number('READINESS_PERIOD_MS', 0),
     GRACE_PERIOD_MS: readEnv.number('GRACE_PERIOD_MS', 20000),
     SLACK_WEBHOOK_URL: readEnv('SLACK_WEBHOOK_URL', ''),
-});
-export const config = {
-    ...lazy(baseConfig),
-    extend: (appConfig) => {
-        const base = config.value;
-        return lazy(() => ({ ...base, ...appConfig }));
-    },
+    VITE_USE_DEV_SERVER: readEnv.boolean('VITE_USE_DEV_SERVER', false),
 };
+export const config = lazy(() => baseConfig);
+export function extendConfig(appConfig) {
+    return lazy(() => Object.assign(baseConfig, appConfig));
+}

package/dist/vite/ssr.js

@@ -3,9 +3,9 @@ import * as path from 'node:path';
 import express, {} from 'express';
 import { createServer as createViteServer } from 'vite';
 import {} from './types.js';
+import { config } from '../config.js';
 import { route, useCspNonce } from '../middleware.js';
-import { readEnv } from '../utils.js';
-export async function createSsrMiddleware({ root = process.cwd(), getInitialData = async () => ({}), useDevServer = readEnv.boolean('VITE_USE_DEV_SERVER', false), } = {}) {
+export async function createSsrMiddleware({ root = process.cwd(), getInitialData = async () => ({}), useDevServer = config.value.VITE_USE_DEV_SERVER, } = {}) {
     const resolve = (p) => path.resolve(root, p);
     let vite;
     const middlewares = [];
@@ -27,8 +27,7 @@ export async function createSsrMiddleware({ root = process.cwd(), getInitialData
                 render = (await vite.ssrLoadModule('/src/entry-server.tsx')).render;
             }
             else {
-                // @ts-expect-error foo foo fo
-                const result = await import('../../dist/server/entry-server.js');
+                const result = await import(path.join(root, 'dist/server/entry-server.js'));
                 render = result.render;
             }
             const rendered = await render(req, res, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.47.4",
+  "version": "0.48.1",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",