@digest/express 3.2.2 → 3.3.3

package/dist/app.d.ts

@@ -1,3 +1,2 @@
-import type { Router } from 'express';
-import type { ServeStaticOptions } from 'serve-static';
-export default function (staticPath?: string, baseHref?: any, compression?: boolean, production?: boolean, serveStaticOptions?: ServeStaticOptions): Router;
+declare const app: import("express-serve-static-core").Express;
+export default app;

package/dist/app.js

@@ -3,39 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const scripts_1 = __importDefault(require("@digest/scripts"));
-const express_1 = require("express");
-const express_static_gzip_1 = __importDefault(require("express-static-gzip"));
-const serve_static_1 = __importDefault(require("serve-static"));
-const router = (0, express_1.Router)();
-const defaultServeStaticOptions = {
-    cacheControl: true,
-    maxAge: 31536000,
-    setHeaders: (response, filePath) => {
-        if (filePath.includes('workbox.js')) {
-            response.setHeader('Cache-Control', 'max-age=0, no-cache, no-store, must-revalidate');
-            response.setHeader('Pragma', 'no-cache');
-            response.setHeader('Expires', '0');
-        }
-    }
-};
-function default_1(staticPath = scripts_1.default.staticPath.replace('/bundle', ''), baseHref = scripts_1.default.baseHref, compression = scripts_1.default.compression, production = scripts_1.default.production, serveStaticOptions) {
-    const options = Object.assign(Object.assign({}, defaultServeStaticOptions), serveStaticOptions);
-    if (production &&
-        compression) {
-        router.use(baseHref, (0, express_static_gzip_1.default)(staticPath, {
-            serveStatic: options
-        }));
-    }
-    else {
-        router.use(baseHref, (0, serve_static_1.default)(staticPath, options));
-    }
-    const defaultIndex = path_1.default.join(staticPath, 'index.html');
-    router.all(`${baseHref}*`, (request, response) => {
-        response.set('Cache-Control', 'public, max-age=31536000');
-        response.sendFile(defaultIndex);
-    });
-    return router;
-}
-exports.default = default_1;
+const express_1 = __importDefault(require("express"));
+const helmet_1 = __importDefault(require("helmet"));
+const routers_1 = __importDefault(require("./routers"));
+const server_1 = __importDefault(require("./server"));
+const app = (0, express_1.default)();
+app.use((0, helmet_1.default)(), routers_1.default);
+(0, server_1.default)(app);
+exports.default = app;

package/dist/routers/history.d.ts

@@ -0,0 +1,2 @@
+declare const history: (baseHref: string) => import("express-serve-static-core").Router;
+export default history;

package/dist/routers/history.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const connect_history_api_fallback_1 = __importDefault(require("connect-history-api-fallback"));
+const express_1 = require("express");
+const ACCEPT_HEADERS = [
+    'text/html',
+    'application/xhtml+xml'
+];
+const router = (0, express_1.Router)({
+    caseSensitive: true,
+    strict: true
+});
+const history = (baseHref) => {
+    const defaultIndex = path_1.default.join(baseHref, 'index.html');
+    const historyMiddleware = (0, connect_history_api_fallback_1.default)({
+        htmlAcceptHeaders: ACCEPT_HEADERS,
+        index: defaultIndex
+    });
+    const historyBase = '/*/';
+    router.get(historyBase, historyMiddleware);
+    router.head(historyBase, historyMiddleware);
+    router.get('/', historyMiddleware);
+    router.head('/', historyMiddleware);
+    return router;
+};
+exports.default = history;

package/dist/routers/index.d.ts

@@ -0,0 +1,2 @@
+declare const routers: import("express-serve-static-core").Router;
+export default routers;

package/dist/routers/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const scripts_1 = __importDefault(require("@digest/scripts"));
+const express_1 = require("express");
+const history_1 = __importDefault(require("./history"));
+const statics_1 = __importDefault(require("./statics"));
+const { baseHref, production } = scripts_1.default;
+const staticPath = scripts_1.default.staticPath.replace('/bundle', '');
+const routers = (0, express_1.Router)({
+    caseSensitive: true,
+    strict: true
+});
+const historyRouter = (0, history_1.default)(baseHref);
+const staticsRouter = (0, statics_1.default)(baseHref, staticPath.replace('/bundle', ''), production);
+routers.use(baseHref, historyRouter, staticsRouter);
+exports.default = routers;

package/dist/routers/statics.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="node" />
+import expressStatic from 'serve-static';
+declare const statics: (baseHref: string, staticPath: string, production?: boolean, serveStaticOptions?: expressStatic.ServeStaticOptions<import("http").ServerResponse> | undefined) => import("express-serve-static-core").Router;
+export default statics;

