@joystick.js/node-canary 0.0.0-canary.372 → 0.0.0-canary.373

package/dist/app/ssr/index.js

@@ -1,4 +1,4 @@
-import u from"fs";import p from"../api/get_api_for_data_functions.js";import y from"../../lib/get_browser_safe_request.js";import $ from"../settings/load.js";import h from"./set_base_attributes_in_html.js";import b from"./set_head_tags_in_html.js";import i from"../../lib/path_exists.js";import w from"../accounts/get_browser_safe_user.js";const{readFile:a}=u.promises,r=$(),s=process.env.NODE_ENV==="development",f=(e={})=>e?.base_html.replace('<div id="app"></div>',`
+import u from"fs";import{parseHTML as p}from"linkedom";import y from"../api/get_api_for_data_functions.js";import $ from"../../lib/get_browser_safe_request.js";import h from"../settings/load.js";import b from"./set_base_attributes_in_html.js";import w from"./set_head_tags_in_html.js";import i from"../../lib/path_exists.js";import f from"../accounts/get_browser_safe_user.js";const{readFile:a}=u.promises,r=h(),s=process.env.NODE_ENV==="development";document=p("<div></div>");const g=(e={})=>e?.base_html.replace("${css}",`<style type="text/css" js-css>${e?.css}</style>`).replace('<div id="app"></div>',`
 			<div id="app">${e?.html}</div>
 			<script>
 				window.joystick = {
@@ -13,20 +13,20 @@ import u from"fs";import p from"../api/get_api_for_data_functions.js";import y f
         ${s?`window.__joystick_hmr_port__ = ${parseInt(process.env.PORT,10)+1}`:""}
         window.__joystick_layout_url__ = ${e?.render_layout_path?`"/_joystick/${e?.render_layout_path}"`:null};
         window.__joystick_page_url__ = ${e?.render_component_path?`"/_joystick/${e?.render_component_path}"`:null};
-       	window.__joystick_request__ = ${JSON.stringify(y(e?.req))};
+       	window.__joystick_request__ = ${JSON.stringify($(e?.req))};
         window.__joystick_settings__ = ${JSON.stringify({global:r?.global,public:r?.public})};
 
         window.__joystick_should_auto_mount__ = true;
         window.__joystick_ssr_props__ = ${JSON.stringify(e?.props)};
         window.__joystick_url__ = ${JSON.stringify(e?.url)};
-        window.__joystick_user__ = ${JSON.stringify(w(e?.req?.context?.user))};
+        window.__joystick_user__ = ${JSON.stringify(f(e?.req?.context?.user))};
 			</script>
 			<script type="module" src="/_joystick/utils/process.js"></script>
       <script type="module" src="/_joystick/index.client.js"></script>
       ${e?.render_component_path?`<script type="module" src="/_joystick/${e?.render_component_path}"></script>`:""}
       ${e?.render_layout_path?`<script type="module" src="/_joystick/${e?.render_layout_path}"></script>`:""}
       ${s?'<script type="module" src="/_joystick/hmr/client.js"></script>':""}
-		`).replace("${css}",`<style type="text/css" js-css>${e?.css}</style>`),g=(e={})=>e?.base_html.replace("${css}",`<style type="text/css">${e?.css}</style>`).replace("${subject}",e?.email_options?.subject).replace("${preheader}",e?.email_options?.preheader||"").replace('<div id="email"></div>',`<div id="email">${e?.html}</div>`),j=(e={})=>e?.is_email?g(e):f(e),k=async(e="")=>await i(`email/${e?`base_${e}`:"base"}.html`)?a(`email/${e?`base_${e}`:"base"}.html`,"utf-8"):(console.warn(`Could not find email/${e?`base_${e}`:"base"}.html`),""),v=async(e="")=>await i(`email/${e?`base_${e}`:"base"}.css`)?a(`email/${e?`base_${e}`:"base"}.css`,"utf-8"):(console.warn(`Could not find email/${e?`base_${e}`:"base"}.css`),""),N=(e=null,t={})=>e(t),O=async(e={})=>{const t=N(e?.component_to_render,e?.component_options),l=p(e?.req,e?.api_schema),c=[],_=await t.render_for_ssr(l,e?.req,c,{is_email:e?.is_email}),n=e?.is_email?await v(e?.email_options?.base_html_name):null,o=e?.is_email?await k(e?.email_options?.base_html_name):null,m=j({is_email:e?.is_email,attributes:e?.attributes,base_html:e?.is_email?o:e?.base_html,component_instance:t,css:e?.is_email?`
+		`),j=(e={})=>e?.base_html.replace("${css}",`<style type="text/css">${e?.css}</style>`).replace("${subject}",e?.email_options?.subject).replace("${preheader}",e?.email_options?.preheader||"").replace('<div id="email"></div>',`<div id="email">${e?.html}</div>`),k=(e={})=>e?.is_email?j(e):g(e),v=async(e="")=>await i(`email/${e?`base_${e}`:"base"}.html`)?a(`email/${e?`base_${e}`:"base"}.html`,"utf-8"):(console.warn(`Could not find email/${e?`base_${e}`:"base"}.html`),""),N=async(e="")=>await i(`email/${e?`base_${e}`:"base"}.css`)?a(`email/${e?`base_${e}`:"base"}.css`,"utf-8"):(console.warn(`Could not find email/${e?`base_${e}`:"base"}.css`),""),O=(e=null,t={})=>e(t),q=async(e={})=>{const t=O(e?.component_to_render,e?.component_options),c=y(e?.req,e?.api_schema),l=[],_=await t.render_for_ssr(c,e?.req,l,{is_email:e?.is_email}),n=e?.is_email?await N(e?.email_options?.base_html_name):null,o=e?.is_email?await v(e?.email_options?.base_html_name):null,m=k({is_email:e?.is_email,attributes:e?.attributes,base_html:e?.is_email?o:e?.base_html,component_instance:t,css:e?.is_email?`
 			${n}
 			${_?.css}
-		`:_?.css,data:_?.data,email_options:e?.email_options,head:e?.head,html:_?.html,props:e?.component_options?.props,render_component_path:e?.render_component_path,render_layout_path:e?.render_layout_path,req:e?.req,translations:e?.component_options?.translations,url:e?.component_options?.url}),d=b(m,e?.head,e?.req);return h(d,e?.attributes)};var P=O;export{P as default};
+		`:_?.css,data:_?.data,email_options:e?.email_options,head:e?.head,html:_?.html,props:e?.component_options?.props,render_component_path:e?.render_component_path,render_layout_path:e?.render_layout_path,req:e?.req,translations:e?.component_options?.translations,url:e?.component_options?.url}),d=w(m,e?.head,e?.req);return b(d,e?.attributes)};var L=q;export{L as default};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joystick.js/node-canary",
   "type": "module",
