@lwrjs/core 0.7.0-alpha.10 → 0.7.0-alpha.11

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.
Files changed (8) hide show
  1. package/build/cjs/env-config.cjs +5 -0
  2. package/build/cjs/middlewares/api-middleware.cjs +9 -9
  3. package/build/cjs/middlewares/utils.cjs +0 -20
  4. package/build/es/env-config.js +5 -0
  5. package/build/es/middlewares/api-middleware.js +2 -2
  6. package/build/es/middlewares/utils.d.ts +0 -10
  7. package/build/es/middlewares/utils.js +0 -29
  8. package/package.json +28 -29
package/build/cjs/env-config.cjs CHANGED
@@ -295,6 +295,11 @@ function normalizeConfig(config) {
295
295
  lwc: normalizeLwcConfig(mergeLWCConfigs(lwrJsonConfig, config)),
296
296
  bundleConfig: mergeBundleConfig(lwrJsonConfig, config),
297
297
  locker: mergeLockerConfig(lwrJsonConfig, config),
298
+ staticSiteGenerator: {
299
+ ...DEFAULT_GENERATOR_CONFIG,
300
+ ...lwrJsonConfig?.staticSiteGenerator,
301
+ ...config?.staticSiteGenerator
302
+ },
298
303
  rootDir
299
304
  };
300
305
  const assets = normalizeAssetsDir(mergedLwrGlobalConfig.assets, rootDir);
package/build/cjs/middlewares/api-middleware.cjs CHANGED
@@ -102,7 +102,7 @@ function apiMiddleware(app, context) {
102
102
  res.type("application/javascript").send(bundleDef.code);
103
103
  } catch (e) {
104
104
  console.log(e);
105
- const error = (0, import_utils.createReturnStatus)(`bundle for "${moduleId?.specifier || req.params?.specifier}"`, e);
105
+ const error = (0, import_diagnostics.createReturnStatus)(`bundle for "${moduleId?.specifier || req.params?.specifier}"`, e);
106
106
  res.status(error.status).send(error.message);
107
107
  }
108
108
  });
@@ -138,7 +138,7 @@ function apiMiddleware(app, context) {
138
138
  }
139
139
  } catch (e) {
140
140
  console.log(e);
141
- const error = (0, import_utils.createReturnStatus)(`bundle for "${moduleId?.specifier || req.params?.specifier}"`, e);
141
+ const error = (0, import_diagnostics.createReturnStatus)(`bundle for "${moduleId?.specifier || req.params?.specifier}"`, e);
142
142
  res.status(error.status).send(error.message);
143
143
  }
144
144
  });
@@ -169,7 +169,7 @@ function apiMiddleware(app, context) {
169
169
  res.type("application/json").send(bundleDef.map);
170
170
  } catch (e) {
171
171
  console.log(e);
172
- const error = (0, import_utils.createReturnStatus)(`bundle sourcemap for "${moduleId?.specifier || req.params?.specifier}"`, e);
172
+ const error = (0, import_diagnostics.createReturnStatus)(`bundle sourcemap for "${moduleId?.specifier || req.params?.specifier}"`, e);
173
173
  res.status(error.status).send(error.message);
174
174
  }
175
175
  });
@@ -211,7 +211,7 @@ function apiMiddleware(app, context) {
211
211
  }
212
212
  } catch (e) {
213
213
  console.log(e);
214
- const error = (0, import_utils.createReturnStatus)(`module "${moduleId?.specifier || req.params?.specifier}"`, e);
214
+ const error = (0, import_diagnostics.createReturnStatus)(`module "${moduleId?.specifier || req.params?.specifier}"`, e);
215
215
  res.status(error.status).send(error.message);
216
216
  }
217
217
  });
@@ -247,7 +247,7 @@ function apiMiddleware(app, context) {
247
247
  }
248
248
  } catch (e) {
249
249
  console.log(e);
250
- const error = (0, import_utils.createReturnStatus)(`module "${moduleId?.specifier || req.params?.specifier}"`, e);
250
+ const error = (0, import_diagnostics.createReturnStatus)(`module "${moduleId?.specifier || req.params?.specifier}"`, e);
251
251
  res.status(error.status).send(error.message);
252
252
  }
253
253
  });
@@ -276,7 +276,7 @@ function apiMiddleware(app, context) {
276
276
  res.status(200).type("application/json").send(importMetadata);
277
277
  } catch (e) {
278
278
  console.log(e);
279
- const error = (0, import_utils.createReturnStatus)(`mappings for "${JSON.stringify(moduleIds || req.params?.specifiers)}"`, e);
279
+ const error = (0, import_diagnostics.createReturnStatus)(`mappings for "${JSON.stringify(moduleIds || req.params?.specifiers)}"`, e);
280
280
  res.status(error.status).send(error.message);
281
281
  }
