@lwrjs/core 0.17.2-alpha.15 → 0.17.2-alpha.17

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 (5) hide show
  1. package/build/cjs/middleware/utils/error-handling.cjs +2 -2
  2. package/build/cjs/middleware/view-middleware.cjs +3 -2
  3. package/build/es/middleware/utils/error-handling.js +3 -3
  4. package/build/es/middleware/view-middleware.js +3 -2
  5. package/package.json +31 -31
package/build/cjs/middleware/utils/error-handling.cjs CHANGED
@@ -60,6 +60,7 @@ function createReturnStatus(error, req, debug) {
60
60
  }
61
61
  if (debug) {
62
62
  body = `<div style="font-family:sans-serif;margin:50px;"><h1>${status}: Document generation failed</h1><p>${body.replace(/</g, "&lt;").replace(/>/g, "&gt;")}</p></div>`;
63
+ status = 200;
63
64
  }
64
65
  return {status, body, headers: Object.keys(headers).length > 0 ? headers : void 0};
65
66
  }
@@ -77,8 +78,7 @@ function handleErrors(middleware, isBaseDoc = false) {
77
78
  }
78
79
  const {status, body, headers} = createReturnStatus(err, req, req.query.debug !== void 0 && isBaseDoc);
79
80
  headers && res.set(headers);
80
- res.status(status);
81
- res.send(body);
81
+ res.status(status).send(body);
82
82
  }
83
83
  };
84
84
  }
package/build/cjs/middleware/view-middleware.cjs CHANGED
@@ -68,8 +68,8 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
68
68
  params: viewRequest.params,
69
69
  query: viewRequest.query,
70
70
  cookie: req.headers?.cookie,
71
- trueClientIP: req.headers && req.headers[import_shared_utils.TRUE_CLIENT_IP],
72
- correlationID: req.headers && req.headers[import_shared_utils.CORRELATION_ID],
71
+ trueClientIP: req.headers?.[import_shared_utils.TRUE_CLIENT_IP],
72
+ correlationID: req.headers?.[import_shared_utils.CORRELATION_ID],
73
73
  coreProxy: req.getCoreProxy(appConfig.coreProxy ?? void 0, route.bootstrap?.proxyForSSR)
74
74
  };
75
75
  const resolve = req.isJsonRequest() ? viewHandler.getViewJson : viewHandler.getViewContent;
@@ -88,6 +88,7 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
88
88
  locale: runtimeParams.locale
89
89
  }
90
90
  }, async (span) => {
91
+ runtimeParams.viewSpanID = span.spanId;
91
92
  traceId = span.traceId;
92
93
  headers = (0, import_shared_utils.getTraceHeaders)(runtimeParams, span);
93
94
  const res2 = await resolve.call(viewHandler, viewRequest, route, runtimeEnvironment, runtimeParams);
package/build/es/middleware/utils/error-handling.js CHANGED
@@ -42,8 +42,9 @@ function createReturnStatus(error, req, debug) {
42
42
  : `${descriptions.SERVER.SERVER_ERROR(req.originalUrl)}: ${body}`;
43
43
  }
44
44
  if (debug) {
45
- // return a debug base doc if debug mode is on
45
+ // return a debug base doc and a 200 response code if debug mode is on
46
46
  body = `<div style="font-family:sans-serif;margin:50px;"><h1>${status}: Document generation failed</h1><p>${body.replace(/</g, '&lt;').replace(/>/g, '&gt;')}</p></div>`;
47
+ status = 200;
47
48
  }
48
49
  return { status, body, headers: Object.keys(headers).length > 0 ? headers : undefined };
49
50
  }
@@ -65,8 +66,7 @@ export function handleErrors(middleware, isBaseDoc = false) {
65
66
  // only return HTML error screen for base doc requests in debug mode
66
67
  req.query.debug !== undefined && isBaseDoc);
67
68
  headers && res.set(headers);
68
- res.status(status);
69
- res.send(body);
69
+ res.status(status).send(body);
70
70
  }
71
71
  };
72
72
  }
package/build/es/middleware/view-middleware.js CHANGED
@@ -42,8 +42,8 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
42
42
  params: viewRequest.params,
43
43
  query: viewRequest.query,
44
44
  cookie: req.headers?.cookie,
45
- trueClientIP: req.headers && req.headers[TRUE_CLIENT_IP],
46
- correlationID: req.headers && req.headers[CORRELATION_ID],
45
+ trueClientIP: req.headers?.[TRUE_CLIENT_IP],
46
+ correlationID: req.headers?.[CORRELATION_ID],
47
47
  coreProxy: req.getCoreProxy(appConfig.coreProxy ?? undefined, route.bootstrap?.proxyForSSR),
48
48
  };
49
49
  const resolve = req.isJsonRequest() ? viewHandler.getViewJson : viewHandler.getViewContent;
@@ -62,6 +62,7 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
62
62
  locale: runtimeParams.locale,
63
63
  },
