@nattyjs/express 0.0.1-beta.49 → 0.0.1-beta.50

package/dist/index.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 const express = require('express');
+const path = require('node:path');
 const cors = require('cors');
 const compression = require('compression');
 const core = require('@nattyjs/core');
@@ -9,6 +10,7 @@ const common = require('@nattyjs/common');
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const express__default = /*#__PURE__*/_interopDefaultCompat(express);
+const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const cors__default = /*#__PURE__*/_interopDefaultCompat(cors);
 const compression__default = /*#__PURE__*/_interopDefaultCompat(compression);
 
@@ -83,11 +85,36 @@ function requestHandler(config) {
 const app = express__default();
 const ExpressModule = {
   init(config) {
+    const apiPrefix = `/${common.commonContainer.nattyConfig.api?.rootPath}`;
+    const staticCfg = config.static;
     app.use(compression__default());
     if (config.cors)
       app.use(cors__default(config.cors));
     app.use(express__default.json({ limit: config.payload?.limit || "1mb" }));
-    app.all("*", requestHandler(config));
+    if (staticCfg?.dir) {
+      const staticDir = path__default.resolve(staticCfg.dir);
+      app.use(
+        express__default.static(staticDir, {
+          index: false,
+          // we'll control SPA index fallback manually
+          maxAge: staticCfg.maxAge ?? "1d"
+        })
+      );
+      if (staticCfg.spaFallback !== false) {
+        app.get("*", (req, res, next) => {
+          const url = req.originalUrl || req.url;
+          if (url.startsWith(apiPrefix))
+            return next();
+          if (req.method !== "GET")
+            return next();
+          const acceptsHtml = req.headers.accept?.includes("text/html");
+          if (!acceptsHtml)
+            return next();
+          return res.sendFile(path__default.join(staticDir, staticCfg.indexFile ?? "index.html"));
+        });
+      }
+    }
+    app.use(apiPrefix, requestHandler(config));
     if (config.autoGeneratePort == true || config.autoGeneratePort == void 0)
       common.getPort().then((port) => {
         app.listen(port, () => {

package/dist/index.mjs

@@ -1,8 +1,9 @@
 import express from 'express';
+import path from 'node:path';
 import cors from 'cors';
 import compression from 'compression';
 import { HttpHandler, HttpContext } from '@nattyjs/core';
-import { GET, FrameworkType, getPort } from '@nattyjs/common';
+import { GET, FrameworkType, commonContainer, getPort } from '@nattyjs/common';
 
 async function getRequestBodyInfo(request) {
   const contentType = request.headers["content-type"];
@@ -75,11 +76,36 @@ function requestHandler(config) {
 const app = express();
 const ExpressModule = {
   init(config) {
+    const apiPrefix = `/${commonContainer.nattyConfig.api?.rootPath}`;
+    const staticCfg = config.static;
     app.use(compression());
     if (config.cors)
       app.use(cors(config.cors));
     app.use(express.json({ limit: config.payload?.limit || "1mb" }));
-    app.all("*", requestHandler(config));
+    if (staticCfg?.dir) {
+      const staticDir = path.resolve(staticCfg.dir);
+      app.use(
+        express.static(staticDir, {
+          index: false,
+          // we'll control SPA index fallback manually
+          maxAge: staticCfg.maxAge ?? "1d"
+        })
+      );
+      if (staticCfg.spaFallback !== false) {
+        app.get("*", (req, res, next) => {
+          const url = req.originalUrl || req.url;
+          if (url.startsWith(apiPrefix))
+            return next();
+          if (req.method !== "GET")
+            return next();
+          const acceptsHtml = req.headers.accept?.includes("text/html");
+          if (!acceptsHtml)
+            return next();
+          return res.sendFile(path.join(staticDir, staticCfg.indexFile ?? "index.html"));
+        });
+      }
+    }
+    app.use(apiPrefix, requestHandler(config));
     if (config.autoGeneratePort == true || config.autoGeneratePort == void 0)
       getPort().then((port) => {
         app.listen(port, () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nattyjs/express",
-  "version": "0.0.1-beta.49",
+  "version": "0.0.1-beta.50",
   "description": "",
   "keywords": [],
   "author": "ajayojha <ojhaajay@outlook.com>",
@@ -19,9 +19,9 @@
     "chokidar": "4.0.3",
     "cors": "2.8.5",
     "compression": "1.7.4",
-    "@nattyjs/core": "0.0.1-beta.49",
-    "@nattyjs/common": "0.0.1-beta.49",
-    "@nattyjs/types": "0.0.1-beta.49"
+    "@nattyjs/core": "0.0.1-beta.50",
+    "@nattyjs/common": "0.0.1-beta.50",
+    "@nattyjs/types": "0.0.1-beta.50"
   },
   "devDependencies": {
     "@types/node": "20.3.1",