@lwrjs/core 0.13.0-alpha.0 → 0.13.0-alpha.10

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/context/provider.cjs +1 -1
  2. package/build/cjs/middleware/request-processor-middleware.cjs +8 -4
  3. package/build/cjs/middleware/resource-middleware.cjs +1 -1
  4. package/build/cjs/tools/static-generation.cjs +12 -8
  5. package/build/cjs/tools/utils/network-dispatcher.cjs +1 -1
  6. package/build/es/context/provider.js +1 -1
  7. package/build/es/middleware/request-processor-middleware.js +9 -5
  8. package/build/es/middleware/resource-middleware.js +1 -1
  9. package/build/es/tools/static-generation.js +13 -11
  10. package/build/es/tools/utils/network-dispatcher.js +2 -2
  11. package/package.json +32 -32
package/build/cjs/context/provider.cjs CHANGED
@@ -55,7 +55,7 @@ function createProviderContext(serverContext) {
55
55
  notifyViewSourceChanged,
56
56
  notifyAssetSourceChanged
57
57
  } = serverContext.appEmitter;
58
- const siteMetadata = staticSiteGenerator.outputDir && import_fs.default.existsSync(staticSiteGenerator.outputDir) ? new import_site_metadata.SiteMetadataImpl({rootDir: staticSiteGenerator.outputDir}) : void 0;
58
+ const siteMetadata = staticSiteGenerator.outputDir && import_fs.default.existsSync(staticSiteGenerator.outputDir) ? new import_site_metadata.SiteMetadataImpl({rootDir: staticSiteGenerator.outputDir, i18n}) : void 0;
59
59
  return {
60
60
  appObserver: (0, import_shared_utils.deepFreeze)({onModuleDefinitionChange, onModuleSourceChange}),
61
61
  appEmitter: {
package/build/cjs/middleware/request-processor-middleware.cjs CHANGED
@@ -37,10 +37,6 @@ function requestProcessorMiddleware(app, context) {
37
37
  let requestDepth;
38
38
  if (req.headers) {
39
39
  if (import_diagnostics.logger.isDebugEnabled()) {
40
- import_diagnostics.logger.debug({
41
- label: `request-processor-middleware`,
42
- message: `Request: ${req.originalUrl}`
43
- });
44
40
  for (const headerName in req.headers) {
45
41
  import_diagnostics.logger.debug({
46
42
  label: `request-processor-middleware`,
@@ -50,6 +46,14 @@ function requestProcessorMiddleware(app, context) {
50
46
  }
51
47
  requestClass = req.headers[MRT_REQUEST_CLASS_KEY];
52
48
  requestDepth = (0, import_shared_utils.parseRequestDepthHeader)(req.headers);
49
+ const forwarded = req.headers["forwarded"];
50
+ const host = req.headers["host"];
51
+ const forwardedProto = req.headers["x-forwarded-proto"];
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
57
  }
54
58
  if (requestDepth && requestDepth > 0) {
55
59
  import_diagnostics.logger.error({
package/build/cjs/middleware/resource-middleware.cjs CHANGED
@@ -51,7 +51,7 @@ function createResourceMiddleware(context) {
51
51
  res.status(200).type(resource.type).stream(resource.stream());
52
52
  return;
53
53
  }
54
- res.status(404).send(import_diagnostics.descriptions.UNRESOLVABLE.RESOURCE(resourceId.specifier).message);
54
+ res.status(404).send(import_diagnostics.descriptions.UNRESOLVABLE.RESOURCE(resourceId.specifier, resourceId.version).message);
55
55
  };
56
56
  }
57
57
  function resourceMiddleware(app, context) {
package/build/cjs/tools/static-generation.cjs CHANGED
@@ -232,14 +232,18 @@ var SiteGenerator = class {
232
232
  addBundleToSiteMetadata(bundleDefinition, url, siteConfig) {
233
233
  if (siteConfig.siteMetadata) {
234
234
  const locale = siteConfig.locale;
235
- const specifier = siteConfig.i18n.defaultLocale === locale ? bundleDefinition.specifier : `${bundleDefinition.specifier}|l/${locale}`;
236
- const imports = bundleDefinition.bundleRecord.imports?.map((moduleRef) => (0, import_shared_utils.getSpecifier)(moduleRef)) || [];
237
- const dynamicImports = bundleDefinition.bundleRecord.dynamicImports?.map((moduleRef) => (0, import_shared_utils.getSpecifier)(moduleRef));
235
+ const specifier = (0, import_site_metadata.getSiteBundleId)(bundleDefinition, locale, siteConfig.i18n);
236
+ const imports = bundleDefinition.bundleRecord.imports?.map((moduleRef) => (0, import_site_metadata.getSiteBundleId)(moduleRef, locale, siteConfig.i18n)) || [];
237
+ const dynamicImports = bundleDefinition.bundleRecord.dynamicImports?.map((moduleRef) => (0, import_site_metadata.getSiteBundleId)(moduleRef, locale, siteConfig.i18n));
238
+ const includedModules = bundleDefinition.bundleRecord.includedModules?.map((moduleRef) => {
239
+ const moduleId = (0, import_shared_utils.explodeSpecifier)(moduleRef);
240
+ return (0, import_site_metadata.getSiteBundleId)(moduleId, locale, siteConfig.i18n);
241
+ }) || [];
238
242
  const version = bundleDefinition.version === import_shared_utils.VERSION_NOT_PROVIDED ? void 0 : bundleDefinition.version;
239
243
  const bundleMetadata = {
240
244
  version,
241
245
  path: decodeURIComponent(url),
242
- includedModules: bundleDefinition.bundleRecord.includedModules || [],
246
+ includedModules,
243
247
  imports,
244
248
  dynamicImports
245
249
  };
@@ -256,14 +260,14 @@ var SiteGenerator = class {
256
260
  additionalInfo: resourceDefinition
257
261
  });
258
262
  } else {
259
- const specifier = resourceDefinition.specifier;
260
263
  const resourceMetadata = {
261
264
  path: decodeURIComponent(url),
262
265
  mimeType: resourceDefinition.type,
263
- inline: resourceDefinition.inline
266
+ inline: resourceDefinition.inline,
267
+ version: resourceDefinition.version
264
268
  };
265
269
  const siteResources = siteConfig.siteMetadata.getSiteResources();
266
- siteResources.resources[specifier] = resourceMetadata;
270
+ siteResources.resources[(0, import_site_metadata.getSiteResourceId)(resourceDefinition)] = resourceMetadata;
267
271
  }
268
272
  }
269
273
  }
@@ -555,7 +559,7 @@ var SiteGenerator = class {
555
559
  endpoints,
556
560
  skipBaseDocumentGeneration,
557
561
  ...featureFlags,
558
- siteMetadata: new import_site_metadata.SiteMetadataImpl({rootDir: outputDir}),
562
+ siteMetadata: new import_site_metadata.SiteMetadataImpl({rootDir: outputDir, i18n}),
559
563
  i18n
560
564
  };
561
565
  }
package/build/cjs/tools/utils/network-dispatcher.cjs CHANGED
@@ -79,7 +79,7 @@ var NetworkDispatcher = class {
79
79
  const jsonResponse = JSON.parse(body);
80
80
  resolve(jsonResponse);
81
81
  } catch (err) {
82
- const message = process.env.MRT_HMR !== "true" ? `unexpected response body: [${method}][${lang}] ${url}: '${body}'` : `unexpected response body: [${method}][${lang}] ${url}`;
82
+ const message = !(0, import_shared_utils.isLocalDev)() ? `unexpected response body: [${method}][${lang}] ${url}: '${body}'` : `unexpected response body: [${method}][${lang}] ${url}`;
83
83
  if (import_diagnostics.logger.isDebugEnabled()) {
84
84
  import_diagnostics.logger.warn({
85
85
  label: `NetworkDispatcher`,
package/build/es/context/provider.js CHANGED
@@ -7,7 +7,7 @@ export function createProviderContext(serverContext) {
7
7
  const { onModuleDefinitionChange, onModuleSourceChange } = serverContext.appObserver;
8
8
  const { notifyModuleDefinitionChanged, notifyModuleSourceChanged, notifyViewSourceChanged, notifyAssetSourceChanged, } = serverContext.appEmitter;
9
9
  const siteMetadata = staticSiteGenerator.outputDir && fs.existsSync(staticSiteGenerator.outputDir)
10
- ? new SiteMetadataImpl({ rootDir: staticSiteGenerator.outputDir })
10
+ ? new SiteMetadataImpl({ rootDir: staticSiteGenerator.outputDir, i18n })
11
11
  : undefined;
12
12
  return {
13
13
  appObserver: deepFreeze({ onModuleDefinitionChange, onModuleSourceChange }),
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 { parseRequestDepthHeader } from '@lwrjs/shared-utils';
10
+ import { REQUEST_DEPTH_HEADER, 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) {
@@ -18,10 +18,6 @@ export function requestProcessorMiddleware(app, context) {
18
18
  if (req.headers) {
19
19
  // If debug print log all the headers
20
20
  if (logger.isDebugEnabled()) {
21
- logger.debug({
22
- label: `request-processor-middleware`,
23
- message: `Request: ${req.originalUrl}`,
24
- });
25
21
  // Loop through and print each header
26
22
  for (const headerName in req.headers) {
27
23
  logger.debug({
@@ -32,6 +28,14 @@ export function requestProcessorMiddleware(app, context) {
32
28
  }
33
29
  requestClass = req.headers[MRT_REQUEST_CLASS_KEY];
34
30
  requestDepth = parseRequestDepthHeader(req.headers);
31
+ const forwarded = req.headers['forwarded'];
32
+ const host = req.headers['host'];
33
+ const forwardedProto = req.headers['x-forwarded-proto'];
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
39
  }
36
40
  // TODO Clean up once we have a long term solution
37
41
  if (requestDepth && requestDepth > 0) {
package/build/es/middleware/resource-middleware.js CHANGED
@@ -23,7 +23,7 @@ function createResourceMiddleware(context) {
23
23
  res.status(200).type(resource.type).stream(resource.stream());
24
24
  return;
25
25
  }
26
- res.status(404).send(descriptions.UNRESOLVABLE.RESOURCE(resourceId.specifier).message);
26
+ res.status(404).send(descriptions.UNRESOLVABLE.RESOURCE(resourceId.specifier, resourceId.version).message);
27
27
  };
28
28
  }
29
29
  export function resourceMiddleware(app, context) {
package/build/es/tools/static-generation.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { performance } from 'perf_hooks';
2
2
  import { logger } from '@lwrjs/diagnostics';
3
- import { getSpecifier, getFeatureFlags, hashContent, isSelfUrl, getModuleUriPrefix, getMappingUriPrefix, isExternalUrl, mimeLookup, getViewUri, sortLocalesByFallback, VERSION_NOT_PROVIDED, PROTOCOL_FILE, normalizeFromFileURL, isExternalSpecifier, } from '@lwrjs/shared-utils';
4
- import { SiteMetadataImpl } from '@lwrjs/static/site-metadata';
3
+ import { getSpecifier, getFeatureFlags, hashContent, isSelfUrl, getModuleUriPrefix, getMappingUriPrefix, isExternalUrl, mimeLookup, getViewUri, sortLocalesByFallback, VERSION_NOT_PROVIDED, PROTOCOL_FILE, normalizeFromFileURL, isExternalSpecifier, explodeSpecifier, } from '@lwrjs/shared-utils';
4
+ import { SiteMetadataImpl, getSiteBundleId, getSiteResourceId } from '@lwrjs/static/site-metadata';
5
5
  import { join, dirname, extname, normalize } from 'path';
6
6
  import fs from 'fs-extra';
7
7
  import { writeResponse } from './utils/stream.js';
@@ -299,16 +299,18 @@ export default class SiteGenerator {
299
299
  addBundleToSiteMetadata(bundleDefinition, url, siteConfig) {
300
300
  if (siteConfig.siteMetadata) {
301
301
  const locale = siteConfig.locale;
302
- const specifier = siteConfig.i18n.defaultLocale === locale
303
- ? bundleDefinition.specifier
304
- : `${bundleDefinition.specifier}|l/${locale}`;
305
- const imports = bundleDefinition.bundleRecord.imports?.map((moduleRef) => getSpecifier(moduleRef)) || [];
306
- const dynamicImports = bundleDefinition.bundleRecord.dynamicImports?.map((moduleRef) => getSpecifier(moduleRef));
302
+ const specifier = getSiteBundleId(bundleDefinition, locale, siteConfig.i18n);
303
+ const imports = bundleDefinition.bundleRecord.imports?.map((moduleRef) => getSiteBundleId(moduleRef, locale, siteConfig.i18n)) || [];
304
+ const dynamicImports = bundleDefinition.bundleRecord.dynamicImports?.map((moduleRef) => getSiteBundleId(moduleRef, locale, siteConfig.i18n));
305
+ const includedModules = bundleDefinition.bundleRecord.includedModules?.map((moduleRef) => {
306
+ const moduleId = explodeSpecifier(moduleRef);
307
+ return getSiteBundleId(moduleId, locale, siteConfig.i18n);
308
+ }) || [];
307
309
  const version = bundleDefinition.version === VERSION_NOT_PROVIDED ? undefined : bundleDefinition.version;
308
310
  const bundleMetadata = {
309
311
  version,
310
312
  path: decodeURIComponent(url),
311
- includedModules: bundleDefinition.bundleRecord.includedModules || [],
313
+ includedModules,
312
314
  imports,
313
315
  dynamicImports,
314
316
  };
@@ -326,14 +328,14 @@ export default class SiteGenerator {
326
328
  });
327
329
  }
328
330
  else {
329
- const specifier = resourceDefinition.specifier;
330
331
  const resourceMetadata = {
331
332
  path: decodeURIComponent(url),
332
333
  mimeType: resourceDefinition.type,
333
334
  inline: resourceDefinition.inline,
335
+ version: resourceDefinition.version,
334
336
  };
335
337
  const siteResources = siteConfig.siteMetadata.getSiteResources();
336
- siteResources.resources[specifier] = resourceMetadata;
338
+ siteResources.resources[getSiteResourceId(resourceDefinition)] = resourceMetadata;
337
339
  }
338
340
  }
339
341
  }
@@ -738,7 +740,7 @@ export default class SiteGenerator {
738
740
  skipBaseDocumentGeneration,
739
741
  // Only include LEGACY_LOADER if true
740
742
  ...featureFlags,
741
- siteMetadata: new SiteMetadataImpl({ rootDir: outputDir }),
743
+ siteMetadata: new SiteMetadataImpl({ rootDir: outputDir, i18n }),
742
744
  i18n,
743
745
  };
744
746
  }
package/build/es/tools/utils/network-dispatcher.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import http from 'http';
2
2
  import https from 'https';
3
3
  import { logger } from '@lwrjs/diagnostics';
4
- import { isModuleOrBundleUrl } from '@lwrjs/shared-utils';
4
+ import { isLocalDev, isModuleOrBundleUrl } from '@lwrjs/shared-utils';
5
5
  export default class NetworkDispatcher {
6
6
  constructor(port, internalRequestKey) {
7
7
  this.port = port || 3000;
@@ -53,7 +53,7 @@ export default class NetworkDispatcher {
53
53
  resolve(jsonResponse);
54
54
  }
55
55
  catch (err) {
56
- const message = process.env.MRT_HMR !== 'true' // avoid giant log messages during local dev
56
+ const message = !isLocalDev() // avoid giant log messages during local dev
57
57
  ? `unexpected response body: [${method}][${lang}] ${url}: '${body}'`
58
58
  : `unexpected response body: [${method}][${lang}] ${url}`;
59
59
  if (logger.isDebugEnabled()) {
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
7
- "version": "0.13.0-alpha.0",
7
+ "version": "0.13.0-alpha.10",
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.0",
47
- "@lwrjs/asset-registry": "0.13.0-alpha.0",
48
- "@lwrjs/asset-transformer": "0.13.0-alpha.0",
49
- "@lwrjs/base-view-provider": "0.13.0-alpha.0",
50
- "@lwrjs/base-view-transformer": "0.13.0-alpha.0",
51
- "@lwrjs/client-modules": "0.13.0-alpha.0",
52
- "@lwrjs/config": "0.13.0-alpha.0",
53
- "@lwrjs/diagnostics": "0.13.0-alpha.0",
54
- "@lwrjs/esbuild": "0.13.0-alpha.0",
55
- "@lwrjs/fs-asset-provider": "0.13.0-alpha.0",
56
- "@lwrjs/fs-watch": "0.13.0-alpha.0",
57
- "@lwrjs/html-view-provider": "0.13.0-alpha.0",
58
- "@lwrjs/instrumentation": "0.13.0-alpha.0",
59
- "@lwrjs/loader": "0.13.0-alpha.0",
60
- "@lwrjs/lwc-module-provider": "0.13.0-alpha.0",
61
- "@lwrjs/lwc-ssr": "0.13.0-alpha.0",
62
- "@lwrjs/markdown-view-provider": "0.13.0-alpha.0",
63
- "@lwrjs/module-bundler": "0.13.0-alpha.0",
64
- "@lwrjs/module-registry": "0.13.0-alpha.0",
65
- "@lwrjs/npm-module-provider": "0.13.0-alpha.0",
66
- "@lwrjs/nunjucks-view-provider": "0.13.0-alpha.0",
67
- "@lwrjs/o11y": "0.13.0-alpha.0",
68
- "@lwrjs/resource-registry": "0.13.0-alpha.0",
69
- "@lwrjs/router": "0.13.0-alpha.0",
70
- "@lwrjs/server": "0.13.0-alpha.0",
71
- "@lwrjs/shared-utils": "0.13.0-alpha.0",
72
- "@lwrjs/static": "0.13.0-alpha.0",
73
- "@lwrjs/view-registry": "0.13.0-alpha.0",
46
+ "@lwrjs/app-service": "0.13.0-alpha.10",
47
+ "@lwrjs/asset-registry": "0.13.0-alpha.10",
48
+ "@lwrjs/asset-transformer": "0.13.0-alpha.10",
49
+ "@lwrjs/base-view-provider": "0.13.0-alpha.10",
50
+ "@lwrjs/base-view-transformer": "0.13.0-alpha.10",
51
+ "@lwrjs/client-modules": "0.13.0-alpha.10",
52
+ "@lwrjs/config": "0.13.0-alpha.10",
53
+ "@lwrjs/diagnostics": "0.13.0-alpha.10",
54
+ "@lwrjs/esbuild": "0.13.0-alpha.10",
55
+ "@lwrjs/fs-asset-provider": "0.13.0-alpha.10",
56
+ "@lwrjs/fs-watch": "0.13.0-alpha.10",
57
+ "@lwrjs/html-view-provider": "0.13.0-alpha.10",
58
+ "@lwrjs/instrumentation": "0.13.0-alpha.10",
59
+ "@lwrjs/loader": "0.13.0-alpha.10",
60
+ "@lwrjs/lwc-module-provider": "0.13.0-alpha.10",
61
+ "@lwrjs/lwc-ssr": "0.13.0-alpha.10",
62
+ "@lwrjs/markdown-view-provider": "0.13.0-alpha.10",
63
+ "@lwrjs/module-bundler": "0.13.0-alpha.10",
64
+ "@lwrjs/module-registry": "0.13.0-alpha.10",
65
+ "@lwrjs/npm-module-provider": "0.13.0-alpha.10",
66
+ "@lwrjs/nunjucks-view-provider": "0.13.0-alpha.10",
67
+ "@lwrjs/o11y": "0.13.0-alpha.10",
68
+ "@lwrjs/resource-registry": "0.13.0-alpha.10",
69
+ "@lwrjs/router": "0.13.0-alpha.10",
70
+ "@lwrjs/server": "0.13.0-alpha.10",
71
+ "@lwrjs/shared-utils": "0.13.0-alpha.10",
72
+ "@lwrjs/static": "0.13.0-alpha.10",
73
+ "@lwrjs/view-registry": "0.13.0-alpha.10",
74
74
  "chokidar": "^3.6.0",
75
75
  "esbuild": "^0.9.7",
76
76
  "fs-extra": "^11.2.0",
77
77
  "path-to-regexp": "^6.2.0",
78
- "qs": "^6.11.2",
78
+ "qs": "^6.12.1",
79
79
  "rollup": "^2.78.0",
80
80
  "ws": "^8.16.0"
81
81
  },
82
82
  "devDependencies": {
83
- "@lwrjs/types": "0.13.0-alpha.0",
83
+ "@lwrjs/types": "0.13.0-alpha.10",
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": "c5fe8db55c74513dbb0937d1b4568109715a13fb"
96
+ "gitHead": "53e2a825868b4c9b1662419b531c80be13afd779"
97
97
  }