@digest/koa 3.3.1 → 3.3.2

package/dist/app.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="koa" />
-/// <reference types="koa__router" />
-import Router from '@koa/router';
-import type { Options } from 'koa-static';
-export default function (staticPath?: string, baseHref?: any, production?: boolean, serveStaticOptions?: Options): Router<import("koa").DefaultState, import("koa").DefaultContext>;
+import Koa from 'koa';
+declare const app: Koa<Koa.DefaultState, Koa.DefaultContext>;
+export default app;

package/dist/app.js

@@ -1,45 +1,13 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 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 router_1 = __importDefault(require("@koa/router"));
+const koa_1 = __importDefault(require("koa"));
 const koa_helmet_1 = __importDefault(require("koa-helmet"));
-const koa_mount_1 = __importDefault(require("koa-mount"));
-const koa_send_1 = __importDefault(require("koa-send"));
-const koa_static_1 = __importDefault(require("koa-static"));
-const MAX_AGE = 31536000;
-const router = new router_1.default();
-const defaultServeStaticOptions = {
-    maxAge: MAX_AGE,
-    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, production = scripts_1.default.production, serveStaticOptions) {
-    const options = Object.assign(Object.assign({ brotli: Boolean(production), gzip: Boolean(production) }, defaultServeStaticOptions), serveStaticOptions);
-    router.use((0, koa_helmet_1.default)());
-    router.use(baseHref, (0, koa_mount_1.default)(baseHref, (0, koa_static_1.default)(staticPath, options)));
-    router.all(`${baseHref}(.*)`, (context) => __awaiter(this, void 0, void 0, function* () {
-        yield (0, koa_send_1.default)(context, 'index.html', {
-            maxAge: MAX_AGE,
-            root: staticPath
-        });
-    }));
-    return router;
-}
-exports.default = default_1;
+const routers_1 = __importDefault(require("./routers"));
+const server_1 = __importDefault(require("./server"));
+const app = new koa_1.default();
+app.use((0, koa_helmet_1.default)()).use(routers_1.default.routes()).use(routers_1.default.allowedMethods());
+(0, server_1.default)(app);
+exports.default = app;

package/dist/middleware/history.d.ts

@@ -0,0 +1,4 @@
+import type { Options } from 'connect-history-api-fallback';
+import type { Context, Next } from 'koa';
+declare const history: (options?: Options | undefined) => (context: Context, next: Next) => Promise<void>;
+export default history;

package/dist/middleware/history.js

@@ -0,0 +1,32 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const koa_history_api_fallback_1 = __importDefault(require("koa-history-api-fallback"));
+const history = (options) => {
+    const middleware = (0, koa_history_api_fallback_1.default)(options);
+    const historyMiddleware = (context, next) => __awaiter(void 0, void 0, void 0, function* () {
+        if (context.state.history) {
+            yield next();
+        }
+        else {
+            const nextRoute = () => __awaiter(void 0, void 0, void 0, function* () {
+                context.state.history = true;
+                yield context.router.routes()(context, next);
+            });
+            yield middleware(context, nextRoute);
+        }
+    });
+    return historyMiddleware;
+};
+exports.default = history;

package/dist/routers/history.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="koa" />
+/// <reference types="koa__router" />
+import Router from '@koa/router';
+declare const history: (baseHref: string) => Router<import("koa").DefaultState, import("koa").DefaultContext>;
+export default history;

package/dist/routers/history.js

@@ -0,0 +1,28 @@
+"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 router_1 = __importDefault(require("@koa/router"));
+const history_1 = __importDefault(require("../middleware/history"));
+const ACCEPT_HEADERS = [
+    'text/html',
+    'application/xhtml+xml'
+];
+const router = new router_1.default({
+    sensitive: true,
+    strict: true
+});
+const history = (baseHref) => {
+    const defaultIndex = path_1.default.join(baseHref, 'index.html');
+    const historyMiddleware = (0, history_1.default)({
+        htmlAcceptHeaders: ACCEPT_HEADERS,
+        index: defaultIndex
+    });
+    const historyBase = '(.*)/';
+    router.get(historyBase, historyMiddleware);
+    router.head(historyBase, historyMiddleware);
+    return router;
+};
+exports.default = history;