package/dist/routers/statics.js

@@ -0,0 +1,60 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const express_static_gzip_1 = __importDefault(require("express-static-gzip"));
+const serve_static_1 = __importDefault(require("serve-static"));
+const MAX_AGE = 31536000;
+const router = (0, express_1.Router)({
+    caseSensitive: true,
+    strict: true
+});
+const defaultServeStaticOptions = {
+    immutable: true,
+    index: false,
+    lastModified: false,
+    maxAge: MAX_AGE,
+    redirect: false,
+    setHeaders: (response, filePath) => {
+        if (filePath.includes('workbox.js')) {
+            response.setHeader('Cache-Control', 'max-age=0, no-cache, no-store, must-revalidate');
+            response.setHeader('Pragma', 'no-cache');
+            response.setHeader('Expires', '0');
+        }
+    }
+};
+const removeBaseHref = (middleware, baseHref) => {
+    return (request, response, next) => {
+        const fixedRequest = {
+            headers: request.headers,
+            method: request.method,
+            originalUrl: baseHref ?
+                request.originalUrl.replace(baseHref, '/') :
+                request.originalUrl,
+            path: baseHref ?
+                request.path.replace(baseHref, '/') :
+                request.path,
+            url: baseHref ?
+                request.url.replace(baseHref, '/') :
+                request.url
+        };
+        return middleware(fixedRequest, response, next);
+    };
+};
+const statics = (baseHref, staticPath, production = false, serveStaticOptions) => {
+    const options = Object.assign(Object.assign({}, defaultServeStaticOptions), serveStaticOptions);
+    const staticBase = '/*';
+    const serveStatic = removeBaseHref(production ?
+        (0, express_static_gzip_1.default)(staticPath, {
+            enableBrotli: true,
+            index: false,
+            serveStatic: options
+        }) :
+        (0, serve_static_1.default)(staticPath, options), baseHref);
+    router.get(staticBase, serveStatic);
+    router.head(staticBase, serveStatic);
+    return router;
+};
+exports.default = statics;

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@digest/express",
 	"title": "Express Digest",
 	"license": "GPL-3.0",
-	"version": "3.2.2",
+	"version": "3.3.3",
 	"description": "Digested Express configurations",
 	"author": "wallzero @wallzeroblog (http://wallzero.com)",
 	"contributors": [
@@ -12,15 +12,19 @@
 			"position": "Initial and Lead Developer"
 		}
 	],
-	"main": "dist/start.js",
-	"types": "dist/start.d.ts",
+	"main": "dist/app.js",
+	"types": "dist/app.d.ts",
 	"files": [
+		"/dist/routers/history.d.ts",
+		"/dist/routers/history.js",
+		"/dist/routers/index.d.ts",
+		"/dist/routers/index.js",
+		"/dist/routers/statics.d.ts",
+		"/dist/routers/statics.js",
 		"/dist/app.d.ts",
 		"/dist/app.js",
 		"/dist/server.d.ts",
 		"/dist/server.js",
-		"/dist/start.d.ts",
-		"/dist/start.js",
 		"/LICENSE.md"
 	],
 	"homepage": "https://gitlab.com/digested/node-digest/tree/master/packages/express",
@@ -38,11 +42,14 @@
 		"clean": "rimraf node_modules dist package-lock.json npm-debug.log"
 	},
 	"dependencies": {
-		"@digest/scripts": "^3.2.2",
+		"@digest/scripts": "^3.3.3",
+		"connect-history-api-fallback": "^1.6.0",
 		"express-static-gzip": "^2.1.1",
+		"helmet": "^4.6.0",
 		"serve-static": "^1.14.1"
 	},
 	"devDependencies": {
+		"@types/connect-history-api-fallback": "^1.3.5",
 		"@types/express": "^4.17.13",
 		"@types/serve-static": "^1.13.10"
 	},
@@ -53,5 +60,5 @@
 		"digest",
 		"express"
 	],
-	"gitHead": "e164547b71e3096174a98b06cdea523ca58c9ad1"
+	"gitHead": "c175e05f8214b698d53d7e8edefc003839361319"
 }

package/dist/start.d.ts

@@ -1,2 +0,0 @@
-declare const start: import("express-serve-static-core").Express;
-export default start;

package/dist/start.js

@@ -1,31 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const express = __importStar(require("express"));
-const app_1 = __importDefault(require("./app"));
-const server_1 = __importDefault(require("./server"));
-const start = express.default();
-start.use((0, app_1.default)());
-(0, server_1.default)(start);
-exports.default = start;