update demo for create-app

electrode-io · Feb 5, 2021 · 5cc0bb2 · 5cc0bb2
1 parent 3dab9cd
commit 5cc0bb2
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 35 deletions.
diff --git a/packages/xarc-create-app/template/src/server/config.ts b/packages/xarc-create-app/template/src/server/config.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 /**
  * A simple configuration to setup fastify to serve routes for the
  * Electrode X webapp.
@@ -23,7 +21,7 @@ export const config = {
      */
     "@xarc/app-dev": {
       priority: -1,
-      enable: process.env.WEBPACK_DEV === "true"
+      enable: Boolean(process.env.WEBPACK_DEV)
     }
   },
   // don't start fastify server automatically so app can setup routes

diff --git a/packages/xarc-create-app/template/src/server/index.ts b/packages/xarc-create-app/template/src/server/index.ts
@@ -4,6 +4,7 @@ import { config } from "./config";
 
 /**
  * main entry point for application
+ *
  * @returns fastify server instance
  */
 export async function start() {
@@ -15,6 +16,8 @@ export async function start() {
 
   const server = await fastifyServer(config);
 
+  // it's important that the routes setup is import *after* runtime support is loaded
+  // else isomorphic assets during development may not work properly
   const { setupRoutes } = await import("./routes");
   setupRoutes(server);
 

diff --git a/packages/xarc-create-app/template/src/server/routes.ts b/packages/xarc-create-app/template/src/server/routes.ts
@@ -7,26 +7,23 @@ import { PageRenderer } from "@xarc/react";
  * @returns nothing
  */
 export function setupRoutes(server) {
-  let homeRenderer: PageRenderer;
+  const homeRenderer: PageRenderer = new PageRenderer({
+    pageTitle: "xarc React App demo",
+    subApps: [
+      { name: home.name, ssr: true },
+      { name: Demo2.name, ssr: true },
+      { name: Demo3.name, ssr: true }
+    ],
+    prodAssetData: {
+      cdnMap: "config/assets.json"
+    }
+  });
 
   server.route({
     method: "GET",
     path: "/",
     async handler(request, reply) {
       try {
-        if (!homeRenderer) {
-          homeRenderer = new PageRenderer({
-            pageTitle: "xarc React App demo",
-            subApps: [
-              { name: home.name, ssr: true },
-              { name: Demo2.name, ssr: true },
-              { name: Demo3.name, ssr: true }
-            ],
-            prodAssetData: {
-              cdnMap: "config/assets.json"
-            }
-          });
-        }
         const context = await homeRenderer.render({ request });
         reply.type("text/html");
 

diff --git a/samples/create-app-demo/src/server/config.ts b/samples/create-app-demo/src/server/config.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 /**
  * A simple configuration to setup fastify to serve routes for the
  * Electrode X webapp.
@@ -23,7 +21,7 @@ export const config = {
      */
     "@xarc/app-dev": {
       priority: -1,
-      enable: process.env.WEBPACK_DEV === "true"
+      enable: Boolean(process.env.WEBPACK_DEV)
     }
   },
   // don't start fastify server automatically so app can setup routes

diff --git a/samples/create-app-demo/src/server/index.ts b/samples/create-app-demo/src/server/index.ts
@@ -4,6 +4,7 @@ import { config } from "./config";
 
 /**
  * main entry point for application
+ *
  * @returns fastify server instance
  */
 export async function start() {
@@ -15,6 +16,8 @@ export async function start() {
 
   const server = await fastifyServer(config);
 
+  // it's important that the routes setup is import *after* runtime support is loaded
+  // else isomorphic assets during development may not work properly
   const { setupRoutes } = await import("./routes");
   setupRoutes(server);
 

diff --git a/samples/create-app-demo/src/server/routes.ts b/samples/create-app-demo/src/server/routes.ts
@@ -7,26 +7,23 @@ import { PageRenderer } from "@xarc/react";
  * @returns nothing
  */
 export function setupRoutes(server) {
-  let homeRenderer: PageRenderer;
+  const homeRenderer: PageRenderer = new PageRenderer({
+    pageTitle: "xarc React App demo",
+    subApps: [
+      { name: home.name, ssr: true },
+      { name: Demo2.name, ssr: true },
+      { name: Demo3.name, ssr: true }
+    ],
+    prodAssetData: {
+      cdnMap: "config/assets.json"
+    }
+  });
 
   server.route({
     method: "GET",
     path: "/",
     async handler(request, reply) {
       try {
-        if (!homeRenderer) {
-          homeRenderer = new PageRenderer({
-            pageTitle: "xarc React App demo",
-            subApps: [
-              { name: home.name, ssr: true },
-              { name: Demo2.name, ssr: true },
-              { name: Demo3.name, ssr: true }
-            ],
-            prodAssetData: {
-              cdnMap: "config/assets.json"
-            }
-          });
-        }
         const context = await homeRenderer.render({ request });
         reply.type("text/html");
 

diff --git a/samples/subapp2-react-query-todoapp/src/server/config.ts b/samples/subapp2-react-query-todoapp/src/server/config.ts
@@ -23,7 +23,7 @@ export const config = {
      */
     "@xarc/app-dev": {
       priority: -1,
-      enable: process.env.WEBPACK_DEV === "true"
+      enable: Boolean(process.env.WEBPACK_DEV)
     }
   },
   deferStart: true