@nordcraft/ssr 1.0.19 → 1.0.20

package/dist/rendering/template.js

@@ -1,6 +1,6 @@
 import { STRING_TEMPLATE } from '@nordcraft/core/dist/api/template';
 import { isDefined } from '@nordcraft/core/dist/utils/util';
-import { skipCookieHeader, skipToddleHeader } from '../utils/headers';
+import { skipCookieHeader, skipNordcraftHeaders } from '../utils/headers';
 export const applyTemplateValues = (input, cookies) => {
     if (!isDefined(input)) {
         return '';
@@ -27,7 +27,7 @@ export const applyTemplateValues = (input, cookies) => {
 };
 export const sanitizeProxyHeaders = ({ cookies, headers, }) => new Headers(mapTemplateHeaders({
     cookies,
-    headers: skipCookieHeader(skipToddleHeader(headers)),
+    headers: skipCookieHeader(skipNordcraftHeaders(headers)),
 }));
 export const mapTemplateHeaders = ({ cookies, headers, }) => new Headers([...headers.entries()].map(([name, value]) => [
     name,

package/dist/rendering/template.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/rendering/template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAA;AAEnE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAC3D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAErE,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,KAAgC,EAChC,OAAuD,EACvD,EAAE;IACF,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,EAAE,CAAA;IACX,CAAC;IACD,MAAM,WAAW,GAAG,wBAAwB,CAAA;IAC5C,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAA;IACrC,IAAI,CAAyB,CAAA;IAC7B,OAAO,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC9C,oEAAoE;QACpE,IAAI,CAAC,CAAC,KAAK,KAAK,WAAW,CAAC,SAAS,EAAE,CAAC;YACtC,WAAW,CAAC,SAAS,EAAE,CAAA;QACzB,CAAC;QACD,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACvB,CAAC;IACD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;QACvC,MAAM,GAAG,MAAM,CAAC,UAAU,CACxB,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC;QACtC,+DAA+D;QAC/D,oEAAoE;QACpE,WAAW,IAAI,EAAE,CAClB,CAAA;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EACnC,OAAO,EACP,OAAO,GAIR,EAAE,EAAE,CACH,IAAI,OAAO,CACT,kBAAkB,CAAC;IACjB,OAAO;IACP,OAAO,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;CACrD,CAAC,CACH,CAAA;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EACjC,OAAO,EACP,OAAO,GAIR,EAAE,EAAE,CACH,IAAI,OAAO,CACT,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAoB,EAAE,CAAC;IAC9D,IAAI;IACJ,8CAA8C;IAC9C,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC;CACpC,CAAC,CACH,CAAA"}
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/rendering/template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAA;AAEnE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAC3D,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAEzE,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,KAAgC,EAChC,OAAuD,EACvD,EAAE;IACF,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,EAAE,CAAA;IACX,CAAC;IACD,MAAM,WAAW,GAAG,wBAAwB,CAAA;IAC5C,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAA;IACrC,IAAI,CAAyB,CAAA;IAC7B,OAAO,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC9C,oEAAoE;QACpE,IAAI,CAAC,CAAC,KAAK,KAAK,WAAW,CAAC,SAAS,EAAE,CAAC;YACtC,WAAW,CAAC,SAAS,EAAE,CAAA;QACzB,CAAC;QACD,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACvB,CAAC;IACD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;QACvC,MAAM,GAAG,MAAM,CAAC,UAAU,CACxB,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC;QACtC,+DAA+D;QAC/D,oEAAoE;QACpE,WAAW,IAAI,EAAE,CAClB,CAAA;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EACnC,OAAO,EACP,OAAO,GAIR,EAAE,EAAE,CACH,IAAI,OAAO,CACT,kBAAkB,CAAC;IACjB,OAAO;IACP,OAAO,EAAE,gBAAgB,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;CACzD,CAAC,CACH,CAAA;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EACjC,OAAO,EACP,OAAO,GAIR,EAAE,EAAE,CACH,IAAI,OAAO,CACT,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAoB,EAAE,CAAC;IAC9D,IAAI;IACJ,8CAA8C;IAC9C,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC;CACpC,CAAC,CACH,CAAA"}

package/dist/utils/headers.d.ts

@@ -5,8 +5,8 @@
  */
 export declare const skipCookieHeader: (headers: Headers) => Headers;
 /**
- * Omit the x-toddle-url header from a set of headers.
- * Since this header is only relevant for toddle requests, it's not useful
- * for other services to receive this.
+ * Omit the "x-nordcraft-url" and "x-nordcraft-templates-in-body" headers
+ * from a set of headers. Since these headers are only relevant for the
+ * Nordcraft API proxy, it's not useful for other services to receive them
  */
-export declare const skipToddleHeader: (headers: Headers) => Headers;
+export declare const skipNordcraftHeaders: (headers: Headers) => Headers;

package/dist/utils/headers.js

@@ -1,4 +1,4 @@
-import { PROXY_URL_HEADER } from '@nordcraft/core/dist/utils/url';
+import { PROXY_TEMPLATES_IN_BODY, PROXY_URL_HEADER, } from '@nordcraft/core/dist/utils/url';
 /**
  * Omit the `cookie` header from a set of headers.
  * This is useful when proxying requests for routes/proxied API requests
@@ -10,13 +10,14 @@ export const skipCookieHeader = (headers) => {
     return newHeaders;
 };
 /**
- * Omit the x-toddle-url header from a set of headers.
- * Since this header is only relevant for toddle requests, it's not useful
- * for other services to receive this.
+ * Omit the "x-nordcraft-url" and "x-nordcraft-templates-in-body" headers
+ * from a set of headers. Since these headers are only relevant for the
+ * Nordcraft API proxy, it's not useful for other services to receive them
  */
-export const skipToddleHeader = (headers) => {
+export const skipNordcraftHeaders = (headers) => {
     const newHeaders = new Headers(headers);
     newHeaders.delete(PROXY_URL_HEADER);
+    newHeaders.delete(PROXY_TEMPLATES_IN_BODY);
     return newHeaders;
 };
 //# sourceMappingURL=headers.js.map

package/dist/utils/headers.js.map

@@ -1 +1 @@
-{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../src/utils/headers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEjE;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAAA;IACvC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC3B,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAAA;IACvC,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;IACnC,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA"}
+{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../src/utils/headers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,gBAAgB,GACjB,MAAM,gCAAgC,CAAA;AAEvC;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAAA;IACvC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC3B,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACvD,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAAA;IACvC,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;IACnC,UAAU,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAA;IAC1C,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA"}

package/package.json

@@ -13,10 +13,10 @@
 "main": "dist/index.js",
 "types": "dist/index.d.ts",
 "dependencies": {
-"@nordcraft/core": "1.0.19",
-"@nordcraft/std-lib": "1.0.19",
+"@nordcraft/core": "1.0.20",
+"@nordcraft/std-lib": "1.0.20",
 "cookie": "1.0.2",
 "xss": "1.0.15"
 },
-"version": "1.0.19"
+"version": "1.0.20"
 }

package/src/rendering/template.ts

@@ -1,7 +1,7 @@
 import { STRING_TEMPLATE } from '@nordcraft/core/dist/api/template'
 import type { ToddleServerEnv } from '@nordcraft/core/dist/formula/formula'
 import { isDefined } from '@nordcraft/core/dist/utils/util'
-import { skipCookieHeader, skipToddleHeader } from '../utils/headers'
+import { skipCookieHeader, skipNordcraftHeaders } from '../utils/headers'
 
 export const applyTemplateValues = (
   input: string | null | undefined,
@@ -43,7 +43,7 @@ export const sanitizeProxyHeaders = ({
   new Headers(
     mapTemplateHeaders({
       cookies,
-      headers: skipCookieHeader(skipToddleHeader(headers)),
+      headers: skipCookieHeader(skipNordcraftHeaders(headers)),
     }),
   )
 

package/src/utils/headers.ts

@@ -1,4 +1,7 @@
-import { PROXY_URL_HEADER } from '@nordcraft/core/dist/utils/url'
+import {
+  PROXY_TEMPLATES_IN_BODY,
+  PROXY_URL_HEADER,
+} from '@nordcraft/core/dist/utils/url'
 
 /**
  * Omit the `cookie` header from a set of headers.
@@ -12,12 +15,13 @@ export const skipCookieHeader = (headers: Headers) => {
 }
 
 /**
- * Omit the x-toddle-url header from a set of headers.
- * Since this header is only relevant for toddle requests, it's not useful
- * for other services to receive this.
+ * Omit the "x-nordcraft-url" and "x-nordcraft-templates-in-body" headers
+ * from a set of headers. Since these headers are only relevant for the
+ * Nordcraft API proxy, it's not useful for other services to receive them
  */
-export const skipToddleHeader = (headers: Headers) => {
+export const skipNordcraftHeaders = (headers: Headers) => {
   const newHeaders = new Headers(headers)
   newHeaders.delete(PROXY_URL_HEADER)
+  newHeaders.delete(PROXY_TEMPLATES_IN_BODY)
   return newHeaders
 }