282
282
  });
@@ -307,7 +307,7 @@ function apiMiddleware(app, context) {
307
307
  res.setMetadata({resource});
308
308
  } catch (e) {
309
309
  console.log(e);
310
- const error = (0, import_utils.createReturnStatus)(`resource "${resourceId?.specifier || req.params?.specifier}"`, e);
310
+ const error = (0, import_diagnostics.createReturnStatus)(`resource "${resourceId?.specifier || req.params?.specifier}"`, e);
311
311
  res.status(error.status).send(error.message);
312
312
  }
313
313
  });
@@ -330,7 +330,7 @@ function apiMiddleware(app, context) {
330
330
  res.stream(assetObj.stream());
331
331
  } catch (e) {
332
332
  console.log(e);
333
- const error = (0, import_utils.createReturnStatus)(`asset at "${specifier}"`, e);
333
+ const error = (0, import_diagnostics.createReturnStatus)(`asset at "${specifier}"`, e);
334
334
  res.status(error.status).send(error.message);
335
335
  }
336
336
  });
@@ -352,7 +352,7 @@ function apiMiddleware(app, context) {
352
352
  res.stream(assetObj.stream());
353
353
  } catch (e) {
354
354
  console.log(e);
355
- const error = (0, import_utils.createReturnStatus)(`asset at "${specifier}"`, e);
355
+ const error = (0, import_diagnostics.createReturnStatus)(`asset at "${specifier}"`, e);
356
356
  res.status(error.status).send(error.message);
357
357
  }
358
358
  });
