@lwrjs/core 0.11.2 → 0.11.3

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 (3) hide show
  1. package/build/cjs/middleware/view-middleware.cjs +19 -9
  2. package/build/es/middleware/view-middleware.js +20 -9
  3. package/package.json +30 -30
package/build/cjs/middleware/view-middleware.cjs CHANGED
@@ -47,9 +47,9 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
47
47
  res.send(import_diagnostics.descriptions.UNRESOLVABLE.INVALID_JSON().message);
48
48
  return;
49
49
  }
50
- const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(context.runtimeEnvironment);
51
- if (!runtimeParams.environment && environmentConfig?.default) {
52
- runtimeParams.environment = environmentConfig.default;
50
+ const {runtimeEnvironment, runtimeParams: defaultRuntimeParams} = req.getRuntimeContext(context.runtimeEnvironment);
51
+ if (!defaultRuntimeParams.environment && environmentConfig?.default) {
52
+ defaultRuntimeParams.environment = environmentConfig.default;
53
53
  }
54
54
  const viewRequest = {
55
55
  url: req.originalUrl,
@@ -57,6 +57,12 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
57
57
  query: req.query,
58
58
  requestPath: req.path
59
59
  };
60
+ const runtimeParams = {
61
+ ...defaultRuntimeParams,
62
+ url: viewRequest.url,
63
+ params: viewRequest.params,
64
+ query: viewRequest.query
65
+ };
60
66
  const resolve = req.isJsonRequest() ? viewHandler.getViewJson : viewHandler.getViewContent;
61
67
  let viewResponse;
62
68
  let resolvedRoute;
@@ -93,9 +99,11 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
93
99
  if (viewResponse.headers) {
94
100
  res.set(viewResponse.headers);
95
101
  }
96
- const cacheTtl = (0, import_shared_utils.shortestTtl)(viewResponse.cache?.ttl, resolvedRoute.cache?.ttl);
97
- if (cacheTtl) {
98
- res.setHeader("cache-control", `public, max-age=${cacheTtl}`);
102
+ if (!res.hasHeader("cache-control")) {
103
+ const cacheTtl = (0, import_shared_utils.shortestTtl)(viewResponse.cache?.ttl, resolvedRoute.cache?.ttl);
104
+ if (cacheTtl) {
105
+ res.setHeader("cache-control", `public, max-age=${cacheTtl}`);
106
+ }
99
107
  }
100
108
  const status = resolvedRoute.status || viewResponse.status || 200;
101
109
  res.status(status);
@@ -127,9 +135,11 @@ function createConfigMiddleware(routes, context, viewHandler) {
127
135
  res.status(404).send(import_diagnostics.descriptions.UNRESOLVABLE.VIEW_CONFIG(url).message);
128
136
  return;
129
137
  }
130
- const cacheTtl = (0, import_shared_utils.shortestTtl)(viewResponse.cache?.ttl, route.cache?.ttl);
131
- if (cacheTtl) {
132
- res.setHeader("cache-control", `public, max-age=${cacheTtl}`);
138
+ if (!res.hasHeader("cache-control")) {
139
+ const cacheTtl = (0, import_shared_utils.shortestTtl)(viewResponse.cache?.ttl, route.cache?.ttl);
140
+ if (cacheTtl) {
141
+ res.setHeader("cache-control", `public, max-age=${cacheTtl}`);
142
+ }
133
143
  }
134
144
  res.status(200);
135
145
  res.type("application/javascript");
package/build/es/middleware/view-middleware.js CHANGED
@@ -19,10 +19,10 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
19
19
  res.send(descriptions.UNRESOLVABLE.INVALID_JSON().message);
20
20
  return;
21
21
  }
22
- const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(context.runtimeEnvironment);
22
+ const { runtimeEnvironment, runtimeParams: defaultRuntimeParams } = req.getRuntimeContext(context.runtimeEnvironment);
23
23
  // set the default environment if an environment is configured in the app config
24
- if (!runtimeParams.environment && environmentConfig?.default) {
25
- runtimeParams.environment = environmentConfig.default;
24
+ if (!defaultRuntimeParams.environment && environmentConfig?.default) {
25
+ defaultRuntimeParams.environment = environmentConfig.default;
26
26
  }
27
27
  const viewRequest = {
28
28
  url: req.originalUrl,
@@ -30,6 +30,13 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
30
30
  query: req.query,
31
31
  requestPath: req.path,
32
32
  };
33
+ // Augment runtime params with viewRequest info
34
+ const runtimeParams = {
35
+ ...defaultRuntimeParams,
36
+ url: viewRequest.url,
37
+ params: viewRequest.params,
38
+ query: viewRequest.query,
39
+ };
33
40
  const resolve = req.isJsonRequest() ? viewHandler.getViewJson : viewHandler.getViewContent;
34
41
  let viewResponse;
35
42
  let resolvedRoute;
@@ -71,9 +78,11 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
71
78
  res.set(viewResponse.headers);
72
79
  }
73
80
  // pick the shortest TTL between the view response and route object
74
- const cacheTtl = shortestTtl(viewResponse.cache?.ttl, resolvedRoute.cache?.ttl);
75
- if (cacheTtl) {
76
- res.setHeader('cache-control', `public, max-age=${cacheTtl}`);
81
+ if (!res.hasHeader('cache-control')) {
82
+ const cacheTtl = shortestTtl(viewResponse.cache?.ttl, resolvedRoute.cache?.ttl);
83
+ if (cacheTtl) {
84
+ res.setHeader('cache-control', `public, max-age=${cacheTtl}`);
85
+ }
77
86
  }
78
87
  const status = resolvedRoute.status || viewResponse.status || 200;
79
88
  res.status(status);
@@ -108,9 +117,11 @@ function createConfigMiddleware(routes, context, viewHandler) {
108
117
  return;
109
118
  }
110
119
  // Pick the shortest TTL between the view response and route object
111
- const cacheTtl = shortestTtl(viewResponse.cache?.ttl, route.cache?.ttl);
112
- if (cacheTtl) {
113
- res.setHeader('cache-control', `public, max-age=${cacheTtl}`);
120
+ if (!res.hasHeader('cache-control')) {
121
+ const cacheTtl = shortestTtl(viewResponse.cache?.ttl, route.cache?.ttl);
122
+ if (cacheTtl) {
123
+ res.setHeader('cache-control', `public, max-age=${cacheTtl}`);
124
+ }
114
125
  }
115
126
  res.status(200);
116
127
  res.type('application/javascript');
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
7
- "version": "0.11.2",
7
+ "version": "0.11.3",
8
8
  "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
9
9
  "repository": {
10
10
  "type": "git",
@@ -39,33 +39,33 @@
39
39
  "build": "tsc -b"
40
40
  },
41
41
  "dependencies": {
42
- "@lwrjs/app-service": "0.11.2",
43
- "@lwrjs/asset-registry": "0.11.2",
44
- "@lwrjs/asset-transformer": "0.11.2",
45
- "@lwrjs/base-view-provider": "0.11.2",
46
- "@lwrjs/base-view-transformer": "0.11.2",
47
- "@lwrjs/client-modules": "0.11.2",
48
- "@lwrjs/config": "0.11.2",
49
- "@lwrjs/diagnostics": "0.11.2",
50
- "@lwrjs/esbuild": "0.11.2",
51
- "@lwrjs/fs-asset-provider": "0.11.2",
52
- "@lwrjs/fs-watch": "0.11.2",
53
- "@lwrjs/html-view-provider": "0.11.2",
54
- "@lwrjs/instrumentation": "0.11.2",
55
- "@lwrjs/loader": "0.11.2",
56
- "@lwrjs/lwc-module-provider": "0.11.2",
57
- "@lwrjs/markdown-view-provider": "0.11.2",
58
- "@lwrjs/module-bundler": "0.11.2",
59
- "@lwrjs/module-registry": "0.11.2",
60
- "@lwrjs/npm-module-provider": "0.11.2",
61
- "@lwrjs/nunjucks-view-provider": "0.11.2",
62
- "@lwrjs/o11y": "0.11.2",
63
- "@lwrjs/resource-registry": "0.11.2",
64
- "@lwrjs/router": "0.11.2",
65
- "@lwrjs/server": "0.11.2",
66
- "@lwrjs/shared-utils": "0.11.2",
67
- "@lwrjs/static": "0.11.2",
68
- "@lwrjs/view-registry": "0.11.2",
42
+ "@lwrjs/app-service": "0.11.3",
43
+ "@lwrjs/asset-registry": "0.11.3",
44
+ "@lwrjs/asset-transformer": "0.11.3",
45
+ "@lwrjs/base-view-provider": "0.11.3",
46
+ "@lwrjs/base-view-transformer": "0.11.3",
47
+ "@lwrjs/client-modules": "0.11.3",
48
+ "@lwrjs/config": "0.11.3",
49
+ "@lwrjs/diagnostics": "0.11.3",
50
+ "@lwrjs/esbuild": "0.11.3",
51
+ "@lwrjs/fs-asset-provider": "0.11.3",
52
+ "@lwrjs/fs-watch": "0.11.3",
53
+ "@lwrjs/html-view-provider": "0.11.3",
54
+ "@lwrjs/instrumentation": "0.11.3",
55
+ "@lwrjs/loader": "0.11.3",
56
+ "@lwrjs/lwc-module-provider": "0.11.3",
57
+ "@lwrjs/markdown-view-provider": "0.11.3",
58
+ "@lwrjs/module-bundler": "0.11.3",
59
+ "@lwrjs/module-registry": "0.11.3",
60
+ "@lwrjs/npm-module-provider": "0.11.3",
61
+ "@lwrjs/nunjucks-view-provider": "0.11.3",
62
+ "@lwrjs/o11y": "0.11.3",
63
+ "@lwrjs/resource-registry": "0.11.3",
64
+ "@lwrjs/router": "0.11.3",
65
+ "@lwrjs/server": "0.11.3",
66
+ "@lwrjs/shared-utils": "0.11.3",
67
+ "@lwrjs/static": "0.11.3",
68
+ "@lwrjs/view-registry": "0.11.3",
69
69
  "chokidar": "^3.5.3",
70
70
  "esbuild": "^0.9.7",
71
71
  "fs-extra": "^11.1.1",
@@ -75,7 +75,7 @@
75
75
  "ws": "^8.8.1"
76
76
  },
77
77
  "devDependencies": {
78
- "@lwrjs/types": "0.11.2",
78
+ "@lwrjs/types": "0.11.3",
79
79
  "@types/ws": "^8.5.3"
80
80
  },
81
81
  "peerDependencies": {
@@ -87,5 +87,5 @@
87
87
  "volta": {
88
88
  "extends": "../../../package.json"
89
89
  },
90
- "gitHead": "290a924d5e6610b54566aec8750895772f06d3aa"
90
+ "gitHead": "e420814f37150c71850f7f46f20372a33e1bb6d8"
91
91
  }