@lwrjs/core 0.13.0-alpha.9 → 0.13.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.
Files changed (11) hide show
  1. package/build/cjs/index.cjs +1 -1
  2. package/build/cjs/info/route-handler.cjs +19 -2
  3. package/build/cjs/middleware/hmr-middleware.cjs +1 -0
  4. package/build/cjs/middleware/request-processor-middleware.cjs +6 -4
  5. package/build/cjs/tools/static-generation.cjs +4 -2
  6. package/build/es/index.js +2 -2
  7. package/build/es/info/route-handler.js +19 -2
  8. package/build/es/middleware/hmr-middleware.js +1 -0
  9. package/build/es/middleware/request-processor-middleware.js +8 -5
  10. package/build/es/tools/static-generation.js +2 -0
  11. package/package.json +34 -34
package/build/cjs/index.cjs CHANGED
@@ -204,7 +204,7 @@ function overrideConfigAsSrc(lwrApp) {
204
204
  const routes = normalizedConfig.routes || [];
205
205
  for (const route of routes) {
206
206
  route.bootstrap = {
207
- ...import_shared_utils.DEFAULT_LWR_BOOTSTRAP_CONFIG,
207
+ ...import_config.DEFAULT_LWR_BOOTSTRAP_CONFIG,
208
208
  ...route.bootstrap,
209
209
  configAsSrc: true
210
210
  };
package/build/cjs/info/route-handler.cjs CHANGED
@@ -99,6 +99,7 @@ var baseHtml = `<!DOCTYPE html>
99
99
  <h1>Site Information</h1>
100
100
  <h2>Environment</h2>
101
101
  {{ versionInfo }}
102
+ {{ mrtInfo }}
102
103
  <h2>Metadata</h2>
103
104
  {{ metadata }}
104
105
  </div>
@@ -114,12 +115,27 @@ async function siteInfoHandler(_request, context) {
114
115
  };
115
116
  let versionInfoString = "<ul>";
116
117
  for (const key in versionInfo) {
117
- if (versionInfo[key] !== "note-provided") {
118
+ if (versionInfo[key] !== "not-provided") {
118
119
  versionInfoString += `<li><span class="key">${key}:</span><span class="val">${versionInfo[key]}</span></li>
119
120
  `;
120
121
  }
121
122
  }
122
123
  versionInfoString += "</ul>";
124
+ let mrtInfoString = "";
125
+ if (process.env.MRT_ORGANIZATION_SLUG || process.env.MOBIFY_PROPERTY_ID || process.env.DEPLOY_TARGET) {
126
+ const mrtInfo = {
127
+ "MRT Tenant": process.env.MRT_ORGANIZATION_SLUG,
128
+ "MRT Project Id": process.env.MOBIFY_PROPERTY_ID,
129
+ "MRT Environment": process.env.DEPLOY_TARGET,
130
+ "MRT Bundle Id": process.env.BUNDLE_ID
131
+ };
132
+ mrtInfoString = "<ul>";
133
+ for (const key in mrtInfo) {
134
+ mrtInfoString += `<li><span class="key">${key}:</span><span class="val">${mrtInfo[key]}</span></li>
135
+ `;
136
+ }
137
+ mrtInfoString += "</ul>";
138
+ }
123
139
  const providedMetadataPath = `${context.rootDir}/site/.metadata/runtime-info.json`;
124
140
  let providedMetadata = {};
125
141
  if (import_fs.default.existsSync(providedMetadataPath)) {
@@ -127,7 +143,7 @@ async function siteInfoHandler(_request, context) {
127
143
  }
128
144
  let providedInfoString = "<ul>";
129
145
  for (const key in providedMetadata) {
130
- if (providedMetadata[key] !== "note-provided") {
146
+ if (providedMetadata[key] !== "not-provided") {
131
147
  const value = typeof providedMetadata[key] === "object" ? `<div class="data-container val">${JSON.stringify(providedMetadata[key], null, 2)}</div>` : `<span class="val">${providedMetadata[key]}</span>`;
132
148
  providedInfoString += `<li><span class="key">${key}:</span>${value}</li>
133
149
  `;
@@ -136,6 +152,7 @@ async function siteInfoHandler(_request, context) {
136
152
  providedInfoString += "</ul>";
137
153
  let infoHtml = baseHtml;
138
154
  infoHtml = infoHtml.replace("{{ versionInfo }}", versionInfoString);
155
+ infoHtml = infoHtml.replace("{{ mrtInfo }}", mrtInfoString);
139
156
  infoHtml = infoHtml.replace("{{ metadata }}", providedInfoString);
140
157
  return {
141
158
  body: infoHtml,
package/build/cjs/middleware/hmr-middleware.cjs CHANGED
@@ -95,6 +95,7 @@ var Hmr = class {
95
95
  ws.send(JSON.stringify({
96
96
  eventType: "moduleUpdate",
97
97
  payload: {
98
+ format,
98
99
  module: moduleId,
99
100
  newHash: signature,
100
101
  oldHash: "latest",
package/build/cjs/middleware/request-processor-middleware.cjs CHANGED
@@ -50,10 +50,12 @@ function requestProcessorMiddleware(app, context) {
50
50
  const host = req.headers["host"];
51
51
  const forwardedProto = req.headers["x-forwarded-proto"];
52
52
  const protocol = req.protocol;
53
- import_diagnostics.logger.info({
54
- label: `request-processor-middleware`,
55
- message: `Original Url: ${req.originalUrl}, Forwarded: ${forwarded}, X-Forwarded-Proto: ${forwardedProto}, Host: ${host}, Protocol: ${protocol}, ${MRT_REQUEST_CLASS}: ${requestClass}, ${import_shared_utils.REQUEST_DEPTH_HEADER}: ${requestDepth}`
56
- });
53
+ if ((0, import_shared_utils.isLambdaEnv)()) {
54
+ import_diagnostics.logger.info({
55
+ label: `request-processor-middleware`,
56
+ message: `Original Url: ${req.originalUrl}, Forwarded: ${forwarded}, X-Forwarded-Proto: ${forwardedProto}, Host: ${host}, Protocol: ${protocol}, ${MRT_REQUEST_CLASS}: ${requestClass}, ${import_shared_utils.REQUEST_DEPTH_HEADER}: ${requestDepth}`
57
+ });
58
+ }
57
59
  }
58
60
  if (requestDepth && requestDepth > 0) {
59
61
  import_diagnostics.logger.error({
package/build/cjs/tools/static-generation.cjs CHANGED
@@ -245,7 +245,8 @@ var SiteGenerator = class {
245
245
  path: decodeURIComponent(url),
246
246
  includedModules,
247
247
  imports,
248
- dynamicImports
248
+ dynamicImports,
249
+ integrity: bundleDefinition.integrity
249
250
  };
250
251
  const siteBundles = siteConfig.siteMetadata.getSiteBundles().bundles;
251
252
  siteBundles[specifier] = bundleMetadata;
@@ -264,7 +265,8 @@ var SiteGenerator = class {
264
265
  path: decodeURIComponent(url),
265
266
  mimeType: resourceDefinition.type,
266
267
  inline: resourceDefinition.inline,
267
- version: resourceDefinition.version
268
+ version: resourceDefinition.version,
269
+ integrity: resourceDefinition.integrity
268
270
  };
269
271
  const siteResources = siteConfig.siteMetadata.getSiteResources();
270
272
  siteResources.resources[(0, import_site_metadata.getSiteResourceId)(resourceDefinition)] = resourceMetadata;
package/build/es/index.js CHANGED
@@ -1,7 +1,7 @@
1
- import { getFeatureFlags, DEFAULT_LWR_BOOTSTRAP_CONFIG } from '@lwrjs/shared-utils';
1
+ import { getFeatureFlags } from '@lwrjs/shared-utils';
2
2
  import { createInternalServer } from '@lwrjs/server';
3
3
  import { LwrServerError, createSingleDiagnosticError, descriptions, logger } from '@lwrjs/diagnostics';
4
- import { loadConfig, executeConfigHooks, executeStartHooks, executeInstrumentationHooks, executeContextHooks, } from '@lwrjs/config';
4
+ import { DEFAULT_LWR_BOOTSTRAP_CONFIG, loadConfig, executeConfigHooks, executeStartHooks, executeInstrumentationHooks, executeContextHooks, } from '@lwrjs/config';
5
5
  import { loadHooks, loadServices, loadRouteHandlers } from '@lwrjs/config/modules';
6
6
  import SiteGenerator from './tools/static-generation.js';
7
7
  import { warmupServer } from './tools/server-warmup.js';
package/build/es/info/route-handler.js CHANGED
@@ -71,6 +71,7 @@ const baseHtml = `<!DOCTYPE html>
71
71
  <h1>Site Information</h1>
72
72
  <h2>Environment</h2>
73
73
  {{ versionInfo }}
74
+ {{ mrtInfo }}
74
75
  <h2>Metadata</h2>
75
76
  {{ metadata }}
76
77
  </div>
@@ -86,11 +87,26 @@ export default async function siteInfoHandler(_request, context) {
86
87
  };
87
88
  let versionInfoString = '<ul>';
88
89
  for (const key in versionInfo) {
89
- if (versionInfo[key] !== 'note-provided') {
90
+ if (versionInfo[key] !== 'not-provided') {
90
91
  versionInfoString += `<li><span class="key">${key}:</span><span class="val">${versionInfo[key]}</span></li>\n`;
91
92
  }
92
93
  }
93
94
  versionInfoString += '</ul>';
95
+ // If MRT add the support info
96
+ let mrtInfoString = '';
97
+ if (process.env.MRT_ORGANIZATION_SLUG || process.env.MOBIFY_PROPERTY_ID || process.env.DEPLOY_TARGET) {
98
+ const mrtInfo = {
99
+ 'MRT Tenant': process.env.MRT_ORGANIZATION_SLUG,
100
+ 'MRT Project Id': process.env.MOBIFY_PROPERTY_ID,
101
+ 'MRT Environment': process.env.DEPLOY_TARGET,
102
+ 'MRT Bundle Id': process.env.BUNDLE_ID,
103
+ };
104
+ mrtInfoString = '<ul>';
105
+ for (const key in mrtInfo) {
106
+ mrtInfoString += `<li><span class="key">${key}:</span><span class="val">${mrtInfo[key]}</span></li>\n`;
107
+ }
108
+ mrtInfoString += '</ul>';
109
+ }
94
110
  // Get any provided metadata from site/.metadata/runtime-info.json
95
111
  const providedMetadataPath = `${context.rootDir}/site/.metadata/runtime-info.json`;
96
112
  let providedMetadata = {};
@@ -99,7 +115,7 @@ export default async function siteInfoHandler(_request, context) {
99
115
  }
100
116
  let providedInfoString = '<ul>';
101
117
  for (const key in providedMetadata) {
102
- if (providedMetadata[key] !== 'note-provided') {
118
+ if (providedMetadata[key] !== 'not-provided') {
103
119
  const value = typeof providedMetadata[key] === 'object'
104
120
  ? `<div class="data-container val">${JSON.stringify(providedMetadata[key], null, 2)}</div>`
105
121
  : `<span class="val">${providedMetadata[key]}</span>`;
@@ -109,6 +125,7 @@ export default async function siteInfoHandler(_request, context) {
109
125
  providedInfoString += '</ul>';
110
126
  let infoHtml = baseHtml;
111
127
  infoHtml = infoHtml.replace('{{ versionInfo }}', versionInfoString);
128
+ infoHtml = infoHtml.replace('{{ mrtInfo }}', mrtInfoString);
112
129
  infoHtml = infoHtml.replace('{{ metadata }}', providedInfoString);
113
130
  return {
114
131
  body: infoHtml,
package/build/es/middleware/hmr-middleware.js CHANGED
@@ -61,6 +61,7 @@ class Hmr {
61
61
  ws.send(JSON.stringify({
62
62
  eventType: 'moduleUpdate',
63
63
  payload: {
64
+ format,
64
65
  module: moduleId,
65
66
  newHash: signature,
66
67
  oldHash: 'latest',
package/build/es/middleware/request-processor-middleware.js CHANGED
@@ -7,7 +7,7 @@
7
7
  *
8
8
  */
9
9
  import { logger } from '@lwrjs/diagnostics';
10
- import { REQUEST_DEPTH_HEADER, parseRequestDepthHeader } from '@lwrjs/shared-utils';
10
+ import { REQUEST_DEPTH_HEADER, isLambdaEnv, parseRequestDepthHeader } from '@lwrjs/shared-utils';
11
11
  const MRT_REQUEST_CLASS = 'X-Mobify-Request-Class';
12
12
  const MRT_REQUEST_CLASS_KEY = MRT_REQUEST_CLASS.toLowerCase();
13
13
  export function requestProcessorMiddleware(app, context) {
@@ -32,10 +32,13 @@ export function requestProcessorMiddleware(app, context) {
32
32
  const host = req.headers['host'];
33
33
  const forwardedProto = req.headers['x-forwarded-proto'];
34
34
  const protocol = req.protocol;
35
- logger.info({
36
- label: `request-processor-middleware`,
37
- message: `Original Url: ${req.originalUrl}, Forwarded: ${forwarded}, X-Forwarded-Proto: ${forwardedProto}, Host: ${host}, Protocol: ${protocol}, ${MRT_REQUEST_CLASS}: ${requestClass}, ${REQUEST_DEPTH_HEADER}: ${requestDepth}`,
38
- });
35
+ // Only Add this log when on MRT. Useful to catch issues where CDN did not send us the right info.
36
+ if (isLambdaEnv()) {
37
+ logger.info({
38
+ label: `request-processor-middleware`,
39
+ message: `Original Url: ${req.originalUrl}, Forwarded: ${forwarded}, X-Forwarded-Proto: ${forwardedProto}, Host: ${host}, Protocol: ${protocol}, ${MRT_REQUEST_CLASS}: ${requestClass}, ${REQUEST_DEPTH_HEADER}: ${requestDepth}`,
40
+ });
41
+ }
39
42
  }
40
43
  // TODO Clean up once we have a long term solution
41
44
  if (requestDepth && requestDepth > 0) {
package/build/es/tools/static-generation.js CHANGED
@@ -313,6 +313,7 @@ export default class SiteGenerator {
313
313
  includedModules,
314
314
  imports,
315
315
  dynamicImports,
316
+ integrity: bundleDefinition.integrity,
316
317
  };
317
318
  const siteBundles = siteConfig.siteMetadata.getSiteBundles().bundles;
318
319
  siteBundles[specifier] = bundleMetadata;
@@ -333,6 +334,7 @@ export default class SiteGenerator {
333
334
  mimeType: resourceDefinition.type,
334
335
  inline: resourceDefinition.inline,
335
336
  version: resourceDefinition.version,
337
+ integrity: resourceDefinition.integrity,
336
338
  };
337
339
  const siteResources = siteConfig.siteMetadata.getSiteResources();
338
340
  siteResources.resources[getSiteResourceId(resourceDefinition)] = resourceMetadata;
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
7
- "version": "0.13.0-alpha.9",
7
+ "version": "0.13.0",
8
8
  "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
9
9
  "repository": {
10
10
  "type": "git",
@@ -43,44 +43,44 @@
43
43
  "build": "tsc -b"
44
44
  },
45
45
  "dependencies": {
46
- "@lwrjs/app-service": "0.13.0-alpha.9",
47
- "@lwrjs/asset-registry": "0.13.0-alpha.9",
48
- "@lwrjs/asset-transformer": "0.13.0-alpha.9",
49
- "@lwrjs/base-view-provider": "0.13.0-alpha.9",
50
- "@lwrjs/base-view-transformer": "0.13.0-alpha.9",
51
- "@lwrjs/client-modules": "0.13.0-alpha.9",
52
- "@lwrjs/config": "0.13.0-alpha.9",
53
- "@lwrjs/diagnostics": "0.13.0-alpha.9",
54
- "@lwrjs/esbuild": "0.13.0-alpha.9",
55
- "@lwrjs/fs-asset-provider": "0.13.0-alpha.9",
56
- "@lwrjs/fs-watch": "0.13.0-alpha.9",
57
- "@lwrjs/html-view-provider": "0.13.0-alpha.9",
58
- "@lwrjs/instrumentation": "0.13.0-alpha.9",
59
- "@lwrjs/loader": "0.13.0-alpha.9",
60
- "@lwrjs/lwc-module-provider": "0.13.0-alpha.9",
61
- "@lwrjs/lwc-ssr": "0.13.0-alpha.9",
62
- "@lwrjs/markdown-view-provider": "0.13.0-alpha.9",
63
- "@lwrjs/module-bundler": "0.13.0-alpha.9",
64
- "@lwrjs/module-registry": "0.13.0-alpha.9",
65
- "@lwrjs/npm-module-provider": "0.13.0-alpha.9",
66
- "@lwrjs/nunjucks-view-provider": "0.13.0-alpha.9",
67
- "@lwrjs/o11y": "0.13.0-alpha.9",
68
- "@lwrjs/resource-registry": "0.13.0-alpha.9",
69
- "@lwrjs/router": "0.13.0-alpha.9",
70
- "@lwrjs/server": "0.13.0-alpha.9",
71
- "@lwrjs/shared-utils": "0.13.0-alpha.9",
72
- "@lwrjs/static": "0.13.0-alpha.9",
73
- "@lwrjs/view-registry": "0.13.0-alpha.9",
46
+ "@lwrjs/app-service": "0.13.0",
47
+ "@lwrjs/asset-registry": "0.13.0",
48
+ "@lwrjs/asset-transformer": "0.13.0",
49
+ "@lwrjs/base-view-provider": "0.13.0",
50
+ "@lwrjs/base-view-transformer": "0.13.0",
51
+ "@lwrjs/client-modules": "0.13.0",
52
+ "@lwrjs/config": "0.13.0",
53
+ "@lwrjs/diagnostics": "0.13.0",
54
+ "@lwrjs/esbuild": "0.13.0",
55
+ "@lwrjs/fs-asset-provider": "0.13.0",
56
+ "@lwrjs/fs-watch": "0.13.0",
57
+ "@lwrjs/html-view-provider": "0.13.0",
58
+ "@lwrjs/instrumentation": "0.13.0",
59
+ "@lwrjs/loader": "0.13.0",
60
+ "@lwrjs/lwc-module-provider": "0.13.0",
61
+ "@lwrjs/lwc-ssr": "0.13.0",
62
+ "@lwrjs/markdown-view-provider": "0.13.0",
63
+ "@lwrjs/module-bundler": "0.13.0",
64
+ "@lwrjs/module-registry": "0.13.0",
65
+ "@lwrjs/npm-module-provider": "0.13.0",
66
+ "@lwrjs/nunjucks-view-provider": "0.13.0",
67
+ "@lwrjs/o11y": "0.13.0",
68
+ "@lwrjs/resource-registry": "0.13.0",
69
+ "@lwrjs/router": "0.13.0",
70
+ "@lwrjs/server": "0.13.0",
71
+ "@lwrjs/shared-utils": "0.13.0",
72
+ "@lwrjs/static": "0.13.0",
73
+ "@lwrjs/view-registry": "0.13.0",
74
74
  "chokidar": "^3.6.0",
75
75
  "esbuild": "^0.9.7",
76
76
  "fs-extra": "^11.2.0",
77
- "path-to-regexp": "^6.2.0",
78
- "qs": "^6.12.1",
77
+ "path-to-regexp": "^6.2.2",
78
+ "qs": "^6.12.3",
79
79
  "rollup": "^2.78.0",
80
- "ws": "^8.16.0"
80
+ "ws": "^8.18.0"
81
81
  },
82
82
  "devDependencies": {
83
- "@lwrjs/types": "0.13.0-alpha.9",
83
+ "@lwrjs/types": "0.13.0",
84
84
  "@types/ws": "^8.5.10",
85
85
  "mock-fs": "^5.2.0"
86
86
  },
@@ -93,5 +93,5 @@
93
93
  "volta": {
94
94
  "extends": "../../../package.json"
95
95
  },
96
- "gitHead": "a2a9e1dbf39a7b04c7a43433e004895b6f4c51a3"
96
+ "gitHead": "21dc6b8ffd2e633f36b46daf9e1563992c5143b9"
97
97
  }