64
64
  }, async (span) => {
65
+ runtimeParams.viewSpanID = span.spanId;
65
66
  traceId = span.traceId;
66
67
  headers = getTraceHeaders(runtimeParams, span);
67
68
  const res = await resolve.call(viewHandler, viewRequest, route, runtimeEnvironment, runtimeParams);
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
7
- "version": "0.17.2-alpha.15",
7
+ "version": "0.17.2-alpha.17",
8
8
  "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
9
9
  "repository": {
10
10
  "type": "git",
@@ -43,34 +43,34 @@
43
43
  "build": "tsc -b"
44
44
  },
45
45
  "dependencies": {
46
- "@lwrjs/app-service": "0.17.2-alpha.15",
47
- "@lwrjs/asset-registry": "0.17.2-alpha.15",
48
- "@lwrjs/asset-transformer": "0.17.2-alpha.15",
49
- "@lwrjs/base-view-provider": "0.17.2-alpha.15",
50
- "@lwrjs/base-view-transformer": "0.17.2-alpha.15",
51
- "@lwrjs/client-modules": "0.17.2-alpha.15",
52
- "@lwrjs/config": "0.17.2-alpha.15",
53
- "@lwrjs/diagnostics": "0.17.2-alpha.15",
54
- "@lwrjs/esbuild": "0.17.2-alpha.15",
55
- "@lwrjs/fs-asset-provider": "0.17.2-alpha.15",
56
- "@lwrjs/fs-watch": "0.17.2-alpha.15",
57
- "@lwrjs/html-view-provider": "0.17.2-alpha.15",
58
- "@lwrjs/instrumentation": "0.17.2-alpha.15",
59
- "@lwrjs/loader": "0.17.2-alpha.15",
60
- "@lwrjs/lwc-module-provider": "0.17.2-alpha.15",
61
- "@lwrjs/lwc-ssr": "0.17.2-alpha.15",
62
- "@lwrjs/markdown-view-provider": "0.17.2-alpha.15",
63
- "@lwrjs/module-bundler": "0.17.2-alpha.15",
64
- "@lwrjs/module-registry": "0.17.2-alpha.15",
65
- "@lwrjs/npm-module-provider": "0.17.2-alpha.15",
66
- "@lwrjs/nunjucks-view-provider": "0.17.2-alpha.15",
67
- "@lwrjs/o11y": "0.17.2-alpha.15",
68
- "@lwrjs/resource-registry": "0.17.2-alpha.15",
69
- "@lwrjs/router": "0.17.2-alpha.15",
70
- "@lwrjs/server": "0.17.2-alpha.15",
71
- "@lwrjs/shared-utils": "0.17.2-alpha.15",
72
- "@lwrjs/static": "0.17.2-alpha.15",
73
- "@lwrjs/view-registry": "0.17.2-alpha.15",
46
+ "@lwrjs/app-service": "0.17.2-alpha.17",
47
+ "@lwrjs/asset-registry": "0.17.2-alpha.17",
48
+ "@lwrjs/asset-transformer": "0.17.2-alpha.17",
49
+ "@lwrjs/base-view-provider": "0.17.2-alpha.17",
50
+ "@lwrjs/base-view-transformer": "0.17.2-alpha.17",
51
+ "@lwrjs/client-modules": "0.17.2-alpha.17",
52
+ "@lwrjs/config": "0.17.2-alpha.17",
53
+ "@lwrjs/diagnostics": "0.17.2-alpha.17",
54
+ "@lwrjs/esbuild": "0.17.2-alpha.17",
55
+ "@lwrjs/fs-asset-provider": "0.17.2-alpha.17",
56
+ "@lwrjs/fs-watch": "0.17.2-alpha.17",
57
+ "@lwrjs/html-view-provider": "0.17.2-alpha.17",
58
+ "@lwrjs/instrumentation": "0.17.2-alpha.17",
59
+ "@lwrjs/loader": "0.17.2-alpha.17",
60
+ "@lwrjs/lwc-module-provider": "0.17.2-alpha.17",
61
+ "@lwrjs/lwc-ssr": "0.17.2-alpha.17",
62
+ "@lwrjs/markdown-view-provider": "0.17.2-alpha.17",
63
+ "@lwrjs/module-bundler": "0.17.2-alpha.17",
64
+ "@lwrjs/module-registry": "0.17.2-alpha.17",
65
+ "@lwrjs/npm-module-provider": "0.17.2-alpha.17",
66
+ "@lwrjs/nunjucks-view-provider": "0.17.2-alpha.17",
67
+ "@lwrjs/o11y": "0.17.2-alpha.17",
68
+ "@lwrjs/resource-registry": "0.17.2-alpha.17",
69
+ "@lwrjs/router": "0.17.2-alpha.17",
70
+ "@lwrjs/server": "0.17.2-alpha.17",
71
+ "@lwrjs/shared-utils": "0.17.2-alpha.17",
72
+ "@lwrjs/static": "0.17.2-alpha.17",
73
+ "@lwrjs/view-registry": "0.17.2-alpha.17",
74
74
  "chokidar": "^3.6.0",
75
75
  "esbuild": "^0.9.7",
76
76
  "fs-extra": "^11.2.0",
@@ -80,7 +80,7 @@
80
80
  "ws": "^8.18.0"
81
81
  },
82
82
  "devDependencies": {
83
- "@lwrjs/types": "0.17.2-alpha.15",
83
+ "@lwrjs/types": "0.17.2-alpha.17",
84
84
  "@types/ws": "^8.5.12",
85
85
  "memfs": "^4.13.0"
86
86
  },
@@ -93,5 +93,5 @@
93
93
  "volta": {
94
94
  "extends": "../../../package.json"
95
95
  },
96
- "gitHead": "91299b871adb9aea8c743d830dd62bce418a0933"
96
+ "gitHead": "ef424aed9e66b323156269a6eb0d92dae935e6c5"
97
97
  }