-  "version": "0.0.0-canary.372",
+  "version": "0.0.0-canary.373",
   "description": "The Node.js framework for Joystick.",
   "main": "./dist/index.js",
   "scripts": {

package/src/app/ssr/index.js

@@ -1,4 +1,5 @@
 import fs from 'fs';
+import { parseHTML } from 'linkedom';
 import get_api_for_data_functions from "../api/get_api_for_data_functions.js";
 import get_browser_safe_request from "../../lib/get_browser_safe_request.js";
 import load_settings from '../settings/load.js';
@@ -11,8 +12,13 @@ const { readFile } = fs.promises;
 const app_settings = load_settings();
 const is_development = process.env.NODE_ENV === 'development';
 
+// NOTE: Set a global document so we have access to a pseudo-DOM in @joystick.js/ui
+// when server-side rendering.
+document = parseHTML('<div></div>');
+
 const build_html_response_for_browser = (options = {}) => {
 	return options?.base_html
+		.replace('${css}', `<style type="text/css" js-css>${options?.css}</style>`)
 		.replace(`<div id="app"></div>`, `
 			<div id="app">${options?.html}</div>
 			<script>
@@ -44,8 +50,7 @@ const build_html_response_for_browser = (options = {}) => {
       ${options?.render_component_path ? `<script type="module" src="/_joystick/${options?.render_component_path}"></script>` : ''}
       ${options?.render_layout_path ? `<script type="module" src="/_joystick/${options?.render_layout_path}"></script>` : ''}
       ${is_development ? `<script type="module" src="/_joystick/hmr/client.js"></script>` : ''}
-		`)
-		.replace('${css}', `<style type="text/css" js-css>${options?.css}</style>`);
+		`);
 };
 
 const build_html_response_for_email = (options = {}) => {