package/dist/routers/index.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="koa" />
+/// <reference types="koa__router" />
+import Router from '@koa/router';
+declare const routers: Router<import("koa").DefaultState, import("koa").DefaultContext>;
+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 router_1 = __importDefault(require("@koa/router"));
+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 = new router_1.default({
+    sensitive: true,
+    strict: true
+});
+const historyRouter = (0, history_1.default)(baseHref);
+const staticsRouter = (0, statics_1.default)(baseHref, staticPath.replace('/bundle', ''), production);
+routers.use(baseHref, staticsRouter.routes(), staticsRouter.allowedMethods(), historyRouter.routes(), historyRouter.allowedMethods());
+exports.default = routers;

package/dist/routers/statics.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="koa" />
+/// <reference types="koa__router" />
+import Router from '@koa/router';
+import type { Options } from 'koa-static';
+declare const statics: (baseHref: string, staticPath: string, production?: boolean, serveStaticOptions?: Options | undefined) => Router<import("koa").DefaultState, import("koa").DefaultContext>;
+export default statics;

package/dist/routers/statics.js

@@ -0,0 +1,32 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const router_1 = __importDefault(require("@koa/router"));
+const koa_mount_1 = __importDefault(require("koa-mount"));
+const koa_static_1 = __importDefault(require("koa-static"));
+const MAX_AGE = 31536000;
+const router = new router_1.default({
+    sensitive: true,
+    strict: true
+});
+const defaultServeStaticOptions = {
+    maxAge: MAX_AGE,
+    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 statics = (baseHref, staticPath, production = false, serveStaticOptions) => {
+    const options = Object.assign(Object.assign({ brotli: production, defer: true, gzip: production }, defaultServeStaticOptions), serveStaticOptions);
+    const staticBase = '(.*)';
+    const serveStatic = (0, koa_static_1.default)(staticPath, options);
+    router.get(staticBase, (0, koa_mount_1.default)(baseHref, serveStatic));
+    router.head(staticBase, (0, koa_mount_1.default)(baseHref, serveStatic));
+    return router;
+};
+exports.default = statics;

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@digest/koa",
 	"title": "Koa Digest",
 	"license": "GPL-3.0",
-	"version": "3.3.1",
+	"version": "3.3.2",
 	"description": "Digested Koa configurations",
 	"author": "wallzero @wallzeroblog (http://wallzero.com)",
 	"contributors": [
@@ -12,15 +12,21 @@
 			"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/middleware/history.d.ts",
+		"/dist/middleware/history.js",
+		"/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/koa",
@@ -38,21 +44,23 @@
 		"clean": "rimraf node_modules dist package-lock.json npm-debug.log"
 	},
 	"dependencies": {
-		"@digest/scripts": "^3.3.1",
+		"@digest/scripts": "^3.3.2",
 		"@koa/router": "^10.1.1",
 		"koa": "^2.13.4",
 		"koa-helmet": "^6.1.0",
+		"koa-history-api-fallback": "^1.0.0",
 		"koa-mount": "^4.0.0",
 		"koa-send": "^5.0.1",
 		"koa-static": "^5.0.0"
 	},
 	"devDependencies": {
+		"@types/connect-history-api-fallback": "^1.3.5",
 		"@types/koa": "^2.13.4",
 		"@types/koa-helmet": "^6.0.4",
 		"@types/koa-mount": "^4.0.1",
 		"@types/koa-send": "^4.1.3",
 		"@types/koa-static": "^4.0.2",
-		"@types/koa__router": "^8.0.9"
+		"@types/koa__router": "^8.0.11"
 	},
 	"peerDependencies": {
 		"koa": "^2.13.4"
@@ -61,5 +69,5 @@
 		"digest",
 		"koa"
 	],
-	"gitHead": "98ab37eaea3ded8d0561b0cf592f5e862eabab8f"
+	"gitHead": "97df5e3e791d3bcac2eddc0d26b37b828b49e1e7"
 }

package/dist/start.d.ts

@@ -1,3 +0,0 @@
-import Koa from 'koa';
-declare const start: Koa<Koa.DefaultState, Koa.DefaultContext>;
-export default start;

package/dist/start.js

@@ -1,13 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const koa_1 = __importDefault(require("koa"));
-const app_1 = __importDefault(require("./app"));
-const server_1 = __importDefault(require("./server"));
-const start = new koa_1.default();
-const router = (0, app_1.default)();
-start.use(router.routes()).use(router.allowedMethods());
-(0, server_1.default)(start);
-exports.default = start;