@lwrjs/core 0.4.2 → 0.4.6
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/context/global-data.cjs +2 -5
- package/build/cjs/context/hooks.cjs +3 -6
- package/build/cjs/context/services.cjs +4 -7
- package/build/cjs/env-config.cjs +21 -24
- package/build/cjs/index.cjs +19 -22
- package/build/cjs/lwr-app-observer.cjs +2 -5
- package/build/cjs/middlewares/api-middleware.cjs +47 -45
- package/build/cjs/middlewares/base-middleware.cjs +1 -1
- package/build/cjs/middlewares/hmr-middleware.cjs +5 -8
- package/build/cjs/middlewares/locale-middleware.cjs +1 -1
- package/build/cjs/middlewares/ui-middleware.cjs +5 -8
- package/build/cjs/middlewares/utils.cjs +4 -7
- package/build/cjs/tools/server-warmup.cjs +2 -5
- package/build/cjs/tools/static-generation.cjs +20 -23
- package/build/cjs/tools/types.cjs +5 -0
- package/build/cjs/tools/utils/dir.cjs +3 -6
- package/build/cjs/tools/utils/network-dispatcher.cjs +2 -5
- package/build/cjs/tools/utils/stream.cjs +2 -5
- package/build/cjs/validation/app-config-context.cjs +7 -10
- package/build/cjs/validation/app-config.cjs +52 -55
- package/build/cjs/validation/helpers.cjs +1 -1
- package/build/es/index.js +3 -3
- package/build/es/middlewares/api-middleware.js +20 -15
- package/package.json +24 -25
|
@@ -6,12 +6,10 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
|
6
6
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
7
7
|
var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
|
|
8
8
|
var __export = (target, all) => {
|
|
9
|
-
__markAsModule(target);
|
|
10
9
|
for (var name in all)
|
|
11
10
|
__defProp(target, name, {get: all[name], enumerable: true});
|
|
12
11
|
};
|
|
13
12
|
var __exportStar = (target, module2, desc) => {
|
|
14
|
-
__markAsModule(target);
|
|
15
13
|
if (module2 && typeof module2 === "object" || typeof module2 === "function") {
|
|
16
14
|
for (let key of __getOwnPropNames(module2))
|
|
17
15
|
if (!__hasOwnProp.call(target, key) && key !== "default")
|
|
@@ -20,12 +18,11 @@ var __exportStar = (target, module2, desc) => {
|
|
|
20
18
|
return target;
|
|
21
19
|
};
|
|
22
20
|
var __toModule = (module2) => {
|
|
23
|
-
|
|
24
|
-
return module2;
|
|
25
|
-
return __exportStar(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", {value: module2, enumerable: true}), module2);
|
|
21
|
+
return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
|
|
26
22
|
};
|
|
27
23
|
|
|
28
24
|
// packages/@lwrjs/core/src/validation/app-config.ts
|
|
25
|
+
__markAsModule(exports);
|
|
29
26
|
__export(exports, {
|
|
30
27
|
SOURCE_BY_PHASE: () => SOURCE_BY_PHASE,
|
|
31
28
|
validateLwrAppConfig: () => validateLwrAppConfig
|
|
@@ -43,11 +40,11 @@ function validateBootstrap(node, validationContext, propPrefix) {
|
|
|
43
40
|
if (node) {
|
|
44
41
|
validationContext.assertIsObject(node, "bootstrap");
|
|
45
42
|
validationContext.assertValidKeys(node, "bootstrap", import_app_config_context.BOOTSTRAP_ATTRIBUTE_KEYS);
|
|
46
|
-
validationContext.assertArrayOfSpecifiers(import_jsonc_parser.findNodeAtLocation(node, ["services"]), `${propPrefix}.services`);
|
|
47
|
-
validationContext.assertIsBoolean(import_jsonc_parser.findNodeAtLocation(node, ["autoBoot"]), `${propPrefix}.autoBoot`);
|
|
48
|
-
validationContext.assertIsBoolean(import_jsonc_parser.findNodeAtLocation(node, ["configAsSrc"]), `${propPrefix}.configAsSrc`);
|
|
49
|
-
validationContext.assertIsBoolean(import_jsonc_parser.findNodeAtLocation(node, ["syntheticShadow"]), `${propPrefix}.syntheticShadow`);
|
|
50
|
-
const workers = import_jsonc_parser.findNodeAtLocation(node, ["workers"]);
|
|
43
|
+
validationContext.assertArrayOfSpecifiers((0, import_jsonc_parser.findNodeAtLocation)(node, ["services"]), `${propPrefix}.services`);
|
|
44
|
+
validationContext.assertIsBoolean((0, import_jsonc_parser.findNodeAtLocation)(node, ["autoBoot"]), `${propPrefix}.autoBoot`);
|
|
45
|
+
validationContext.assertIsBoolean((0, import_jsonc_parser.findNodeAtLocation)(node, ["configAsSrc"]), `${propPrefix}.configAsSrc`);
|
|
46
|
+
validationContext.assertIsBoolean((0, import_jsonc_parser.findNodeAtLocation)(node, ["syntheticShadow"]), `${propPrefix}.syntheticShadow`);
|
|
47
|
+
const workers = (0, import_jsonc_parser.findNodeAtLocation)(node, ["workers"]);
|
|
51
48
|
if (workers && workers.children) {
|
|
52
49
|
workers.children.forEach((w, index) => {
|
|
53
50
|
if (w.children && w.children.length > 1) {
|
|
@@ -63,12 +60,12 @@ function validateRouteCommon(node, validationContext, propPrefix) {
|
|
|
63
60
|
"contentTemplate",
|
|
64
61
|
"routeHandler"
|
|
65
62
|
]);
|
|
66
|
-
validationContext.assertNotEmptyString(import_jsonc_parser.findNodeAtLocation(node, ["id"]), `${propPrefix}.id`);
|
|
67
|
-
validationContext.assertIsSpecifier(import_jsonc_parser.findNodeAtLocation(node, ["rootComponent"]), `${propPrefix}.rootComponent`);
|
|
68
|
-
validationContext.assertNotEmptyString(import_jsonc_parser.findNodeAtLocation(node, ["contentTemplate"]), `${propPrefix}.contentTemplate`);
|
|
69
|
-
validationContext.assertNotEmptyString(import_jsonc_parser.findNodeAtLocation(node, ["layoutTemplate"]), `${propPrefix}.layoutTemplate`);
|
|
70
|
-
validationContext.assertNotEmptyString(import_jsonc_parser.findNodeAtLocation(node, ["routeHandler"]), `${propPrefix}.routeHandler`);
|
|
71
|
-
validateBootstrap(import_jsonc_parser.findNodeAtLocation(node, ["bootstrap"]), validationContext, `${propPrefix}.bootstrap`);
|
|
63
|
+
validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["id"]), `${propPrefix}.id`);
|
|
64
|
+
validationContext.assertIsSpecifier((0, import_jsonc_parser.findNodeAtLocation)(node, ["rootComponent"]), `${propPrefix}.rootComponent`);
|
|
65
|
+
validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["contentTemplate"]), `${propPrefix}.contentTemplate`);
|
|
66
|
+
validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["layoutTemplate"]), `${propPrefix}.layoutTemplate`);
|
|
67
|
+
validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["routeHandler"]), `${propPrefix}.routeHandler`);
|
|
68
|
+
validateBootstrap((0, import_jsonc_parser.findNodeAtLocation)(node, ["bootstrap"]), validationContext, `${propPrefix}.bootstrap`);
|
|
72
69
|
}
|
|
73
70
|
function validateRoutes(node, validationContext) {
|
|
74
71
|
if (node) {
|
|
@@ -79,8 +76,8 @@ function validateRoutes(node, validationContext) {
|
|
|
79
76
|
validationContext.assertIsObject(n, "routes");
|
|
80
77
|
validationContext.assertValidKeys(n, "routes", import_app_config_context.ROUTE_ATTRIBUTE_KEYS);
|
|
81
78
|
validationContext.assertRequiredKeys(n, propPrefix, ["id", "path"]);
|
|
82
|
-
validationContext.assertIsPath(import_jsonc_parser.findNodeAtLocation(n, ["path"]), `${propPrefix}.path`);
|
|
83
|
-
validationContext.assertIsMethod(import_jsonc_parser.findNodeAtLocation(n, ["method"]), `${propPrefix}.method`);
|
|
79
|
+
validationContext.assertIsPath((0, import_jsonc_parser.findNodeAtLocation)(n, ["path"]), `${propPrefix}.path`);
|
|
80
|
+
validationContext.assertIsMethod((0, import_jsonc_parser.findNodeAtLocation)(n, ["method"]), `${propPrefix}.method`);
|
|
84
81
|
validateRouteCommon(n, validationContext, propPrefix);
|
|
85
82
|
});
|
|
86
83
|
}
|
|
@@ -95,7 +92,7 @@ function validateErrorRoutes(node, validationContext) {
|
|
|
95
92
|
validationContext.assertIsObject(n, "errorRoutes");
|
|
96
93
|
validationContext.assertValidKeys(n, "errorRoutes", import_app_config_context.ERROR_ROUTE_ATTRIBUTE_KEYS);
|
|
97
94
|
validationContext.assertRequiredKeys(n, propPrefix, ["id", "status"]);
|
|
98
|
-
validationContext.assertIsStatus(import_jsonc_parser.findNodeAtLocation(n, ["status"]), `${propPrefix}.status`);
|
|
95
|
+
validationContext.assertIsStatus((0, import_jsonc_parser.findNodeAtLocation)(n, ["status"]), `${propPrefix}.status`);
|
|
99
96
|
validateRouteCommon(n, validationContext, propPrefix);
|
|
100
97
|
});
|
|
101
98
|
}
|
|
@@ -109,8 +106,8 @@ function validateAssets(node, validationContext, preMerge) {
|
|
|
109
106
|
validationContext.assertNotEmptyArray(node, "assets");
|
|
110
107
|
if (node.children) {
|
|
111
108
|
node.children.forEach((n, index) => {
|
|
112
|
-
const dirNode = import_jsonc_parser.findNodeAtLocation(n, ["dir"]);
|
|
113
|
-
const fileNode = import_jsonc_parser.findNodeAtLocation(n, ["file"]);
|
|
109
|
+
const dirNode = (0, import_jsonc_parser.findNodeAtLocation)(n, ["dir"]);
|
|
110
|
+
const fileNode = (0, import_jsonc_parser.findNodeAtLocation)(n, ["file"]);
|
|
114
111
|
if (dirNode?.type === "string") {
|
|
115
112
|
validationContext.assertIsObject(n, "assetDir");
|
|
116
113
|
validationContext.assertValidKeys(n, "assetDir", import_app_config_context.ASSET_DIR_ATTRIBUTE_KEYS);
|
|
@@ -122,8 +119,8 @@ function validateAssets(node, validationContext, preMerge) {
|
|
|
122
119
|
validationContext.assertHasOnlyOne(n, `assets[${index}]`, ["dir", "file"]);
|
|
123
120
|
validationContext.assertNotEmptyString(dirNode, `assets[${index}].dir`);
|
|
124
121
|
validationContext.assertNotEmptyString(fileNode, `assets[${index}].file`);
|
|
125
|
-
validationContext.assertIsPath(import_jsonc_parser.findNodeAtLocation(n, ["urlPath"]), `assets[${index}].urlPath`);
|
|
126
|
-
validationContext.assertNotEmptyString(import_jsonc_parser.findNodeAtLocation(n, ["alias"]), `assets[${index}].alias`);
|
|
122
|
+
validationContext.assertIsPath((0, import_jsonc_parser.findNodeAtLocation)(n, ["urlPath"]), `assets[${index}].urlPath`);
|
|
123
|
+
validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(n, ["alias"]), `assets[${index}].alias`);
|
|
127
124
|
});
|
|
128
125
|
}
|
|
129
126
|
}
|
|
@@ -134,52 +131,52 @@ function validateLocker(node, validationContext) {
|
|
|
134
131
|
validationContext.assertIsObject(node, "locker");
|
|
135
132
|
validationContext.assertValidKeys(node, "locker", import_app_config_context.LOCKER_ATTRIBUTE_KEYS);
|
|
136
133
|
validationContext.assertRequiredKeys(node, "locker", ["enabled"]);
|
|
137
|
-
validationContext.assertIsBoolean(import_jsonc_parser.findNodeAtLocation(node, ["enabled"]), "locker.enabled");
|
|
138
|
-
validationContext.assertArrayOfStrings(import_jsonc_parser.findNodeAtLocation(node, ["trustedComponents"]), "locker.trustedComponents");
|
|
134
|
+
validationContext.assertIsBoolean((0, import_jsonc_parser.findNodeAtLocation)(node, ["enabled"]), "locker.enabled");
|
|
135
|
+
validationContext.assertArrayOfStrings((0, import_jsonc_parser.findNodeAtLocation)(node, ["trustedComponents"]), "locker.trustedComponents");
|
|
139
136
|
}
|
|
140
137
|
}
|
|
141
138
|
function validateRoot(node, validationContext, preMerge) {
|
|
142
139
|
validationContext.assertIsObject(node, "root");
|
|
143
140
|
validationContext.assertValidKeys(node, "root", import_app_config_context.ROOT_ATTRIBUTE_KEYS);
|
|
144
141
|
!preMerge && validationContext.assertRequiredKeys(node, "root", import_app_config_context.ROOT_ATTRIBUTE_KEYS);
|
|
145
|
-
const routes = import_jsonc_parser.findNodeAtLocation(node, ["routes"]);
|
|
146
|
-
const errorRoutes = import_jsonc_parser.findNodeAtLocation(node, ["errorRoutes"]);
|
|
142
|
+
const routes = (0, import_jsonc_parser.findNodeAtLocation)(node, ["routes"]);
|
|
143
|
+
const errorRoutes = (0, import_jsonc_parser.findNodeAtLocation)(node, ["errorRoutes"]);
|
|
147
144
|
validationContext.assertUniqueIds([...routes?.children || [], ...errorRoutes?.children || []], "routes");
|
|
148
145
|
validateRoutes(routes, validationContext);
|
|
149
146
|
validateErrorRoutes(errorRoutes, validationContext);
|
|
150
|
-
validateAssets(import_jsonc_parser.findNodeAtLocation(node, ["assets"]), validationContext, preMerge);
|
|
151
|
-
validateLocker(import_jsonc_parser.findNodeAtLocation(node, ["locker"]), validationContext);
|
|
152
|
-
validationContext.assertNotEmptyString(import_jsonc_parser.findNodeAtLocation(node, ["apiVersion"]), "apiVersion");
|
|
153
|
-
validationContext.assertNotEmptyString(import_jsonc_parser.findNodeAtLocation(node, ["lwrVersion"]), "lwrVersion");
|
|
154
|
-
validationContext.assertIsSpecifier(import_jsonc_parser.findNodeAtLocation(node, ["amdLoader"]), "amdLoader");
|
|
155
|
-
validationContext.assertIsSpecifier(import_jsonc_parser.findNodeAtLocation(node, ["esmLoader"]), "esmLoader");
|
|
156
|
-
validationContext.assertIsPort(import_jsonc_parser.findNodeAtLocation(node, ["port"]), "port");
|
|
157
|
-
validationContext.assertNotEmptyString(import_jsonc_parser.findNodeAtLocation(node, ["serverMode"]), "serverMode");
|
|
158
|
-
validationContext.assertIsServerType(import_jsonc_parser.findNodeAtLocation(node, ["serverType"]), "serverType");
|
|
159
|
-
validationContext.assertIsStaticSiteGenerator(import_jsonc_parser.findNodeAtLocation(node, ["staticSiteGenerator"]), "staticSiteGenerator");
|
|
160
|
-
validationContext.assertNotEmptyString(import_jsonc_parser.findNodeAtLocation(node, ["rootDir"]), "rootDir");
|
|
161
|
-
validationContext.assertNotEmptyString(import_jsonc_parser.findNodeAtLocation(node, ["cacheDir"]), "cacheDir");
|
|
162
|
-
validationContext.assertNotEmptyString(import_jsonc_parser.findNodeAtLocation(node, ["contentDir"]), "contentDir");
|
|
163
|
-
validationContext.assertNotEmptyString(import_jsonc_parser.findNodeAtLocation(node, ["layoutsDir"]), "layoutsDir");
|
|
164
|
-
validationContext.assertNotEmptyString(import_jsonc_parser.findNodeAtLocation(node, ["globalDataDir"]), "globalDataDir");
|
|
165
|
-
validationContext.assertArrayOfServices(import_jsonc_parser.findNodeAtLocation(node, ["hooks"]), "hooks");
|
|
166
|
-
validationContext.assertNotEmptyString(import_jsonc_parser.findNodeAtLocation(node, ["templateEngine"]), "templateEngine");
|
|
167
|
-
validationContext.assertArrayOfServices(import_jsonc_parser.findNodeAtLocation(node, ["moduleProviders"]), "moduleProviders");
|
|
168
|
-
validationContext.assertArrayOfServices(import_jsonc_parser.findNodeAtLocation(node, ["viewProviders"]), "viewProviders");
|
|
169
|
-
validationContext.assertArrayOfServices(import_jsonc_parser.findNodeAtLocation(node, ["resourceProviders"]), "resourceProviders");
|
|
170
|
-
validationContext.assertArrayOfServices(import_jsonc_parser.findNodeAtLocation(node, ["assetProviders"]), "assetProviders");
|
|
171
|
-
validationContext.assertNotEmptyArray(import_jsonc_parser.findNodeAtLocation(node, ["lwc", "modules"]), "lwc.modules");
|
|
172
|
-
validationContext.assertIsEnvironment(import_jsonc_parser.findNodeAtLocation(node, ["environment"]), "environment");
|
|
147
|
+
validateAssets((0, import_jsonc_parser.findNodeAtLocation)(node, ["assets"]), validationContext, preMerge);
|
|
148
|
+
validateLocker((0, import_jsonc_parser.findNodeAtLocation)(node, ["locker"]), validationContext);
|
|
149
|
+
validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["apiVersion"]), "apiVersion");
|
|
150
|
+
validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["lwrVersion"]), "lwrVersion");
|
|
151
|
+
validationContext.assertIsSpecifier((0, import_jsonc_parser.findNodeAtLocation)(node, ["amdLoader"]), "amdLoader");
|
|
152
|
+
validationContext.assertIsSpecifier((0, import_jsonc_parser.findNodeAtLocation)(node, ["esmLoader"]), "esmLoader");
|
|
153
|
+
validationContext.assertIsPort((0, import_jsonc_parser.findNodeAtLocation)(node, ["port"]), "port");
|
|
154
|
+
validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["serverMode"]), "serverMode");
|
|
155
|
+
validationContext.assertIsServerType((0, import_jsonc_parser.findNodeAtLocation)(node, ["serverType"]), "serverType");
|
|
156
|
+
validationContext.assertIsStaticSiteGenerator((0, import_jsonc_parser.findNodeAtLocation)(node, ["staticSiteGenerator"]), "staticSiteGenerator");
|
|
157
|
+
validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["rootDir"]), "rootDir");
|
|
158
|
+
validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["cacheDir"]), "cacheDir");
|
|
159
|
+
validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["contentDir"]), "contentDir");
|
|
160
|
+
validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["layoutsDir"]), "layoutsDir");
|
|
161
|
+
validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["globalDataDir"]), "globalDataDir");
|
|
162
|
+
validationContext.assertArrayOfServices((0, import_jsonc_parser.findNodeAtLocation)(node, ["hooks"]), "hooks");
|
|
163
|
+
validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["templateEngine"]), "templateEngine");
|
|
164
|
+
validationContext.assertArrayOfServices((0, import_jsonc_parser.findNodeAtLocation)(node, ["moduleProviders"]), "moduleProviders");
|
|
165
|
+
validationContext.assertArrayOfServices((0, import_jsonc_parser.findNodeAtLocation)(node, ["viewProviders"]), "viewProviders");
|
|
166
|
+
validationContext.assertArrayOfServices((0, import_jsonc_parser.findNodeAtLocation)(node, ["resourceProviders"]), "resourceProviders");
|
|
167
|
+
validationContext.assertArrayOfServices((0, import_jsonc_parser.findNodeAtLocation)(node, ["assetProviders"]), "assetProviders");
|
|
168
|
+
validationContext.assertNotEmptyArray((0, import_jsonc_parser.findNodeAtLocation)(node, ["lwc", "modules"]), "lwc.modules");
|
|
169
|
+
validationContext.assertIsEnvironment((0, import_jsonc_parser.findNodeAtLocation)(node, ["environment"]), "environment");
|
|
173
170
|
}
|
|
174
171
|
function validateLwrAppConfig(jsonSourceText, phase) {
|
|
175
172
|
const errors = [];
|
|
176
173
|
const preMerge = phase !== "post";
|
|
177
|
-
const rootNode = import_jsonc_parser.parseTree(jsonSourceText, errors);
|
|
174
|
+
const rootNode = (0, import_jsonc_parser.parseTree)(jsonSourceText, errors);
|
|
178
175
|
if (errors.length) {
|
|
179
176
|
const {error, length, offset} = errors[0];
|
|
180
|
-
const message = import_jsonc_parser.printParseErrorCode(error);
|
|
181
|
-
const sourceLocation = import_helpers.calculatePositionFromSource(jsonSourceText, {length, offset});
|
|
182
|
-
throw import_diagnostics.createSingleDiagnosticError({
|
|
177
|
+
const message = (0, import_jsonc_parser.printParseErrorCode)(error);
|
|
178
|
+
const sourceLocation = (0, import_helpers.calculatePositionFromSource)(jsonSourceText, {length, offset});
|
|
179
|
+
throw (0, import_diagnostics.createSingleDiagnosticError)({
|
|
183
180
|
location: sourceLocation,
|
|
184
181
|
description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_JSON(message)
|
|
185
182
|
}, import_diagnostics.LwrConfigValidationError);
|
|
@@ -189,5 +186,5 @@ function validateLwrAppConfig(jsonSourceText, phase) {
|
|
|
189
186
|
if (validationContext.diagnostics.length) {
|
|
190
187
|
throw new import_diagnostics.LwrConfigValidationError(`Configuration validation errors in ${SOURCE_BY_PHASE[phase]}`, validationContext.diagnostics);
|
|
191
188
|
}
|
|
192
|
-
return import_jsonc_parser.parse(jsonSourceText);
|
|
189
|
+
return (0, import_jsonc_parser.parse)(jsonSourceText);
|
|
193
190
|
}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
var __defProp = Object.defineProperty;
|
|
2
2
|
var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
|
|
3
3
|
var __export = (target, all) => {
|
|
4
|
-
__markAsModule(target);
|
|
5
4
|
for (var name in all)
|
|
6
5
|
__defProp(target, name, {get: all[name], enumerable: true});
|
|
7
6
|
};
|
|
8
7
|
|
|
9
8
|
// packages/@lwrjs/core/src/validation/helpers.ts
|
|
9
|
+
__markAsModule(exports);
|
|
10
10
|
__export(exports, {
|
|
11
11
|
calculatePositionFromSource: () => calculatePositionFromSource
|
|
12
12
|
});
|
package/build/es/index.js
CHANGED
|
@@ -163,11 +163,11 @@ export class LwrApp {
|
|
|
163
163
|
await this.init();
|
|
164
164
|
const { server, config, app } = this;
|
|
165
165
|
const { serverMode, port } = config;
|
|
166
|
-
server.listen(port || config.port, () => {
|
|
167
|
-
callback?.({ serverMode, port });
|
|
166
|
+
server.listen(port || config.port, async () => {
|
|
168
167
|
if (process.env.WARMUP?.toLowerCase() === 'true') {
|
|
169
|
-
warmupServer(config, app.getInternalRequestKey());
|
|
168
|
+
await warmupServer(config, app.getInternalRequestKey());
|
|
170
169
|
}
|
|
170
|
+
callback?.({ serverMode, port });
|
|
171
171
|
});
|
|
172
172
|
}
|
|
173
173
|
async close() {
|
|
@@ -27,8 +27,9 @@ export default function apiMiddleware(app, context) {
|
|
|
27
27
|
res.status(400).send({ error: `Environment "${targetEnvironment}" is not supported` });
|
|
28
28
|
return;
|
|
29
29
|
}
|
|
30
|
-
|
|
30
|
+
let moduleId, signature;
|
|
31
31
|
try {
|
|
32
|
+
({ moduleId, signature } = getModuleIdentity(req));
|
|
32
33
|
const sourceMapUrl = req.path.replace('/bundle/', '/sourcemaps/bundle/');
|
|
33
34
|
const sourceMapRuntimeContext = { ...runtimeEnvironment, sourceMapUrl };
|
|
34
35
|
// Redirect module requests to the concrete URL when requested with an importer
|
|
@@ -81,7 +82,7 @@ export default function apiMiddleware(app, context) {
|
|
|
81
82
|
}
|
|
82
83
|
catch (e) {
|
|
83
84
|
console.log(e);
|
|
84
|
-
const error = createReturnStatus(`bundle for "${moduleId
|
|
85
|
+
const error = createReturnStatus(`bundle for "${moduleId?.specifier}"`, e);
|
|
85
86
|
res.status(error.status).send(error.message);
|
|
86
87
|
}
|
|
87
88
|
});
|
|
@@ -102,9 +103,9 @@ export default function apiMiddleware(app, context) {
|
|
|
102
103
|
res.status(400).send({ error: `Environment "${targetEnvironment}" is not supported` });
|
|
103
104
|
return;
|
|
104
105
|
}
|
|
105
|
-
|
|
106
|
-
let moduleId = id.moduleId;
|
|
106
|
+
let moduleId;
|
|
107
107
|
try {
|
|
108
|
+
({ moduleId } = getModuleIdentity(req));
|
|
108
109
|
// Get the importer's specifier via the "importer" query param
|
|
109
110
|
const importerSpecifier = req.query.importer;
|
|
110
111
|
if (importerSpecifier) {
|
|
@@ -133,7 +134,7 @@ export default function apiMiddleware(app, context) {
|
|
|
133
134
|
}
|
|
134
135
|
catch (e) {
|
|
135
136
|
console.log(e);
|
|
136
|
-
const error = createReturnStatus(`bundle for "${moduleId
|
|
137
|
+
const error = createReturnStatus(`bundle for "${moduleId?.specifier}"`, e);
|
|
137
138
|
res.status(error.status).send(error.message);
|
|
138
139
|
}
|
|
139
140
|
});
|
|
@@ -159,8 +160,9 @@ export default function apiMiddleware(app, context) {
|
|
|
159
160
|
res.status(400).send({ error: `Environment "${targetEnvironment}" is not supported` });
|
|
160
161
|
return;
|
|
161
162
|
}
|
|
162
|
-
|
|
163
|
+
let moduleId, signature;
|
|
163
164
|
try {
|
|
165
|
+
({ moduleId, signature } = getModuleIdentity(req));
|
|
164
166
|
const bundleDef = await moduleBundler.getModuleBundle(moduleId, runtimeEnvironment);
|
|
165
167
|
if (signature !== LATEST_SIGNATURE) {
|
|
166
168
|
res.setHeader('Cache-control', 'public, max-age=31536000, immutable');
|
|
@@ -169,7 +171,7 @@ export default function apiMiddleware(app, context) {
|
|
|
169
171
|
}
|
|
170
172
|
catch (e) {
|
|
171
173
|
console.log(e);
|
|
172
|
-
const error = createReturnStatus(`bundle sourcemap for "${moduleId
|
|
174
|
+
const error = createReturnStatus(`bundle sourcemap for "${moduleId?.specifier}"`, e);
|
|
173
175
|
res.status(error.status).send(error.message);
|
|
174
176
|
}
|
|
175
177
|
});
|
|
@@ -195,8 +197,9 @@ export default function apiMiddleware(app, context) {
|
|
|
195
197
|
res.status(400).send({ error: `Environment "${targetEnvironment}" is not supported` });
|
|
196
198
|
return;
|
|
197
199
|
}
|
|
198
|
-
|
|
200
|
+
let moduleId, signature;
|
|
199
201
|
try {
|
|
202
|
+
({ moduleId, signature } = getModuleIdentity(req));
|
|
200
203
|
if (!req.validateJsonRequest()) {
|
|
201
204
|
throw createDiagnostic({ description: errors.INVALID_JSON() }, LwrUnresolvableError);
|
|
202
205
|
}
|
|
@@ -221,7 +224,7 @@ export default function apiMiddleware(app, context) {
|
|
|
221
224
|
}
|
|
222
225
|
catch (e) {
|
|
223
226
|
console.log(e);
|
|
224
|
-
const error = createReturnStatus(`module "${moduleId
|
|
227
|
+
const error = createReturnStatus(`module "${moduleId?.specifier}"`, e);
|
|
225
228
|
res.status(error.status).send(error.message);
|
|
226
229
|
}
|
|
227
230
|
});
|
|
@@ -242,9 +245,9 @@ export default function apiMiddleware(app, context) {
|
|
|
242
245
|
res.status(400).send({ error: `Environment "${targetEnvironment}" is not supported` });
|
|
243
246
|
return;
|
|
244
247
|
}
|
|
245
|
-
|
|
246
|
-
let moduleId = id.moduleId;
|
|
248
|
+
let moduleId;
|
|
247
249
|
try {
|
|
250
|
+
({ moduleId } = getModuleIdentity(req));
|
|
248
251
|
// Get the importer's specifier via the "importer" query param
|
|
249
252
|
const importerSpecifier = req.query.importer;
|
|
250
253
|
if (importerSpecifier) {
|
|
@@ -273,7 +276,7 @@ export default function apiMiddleware(app, context) {
|
|
|
273
276
|
}
|
|
274
277
|
catch (e) {
|
|
275
278
|
console.log(e);
|
|
276
|
-
const error = createReturnStatus(`module "${moduleId
|
|
279
|
+
const error = createReturnStatus(`module "${moduleId?.specifier}"`, e);
|
|
277
280
|
res.status(error.status).send(error.message);
|
|
278
281
|
}
|
|
279
282
|
});
|
|
@@ -295,8 +298,9 @@ export default function apiMiddleware(app, context) {
|
|
|
295
298
|
res.status(400).send({ error: `Environment "${targetEnvironment}" is not supported` });
|
|
296
299
|
return;
|
|
297
300
|
}
|
|
298
|
-
|
|
301
|
+
let moduleIds;
|
|
299
302
|
try {
|
|
303
|
+
({ moduleIds } = getMappingIdentity(req));
|
|
300
304
|
const { runtimeEnvironment, runtimeParams } = requestContext;
|
|
301
305
|
const importMetadata = await getImportMetadataMappings(moduleIds, runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler);
|
|
302
306
|
res.type('application/json').send(importMetadata);
|
|
@@ -324,8 +328,9 @@ export default function apiMiddleware(app, context) {
|
|
|
324
328
|
res.status(400).send({ error: `Environment "${targetEnvironment}" is not supported` });
|
|
325
329
|
return;
|
|
326
330
|
}
|
|
327
|
-
|
|
331
|
+
let resourceId;
|
|
328
332
|
try {
|
|
333
|
+
({ resourceId } = getResourceIdentity(req));
|
|
329
334
|
const resource = await resourceRegistry.getResource(resourceId, runtimeEnvironment, runtimeParams);
|
|
330
335
|
if (resource && resource.content) {
|
|
331
336
|
// Static resource
|
|
@@ -343,7 +348,7 @@ export default function apiMiddleware(app, context) {
|
|
|
343
348
|
}
|
|
344
349
|
catch (e) {
|
|
345
350
|
console.log(e);
|
|
346
|
-
const error = createReturnStatus(`resource "${resourceId
|
|
351
|
+
const error = createReturnStatus(`resource "${resourceId?.specifier}"`, e);
|
|
347
352
|
res.status(error.status).send(error.message);
|
|
348
353
|
}
|
|
349
354
|
});
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
7
|
-
"version": "0.4.
|
|
7
|
+
"version": "0.4.6",
|
|
8
8
|
"homepage": "https://lwr.dev/",
|
|
9
9
|
"repository": {
|
|
10
10
|
"type": "git",
|
|
@@ -33,28 +33,27 @@
|
|
|
33
33
|
"package.cjs"
|
|
34
34
|
],
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@
|
|
37
|
-
"@lwrjs/
|
|
38
|
-
"@lwrjs/
|
|
39
|
-
"@lwrjs/base-
|
|
40
|
-
"@lwrjs/
|
|
41
|
-
"@lwrjs/
|
|
42
|
-
"@lwrjs/
|
|
43
|
-
"@lwrjs/
|
|
44
|
-
"@lwrjs/
|
|
45
|
-
"@lwrjs/
|
|
46
|
-
"@lwrjs/
|
|
47
|
-
"@lwrjs/
|
|
48
|
-
"@lwrjs/
|
|
49
|
-
"@lwrjs/module-
|
|
50
|
-
"@lwrjs/module-
|
|
51
|
-
"@lwrjs/
|
|
52
|
-
"@lwrjs/
|
|
53
|
-
"@lwrjs/
|
|
54
|
-
"@lwrjs/
|
|
55
|
-
"@lwrjs/
|
|
56
|
-
"@lwrjs/
|
|
57
|
-
"@lwrjs/view-registry": "0.4.2",
|
|
36
|
+
"@lwrjs/app-service": "0.4.6",
|
|
37
|
+
"@lwrjs/asset-registry": "0.4.6",
|
|
38
|
+
"@lwrjs/base-template-engine": "0.4.6",
|
|
39
|
+
"@lwrjs/base-view-provider": "0.4.6",
|
|
40
|
+
"@lwrjs/client-modules": "0.4.6",
|
|
41
|
+
"@lwrjs/compiler": "0.4.6",
|
|
42
|
+
"@lwrjs/diagnostics": "0.4.6",
|
|
43
|
+
"@lwrjs/fs-asset-provider": "0.4.6",
|
|
44
|
+
"@lwrjs/html-view-provider": "0.4.6",
|
|
45
|
+
"@lwrjs/loader": "0.4.6",
|
|
46
|
+
"@lwrjs/lwc-module-provider": "0.4.6",
|
|
47
|
+
"@lwrjs/markdown-view-provider": "0.4.6",
|
|
48
|
+
"@lwrjs/module-bundler": "0.4.6",
|
|
49
|
+
"@lwrjs/module-registry": "0.4.6",
|
|
50
|
+
"@lwrjs/npm-module-provider": "0.4.6",
|
|
51
|
+
"@lwrjs/nunjucks-view-provider": "0.4.6",
|
|
52
|
+
"@lwrjs/resource-registry": "0.4.6",
|
|
53
|
+
"@lwrjs/router": "0.4.6",
|
|
54
|
+
"@lwrjs/server": "0.4.6",
|
|
55
|
+
"@lwrjs/shared-utils": "0.4.6",
|
|
56
|
+
"@lwrjs/view-registry": "0.4.6",
|
|
58
57
|
"dompurify": "^2.3.0",
|
|
59
58
|
"fs-extra": "^10.0.0",
|
|
60
59
|
"jsdom": "^16.7.0",
|
|
@@ -64,7 +63,7 @@
|
|
|
64
63
|
"qs": "^6.9.4"
|
|
65
64
|
},
|
|
66
65
|
"devDependencies": {
|
|
67
|
-
"@lwrjs/types": "0.4.
|
|
66
|
+
"@lwrjs/types": "0.4.6"
|
|
68
67
|
},
|
|
69
68
|
"peerDependencies": {
|
|
70
69
|
"lwc": ">= 1.x <= 2.x"
|
|
@@ -72,5 +71,5 @@
|
|
|
72
71
|
"engines": {
|
|
73
72
|
"node": ">=14.15.4 <15"
|
|
74
73
|
},
|
|
75
|
-
"gitHead": "
|
|
74
|
+
"gitHead": "71f599b20c35d612e55312e94804a97e7cc778e1"
|
|
76
75
|
}
|