@haibun/web-server-express 1.31.3 → 1.32.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/defs.d.ts +13 -6
- package/build/defs.js +1 -0
- package/build/defs.js.map +1 -1
- package/build/server-express.d.ts +6 -8
- package/build/server-express.js +22 -12
- package/build/server-express.js.map +1 -1
- package/build/web-server-stepper.js +2 -2
- package/build/web-server-stepper.js.map +1 -1
- package/build/web-server-stepper.test.js +1 -1
- package/build/web-server-stepper.test.js.map +1 -1
- package/package.json +4 -4
package/build/defs.d.ts
CHANGED
|
@@ -2,19 +2,26 @@ export declare const WEBSERVER = "webserver";
|
|
|
2
2
|
export declare const CHECK_LISTENER = "CHECK_LISTENER";
|
|
3
3
|
import * as express from 'express';
|
|
4
4
|
export interface IWebServer {
|
|
5
|
-
checkAddStaticFolder(subdir: string, loc: string): undefined | string;
|
|
5
|
+
checkAddStaticFolder(subdir: string, loc: string, options?: TStaticFolderOptions): undefined | string;
|
|
6
6
|
checkAddIndexFolder(subdir: string, loc: string): undefined | string;
|
|
7
7
|
addKnownStaticFolder(subdir: string, mountAt?: string): undefined | string;
|
|
8
8
|
listen(): Promise<unknown>;
|
|
9
9
|
close(): Promise<void>;
|
|
10
|
-
mounted:
|
|
11
|
-
get: object;
|
|
12
|
-
post: object;
|
|
13
|
-
};
|
|
10
|
+
mounted: TRouteMap;
|
|
14
11
|
addRoute(type: TRouteTypes, path: string, route: TRequestHandler): void;
|
|
12
|
+
addKnownRoute(type: TRouteTypes, path: string, route: TRequestHandler): void;
|
|
15
13
|
use(middleware: express.RequestHandler): void;
|
|
16
14
|
}
|
|
17
|
-
export
|
|
15
|
+
export declare const ROUTE_TYPES: readonly ["get", "post", "put", "delete", "head", "options"];
|
|
16
|
+
export type TRouteTypes = typeof ROUTE_TYPES[number];
|
|
17
|
+
export type TRouteMap = {
|
|
18
|
+
[K in TRouteTypes]: {
|
|
19
|
+
[path: string]: string;
|
|
20
|
+
};
|
|
21
|
+
};
|
|
18
22
|
export type IRequest = typeof express.request;
|
|
19
23
|
export type IResponse = typeof express.response;
|
|
20
24
|
export type TRequestHandler = (req: IRequest, res: IResponse) => void;
|
|
25
|
+
export type TStaticFolderOptions = {
|
|
26
|
+
setHeaders?: (res: any, filePath: any, stat: any) => void;
|
|
27
|
+
};
|
package/build/defs.js
CHANGED
package/build/defs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defs.js","sourceRoot":"","sources":["../src/defs.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,SAAS,GAAG,WAAW,CAAC;AACrC,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAC"}
|
|
1
|
+
{"version":3,"file":"defs.js","sourceRoot":"","sources":["../src/defs.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,SAAS,GAAG,WAAW,CAAC;AACrC,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAe/C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAU,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
import http from 'http';
|
|
3
3
|
import { RequestHandler } from 'express';
|
|
4
|
-
import { IWebServer, TRouteTypes } from './defs.js';
|
|
4
|
+
import { IWebServer, TRouteMap, TRouteTypes, TStaticFolderOptions } from './defs.js';
|
|
5
5
|
import { ILogger } from '@haibun/core/build/lib/interfaces/logger.js';
|
|
6
6
|
export declare const DEFAULT_PORT = 8123;
|
|
7
7
|
export declare class ServerExpress implements IWebServer {
|
|
@@ -9,20 +9,18 @@ export declare class ServerExpress implements IWebServer {
|
|
|
9
9
|
static listening: boolean;
|
|
10
10
|
listener?: http.Server;
|
|
11
11
|
app: import("express-serve-static-core").Express;
|
|
12
|
-
mounted:
|
|
13
|
-
get: {};
|
|
14
|
-
post: {};
|
|
15
|
-
};
|
|
12
|
+
mounted: TRouteMap;
|
|
16
13
|
base: string;
|
|
17
14
|
port: number;
|
|
18
15
|
constructor(logger: ILogger, base: string, port?: number);
|
|
19
16
|
use(middleware: RequestHandler): void;
|
|
20
17
|
listen(): Promise<unknown>;
|
|
21
18
|
addRoute(type: TRouteTypes, path: string, route: RequestHandler): void;
|
|
19
|
+
addKnownRoute(type: TRouteTypes, path: string, route: RequestHandler): void;
|
|
22
20
|
private addMounted;
|
|
23
|
-
checkAddStaticFolder(relativeFolder: string, mountAt?: string): string;
|
|
24
|
-
checkAddIndexFolder(relativeFolder: string, mountAt?: string): string;
|
|
25
|
-
addKnownStaticFolder(folder: string, mountAt?: string): string;
|
|
21
|
+
checkAddStaticFolder(relativeFolder: string, mountAt?: string, options?: TStaticFolderOptions): string;
|
|
22
|
+
checkAddIndexFolder(relativeFolder: string, mountAt?: string, options?: TStaticFolderOptions): string;
|
|
23
|
+
addKnownStaticFolder(folder: string, mountAt?: string, options?: TStaticFolderOptions): string;
|
|
26
24
|
private doAddStaticFolder;
|
|
27
25
|
checkMountBadOrMounted(type: string, loc: string, what: string): string;
|
|
28
26
|
close(): Promise<void>;
|
package/build/server-express.js
CHANGED
|
@@ -2,13 +2,15 @@ import { statSync, existsSync } from 'fs';
|
|
|
2
2
|
import express from 'express';
|
|
3
3
|
import serveIndex from 'serve-index';
|
|
4
4
|
import cookieParser from 'cookie-parser';
|
|
5
|
+
import { ROUTE_TYPES } from './defs.js';
|
|
5
6
|
export const DEFAULT_PORT = 8123;
|
|
7
|
+
const defaultMounted = () => ROUTE_TYPES.reduce((acc, type) => ({ ...acc, [type]: {} }), {});
|
|
6
8
|
export class ServerExpress {
|
|
7
9
|
logger;
|
|
8
10
|
static listening = false;
|
|
9
11
|
listener;
|
|
10
12
|
app = express();
|
|
11
|
-
mounted =
|
|
13
|
+
mounted = defaultMounted();
|
|
12
14
|
base;
|
|
13
15
|
port;
|
|
14
16
|
constructor(logger, base, port = DEFAULT_PORT) {
|
|
@@ -16,7 +18,10 @@ export class ServerExpress {
|
|
|
16
18
|
this.base = base;
|
|
17
19
|
this.port = port;
|
|
18
20
|
this.app.use(cookieParser());
|
|
19
|
-
this.app.use(express.json({ limit: '
|
|
21
|
+
this.app.use(express.json({ limit: '150mb' }));
|
|
22
|
+
this.app.use(express.urlencoded({ extended: true }));
|
|
23
|
+
this.app.use(express.text());
|
|
24
|
+
this.app.disable('x-powered-by');
|
|
20
25
|
}
|
|
21
26
|
use(middleware) {
|
|
22
27
|
this.app.use(middleware);
|
|
@@ -43,7 +48,7 @@ export class ServerExpress {
|
|
|
43
48
|
});
|
|
44
49
|
}
|
|
45
50
|
addRoute(type, path, route) {
|
|
46
|
-
if (type !== 'get' && type !== 'post') {
|
|
51
|
+
if (type !== 'get' && type !== 'post' && type !== 'put' && type !== 'delete' && type !== 'head') {
|
|
47
52
|
throw Error(`invalid route type ${type}`);
|
|
48
53
|
}
|
|
49
54
|
const bad = this.checkMountBadOrMounted('get', path, route.toString());
|
|
@@ -54,30 +59,35 @@ export class ServerExpress {
|
|
|
54
59
|
this.app[type](path, route);
|
|
55
60
|
this.addMounted(type, path, route.toString());
|
|
56
61
|
}
|
|
62
|
+
addKnownRoute(type, path, route) {
|
|
63
|
+
this.logger.log(`adding known ${type} route from ${path}`);
|
|
64
|
+
this.app[type](path, route);
|
|
65
|
+
this.addMounted(type, path, route.toString());
|
|
66
|
+
}
|
|
57
67
|
addMounted(type, path, what) {
|
|
58
68
|
this.mounted[type][path] = what;
|
|
59
69
|
}
|
|
60
70
|
// add a static folder restricted to relative paths from files
|
|
61
|
-
checkAddStaticFolder(relativeFolder, mountAt = '/') {
|
|
71
|
+
checkAddStaticFolder(relativeFolder, mountAt = '/', options) {
|
|
62
72
|
const folder = [this.base, relativeFolder].join('/');
|
|
63
|
-
return this.doAddStaticFolder(folder, mountAt);
|
|
73
|
+
return this.doAddStaticFolder(folder, mountAt, options);
|
|
64
74
|
}
|
|
65
75
|
// add a index folder restricted to relative paths from files
|
|
66
|
-
checkAddIndexFolder(relativeFolder, mountAt = '/') {
|
|
76
|
+
checkAddIndexFolder(relativeFolder, mountAt = '/', options) {
|
|
67
77
|
const folder = [this.base, relativeFolder].join('/');
|
|
68
78
|
const bad = this.checkMountBadOrMounted('get', folder, mountAt);
|
|
69
79
|
if (bad) {
|
|
70
80
|
return bad;
|
|
71
81
|
}
|
|
72
82
|
this.logger.info(`serving index from ${folder} at ${mountAt}`);
|
|
73
|
-
this.app.use(mountAt, serveIndex(folder), express.static(folder));
|
|
83
|
+
this.app.use(mountAt, serveIndex(folder), express.static(folder, options));
|
|
74
84
|
return;
|
|
75
85
|
}
|
|
76
86
|
// add a static folder at any path
|
|
77
|
-
addKnownStaticFolder(folder, mountAt = '/') {
|
|
78
|
-
return this.doAddStaticFolder(folder, mountAt);
|
|
87
|
+
addKnownStaticFolder(folder, mountAt = '/', options) {
|
|
88
|
+
return this.doAddStaticFolder(folder, mountAt, options);
|
|
79
89
|
}
|
|
80
|
-
doAddStaticFolder(folder, mountAt = '/') {
|
|
90
|
+
doAddStaticFolder(folder, mountAt = '/', options = {}) {
|
|
81
91
|
const bad = this.checkMountBadOrMounted('get', mountAt, folder);
|
|
82
92
|
if (bad) {
|
|
83
93
|
return bad;
|
|
@@ -89,7 +99,7 @@ export class ServerExpress {
|
|
|
89
99
|
if (!stat.isDirectory()) {
|
|
90
100
|
return `"${folder}" is not a directory`;
|
|
91
101
|
}
|
|
92
|
-
this.app.use(mountAt, express.static(folder));
|
|
102
|
+
this.app.use(mountAt, express.static(folder, options));
|
|
93
103
|
this.addMounted('get', mountAt, folder);
|
|
94
104
|
this.logger.info(`serving files from ${folder} at ${mountAt}`);
|
|
95
105
|
return;
|
|
@@ -107,7 +117,7 @@ export class ServerExpress {
|
|
|
107
117
|
async close() {
|
|
108
118
|
this.logger.info(`closing server ${this.port}`);
|
|
109
119
|
await this.listener?.close();
|
|
110
|
-
this.mounted =
|
|
120
|
+
this.mounted = defaultMounted();
|
|
111
121
|
ServerExpress.listening = false;
|
|
112
122
|
}
|
|
113
123
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-express.js","sourceRoot":"","sources":["../src/server-express.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"server-express.js","sourceRoot":"","sources":["../src/server-express.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ const WebServerStepper = class WebServerStepper extends AStepper {
|
|
|
44
44
|
action: async () => {
|
|
45
45
|
const webserver = getFromRuntime(this.getWorld().runtime, WEBSERVER);
|
|
46
46
|
const mounts = webserver.mounted;
|
|
47
|
-
this.getWorld().logger.info(`mounts: ${JSON.stringify(mounts)}`);
|
|
47
|
+
this.getWorld().logger.info(`mounts: ${JSON.stringify(mounts, null, 2)}`);
|
|
48
48
|
return OK;
|
|
49
49
|
},
|
|
50
50
|
},
|
|
@@ -90,7 +90,7 @@ const WebServerStepper = class WebServerStepper extends AStepper {
|
|
|
90
90
|
const ws = getFromRuntime(this.getWorld().runtime, WEBSERVER);
|
|
91
91
|
const res = ws.checkAddStaticFolder(loc, where);
|
|
92
92
|
if (res) {
|
|
93
|
-
throw Error(`failed to add static folder ${loc} at ${where}`);
|
|
93
|
+
throw Error(`failed to add static folder ${loc} at ${where}: ${res}`);
|
|
94
94
|
}
|
|
95
95
|
await this.listen();
|
|
96
96
|
return OK;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-server-stepper.js","sourceRoot":"","sources":["../src/web-server-stepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,EAAE,EAA4B,QAAQ,GAAW,MAAM,gCAAgC,CAAC;AAC9G,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AACjH,OAAO,EAAc,SAAS,GAAG,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,gDAAgD,CAAC;AAE1E,MAAM,gBAAgB,GAAG,MAAM,gBAAiB,SAAQ,QAAQ;IAC9D,SAAS,CAA4B;IAErC,OAAO,GAAG;QACR,IAAI,EAAE;YACJ,IAAI,EAAE,+BAA+B,YAAY,EAAE;YACnD,KAAK,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;SAC1C;KACF,CAAC;IAEF,KAAK,CAAC,QAAQ,CAAC,KAAa,EAAE,QAAoB;QAChD,MAAM,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACtC,uEAAuE;QACvE,MAAM,IAAI,GAAG,QAAQ,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,YAAY,CAAC;QAC1F,IAAI,CAAC,SAAS,GAAG,IAAI,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QAC3F,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC;IAChC,CAAC;IAED,KAAK,GAAG;QACN,OAAO,EAAE;YACP,IAAI,EAAE,KAAK,QAAQ,aAAa;YAChC,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,EAAU,EAAE,KAAa,EAAE,EAAE;gBACjD,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;gBAE/B,MAAM,SAAS,GAAe,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;gBACjF,MAAM,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAClD,OAAO,EAAE,CAAC;YACZ,CAAC;SACF;QACD,aAAa;QACb,WAAW,EAAE;YACX,IAAI,EAAE,wBAAwB;YAC9B,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;gBACpB,OAAO,EAAE,CAAC;YACZ,CAAC;SACF;QACD,UAAU,EAAE;YACV,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,MAAM,SAAS,GAAe,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;gBACjF,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC;gBACjC,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"web-server-stepper.js","sourceRoot":"","sources":["../src/web-server-stepper.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import WebHttp from '@haibun/web-http/build/web-http.js';
|
|
|
3
3
|
import server from './web-server-stepper.js';
|
|
4
4
|
describe('static mount', () => {
|
|
5
5
|
it('serves files', async () => {
|
|
6
|
-
const feature = { path: '/features/test.feature', content: `serve files from test\
|
|
6
|
+
const feature = { path: '/features/test.feature', content: `serve files from test\nhttp get from http://localhost:8123/testfile webpage returns content "content"` };
|
|
7
7
|
const result = await testWithDefaults([feature], [server, WebHttp]);
|
|
8
8
|
expect(result.ok).toBe(true);
|
|
9
9
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-server-stepper.test.js","sourceRoot":"","sources":["../src/web-server-stepper.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,OAAO,MAAM,oCAAoC,CAAC;AAEzD,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAE7C,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;QAC5B,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"web-server-stepper.test.js","sourceRoot":"","sources":["../src/web-server-stepper.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,OAAO,MAAM,oCAAoC,CAAC;AAEzD,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAE7C,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;QAC5B,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAE,uGAAuG,EAAE,CAAC;QACrK,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACpE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAE,0BAA0B,EAAE,CAAA;QACvF,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QAClD,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAE,gDAAgD,EAAE,CAAA;QAC7G,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAE,iDAAiD,EAAE,CAAA;QAC9G,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE;IAChC,4CAA4C;IAC5C,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;QAC9B,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAE,yKAAyK,EAAE,CAAC;QACvO,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACpE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;QAC3B,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAE,iJAAiJ,EAAE,CAAC;QAC/M,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACpE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@haibun/web-server-express",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.32.0",
|
|
5
5
|
"description": "",
|
|
6
6
|
"main": "build/web-server-stepper.js",
|
|
7
7
|
"files": [
|
|
@@ -20,14 +20,14 @@
|
|
|
20
20
|
"author": "",
|
|
21
21
|
"license": "ISC",
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@haibun/core": "1.
|
|
24
|
-
"@haibun/domain-webpage": "1.
|
|
23
|
+
"@haibun/core": "1.32.0",
|
|
24
|
+
"@haibun/domain-webpage": "1.32.0",
|
|
25
25
|
"cookie-parser": "^1.4.5",
|
|
26
26
|
"express": "^4.17.1",
|
|
27
27
|
"serve-index": "^1.9.1"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@haibun/web-http": "1.
|
|
30
|
+
"@haibun/web-http": "1.32.0",
|
|
31
31
|
"@types/cookie-parser": "^1.4.2",
|
|
32
32
|
"@types/express": "^4.17.15"
|
|
33
33
|
},
|