package/build/cjs/middlewares/utils.cjs CHANGED
@@ -24,31 +24,11 @@ var __toModule = (module2) => {
24
24
  // packages/@lwrjs/core/src/middlewares/utils.ts
25
25
  __markAsModule(exports);
26
26
  __export(exports, {
27
- createReturnStatus: () => createReturnStatus,
28
27
  getRequestProperties: () => getRequestProperties,
29
28
  isSupportedEnvironment: () => isSupportedEnvironment
30
29
  });
31
- var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
32
30
  var import_path_to_regexp = __toModule(require("path-to-regexp"));
33
31
  var import_qs = __toModule(require("qs"));
34
- var import_dompurify = __toModule(require("dompurify"));
35
- var import_jsdom = __toModule(require("jsdom"));
36
- var window = new import_jsdom.JSDOM("").window;
37
- var DOMPurify = (0, import_dompurify.default)(window);
38
- function createReturnStatus(name, error) {
39
- let returnStatus = {status: 501, message: ""};
40
- if ((0, import_diagnostics.isNodeError)(error) && error.code === "NO_LWC_MODULE_FOUND") {
41
- returnStatus = {status: 404, message: import_diagnostics.descriptions.UNRESOLVABLE.LWC_MODULE(name).message};
42
- } else if (error instanceof import_diagnostics.LwrUnresolvableError && error.diagnostics[0].description.category === "lwrUnresolvable/invalid") {
43
- returnStatus = {status: 400, message: error.message};
44
- } else if (error instanceof import_diagnostics.LwrUnresolvableError) {
45
- returnStatus = {status: 404, message: error.message};
46
- } else {
47
- returnStatus = {status: 500, message: import_diagnostics.descriptions.UNRESOLVABLE.SERVER_ERROR(name).message};
48
- }
49
- returnStatus.message = DOMPurify.sanitize(returnStatus.message);
50
- return returnStatus;
51
- }
52
32
  function getRequestProperties(pattern, req) {
53
33
  const {url = "/"} = req;
54
34
  const [pathname, search] = url.split("?");
package/build/es/env-config.js CHANGED
@@ -306,6 +306,11 @@ export function normalizeConfig(config) {
306
306
  lwc: normalizeLwcConfig(mergeLWCConfigs(lwrJsonConfig, config)),
307
307
  bundleConfig: mergeBundleConfig(lwrJsonConfig, config),
308
308
  locker: mergeLockerConfig(lwrJsonConfig, config),
309
+ staticSiteGenerator: {
310
+ ...DEFAULT_GENERATOR_CONFIG,
311
+ ...lwrJsonConfig?.staticSiteGenerator,
312
+ ...config?.staticSiteGenerator,
313
+ },
309
314
  rootDir,
310
315
  };
311
316
  // Normalize entries (eg: parse full file paths, etc)
package/build/es/middlewares/api-middleware.js CHANGED
@@ -1,6 +1,6 @@
1
- import { LwrUnresolvableError, createSingleDiagnosticError as createDiagnostic, descriptions, } from '@lwrjs/diagnostics';
1
+ import { createReturnStatus, LwrUnresolvableError, createSingleDiagnosticError as createDiagnostic, descriptions, } from '@lwrjs/diagnostics';
2
2
  import { LATEST_SIGNATURE, explodeSpecifier, getImportMetadataMappings, serializeModuleToJson, getModuleIdentity, getResourceIdentity, getAssetIdentity, getMappingIdentity, getVersionedModuleId, } from '@lwrjs/shared-utils';
3
- import { createReturnStatus, isSupportedEnvironment } from './utils.js';
3
+ import { isSupportedEnvironment } from './utils.js';
4
4
  export default function apiMiddleware(app, context) {
5
5
  const { appConfig: { environment: environmentConfig }, moduleRegistry, moduleBundler, resourceRegistry, runtimeEnvironment: defaultRuntimeEnvironment, } = context;
6
6
  const errors = descriptions.UNRESOLVABLE;
package/build/es/middlewares/utils.d.ts CHANGED
@@ -2,16 +2,6 @@
2
2
  import http from 'http';
3
3
  import { EnvironmentConfig } from '@lwrjs/types';
4
4
  import qs from 'qs';
5
- /**
6
- * Create a status object Express can return when there is an error
7
- *
8
- * @param name - string name of the problem module/resource
9
- * @param error - an Error/Diagnostic object; thrown from try/catch
10
- */
11
- export declare function createReturnStatus(name: string, error: unknown): {
12
- status: number;
13
- message: string;
14
- };
15
5
  interface Params {
16
6
  [key: string]: string;
17
7
  }
package/build/es/middlewares/utils.js CHANGED
@@ -1,34 +1,5 @@
1
- import { LwrUnresolvableError, descriptions, isNodeError } from '@lwrjs/diagnostics';
2
1
  import { pathToRegexp } from 'path-to-regexp';
3
2
  import qs from 'qs';
4
- import createDOMPurify from 'dompurify';
5
- import { JSDOM } from 'jsdom';
6
- const window = new JSDOM('').window;
7
- const DOMPurify = createDOMPurify(window);
8
- /**
9
- * Create a status object Express can return when there is an error
10
- *
11
- * @param name - string name of the problem module/resource
12
- * @param error - an Error/Diagnostic object; thrown from try/catch
13
- */
14
- export function createReturnStatus(name, error) {
15
- let returnStatus = { status: 501, message: '' };
16
- if (isNodeError(error) && error.code === 'NO_LWC_MODULE_FOUND') {
17
- returnStatus = { status: 404, message: descriptions.UNRESOLVABLE.LWC_MODULE(name).message };
18
- }
19
- else if (error instanceof LwrUnresolvableError &&
20
- error.diagnostics[0].description.category === 'lwrUnresolvable/invalid') {
21
- returnStatus = { status: 400, message: error.message };
22
- }
23
- else if (error instanceof LwrUnresolvableError) {
24
- returnStatus = { status: 404, message: error.message };
25
- }
26
- else {
27
- returnStatus = { status: 500, message: descriptions.UNRESOLVABLE.SERVER_ERROR(name).message };
28
- }
29
- returnStatus.message = DOMPurify.sanitize(returnStatus.message);
30
- return returnStatus;
31
- }
32
3
  // Adapted from https://github.com/expressjs/express/blob/master/lib/router/layer.js
33
4
  export function getRequestProperties(pattern, req) {
34
5
  const { url = '/' } = req;
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
7
- "version": "0.7.0-alpha.10",
7
+ "version": "0.7.0-alpha.11",
8
8
  "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
9
9
  "repository": {
10
10
  "type": "git",
@@ -33,32 +33,31 @@
33
33
  "package.cjs"
34
34
  ],
35
35
  "dependencies": {
36
- "@lwrjs/app-service": "0.7.0-alpha.10",
37
- "@lwrjs/asset-registry": "0.7.0-alpha.10",
38
- "@lwrjs/asset-transformer": "0.7.0-alpha.10",
39
- "@lwrjs/base-template-engine": "0.7.0-alpha.10",
40
- "@lwrjs/base-view-provider": "0.7.0-alpha.10",
41
- "@lwrjs/base-view-transformer": "0.7.0-alpha.10",
42
- "@lwrjs/client-modules": "0.7.0-alpha.10",
43
- "@lwrjs/compiler": "0.7.0-alpha.10",
44
- "@lwrjs/diagnostics": "0.7.0-alpha.10",
45
- "@lwrjs/fs-asset-provider": "0.7.0-alpha.10",
46
- "@lwrjs/html-view-provider": "0.7.0-alpha.10",
47
- "@lwrjs/loader": "0.7.0-alpha.10",
48
- "@lwrjs/lwc-module-provider": "0.7.0-alpha.10",
49
- "@lwrjs/lwc-ssr": "0.7.0-alpha.10",
50
- "@lwrjs/markdown-view-provider": "0.7.0-alpha.10",
51
- "@lwrjs/module-bundler": "0.7.0-alpha.10",
52
- "@lwrjs/module-registry": "0.7.0-alpha.10",
53
- "@lwrjs/npm-module-provider": "0.7.0-alpha.10",
54
- "@lwrjs/nunjucks-view-provider": "0.7.0-alpha.10",
55
- "@lwrjs/o11y": "0.7.0-alpha.10",
56
- "@lwrjs/resource-registry": "0.7.0-alpha.10",
57
- "@lwrjs/router": "0.7.0-alpha.10",
58
- "@lwrjs/server": "0.7.0-alpha.10",
59
- "@lwrjs/shared-utils": "0.7.0-alpha.10",
60
- "@lwrjs/view-registry": "0.7.0-alpha.10",
61
- "dompurify": "^2.3.0",
36
+ "@lwrjs/app-service": "0.7.0-alpha.11",
37
+ "@lwrjs/asset-registry": "0.7.0-alpha.11",
38
+ "@lwrjs/asset-transformer": "0.7.0-alpha.11",
39
+ "@lwrjs/base-template-engine": "0.7.0-alpha.11",
40
+ "@lwrjs/base-view-provider": "0.7.0-alpha.11",
41
+ "@lwrjs/base-view-transformer": "0.7.0-alpha.11",
42
+ "@lwrjs/client-modules": "0.7.0-alpha.11",
43
+ "@lwrjs/compiler": "0.7.0-alpha.11",
44
+ "@lwrjs/diagnostics": "0.7.0-alpha.11",
45
+ "@lwrjs/fs-asset-provider": "0.7.0-alpha.11",
46
+ "@lwrjs/html-view-provider": "0.7.0-alpha.11",
47
+ "@lwrjs/loader": "0.7.0-alpha.11",
48
+ "@lwrjs/lwc-module-provider": "0.7.0-alpha.11",
49
+ "@lwrjs/lwc-ssr": "0.7.0-alpha.11",
50
+ "@lwrjs/markdown-view-provider": "0.7.0-alpha.11",
51
+ "@lwrjs/module-bundler": "0.7.0-alpha.11",
52
+ "@lwrjs/module-registry": "0.7.0-alpha.11",
53
+ "@lwrjs/npm-module-provider": "0.7.0-alpha.11",
54
+ "@lwrjs/nunjucks-view-provider": "0.7.0-alpha.11",
55
+ "@lwrjs/o11y": "0.7.0-alpha.11",
56
+ "@lwrjs/resource-registry": "0.7.0-alpha.11",
57
+ "@lwrjs/router": "0.7.0-alpha.11",
58
+ "@lwrjs/server": "0.7.0-alpha.11",
59
+ "@lwrjs/shared-utils": "0.7.0-alpha.11",
60
+ "@lwrjs/view-registry": "0.7.0-alpha.11",
62
61
  "fs-extra": "^10.0.0",
63
62
  "jsdom": "^16.7.0",
64
63
  "jsonc-parser": "^3.0.0",
@@ -67,7 +66,7 @@
67
66
  "qs": "^6.9.4"
68
67
  },
69
68
  "devDependencies": {
70
- "@lwrjs/types": "0.7.0-alpha.10"
69
+ "@lwrjs/types": "0.7.0-alpha.11"
71
70
  },
72
71
  "peerDependencies": {
73
72
  "lwc": ">= 1.x <= 2.x"
@@ -75,5 +74,5 @@
75
74
  "engines": {
76
75
  "node": ">=14.15.4 <17"
77
76
  },
78
- "gitHead": "83c1e65e2169094cb55ac2c37e5aef16d3a9aa4a"
77
+ "gitHead": "0b272d15905ec7b949974e8c5ba668a98eaa7e2d"
79
78
  }