@lwrjs/server 0.15.0-alpha.17 → 0.15.0-alpha.18
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/cjs/common/abstract-request.cjs +2 -2
- package/build/cjs/express/express-server.cjs +3 -0
- package/build/cjs/fs/fs-server.cjs +4 -1
- package/build/cjs/koa/koa-server.cjs +4 -1
- package/build/es/common/abstract-request.d.ts +1 -1
- package/build/es/common/abstract-request.js +2 -2
- package/build/es/express/express-server.js +3 -0
- package/build/es/fs/fs-server.js +4 -1
- package/build/es/index.d.ts +2 -6
- package/build/es/koa/koa-server.js +4 -1
- package/package.json +6 -6
|
@@ -120,7 +120,7 @@ var AbstractMiddlewareRequest = class {
|
|
|
120
120
|
runtimeParams
|
|
121
121
|
};
|
|
122
122
|
}
|
|
123
|
-
getCoreProxy(proxyForSSR = false) {
|
|
123
|
+
getCoreProxy(appCoreProxy, proxyForSSR = false) {
|
|
124
124
|
const origin = process.env.CORE_ORIGIN;
|
|
125
125
|
const host = process.env.CORE_HOST;
|
|
126
126
|
const servername = process.env.CORE_SERVERNAME;
|
|
@@ -128,6 +128,6 @@ var AbstractMiddlewareRequest = class {
|
|
|
128
128
|
const override = process.env.PROXY_FOR_SSR;
|
|
129
129
|
if (override === "false" || !proxyForSSR && override !== "true")
|
|
130
130
|
return void 0;
|
|
131
|
-
return origin && host && (servername || sitePath) ? {origin, host, servername, sitePath} :
|
|
131
|
+
return origin && host && (servername || sitePath) ? {origin, host, servername, sitePath} : appCoreProxy;
|
|
132
132
|
}
|
|
133
133
|
};
|
|
@@ -35,6 +35,9 @@ var ExpressInternalServer = class extends import_abstract_internal_app_server.de
|
|
|
35
35
|
constructor(options) {
|
|
36
36
|
super();
|
|
37
37
|
this.expressApp = options?.app || (0, import_express.default)();
|
|
38
|
+
if (!options?.app) {
|
|
39
|
+
this.expressApp.set("case sensitive routing", options?.caseSensitiveRoutes);
|
|
40
|
+
}
|
|
38
41
|
if (options.basePath) {
|
|
39
42
|
this.basePath = options.basePath;
|
|
40
43
|
}
|
|
@@ -60,7 +60,10 @@ var FsInternalServer = class extends import_abstract_internal_app_server.default
|
|
|
60
60
|
super();
|
|
61
61
|
this.middlewares = [];
|
|
62
62
|
this.lwrFsKoaApp = new LwrFsKoa();
|
|
63
|
-
this.koaRouter =
|
|
63
|
+
this.koaRouter = new import_router.default({
|
|
64
|
+
prefix: options.basePath ?? void 0,
|
|
65
|
+
sensitive: options.caseSensitiveRoutes
|
|
66
|
+
});
|
|
64
67
|
}
|
|
65
68
|
createHttpServer() {
|
|
66
69
|
return import_http.default.createServer();
|
|
@@ -36,7 +36,10 @@ var KoaInternalServer = class extends import_abstract_internal_app_server.defaul
|
|
|
36
36
|
constructor(options) {
|
|
37
37
|
super();
|
|
38
38
|
this.koaApp = new import_koa.default();
|
|
39
|
-
this.koaRouter =
|
|
39
|
+
this.koaRouter = new import_router.default({
|
|
40
|
+
prefix: options.basePath ?? void 0,
|
|
41
|
+
sensitive: options.caseSensitiveRoutes
|
|
42
|
+
});
|
|
40
43
|
}
|
|
41
44
|
getImpl() {
|
|
42
45
|
return this.koaApp;
|
|
@@ -22,6 +22,6 @@ export declare abstract class AbstractMiddlewareRequest implements MiddlewareReq
|
|
|
22
22
|
validateEnvironmentRequest(config: NormalizedLwrGlobalConfig): boolean;
|
|
23
23
|
validateApiVersion(config: NormalizedLwrGlobalConfig): boolean;
|
|
24
24
|
getRuntimeContext(defaultRuntimeEnvironment: RuntimeEnvironment): RuntimeContext;
|
|
25
|
-
getCoreProxy(proxyForSSR?: boolean): DirectToCoreProxy | undefined;
|
|
25
|
+
getCoreProxy(appCoreProxy?: DirectToCoreProxy, proxyForSSR?: boolean): DirectToCoreProxy | undefined;
|
|
26
26
|
}
|
|
27
27
|
//# sourceMappingURL=abstract-request.d.ts.map
|
|
@@ -101,7 +101,7 @@ export class AbstractMiddlewareRequest {
|
|
|
101
101
|
runtimeParams,
|
|
102
102
|
};
|
|
103
103
|
}
|
|
104
|
-
getCoreProxy(proxyForSSR = false) {
|
|
104
|
+
getCoreProxy(appCoreProxy, proxyForSSR = false) {
|
|
105
105
|
const origin = process.env.CORE_ORIGIN;
|
|
106
106
|
const host = process.env.CORE_HOST;
|
|
107
107
|
const servername = process.env.CORE_SERVERNAME;
|
|
@@ -116,7 +116,7 @@ export class AbstractMiddlewareRequest {
|
|
|
116
116
|
// origin and host plus one of either servername or sitePath are required to proxy to Core
|
|
117
117
|
return origin && host && (servername || sitePath)
|
|
118
118
|
? { origin, host, servername, sitePath }
|
|
119
|
-
:
|
|
119
|
+
: appCoreProxy;
|
|
120
120
|
}
|
|
121
121
|
}
|
|
122
122
|
//# sourceMappingURL=abstract-request.js.map
|
|
@@ -10,6 +10,9 @@ export default class ExpressInternalServer extends AbstractInternalAppServer {
|
|
|
10
10
|
constructor(options) {
|
|
11
11
|
super();
|
|
12
12
|
this.expressApp = options?.app || express();
|
|
13
|
+
if (!options?.app) {
|
|
14
|
+
this.expressApp.set('case sensitive routing', options?.caseSensitiveRoutes);
|
|
15
|
+
}
|
|
13
16
|
if (options.basePath) {
|
|
14
17
|
this.basePath = options.basePath;
|
|
15
18
|
}
|
package/build/es/fs/fs-server.js
CHANGED
|
@@ -34,7 +34,10 @@ export class FsInternalServer extends AbstractInternalAppServer {
|
|
|
34
34
|
super();
|
|
35
35
|
this.middlewares = [];
|
|
36
36
|
this.lwrFsKoaApp = new LwrFsKoa();
|
|
37
|
-
this.koaRouter =
|
|
37
|
+
this.koaRouter = new KoaRouter({
|
|
38
|
+
prefix: options.basePath ?? undefined,
|
|
39
|
+
sensitive: options.caseSensitiveRoutes,
|
|
40
|
+
});
|
|
38
41
|
}
|
|
39
42
|
// TODO: mock this API as is not used for now
|
|
40
43
|
createHttpServer() {
|
package/build/es/index.d.ts
CHANGED
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
import { LwrFsKoa } from './fs/fs-server.js';
|
|
2
|
-
import type { InternalAppServer, MiddlewareRequest, MiddlewareResponse,
|
|
2
|
+
import type { InternalAppServer, InternalAppServerOptions, MiddlewareRequest, MiddlewareResponse, ServerTypes } from '@lwrjs/types';
|
|
3
3
|
import type { Request, Response } from 'express';
|
|
4
|
-
|
|
5
|
-
app?: ServerTypeImpl<ServerTypes>;
|
|
6
|
-
basePath?: string;
|
|
7
|
-
};
|
|
8
|
-
declare function createInternalServer<T extends ServerTypes>(serverType?: string, options?: ServerOptions): InternalAppServer<T>;
|
|
4
|
+
declare function createInternalServer<T extends ServerTypes>(serverType?: string, options?: InternalAppServerOptions): InternalAppServer<T>;
|
|
9
5
|
declare function mockMiddlewareRequest(req: Request): MiddlewareRequest;
|
|
10
6
|
declare function mockMiddlewareResponse(res: Response): MiddlewareResponse;
|
|
11
7
|
export { createInternalServer, mockMiddlewareRequest, mockMiddlewareResponse, LwrFsKoa };
|
|
@@ -11,7 +11,10 @@ export default class KoaInternalServer extends AbstractInternalAppServer {
|
|
|
11
11
|
constructor(options) {
|
|
12
12
|
super();
|
|
13
13
|
this.koaApp = new Koa();
|
|
14
|
-
this.koaRouter =
|
|
14
|
+
this.koaRouter = new KoaRouter({
|
|
15
|
+
prefix: options.basePath ?? undefined,
|
|
16
|
+
sensitive: options.caseSensitiveRoutes,
|
|
17
|
+
});
|
|
15
18
|
}
|
|
16
19
|
getImpl() {
|
|
17
20
|
return this.koaApp;
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
7
|
-
"version": "0.15.0-alpha.
|
|
7
|
+
"version": "0.15.0-alpha.18",
|
|
8
8
|
"homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
|
|
9
9
|
"repository": {
|
|
10
10
|
"type": "git",
|
|
@@ -37,16 +37,16 @@
|
|
|
37
37
|
"build": "tsc -b"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@lwrjs/types": "0.15.0-alpha.
|
|
40
|
+
"@lwrjs/types": "0.15.0-alpha.18",
|
|
41
41
|
"@types/koa-compress": "^4.0.6",
|
|
42
42
|
"@types/koa__router": "^8.0.4",
|
|
43
43
|
"jest-express": "^1.12.0"
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
46
|
"@koa/router": "^10.0.0",
|
|
47
|
-
"@lwrjs/diagnostics": "0.15.0-alpha.
|
|
48
|
-
"@lwrjs/instrumentation": "0.15.0-alpha.
|
|
49
|
-
"@lwrjs/shared-utils": "0.15.0-alpha.
|
|
47
|
+
"@lwrjs/diagnostics": "0.15.0-alpha.18",
|
|
48
|
+
"@lwrjs/instrumentation": "0.15.0-alpha.18",
|
|
49
|
+
"@lwrjs/shared-utils": "0.15.0-alpha.18",
|
|
50
50
|
"@types/express": "^4.17.21",
|
|
51
51
|
"@types/koa": "^2.15.0",
|
|
52
52
|
"express": "^4.20.0",
|
|
@@ -56,5 +56,5 @@
|
|
|
56
56
|
"engines": {
|
|
57
57
|
"node": ">=18.0.0"
|
|
58
58
|
},
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "fefc639770948be769b1ace03b7759e7b8906cae"
|
|
60
60
|
}
|