tungsten 0.1.58 → 0.1.60

package/dist/RenderedContentNode.js

@@ -52,10 +52,10 @@ export function WideRenderedContentNodeIsHtml(wrcn) {
   return wrcn !== $contentNull && RenderedContentNodeIsHtml(wrcn);
 }
 export function RenderedContentNodeIsHead(rcn) {
-  return typeof rcn === 'object' && rcn !== null && !Array.isArray(rcn) && rcn[$type] === $head;
+  return typeof rcn === 'object' && rcn !== null && !Array.isArray(rcn) && rcn[$type] === 'head'; //$head
 }
 export function RenderedContentNodeSingleIsHead(rcns) {
-  return typeof rcns === 'object' && rcns[$type] === $head;
+  return typeof rcns === 'object' && rcns[$type] === 'head'; // $head
 }
 export function RenderedContentNodeIsComponent(rcn) {
   return typeof rcn === 'object' && rcn !== null && !Array.isArray(rcn) && typeof rcn[$type] === 'function';

package/dist/RenderingNode.d.ts

@@ -1,13 +1,17 @@
 import type { TungstenBaseComponent, TungstenBaseComponentType } from './Components.jsx';
 import type { FunctionComponentStandInAny } from './FunctionComponentStandIn.js';
-import { type ContentNodeLiteral, type ContentNodeNonRendered, type NodeValue, ContentNodeClassComponent, ContentNodeFunctionComponent } from './ContentNode.js';
+import { type ContentNodeLiteral, type ContentNodeNonRendered, type NodeValue, ContentNodeClassComponent, ContentNodeFunctionComponent, ContentNodeRendered } from './ContentNode.js';
 import { $key, $props, $type } from './contentNodeSymbols.js';
 import { KeyAttr } from './KeyAttr.js';
 import { FunctionComponent } from './FunctionComponent.js';
 export declare const $component: unique symbol;
-export declare const $Component: "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
+export type $Component = typeof $component;
+export declare const $element: unique symbol;
+export type $Element = typeof $element;
 export declare const $children: unique symbol;
-export declare const $Children: "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
+export type $Children = typeof $children;
+export declare const $placeholder: unique symbol;
+export type $Placeholder = typeof $placeholder;
 export type RenderingNodeProps = {
     children?: RenderingNode;
     value?: NodeValue;
@@ -15,6 +19,7 @@ export type RenderingNodeProps = {
 };
 export type RenderingNodeNonRendered = ContentNodeNonRendered;
 export type RenderingNodeLiteral = ContentNodeLiteral;
+export type RenderingNodeRendered = ContentNodeRendered;
 export type RenderingNodeHtml = {
     [$type]: string;
     [$props]: RenderingNodeProps;
@@ -22,21 +27,31 @@ export type RenderingNodeHtml = {
 };
 export type RenderingNodeClassComponent = {
     [$type]: TungstenBaseComponentType<any, any>;
-    [$component]: TungstenBaseComponent;
     [$props]: RenderingNodeProps;
+    [$placeholder]?: boolean;
 };
 export type RenderingNodeFunctionComponent = {
     [$type]: FunctionComponent<any, any>;
-    [$component]: FunctionComponentStandInAny;
+    [$props]: RenderingNodeProps;
+    [$placeholder]?: boolean;
+};
+export type RenderingNodePlaceholder = {
+    [$type]: $Placeholder;
+    [$component]: TungstenBaseComponentType<any, any>;
     [$props]: RenderingNodeProps;
 };
 export type RenderingNodeComponent = RenderingNodeClassComponent | RenderingNodeFunctionComponent;
 export type RenderingNodeElement = RenderingNodeHtml | RenderingNodeComponent;
 export type RenderingNodeSingle = RenderingNodeElement | RenderingNodeLiteral | ContentNodeNonRendered;
 export type RenderingNode = RenderingNodeSingle | RenderingNode[];
-export declare function makeRenderingNodeClassComponentFromContentNodeClassComponent(contentNode: ContentNodeClassComponent, component: TungstenBaseComponent<any, any>, renderingChildren: RenderingNode): RenderingNodeClassComponent;
-export declare function makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(contentNode: ContentNodeFunctionComponent, component: FunctionComponentStandInAny, renderingChildren: RenderingNode): RenderingNodeFunctionComponent;
+export declare function makeRenderingNodeClassComponentFromContentNodeClassComponent(contentNode: ContentNodeClassComponent, element: TungstenBaseComponent<any, any> | null, renderingChildren: RenderingNode, placeholder?: boolean): RenderingNodeClassComponent;
+export declare function makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(contentNode: ContentNodeFunctionComponent, element: FunctionComponentStandInAny | null, renderingChildren: RenderingNode, placeholder?: boolean): RenderingNodeFunctionComponent;
+export declare function makeRenderingNodePlaceholderFromContentNodeComponent(contentNode: ContentNodeClassComponent, element: TungstenBaseComponent<any, any> | FunctionComponentStandInAny | null, renderingChildren: RenderingNode): RenderingNodePlaceholder;
 export declare function RenderingNodeIsElement(item: RenderingNode): item is RenderingNodeElement;
-export declare function RenderingNodeIsHtml(item: RenderingNode): item is RenderingNodeElement;
+export declare function RenderingNodeIsHtml(item: RenderingNode): item is RenderingNodeHtml;
 export declare function RenderingNodeElementIsHtml(item: RenderingNodeElement): item is RenderingNodeHtml;
+export declare function RenderingNodeElementIsComponent(item: RenderingNodeElement): item is RenderingNodeClassComponent | RenderingNodeFunctionComponent;
+export declare function RenderingNodeIsLiteral(item: RenderingNode): item is RenderingNodeLiteral;
+export declare function RenderingNodeIsNonRendered(item: RenderingNode): item is RenderingNodeNonRendered;
+export declare function RenderingNodeIsRendered(item: RenderingNode): item is RenderingNodeRendered;
 //# sourceMappingURL=RenderingNode.d.ts.map

package/dist/RenderingNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RenderingNode.d.ts","sourceRoot":"","sources":["../src/RenderingNode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAA;AACxF,OAAO,KAAK,EAAmB,2BAA2B,EAAE,MAAM,+BAA+B,CAAA;AACjG,OAAO,EAAmE,KAAK,kBAAkB,EAAE,KAAK,sBAAsB,EAAE,KAAK,SAAS,EAAE,yBAAyB,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAA;AACjO,OAAO,EAAE,IAAI,EAAE,MAAM,EAA4B,KAAK,EAAE,MAAM,yBAAyB,CAAA;AACvF,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAGtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAG1D,eAAO,MAAM,UAAU,eAAoB,CAAA;AAC3C,eAAO,MAAM,UAAU,6FAAoB,CAAA;AAC3C,eAAO,MAAM,SAAS,eAAqB,CAAA;AAC3C,eAAO,MAAM,SAAS,6FAAmB,CAAA;AAEzC,MAAM,MAAM,kBAAkB,GAAG;IAC7B,QAAQ,CAAC,EAAE,aAAa,CAAA;IACxB,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG,sBAAsB,CAAA;AAC7D,MAAM,MAAM,oBAAoB,GAAG,kBAAkB,CAAA;AAErD,MAAM,MAAM,iBAAiB,GAAG;IAC5B,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;IACf,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAA;IAC5B,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,2BAA2B,GAAG;IACtC,CAAC,KAAK,CAAC,EAAE,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC5C,CAAC,UAAU,CAAC,EAAE,qBAAqB,CAAA;IACnC,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAA;CAK/B,CAAA;AAED,MAAM,MAAM,8BAA8B,GAAG;IACzC,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACpC,CAAC,UAAU,CAAC,EAAE,2BAA2B,CAAA;IACzC,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAA;CAK/B,CAAA;AAID,MAAM,MAAM,sBAAsB,GAAG,2BAA2B,GAAG,8BAA8B,CAAA;AAEjG,MAAM,MAAM,oBAAoB,GAAG,iBAAiB,GAAG,sBAAsB,CAAA;AAE7E,MAAM,MAAM,mBAAmB,GAAG,oBAAoB,GAAG,oBAAoB,GAAG,sBAAsB,CAAA;AAEtG,MAAM,MAAM,aAAa,GAAG,mBAAmB,GAAG,aAAa,EAAE,CAAA;AAGjE,wBAAgB,4DAA4D,CACxE,WAAW,EAAE,yBAAyB,EACtC,SAAS,EAAE,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC,EAC1C,iBAAiB,EAAE,aAAa,GACjC,2BAA2B,CAQ7B;AAED,wBAAgB,kEAAkE,CAC9E,WAAW,EAAE,4BAA4B,EACzC,SAAS,EAAE,2BAA2B,EACtC,iBAAiB,EAAE,aAAa,GACjC,8BAA8B,CAQhC;AAGD,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI,IAAI,oBAAoB,CAExF;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI,IAAI,oBAAoB,CAErF;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,oBAAoB,GAAG,IAAI,IAAI,iBAAiB,CAEhG"}
+{"version":3,"file":"RenderingNode.d.ts","sourceRoot":"","sources":["../src/RenderingNode.ts"],"names":[],"mappings":"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"}

package/dist/RenderingNode.js

@@ -1,21 +1,36 @@
+import { ContentNodeIsLiteral } from "./ContentNode.js";
 import { $key, $props, $type } from "./contentNodeSymbols.js";
 export const $component = Symbol('element');
-export const $Component = typeof $component;
+export const $element = Symbol('element');
 export const $children = Symbol('children');
-export const $Children = typeof $children;
-export function makeRenderingNodeClassComponentFromContentNodeClassComponent(contentNode, component, renderingChildren) {
-  return {
+export const $placeholder = Symbol('placeholder');
+export function makeRenderingNodeClassComponentFromContentNodeClassComponent(contentNode, element, renderingChildren, placeholder) {
+  const n = {
     [$type]: contentNode[$type],
-    [$component]: component,
+    //[$component]: component,
     [$props]: {
       children: renderingChildren
     }
   };
+  if (placeholder) n[$placeholder] = placeholder;
+  return n;
 }
-export function makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(contentNode, component, renderingChildren) {
-  return {
+export function makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(contentNode, element, renderingChildren, placeholder) {
+  const n = {
     [$type]: contentNode[$type],
-    [$component]: component,
+    //[$component]: component,
+    [$props]: {
+      children: renderingChildren
+    }
+  };
+  if (placeholder) n[$placeholder] = placeholder;
+  return n;
+}
+export function makeRenderingNodePlaceholderFromContentNodeComponent(contentNode, element, renderingChildren) {
+  return {
+    [$type]: $placeholder,
+    [$component]: contentNode[$type],
+    //[$component]: component,
     [$props]: {
       children: renderingChildren
     }
@@ -29,4 +44,20 @@ export function RenderingNodeIsHtml(item) {
 }
 export function RenderingNodeElementIsHtml(item) {
   return typeof item[$type] === 'string';
+}
+export function RenderingNodeElementIsComponent(item) {
+  //: item is ContentNodeComponentAny {
+  return typeof item[$type] === 'function';
+}
+// export function RenderingNodeElementIsPlaceholder(item: RenderingNodeElement): item is RenderingNodePlaceholder {
+//     return item[$type] === $placeholder
+// }
+export function RenderingNodeIsLiteral(item) {
+  return ContentNodeIsLiteral(item);
+}
+export function RenderingNodeIsNonRendered(item) {
+  return item === null || item === undefined || typeof item === 'boolean';
+}
+export function RenderingNodeIsRendered(item) {
+  return !RenderingNodeIsNonRendered(item);
 }

package/dist/Servers/DevServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DevServer.d.ts","sourceRoot":"","sources":["../../src/Servers/DevServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAA4D,MAAM,SAAS,CAAA;AAGlF,OAAO,KAAK,EAAE,uBAAuB,EAAwB,MAAM,uBAAuB,CAAA;AAC1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAIpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAiB3C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAYrD,qBAAa,SAAU,SAAQ,cAAc;IACzC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAC9B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IAExB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,OAAO,CAAO;gBAEvB,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,eAAe,EACvF,iBAAiB,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM;IA8DlD,OAAO,CAAC,mBAAmB,CAwC1B;IAKD,OAAO,CAAC,gBAAgB,CAcvB;IACD,OAAO,CAAC,aAAa,CAwGpB;IAID,QAAQ,UAAW,OAAO,UAEzB;IACD,SAAS,UAAW,OAAO,YAY1B;IACD,KAAK,QAAO,OAAO,CAAC,MAAM,CAAC,CAQ1B;IACD,IAAI,aAEH;CAGJ"}
+{"version":3,"file":"DevServer.d.ts","sourceRoot":"","sources":["../../src/Servers/DevServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAA4D,MAAM,SAAS,CAAA;AAGlF,OAAO,KAAK,EAAE,uBAAuB,EAAwB,MAAM,uBAAuB,CAAA;AAC1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAOpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAiB3C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAgBrD,qBAAa,SAAU,SAAQ,cAAc;IACzC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAC9B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IAExB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,OAAO,CAAO;gBAEvB,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,eAAe,EACvF,iBAAiB,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM;IA0ElD,OAAO,CAAC,mBAAmB,CA8C1B;IAKD,OAAO,CAAC,gBAAgB,CAcvB;IACD,OAAO,CAAC,aAAa,CAoJpB;IAID,QAAQ,UAAW,OAAO,UAEzB;IACD,SAAS,UAAW,OAAO,YAY1B;IACD,KAAK,QAAO,OAAO,CAAC,MAAM,CAAC,CAQ1B;IACD,IAAI,aAEH;CAGJ"}

package/dist/Servers/DevServer.js

@@ -6,9 +6,10 @@ import { join } from 'path';
 import { allObj as promiseAllObj } from 'sxy-lib/promises.js';
 import { staticFolder, assetsFolder, publicFolder, packagesFolder, clientFolder, componentCssFolder } from "../settings.js";
 import { rootToHtmlDev as renderRootToHtmlDev } from "../render/rootToHtmlDev.js";
+import { contentToHtmlDev as renderContentToHtmlDev } from "../render/contentToHtmlDev.js";
 import { Instance } from "../Instance/Instance.js";
 import { TungstenError } from "../TungstenError.js";
-import { createAppConfigFromFrameworkConfig } from "../createInstanceConfigFromFrameworkConfig.js";
+import { makeInstanceConfigFromFrameworkConfig } from "../makeInstanceConfigFromFrameworkConfig.js";
 import { cliNews, cliOut, cliLog } from "../cliOutput.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
 import { existsSync } from 'fs';
 import { getApiRoutes } from "../api/getApiRoutes.js";
@@ -22,7 +23,7 @@ import { createLoad } from 'sxy-loader';
 import { routing } from "./routing.js";
 import { globalDataFunc } from "../routing/registerGlobalData.js";
 import { TungstenServer } from "./TungstenServer.js";
-import { RoutingRedirect } from "../indexInner.js";
+import { RoutingRedirect } from "../routing/RoutingRedirect.js";
 import { portError } from "./portError.js";
 import { loadEnvsDev } from "./loadEnvsDev.js";
 import { initStores } from "./initStores.js";
@@ -63,13 +64,15 @@ export class DevServer extends TungstenServer {
         const fullFilePath = 'file://' + join(this.compilationInfo.codeLocation, middlewareFile);
         const middlewareModule = await load(fullFilePath);
         if (!(middlewareExportName in middlewareModule)) {
-          throwError('DevServer', `export ${middlewareExportName} not found in ${middlewareFile} when trying to load server middleware`);
+          throwError('DevServer', `export ${middlewareExportName} not found in ${middlewareFile}` + ` when trying to load server middleware`);
         }
         const middlewares = middlewareModule[middlewareExportName]; // eslint-disable-line no-type-assertion/no-type-assertion
         if (!Array.isArray(middlewares)) throwError('addServerMiddleware', `Expected middlewares to be an array`);
         if (!(0 in middlewares)) throwError('addServerMiddleware', `No middleware entry at index 0`);
         const firstMiddleware = middlewares[0];
-        if (!(typeof firstMiddleware === 'function')) throwError('addServerMiddleware', `Expected middleware to be a function`);
+        if (!(typeof firstMiddleware === 'function')) {
+          throwError('addServerMiddleware', `Expected middleware to be a function`);
+        }
         let i = 0;
         const next = () => {
           i++;
@@ -123,7 +126,7 @@ export class DevServer extends TungstenServer {
         //// perhaps, set some return data in the instance
         //// then return html string + other data
         const location = req.url;
-        const instanceConfig = createAppConfigFromFrameworkConfig(this.config, true);
+        const instanceConfig = makeInstanceConfigFromFrameworkConfig(this.config, true);
         if (this.framework.frameworkModules === undefined) {
           throwError('DevServer.handleRequest()', 'framework.frameworkModules is undefined');
         }
@@ -132,22 +135,6 @@ export class DevServer extends TungstenServer {
         }
         const load = await createLoad(import.meta.url, sxyLoaderConfig);
         await loadEnvsDev(this.config, load, this.initialProcessEnv, false);
-        // load everything in parallel
-        //const envFile = join(this.compilationInfo.location, '.env.js')
-        //const privateEnvFile = join(this.compilationInfo.location, '.private.env.js')
-        //const publicEnvFile = join(this.compilationInfo.location, clientFolder, '.public.env.js')
-        const rootComponentFileFull = join(this.compilationInfo.location, this.config.rootComponent);
-        const {
-          appRoutes,
-          RootComponentClass
-        } = await promiseAllObj({
-          //envFile: existsSync(envFile) && load(envFile),
-          //privateEnv: existsSync(privateEnvFile) && load(privateEnvFile),
-          //publicEnv: existsSync(publicEnvFile) && load(publicEnvFile),
-          //AppClass: getAppClass(),
-          appRoutes: getRoutesDev(this.compilationInfo, this.config, load),
-          RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, load)
-        });
         // we are delaying instance creation until after we load the app code, to lets things initialise?
         const reqRes = {
           req,
@@ -157,10 +144,51 @@ export class DevServer extends TungstenServer {
         const serverDataLoading = {
           value: false
         };
+        const routingPromise = getRoutesDev(this.compilationInfo, this.config, load).then(async appRoutes => {
+          const routes = typeof appRoutes === 'function' ? appRoutes(reqRes) : appRoutes;
+          // load data, and do routing
+          return promiseAllObj({
+            appRoutes,
+            routes,
+            globalData: globalDataFunc !== undefined ? globalDataFunc(reqRes) : {},
+            matchedRouteInfo: routing(location, routes, serverDataLoading)
+          });
+        });
+        let appRoutes;
+        let routes;
+        let globalData;
+        let matchedRouteInfo;
+        let RootComponentClass = null;
+        if (this.config.useRootComponent) {
+          const rootComponentFileFull = join(this.compilationInfo.location, this.config.rootComponent);
+          ({
+            routing: {
+              appRoutes,
+              routes,
+              globalData,
+              matchedRouteInfo
+            },
+            RootComponentClass
+          } = await promiseAllObj({
+            routing: routingPromise,
+            RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, load)
+          }));
+        } else {
+          ({
+            appRoutes,
+            routes,
+            globalData,
+            matchedRouteInfo
+          } = await routingPromise);
+          //throwError('DevServer', 'useRootComponent = false not implemented yet')
+        }
         // get routes (running the getRoutes function if needed)
-        const routes = typeof appRoutes === 'function' ? appRoutes(reqRes) : appRoutes;
+        //const routes = (typeof appRoutes === 'function') ? appRoutes(reqRes) : appRoutes
         // load data, and do routing
-        const [globalData, matchedRouteInfo] = await Promise.all([globalDataFunc !== undefined ? globalDataFunc(reqRes) : {}, routing(location, routes, serverDataLoading)]);
+        // const [globalData, matchedRouteInfo] = await Promise.all([
+        //     (globalDataFunc !== undefined) ? globalDataFunc(reqRes) : {},
+        //     routing(location, routes, serverDataLoading)
+        // ])
         // handle any redirect issued during routing
         if (matchedRouteInfo.data instanceof RoutingRedirect) {
           const redirect = matchedRouteInfo.data;
@@ -175,7 +203,26 @@ export class DevServer extends TungstenServer {
         } = initStores(location, reqRes, globalData, matchedRouteInfo, serverDataLoading);
         // create the instance
         const instance = new Instance(location, instanceConfig, reqRes, appRoutes, routes, internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo);
-        const html = await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, RootComponentClass, instance, global.tungstenPublicEnv, '');
+        let html;
+        if (RootComponentClass) {
+          html = await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, RootComponentClass, instance, this.config, global.tungstenPublicEnv, '' // siteBasePathOverride
+          );
+        } else {
+          const {
+            params,
+            data
+          } = matchedRouteInfo;
+          let {
+            content
+          } = matchedRouteInfo;
+          if (typeof content === 'function') {
+            content = content(data, params, {} /* props */, globalData, location);
+            //throwError('DevServer', 'route content is a function')
+          }
+          //console.log('content to render', content)
+          html = await renderContentToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, content, instance, this.config, global.tungstenPublicEnv, '' // siteBasePathOverride
+          );
+        }
         //debug('html', html)
         res.setHeader('Content-Type', 'text/html');
         res.status(instance.matchedRouteInfo.key === '404' ? 404 : 200);
@@ -256,7 +303,9 @@ export class DevServer extends TungstenServer {
       const publicLocation = join(this.compilationInfo.location, publicFolder);
       if (existsSync(publicLocation)) this.app.use(express.static(publicLocation)); // files from public folder
       //cliWarn(`assets dir:`, this.config.assetsDir)
-      if (this.config.assetsDir !== undefined) this.app.use(`/${this.config.assetsDir}`, express.static(join(this.compilationInfo.location, assetsFolder))); // files from assets folder
+      if (this.config.assetsDir !== undefined) {
+        this.app.use(`/${this.config.assetsDir}`, express.static(join(this.compilationInfo.location, assetsFolder))); // files from assets folder
+      }
       this.app.use(express.static(this.compilationInfo.location, {
         dotfiles: 'allow'
       })); // serving the app files themselves

package/dist/Servers/ProdServer.d.ts

@@ -4,19 +4,23 @@ import type { FrameworkConfigComplete } from '../FrameworkConfig.js';
 import type { CompilationInfo } from '../build/CompilationInfo.js';
 import type { ApiRoutes } from '../api/ApiRoutes.js';
 import { Framework } from '../Framework.js';
+import { AnyComponentType } from '../AnyComponentType.js';
+import { AppRoutes } from '../routing/AppRoutes.js';
 import { ServerMiddleware } from './ServerMiddleware.js';
 import { TungstenServer } from './TungstenServer.jsx';
 export declare class ProdServer extends TungstenServer {
     framework: Framework;
     config: FrameworkConfigComplete;
     compilationInfo: CompilationInfo;
+    appRoutes: AppRoutes;
+    RootComponentOrNull: AnyComponentType | null;
     port: number;
     location: string | null;
     app: express.Application;
     apiRoutesPromise?: Promise<ApiRoutes>;
     apiRoutes?: ApiRoutes;
     server?: Server;
-    constructor(framework: Framework, config: FrameworkConfigComplete, compilationInfo: CompilationInfo, serverMiddleware: ServerMiddleware | null);
+    constructor(framework: Framework, config: FrameworkConfigComplete, compilationInfo: CompilationInfo, appRoutes: AppRoutes, RootComponentOrNull: AnyComponentType | null, serverMiddleware: ServerMiddleware | null);
     private handleRequestApi;
     handleRequest: (req: express.Request, res: express.Response) => Promise<void>;
     errorPage: () => string;

package/dist/Servers/ProdServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProdServer.d.ts","sourceRoot":"","sources":["../../src/Servers/ProdServer.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAI7B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAKpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAiB3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAYrD,qBAAa,UAAW,SAAQ,cAAc;IAC1C,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAIhC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAC9B,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IACrC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;gBAEX,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,uBAAuB,EAC/B,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IA0F7C,OAAO,CAAC,gBAAgB,CAcvB;IACD,aAAa,QAAe,OAAO,CAAC,OAAO,OAAO,OAAO,CAAC,QAAQ,KAAG,OAAO,CAAC,IAAI,CAAC,CA4DjF;IACD,SAAS,eASR;IAID,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAYlE,IAAI;CAKP"}
+{"version":3,"file":"ProdServer.d.ts","sourceRoot":"","sources":["../../src/Servers/ProdServer.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAI7B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAMpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAM3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAUnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAYrD,qBAAa,UAAW,SAAQ,cAAc;IAC1C,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,SAAS,EAAE,SAAS,CAAA;IACpB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,CAAA;IAI5C,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAC9B,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IACrC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;gBAEX,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,uBAAuB,EAC/B,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,EACpB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,EAC5C,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IA+E7C,OAAO,CAAC,gBAAgB,CAgBvB;IACD,aAAa,QAAe,OAAO,CAAC,OAAO,OAAO,OAAO,CAAC,QAAQ,KAAG,OAAO,CAAC,IAAI,CAAC,CAqFjF;IACD,SAAS,eASR;IAID,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAYlE,IAAI;CAKP"}

package/dist/Servers/ProdServer.js

@@ -6,15 +6,14 @@ import { join } from 'path';
 import { existsSync } from 'fs';
 import { staticFolder, assetsFolder, packageNameCapitalized, publicFolder } from "../settings.js";
 import { rootToHtml as renderRootToHtml } from "../render/rootToHtml.js";
+import { contentToHtml as renderContentToHtml } from "../render/contentToHtml.js";
 import { Instance } from "../Instance/Instance.js";
 import { cliOut, cliLog, cliNews } from "../cliOutput.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
 import { TungstenError } from "../TungstenError.js";
-import { createAppConfigFromFrameworkConfig } from "../createInstanceConfigFromFrameworkConfig.js";
+import { makeInstanceConfigFromFrameworkConfig } from "../makeInstanceConfigFromFrameworkConfig.js";
 //import { addRequireResolveHooks } from '../reRouting/addRequireResolveHooks.js'
 import { standardizeWebPath } from "../standardizeWebPath.js";
 import { throwError } from "../throwError.js";
-import { getRoutes } from "../getRoutes.js";
-import { getComponent } from "../getComponent.js";
 import { routing } from "./routing.js";
 import { globalDataFunc } from "../routing/registerGlobalData.js";
 import { TungstenServer } from "./TungstenServer.js";
@@ -24,11 +23,13 @@ function debug(...texts) {
   // console.log(...texts)
 }
 export class ProdServer extends TungstenServer {
-  constructor(framework, config, compilationInfo, serverMiddleware) {
+  constructor(framework, _config, compilationInfo, _appRoutes, _RootComponentOrNull, serverMiddleware) {
     super();
     _defineProperty(this, "framework", void 0);
     _defineProperty(this, "config", void 0);
     _defineProperty(this, "compilationInfo", void 0);
+    _defineProperty(this, "appRoutes", void 0);
+    _defineProperty(this, "RootComponentOrNull", void 0);
     // projectDir: string
     // prodBuildLocation: string
     // bundleLocation: string
@@ -84,16 +85,27 @@ export class ProdServer extends TungstenServer {
       }
       try {
         const location = req.url;
-        const instanceConfig = createAppConfigFromFrameworkConfig(this.config);
+        const instanceConfig = makeInstanceConfigFromFrameworkConfig(this.config);
         if (this.framework.frameworkModules === undefined) {
           throwError('ProdServer.handleRequest()', 'framework.frameworkModules is undefined');
         }
         if (this.framework.clientImportAliases === undefined) {
           throwError('ProdServer.handleRequest()', 'framework.clientImportAliases is undefined');
         }
-        const appRoutes = await getRoutes(this.compilationInfo, this.config);
-        const rootComponentFileFull = join(this.compilationInfo.location, this.config.rootComponent);
-        const RootComponentClass = await getComponent(rootComponentFileFull, this.config.rootComponent);
+        // const appRoutes: AppRoutes = await getRoutes(this.compilationInfo, this.config)
+        // let RootComponentClass: AnyComponentType
+        // if (this.config.useRootComponent) {
+        //     const rootComponentFileFull = join(this.compilationInfo.location, this.config.rootComponent)
+        //     RootComponentClass = await getComponent(rootComponentFileFull, this.config.rootComponent)
+        // } else {
+        //     throwError('DevServer', 'useRootComponent = false not implemented yet')
+        // }
+        const {
+          compilationInfo,
+          config,
+          appRoutes,
+          RootComponentOrNull
+        } = this;
         const reqRes = {
           req,
           res
@@ -111,7 +123,23 @@ export class ProdServer extends TungstenServer {
           storeSubscriptions
         } = initStores(location, reqRes, globalData, matchedRouteInfo, serverDataLoading);
         const instance = new Instance(location, instanceConfig, reqRes, appRoutes, routes, internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo);
-        const html = await renderRootToHtml(this.compilationInfo, this.framework.clientImportAliases, RootComponentClass, instance, this.config.siteBasePath);
+        let html;
+        if (RootComponentOrNull !== null) {
+          html = await renderRootToHtml(this.compilationInfo, this.framework.clientImportAliases, RootComponentOrNull, instance, config, this.config.siteBasePath);
+        } else {
+          const {
+            params,
+            data
+          } = matchedRouteInfo;
+          let {
+            content
+          } = matchedRouteInfo;
+          if (typeof content === 'function') {
+            content = content(data, params, {} /* props */, globalData, location);
+            //throwError('DevServer', 'route content is a function')
+          }
+          html = await renderContentToHtml(this.compilationInfo, this.framework.clientImportAliases, content, instance, config, this.config.siteBasePath);
+        }
         //debug('html', html)
         res.setHeader('Content-Type', 'text/html');
         res.status(instance.matchedRouteInfo.key === '404' ? 404 : 200);
@@ -134,13 +162,17 @@ export class ProdServer extends TungstenServer {
 </html>`;
     });
     this.framework = framework;
-    this.config = config;
+    this.config = _config;
     this.compilationInfo = compilationInfo;
+    this.appRoutes = _appRoutes;
+    this.RootComponentOrNull = _RootComponentOrNull;
     if (tungstenPrivateEnv.TUNGSTEN_SERVER_PORT === -999) {
       throwError('ProdServer', 'TUNGSTEN_SERVER_PORT environment variable has not been set');
     }
     // !! I wrote this line while drunk. Please check this over. I think its wrong
     const _port = Number(typeof tungstenPrivateEnv !== 'undefined' ? tungstenPrivateEnv.TUNGSTEN_SERVER_PORT : process.env.TUNGSTEN_SERVER_PORT);
+    // seems like all we need is:
+    //const _port = tungstenPrivateEnv.TUNGSTEN_SERVER_PORT
     if (isNaN(_port) || _port === 0) throwError('ProdServer', portError(_port));
     this.port = _port;
     this.app = express();
@@ -152,43 +184,27 @@ export class ProdServer extends TungstenServer {
       this.app.use(path, middlewares);
     }
     //this.app.set('etag', false)
-    if (this.compilationInfo.bundleLocation === undefined) throwError('ProdServer', 'compilationInfo.bundleLocation is unset/undefined');
+    if (this.compilationInfo.bundleLocation === undefined) {
+      throwError('ProdServer', 'compilationInfo.bundleLocation is unset/undefined');
+    }
     this.app.use('/bundle', express.static(this.compilationInfo.bundleLocation));
     const publicLocation = join(this.compilationInfo.location, publicFolder);
     //console.log('publicLocation', publicLocation, existsSync(publicLocation))
     if (existsSync(publicLocation)) this.app.use(express.static(publicLocation)); // files from public folder
     //console.log("serving static files with etag")
     this.app.use(express.static(join(this.compilationInfo.location, staticFolder)));
-    if (this.config.assetsDir !== undefined) this.app.use('/assets', express.static(join(this.compilationInfo.location, assetsFolder)));
+    if (this.config.assetsDir !== undefined) {
+      this.app.use('/assets', express.static(join(this.compilationInfo.location, assetsFolder)));
+    }
     this.app.use(express.static(this.compilationInfo.location));
-    if (typeof config.apiRoutes === 'string' && config.apiRoutes !== '') {
+    if (typeof _config.apiRoutes === 'string' && _config.apiRoutes !== '') {
       const apiPath = standardizeWebPath(this.config.apiPath);
       cliOut(`API listening at ${apiPath}`);
       this.app.use(apiPath, express.json());
       this.app.use(apiPath, this.handleRequestApi);
     }
     this.app.use(this.handleRequest);
-    /*
-    These are from dev server
-    we need to integrate these
-    
-    this.app.use(`/.tungsten.config.js`, express.static(join(this.compilationInfo.location, '.tungsten.config.js'))) // compiled packages
-    this.app.use(`/${packagesFolder}/`, express.static(join(this.compilationInfo.location, packagesFolder))) // compiled packages
-    this.app.use(`/${clientFolder}/`, express.static(join(this.compilationInfo.location, clientFolder))) // compiled packages
-    this.app.use(`/${componentCssFolder}/`, express.static(join(this.compilationInfo.location, componentCssFolder))) // compiled packages
-    this.app.use(express.static(join(this.compilationInfo.location, staticFolder))) // compiled stylesheets?
-    const publicLocation = join(this.compilationInfo.location, publicFolder)
-    if (existsSync(publicLocation)) this.app.use(express.static(publicLocation)) // files from public folder
-    cliWarn(`assets dir:`, this.config.assetsDir)
-    if (this.config.assetsDir !== undefined) this.app.use(`/${this.config.assetsDir}`, express.static(join(this.compilationInfo.location, assetsFolder))) // files from assets folder
-    this.app.use(express.static(this.compilationInfo.location, { dotfiles:'allow' })) // serving the app files themselves
-    this.app.use(this.handleRequest)
-    */
-    // start hooking into require to rewrite react requires to tungsten
-    //addRequireResolveHooks() // we need this for server side
-    // we will need a server side import loader too
   }
-
   // private async handlePost(req: express.Request, res: express.Response): Promise<void> {
   //     throw new TungstenError(`Err - Dev server received a post request. Not supported yet.`)
   // }

package/dist/TungstenElement.d.ts

@@ -0,0 +1,3 @@
+import type { AnyComponent } from './AnyComponent.js';
+export type TungstenElement = AnyComponent;
+//# sourceMappingURL=TungstenElement.d.ts.map

package/dist/TungstenElement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TungstenElement.d.ts","sourceRoot":"","sources":["../src/TungstenElement.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAGrD,MAAM,MAAM,eAAe,GAAG,YAAY,CAAA"}

package/dist/TungstenElement.js

@@ -0,0 +1 @@
+export {};

package/dist/TungstenError.d.ts

@@ -2,4 +2,8 @@ export declare class TungstenError extends Error {
     name: string;
     constructor(message: string);
 }
+export declare class TungstenProductionError extends TungstenError {
+    name: string;
+    constructor(message?: string);
+}
 //# sourceMappingURL=TungstenError.d.ts.map

package/dist/TungstenError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TungstenError.d.ts","sourceRoot":"","sources":["../src/TungstenError.ts"],"names":[],"mappings":"AACA,qBAAa,aAAc,SAAQ,KAAK;IACpC,IAAI,SAAkB;gBACV,OAAO,EAAE,MAAM;CAG9B"}
+{"version":3,"file":"TungstenError.d.ts","sourceRoot":"","sources":["../src/TungstenError.ts"],"names":[],"mappings":"AACA,qBAAa,aAAc,SAAQ,KAAK;IACpC,IAAI,SAAkB;gBACV,OAAO,EAAE,MAAM;CAG9B;AAED,qBAAa,uBAAwB,SAAQ,aAAa;IACtD,IAAI,SAA4B;gBACpB,OAAO,CAAC,EAAE,MAAM;CAG/B"}

package/dist/TungstenError.js

@@ -6,4 +6,10 @@ export class TungstenError extends Error {
     super(message);
     _defineProperty(this, "name", 'TungstenError');
   }
+}
+export class TungstenProductionError extends TungstenError {
+  constructor(message) {
+    super(message !== undefined ? message : 'A Tungsten Framework error occurred');
+    _defineProperty(this, "name", 'TungstenProductionError');
+  }
 }

package/dist/_client/client.d.ts

@@ -1,3 +1,7 @@
+import { InstanceConfig } from 'tungsten/Instance/InstanceConfig.js';
+declare module '../.tungsten.config.js' {
+    export default InstanceConfig;
+}
 declare global {
     interface Window {
         __tungsten_hydrate__: Promise<any>;
@@ -5,5 +9,4 @@ declare global {
         foo: number;
     }
 }
-export {};
 //# sourceMappingURL=client.d.ts.map

package/dist/_client/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/_client/client.ts"],"names":[],"mappings":"AASA,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;QAClC,iBAAiB,EAAE,OAAO,CAAA;QAC1B,GAAG,EAAE,MAAM,CAAA;KACd;CACJ"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/_client/client.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AAKpE,OAAO,QAAQ,wBAAwB,CAAC;IACpC,eAAe,cAAc,CAAA;CAChC;AAMD,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;QAClC,iBAAiB,EAAE,OAAO,CAAA;QAC1B,GAAG,EAAE,MAAM,CAAA;KACd;CACJ"}

package/dist/_client/client.js

@@ -1,7 +1,8 @@
 //import { helpers } from './cjsHelpers.js'
 import { hydrate } from 'tungsten';
-// @ts-ignore
-import appConfig from "../.tungsten.config.js";
+// @ts-ignore -- ignore module not found, will be generated later
+import instanceConfig from "../.tungsten.config.js";
+console.log('app config', instanceConfig);
 // wrap the async code in an async IIFE to help rollup
 const clientPromise = (async () => {
   //const isProd = window.__tungsten_prod__ = appConfig.prod
@@ -10,12 +11,18 @@ const clientPromise = (async () => {
   // dynamically import this here, so that we can set __tungsten_prod__ first
   // is this causing a slowdown?
   // need to change this to static imports via build steps
-  let routes, RootComponent;
-  await Promise.all([import("./routes.js").then(mod => routes = mod.routes), import("./RootComponent.js").then(({
-    module,
-    filename
-  }) => RootComponent = 'default' in module ? module.default : module[filename]) // could probably do with better error handling/reporting
-  ]);
+  let routes;
+  const promises = [import("./routes.js").then(mod => routes = mod.routes)];
+  let RootComponent = null;
+  if (instanceConfig.useRootComponent) {
+    // rollup is failing to handle this when useRootComponent is false
+    promises.push(import("./RootComponent.js").then(({
+      module,
+      filename
+    }) => RootComponent = 'default' in module ? module.default : module[filename]) // could probably do with better error handling/reporting
+    );
+  }
+  await Promise.all(promises);
   //const rootComponentRelFilePath = (await import('./rootComponentRelFilePath.js')).rootComponentRelFilePath
   // let RootComponent: TungstenBaseComponentType
   // if ('default' in rootModule) {
@@ -31,6 +38,6 @@ const clientPromise = (async () => {
   //     }
   // }
   // @ts-expect-error -- TS doesn't understand that RootComponent was assigned by the promise
-  await hydrate(routes, RootComponent, appConfig);
+  await hydrate(routes, RootComponent, instanceConfig);
 })();
 window.__tungsten_hydrate__ = clientPromise;