@lwrjs/view-registry 0.9.0-alpha.9 → 0.9.0

package/build/es/linkers/legacy_view_bootstrap.js

@@ -1,21 +1,32 @@
-import { kebabCaseToModuleSpecifer, getModuleGraphs, GraphDepth, getModuleUriPrefix, logger, } from '@lwrjs/shared-utils';
+import { kebabCaseToModuleSpecifier, getModuleGraphs, GraphDepth, getModuleUriPrefix, logger, explodeSpecifier, isBundler, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
-import { generateHtmlTag, getModuleResource, getModuleResourceByUri } from '../utils.js';
-import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
+import { generateHtmlTag, getModuleResourceByUri } from '../utils.js';
+import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, getPreloadModulesMeta, } from './utils.js';
 export async function getHtmlResources(view, viewParams, resourceContext) {
     const { runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler, resourceRegistry, viewMetadata, } = resourceContext;
-    const { id: appName, bootstrap: { services } = { services: [] } } = view;
+    const { bundleConfig } = resourceContext;
+    const { external = {} } = bundleConfig;
+    const isExternal = function (rawSpecifier) {
+        const { specifier } = explodeSpecifier(rawSpecifier);
+        return Object.keys(external).some((e) => specifier === e);
+    };
+    const { id: appName, bootstrap: { services, module: bootstrapModule, preloadModules = [] } = {
+        services: [],
+        preloadModules: [],
+    }, } = view;
     const { lwrVersion, format, hmrEnabled, bundle, debug, minify } = runtimeEnvironment;
     const { customElements } = viewMetadata;
     const version = lwrVersion;
     const isAMD = format === 'amd';
-    // Application Bootstrap (ABS) module resource: "@lwrjs/app-service/{appName}/module/{format}"
+    // The Application Bootstrap (ABS) module resource is EITHER
+    //      - configured as routes[x].bootstrap.module OR
+    //      - defaulted as "@lwrjs/app-service/{appName}/module/{format}"
     const appIdentity = {
         appName,
         format: runtimeEnvironment.format,
         resourceType: AppResourceEnum.MODULE,
     };
-    const bootstrapSpecifier = getAppSpecifier(appIdentity);
+    const bootstrapSpecifier = bootstrapModule || getAppSpecifier(appIdentity);
     /*
         Internal module and module dependency related resources used by the view to render view related components.
      */
@@ -37,25 +48,34 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const rootComponents = [];
     // Collection of modules specifiers that MUST be loaded in the view
     const requiredAmdModules = [];
-    // Collection of modules that will be loaded in the view
-    const preloadAmdModules = [];
+    // Collection of modules that will be preloaded. For AMD, it will be part of
+    // the preloadModules client bootstrap config
+    const preloadModulesMeta = new Map();
     // Determine if server side rendering view modules
     const isSSR = view.bootstrap?.ssr;
     // ------ AMD Required module resources
     if (isAMD) {
         // Keep shim format in sync with view_bootstrap.ts
-        const shimBundle = !bundle
-            ? 'lwr-loader-shim-legacy.js'
-            : debug || minify === false
-                ? 'lwr-loader-shim-legacy.bundle.js'
-                : 'lwr-loader-shim-legacy.bundle.min.js';
-        const def = (await resourceRegistry.getResource({ specifier: shimBundle, version }, runtimeEnvironment, runtimeParams));
+        const shimBundle = debug || minify === false
+            ? 'lwr-loader-shim-legacy.bundle.js'
+            : 'lwr-loader-shim-legacy.bundle.min.js';
+        let def = (await resourceRegistry.getResource({ specifier: shimBundle, version }, runtimeEnvironment, runtimeParams));
         if (!def) {
-            throw Error('Failed to find definition of resource: ' + shimBundle);
-        }
-        // HACK: preemptively closing the stream because it is never read
-        if (def.stream) {
-            def.stream.destroy();
+            // HACK: fallback to looking for the other shim.
+            // TODO: remove this once we solve debug mode in MRT
+            let fallbackShimBundle;
+            if (shimBundle === 'lwr-loader-shim-legacy.bundle.js') {
+                fallbackShimBundle = 'lwr-loader-shim-legacy.bundle.min.js';
+                def = (await resourceRegistry.getResource({ specifier: fallbackShimBundle, version }, runtimeEnvironment, runtimeParams));
+            }
+            else {
+                fallbackShimBundle = 'lwr-loader-shim-legacy.bundle.js';
+                def = (await resourceRegistry.getResource({ specifier: fallbackShimBundle, version }, runtimeEnvironment, runtimeParams));
+            }
+            // throw if we still can't find it
+            if (!def) {
+                throw Error('Failed to find definition of resource: ' + shimBundle);
+            }
         }
         requiredResources.push(def);
         // Always inline the error shim script after the shim
@@ -64,30 +84,34 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             throw Error('Failed to find definition of resource: lwr-error-shim.js');
         }
         requiredResources.push(errorShimDef);
-        // Add loader, if not already bundled with the shim
-        if (!bundle) {
-            // needed because we're resolving against fully-linked modules
-            requiredResources.push(await getModuleResource({
-                specifier: 'lwr/loaderLegacy',
-                version,
-            }, runtimeEnvironment, {
-                isPreload: false,
-                isSSR,
-            }, moduleRegistry, runtimeParams));
-        }
     }
     // ------- Application Bootstrap module
     // Traversal of the Bootstrap Module Graph is done to get all the URLS for discoverable static dependencies.
-    // Reasoning: This is to avoid unecessary HTTP 302's during initial application module fetching.
+    // Reasoning: This is to avoid unnecessary HTTP 302's during initial application module fetching.
     // Scope: ESM currently only exposes immutable URI references, optimize for AMD formats
     const depth = isAMD
         ? { static: GraphDepth.ALL, dynamic: 1 }
         : { static: GraphDepth.NONE, dynamic: 0 };
-    const bootstrapModuleGraph = await getModuleGraphs(bootstrapSpecifier, { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams, visitedCache);
+    const defRegistry = bundle ? moduleBundler : moduleRegistry;
+    const bootstrapModuleGraph = await getModuleGraphs(bootstrapSpecifier, { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visitedCache);
     // ADD bootstrap module uri as a script resource
     const versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
     const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
     moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: false, isSSR }));
+    // PRELOAD the bootstrap module static dependencies as preloaded script resources
+    for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
+        if (!isExternal(depSpecifier)) {
+            const uri = bootstrapModuleGraph.uriMap[depSpecifier];
+            preloadModulesMeta.set(depSpecifier, uri);
+        }
+    }
+    // PRELOAD configured preloadModules as preloaded script resources
+    if (isBundler(defRegistry)) {
+        for (const specifier of preloadModules) {
+            // eslint-disable-next-line no-await-in-loop
+            await getPreloadModulesMeta(specifier, preloadModulesMeta, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams);
+        }
+    }
     if (isAMD) {
         // ADD bootstrap module as required
         requiredAmdModules.push(versionedSpecifier);
@@ -100,8 +124,6 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             imports[staticDep] = uri;
             // ADD bootstrap module static deps to requiredAmdModules if services, otherwise preloadModules
             if (services && services.length) {
-                // get the graphs for the bs static deps
-                moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: true, isSSR }));
                 requiredAmdModules.push(staticDep);
             }
         }
@@ -120,18 +142,26 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const customElementsRecords = [];
     const flattenedElements = flattenCustomElements(customElements, isSSR);
     await Promise.all(flattenedElements.map(async ({ tagName: element, props }) => {
-        const graph = await getModuleGraphs(kebabCaseToModuleSpecifer(element), { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
+        const graph = await getModuleGraphs(kebabCaseToModuleSpecifier(element), { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
         // add to the viewRecord
         customElementsRecords.push({ elementName: element, flatGraph: graph });
-        // PRELOAD custom element static deps as link resource
+        // PRELOAD the custom element module as a link resource
         const specifier = graph.graphs[0].specifier;
         const uri = graph.uriMap[specifier];
-        moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: true, isSSR }));
+        preloadModulesMeta.set(specifier, uri);
+        // PRELOAD custom element static deps as link resources when bundling is ON
+        if (bundle) {
+            for (const depSpecifier of graph.graphs[0].static) {
+                if (!isExternal(depSpecifier)) {
+                    const uri = graph.uriMap[depSpecifier];
+                    preloadModulesMeta.set(depSpecifier, uri);
+                }
+            }
+        }
         // ADD register custom elements as a uri addressable rootComponents
         rootComponents.push(specifier);
         imports[specifier] = uri;
         if (isAMD) {
-            preloadAmdModules.push(specifier);
             for (const staticDep of graph.graphs[0].static) {
                 const uri = graph.uriMap[staticDep];
                 // AMD ADD static module dep uri addressability
@@ -159,11 +189,16 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         },
         rootComponents,
         ...(isAMD && { requiredModules: requiredAmdModules }),
-        ...(isAMD && { preloadModules: preloadAmdModules }),
+        // in AMD we need to tell the loader what modules we are preloading
+        ...(isAMD && { preloadModules: Array.from(preloadModulesMeta.keys()) }),
     }, runtimeEnvironment, runtimeParams));
     if (!isAMD && hmrEnabled) {
         configResources.unshift(await getViewHmrConfigurationResource(view, viewMetadata));
     }
+    // PRELOAD script resources for preload module URIs after the bootstrap module
+    for (const [, preloadUri] of preloadModulesMeta) {
+        moduleResources.push(getModuleResourceByUri(preloadUri, runtimeEnvironment, { isPreload: true, isSSR }));
+    }
     // generate html partial
     const htmlResources = await Promise.all([...configResources, ...requiredResources, ...moduleResources].map(generateHtmlTag));
     return {

package/build/es/linkers/link-lwr-resources.d.ts

@@ -1,4 +1,4 @@
-import { ModuleRegistry, LinkedViewDefinition, RenderedViewMetadata, ResourceRegistry, RuntimeEnvironment, RuntimeParams, View, ModuleBundler, ViewParams } from '@lwrjs/types';
+import { ModuleRegistry, LinkedViewDefinition, RenderedViewMetadata, ResourceRegistry, RuntimeEnvironment, RuntimeParams, View, ModuleBundler, ViewParams, BundleConfig } from '@lwrjs/types';
 export interface LwrResourcesLinkedContext extends ResourceContext {
     lwrResourcesId: string;
 }
@@ -9,6 +9,7 @@ interface ResourceContext {
     moduleRegistry: ModuleRegistry;
     moduleBundler: ModuleBundler;
     resourceRegistry: ResourceRegistry;
+    bundleConfig: BundleConfig;
 }
 declare type LinkedResourcesViewDefinition = Pick<LinkedViewDefinition, 'renderedView' | 'viewRecord'>;
 export declare function linkLwrResources(source: string, view: View, viewParams: ViewParams, cxt: LwrResourcesLinkedContext): Promise<LinkedResourcesViewDefinition>;

package/build/es/linkers/utils.d.ts

@@ -1,6 +1,12 @@
-import { ClientBootstrapConfig, RuntimeEnvironment, RuntimeParams, ResourceDefinition, RenderedViewMetadata, CustomElementReference } from '@lwrjs/types';
+import { ClientBootstrapConfig, RuntimeEnvironment, RuntimeParams, ResourceDefinition, RenderedViewMetadata, CustomElementReference, BundleConfig, ModuleBundler, ModuleRegistry } from '@lwrjs/types';
 import { View, ViewInfo } from '@lwrjs/types';
 export declare function getViewBootstrapConfigurationResource(viewInfo: ViewInfo, config: ClientBootstrapConfig, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): ResourceDefinition;
 export declare function getViewHmrConfigurationResource(view: View, viewMetadata: RenderedViewMetadata): ResourceDefinition;
 export declare function flattenCustomElements(arr: CustomElementReference[], isSSR?: boolean): CustomElementReference[];
+/**
+ * Recursively gets preloadModules metadata starting with a specifer
+ * Note: don't call me unless you got bundles
+ */
+export declare function getPreloadModulesMeta(specifier: string, // unversioned specifier
+preloadModulesMeta: Map<string, string>, bundleConfig: BundleConfig, moduleRegistry: ModuleRegistry, defRegistry: ModuleBundler, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams, pending?: Map<string, boolean>): Promise<void>;
 //# sourceMappingURL=utils.d.ts.map

package/build/es/linkers/utils.js

@@ -1,4 +1,4 @@
-import { getMappingUriPrefix, getModuleUriPrefix, getClientBootstrapConfigurationUri, hashContent, } from '@lwrjs/shared-utils';
+import { getMappingUriPrefix, getModuleUriPrefix, getClientBootstrapConfigurationUri, hashContent, getVersionedModuleId, normalizeVersionToUri, logger, VERSION_NOT_PROVIDED, explodeSpecifier, getSpecifier, } from '@lwrjs/shared-utils';
 const CONTENT_TYPE = 'application/javascript';
 export function getViewBootstrapConfigurationResource(viewInfo, config, runtimeEnvironment, runtimeParams) {
     const { compat, debug, hmrEnabled, apiVersion, format } = runtimeEnvironment;
@@ -25,6 +25,7 @@ export function getViewBootstrapConfigurationResource(viewInfo, config, runtimeE
             ...config,
             endpoints,
         })});`,
+        // TODO: W-12639529 change after addressing downstream customers
         `globalThis.process = { env: { NODE_ENV: "${runtimeEnvironment.serverMode}" } };`,
     ]
         .filter(Boolean)
@@ -99,4 +100,54 @@ export function flattenCustomElements(arr, isSSR = false) {
     flatten(arr);
     return ret;
 }
+/**
+ * Recursively gets preloadModules metadata starting with a specifer
+ * Note: don't call me unless you got bundles
+ */
+export async function getPreloadModulesMeta(specifier, // unversioned specifier
+preloadModulesMeta, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, pending) {
+    const { exclude = [], external = {} } = bundleConfig;
+    const isExternal = function (rawSpecifier) {
+        const { specifier } = explodeSpecifier(rawSpecifier);
+        return Object.keys(external).includes(specifier);
+    };
+    const isExclude = function (specifier) {
+        return exclude.includes(specifier);
+    };
+    if (isExternal(specifier)) {
+        logger.warn(`"${specifier}" is configured in both bundleConfig.externals and bootstrap.preloadModules. We are treating it as external.`);
+    }
+    else {
+        // eslint-disable-next-line no-await-in-loop
+        const versionedModuleId = await getVersionedModuleId(specifier, moduleRegistry); // TODO replace moduleRegistry with defRegistry
+        const versionedModuleSpecifier = getSpecifier({
+            specifier,
+            version: normalizeVersionToUri(versionedModuleId.version),
+        });
+        const uri = 
+        // eslint-disable-next-line no-await-in-loop
+        await defRegistry.resolveModuleUri(versionedModuleId, runtimeEnvironment, runtimeParams);
+        // fallback to unversioned specifier if needed
+        const normalizedSpecifier = versionedModuleId.version === VERSION_NOT_PROVIDED ? specifier : versionedModuleSpecifier;
+        preloadModulesMeta.set(normalizedSpecifier, uri);
+        if (exclude.length) {
+            // check if we need to also preload any excluded dependencies of this preload module
+            const preloadModuleRecord = await defRegistry.getModuleBundle(versionedModuleId, runtimeEnvironment, runtimeParams);
+            const { imports } = preloadModuleRecord.bundleRecord;
+            if (imports) {
+                if (!pending) {
+                    pending = new Map();
+                }
+                for (let i = 0; i < imports.length; i++) {
+                    const imp = imports[i];
+                    if (!pending.has(imp.specifier) && isExclude(imp.specifier)) {
+                        pending.set(imp.specifier, true); // prevent dupe calls
+                        // eslint-disable-next-line no-await-in-loop
+                        await getPreloadModulesMeta(imp.specifier, preloadModulesMeta, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, pending);
+                    }
+                }
+            }
+        }
+    }
+}
 //# sourceMappingURL=utils.js.map

package/build/es/linkers/view_bootstrap.d.ts

@@ -1,4 +1,4 @@
-import { ModuleRegistry, RenderedViewMetadata, RenderedViewRecord, ResourceRegistry, RuntimeEnvironment, RuntimeParams, View, ModuleBundler, ViewParams } from '@lwrjs/types';
+import { BundleConfig, ModuleRegistry, RenderedViewMetadata, RenderedViewRecord, ResourceRegistry, RuntimeEnvironment, RuntimeParams, View, ModuleBundler, ViewParams } from '@lwrjs/types';
 export interface LwrResourcesLinkedContext extends ResourceContext {
     lwrResourcesId: string;
 }
@@ -9,6 +9,7 @@ interface ResourceContext {
     moduleRegistry: ModuleRegistry;
     moduleBundler: ModuleBundler;
     resourceRegistry: ResourceRegistry;
+    bundleConfig: BundleConfig;
 }
 export declare function getHtmlResources(view: View, viewParams: ViewParams, resourceContext: ResourceContext): Promise<{
     partial: string;

package/build/es/linkers/view_bootstrap.js

@@ -1,21 +1,33 @@
-import { kebabCaseToModuleSpecifer, toImportMetadata, getModuleGraphs, getMappingUriPrefix, GraphDepth, logger, } from '@lwrjs/shared-utils';
+import { kebabCaseToModuleSpecifier, toImportMetadata, getModuleGraphs, getMappingUriPrefix, GraphDepth, logger, explodeSpecifier, isBundler, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
-import { generateHtmlTag, getModuleResource, getModuleResourceByUri } from '../utils.js';
-import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
+import { generateHtmlTag, getModuleResourceByUri } from '../utils.js';
+import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, getPreloadModulesMeta, } from './utils.js';
 export async function getHtmlResources(view, viewParams, resourceContext) {
     const { runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler, resourceRegistry, viewMetadata, } = resourceContext;
-    const { id: appName, bootstrap: { services } = { services: [] } } = view;
+    const { bundleConfig } = resourceContext;
+    const { external = {} } = bundleConfig;
+    const isExternal = function (rawSpecifier) {
+        const { specifier } = explodeSpecifier(rawSpecifier);
+        return Object.keys(external).some((e) => specifier === e);
+    };
+    const { id: appName, bootstrap: { services, module: bootstrapModule, preloadModules = [] } = {
+        services: [],
+        preloadModules: [],
+    }, } = view;
     const { lwrVersion, format, hmrEnabled, bundle, debug, minify } = runtimeEnvironment;
     const { customElements } = viewMetadata;
+    const defRegistry = bundle ? moduleBundler : moduleRegistry;
     const version = lwrVersion;
     const isAMD = format === 'amd';
-    // Application Bootstrap (ABS) module resource: "@lwrjs/app-service/{appName}/module/{format}"
+    // The Application Bootstrap (ABS) module resource is EITHER
+    //      - configured as routes[x].bootstrap.module OR
+    //      - defaulted as "@lwrjs/app-service/{appName}/module/{format}"
     const appIdentity = {
         appName,
         format: runtimeEnvironment.format,
         resourceType: AppResourceEnum.MODULE,
     };
-    const bootstrapSpecifier = getAppSpecifier(appIdentity);
+    const bootstrapSpecifier = bootstrapModule || getAppSpecifier(appIdentity);
     /*
         Internal module and module dependency related resources used by the view to render view related components.
      */
@@ -37,26 +49,19 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const rootComponents = [];
     // Collection of modules specifiers that MUST be loaded in the view
     const requiredAmdModules = [];
-    // Collection of modules that will be loaded in the view
-    const preloadAmdModules = [];
+    // Collection of modules that will be preloaded. For AMD, it will be part of
+    // the preloadModules client bootstrap config
+    const preloadModulesMeta = new Map();
     // Determine if server side rendering view modules
     const isSSR = view.bootstrap?.ssr;
     // ------ AMD Required module resources
     if (isAMD) {
         // Keep shim format in sync with legacy_view_bootstrap.ts
-        const shimBundle = !bundle
-            ? 'lwr-loader-shim.js'
-            : debug || minify === false
-                ? 'lwr-loader-shim.bundle.js'
-                : 'lwr-loader-shim.bundle.min.js';
+        const shimBundle = debug || minify === false ? 'lwr-loader-shim.bundle.js' : 'lwr-loader-shim.bundle.min.js';
         const def = (await resourceRegistry.getResource({ specifier: shimBundle, version }, runtimeEnvironment, runtimeParams));
         if (!def) {
             throw Error('Failed to find definition of resource: ' + shimBundle);
         }
-        // HACK: preemptively closing the stream because it is never read
-        if (def.stream) {
-            def.stream.destroy();
-        }
         requiredResources.push(def);
         // Always inline the error shim script after the shim
         const errorShimDef = (await resourceRegistry.getResource({ specifier: 'lwr-error-shim.js', version }, runtimeEnvironment, runtimeParams));
@@ -64,16 +69,6 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             throw Error('Failed to find definition of resource: lwr-error-shim.js');
         }
         requiredResources.push(errorShimDef);
-        // Add loader, if not already bundled with the shim
-        if (!bundle) {
-            // needed because we're resolving against fully-linked modules
-            requiredResources.push(await getModuleResource({
-                specifier: 'lwr/loader',
-                version,
-            }, runtimeEnvironment, {
-                isSSR,
-            }, moduleRegistry, runtimeParams));
-        }
     }
     // ------- Application Bootstrap module
     // Traversal of the Bootstrap Module Graph is done to get all the URLS for discoverable static dependencies.
@@ -81,11 +76,25 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const depth = isAMD
         ? { static: GraphDepth.ALL, dynamic: 1 }
         : { static: GraphDepth.NONE, dynamic: 1 };
-    const bootstrapModuleGraph = await getModuleGraphs(bootstrapSpecifier, { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams, visitedCache);
+    const bootstrapModuleGraph = await getModuleGraphs(bootstrapSpecifier, { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visitedCache);
     // ADD bootstrap module uri as a script resource
     const versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
     const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
     moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: false, isSSR }));
+    // PRELOAD the bootstrap module static dependencies as preloaded script resources
+    for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
+        if (!isExternal(depSpecifier)) {
+            const uri = bootstrapModuleGraph.uriMap[depSpecifier];
+            preloadModulesMeta.set(depSpecifier, uri);
+        }
+    }
+    // PRELOAD configured preloadModules as preloaded script resources
+    if (isBundler(defRegistry)) {
+        for (const specifier of preloadModules) {
+            // eslint-disable-next-line no-await-in-loop
+            await getPreloadModulesMeta(specifier, preloadModulesMeta, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams);
+        }
+    }
     if (isAMD) {
         // ADD bootstrap module as required
         requiredAmdModules.push(versionedSpecifier);
@@ -98,8 +107,6 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             imports[staticDep] = uri;
             // ADD bootstrap module static deps to requiredAmdModules if services, otherwise preloadModules
             if (services && services.length) {
-                // get the graphs for the bs static deps
-                moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: true, isSSR }));
                 requiredAmdModules.push(staticDep);
             }
         }
@@ -120,18 +127,26 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const flattenedElements = flattenCustomElements(customElements, isSSR);
     for (const { tagName: element } of flattenedElements) {
         // eslint-disable-next-line no-await-in-loop
-        const graph = await getModuleGraphs(kebabCaseToModuleSpecifer(element), { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
+        const graph = await getModuleGraphs(kebabCaseToModuleSpecifier(element), { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
         // add to the viewRecord
         customElementsRecords.push({ elementName: element, flatGraph: graph });
-        // PRELOAD custom element static deps as link resource
+        // PRELOAD the custom element module as a link resource
         const specifier = graph.graphs[0].specifier;
         const uri = graph.uriMap[specifier];
-        moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: true, isSSR }));
+        preloadModulesMeta.set(specifier, uri);
+        // PRELOAD custom element static deps as link resources when bundling is ON
+        if (bundle) {
+            for (const depSpecifier of graph.graphs[0].static) {
+                if (!isExternal(depSpecifier)) {
+                    const uri = graph.uriMap[depSpecifier];
+                    preloadModulesMeta.set(depSpecifier, uri);
+                }
+            }
+        }
         // ADD register custom elements as a uri addressable rootComponents
         rootComponents.push(specifier);
         imports[specifier] = uri;
         if (isAMD) {
-            preloadAmdModules.push(specifier);
             for (const staticDep of graph.graphs[0].static) {
                 const uri = graph.uriMap[staticDep];
                 // AMD ADD static module dep uri addressability
@@ -159,11 +174,16 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         index: importMetadata?.index,
         rootComponents,
         ...(isAMD && { requiredModules: requiredAmdModules }),
-        ...(isAMD && { preloadModules: preloadAmdModules }),
+        // in AMD we need to tell the loader what modules we are preloading
+        ...(isAMD && { preloadModules: Array.from(preloadModulesMeta.keys()) }),
     }, runtimeEnvironment, runtimeParams));
     if (!isAMD && hmrEnabled) {
         configResources.unshift(await getViewHmrConfigurationResource(view, viewMetadata));
     }
+    // PRELOAD script resources for preload module URIs after the bootstrap module
+    for (const [, preloadUri] of preloadModulesMeta) {
+        moduleResources.push(getModuleResourceByUri(preloadUri, runtimeEnvironment, { isPreload: true, isSSR }));
+    }
     // generate html partial
     const htmlResources = await Promise.all([...configResources, ...requiredResources, ...moduleResources].map(generateHtmlTag));
     const mapping = getMappingUriPrefix(runtimeEnvironment, runtimeParams);

package/build/es/utils.d.ts

@@ -1,5 +1,4 @@
-import { NormalizedRenderingResult, RenderingResult, ResourceDefinition, AssetReference, RenderedAssetReference, RenderOptions, ModuleId, ViewModuleResourceContext, ViewPageContext, JsonCompatible } from '@lwrjs/types';
-import { PublicModuleRegistry, RuntimeEnvironment, RuntimeParams, ModuleJson, RouteHandlerViewResponse, ViewResponse, RouteHandlerFunction, LwrRoute, LwrErrorRoute, ViewRequest, LinkedViewDefinition, ModuleRegistry } from 'packages/@lwrjs/types/src';
+import type { AssetReference, JsonCompatible, LinkedViewDefinition, LwrErrorRoute, LwrRoute, ModuleBundler, ModuleId, ModuleJson, ModuleRegistry, NormalizedRenderingResult, PublicModuleRegistry, RenderOptions, RenderedAssetReference, RenderingResult, ResourceDefinition, RouteHandlerViewResponse, RuntimeEnvironment, RuntimeParams, ViewModuleResourceContext, ViewPageContext, ViewRequest, ViewResponse } from '@lwrjs/types';
 export declare type HTMLResource = Partial<ResourceDefinition>;
 export declare function generateHtmlTag(definition: HTMLResource): Promise<string>;
 export declare function normalizeRenderedResult({ renderedView, metadata, options, }: RenderingResult): NormalizedRenderingResult;
@@ -7,19 +6,8 @@ export declare function reduceSourceAssetReferences(assets: AssetReference[]): R
 export declare function normalizeRenderOptions(runtimeEnvironment: RuntimeEnvironment, overrideRenderOptions?: RenderOptions, baseRenderOptions?: RenderOptions): Required<RenderOptions>;
 export declare function generatePageContext({ requestPath: url }: ViewRequest, { id, contentTemplate, properties }: LwrRoute | LwrErrorRoute): JsonCompatible<ViewPageContext>;
 export declare function isViewResponse(response: RouteHandlerViewResponse): response is ViewResponse;
-interface RouteHandlerContext {
-    cacheDir: string;
-    rootDir: string;
-}
-/**
- * Load and cache a route handler function (for a view) from the fs
- * @param path - path to the route handle code on the fs
- * @param param1 - directories
- */
-export declare function getRouteHandler(path: string, { cacheDir, rootDir }: RouteHandlerContext): Promise<RouteHandlerFunction>;
 export declare function toJsonFormat(viewRequest: ViewRequest, viewDefinition: LinkedViewDefinition, route: LwrRoute | LwrErrorRoute, runtimeEnvironment: RuntimeEnvironment, runtimeParams: RuntimeParams, moduleRegistry: ModuleRegistry): Promise<ViewResponse>;
-export declare function getModuleResource(moduleId: Pick<ModuleId, 'specifier' | 'version'>, runtimeEnvironment: RuntimeEnvironment, moduleResouceMeta: ViewModuleResourceContext, moduleRegistry: ModuleRegistry, runtimeParams?: RuntimeParams): Promise<ResourceDefinition>;
+export declare function getModuleResource(moduleId: Pick<ModuleId, 'specifier' | 'version'>, runtimeEnvironment: RuntimeEnvironment, moduleResouceMeta: ViewModuleResourceContext, defRegistry: ModuleRegistry | ModuleBundler, runtimeParams?: RuntimeParams): Promise<ResourceDefinition>;
 export declare function getModuleResourceByUri(uri: string, runtimeEnvironment: RuntimeEnvironment, moduleResouceMeta: ViewModuleResourceContext): ResourceDefinition;
 export declare function createJsonModule(specifier: string, moduleRegistry: PublicModuleRegistry, environment: RuntimeEnvironment, params?: RuntimeParams): Promise<ModuleJson>;
-export {};
 //# sourceMappingURL=utils.d.ts.map

package/build/es/utils.js

@@ -1,9 +1,6 @@
-import { explodeSpecifier, getMappingUriPrefix, getSpecifier, resolveFileExtension, transpileTs, DEFAULT_TITLE, } from '@lwrjs/shared-utils';
-import libPath from 'path';
 import { basename, extname } from 'path';
-import { mimeLookup } from '@lwrjs/shared-utils';
+import { explodeSpecifier, getMappingUriPrefix, getSpecifier, getClientBootstrapConfigurationUri, mimeLookup, DEFAULT_TITLE, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier, ResourceIdentityTypes, } from '@lwrjs/app-service/identity';
-import { getClientBootstrapConfigurationUri } from '@lwrjs/shared-utils';
 function streamToString(stream) {
     const chunks = [];
     return new Promise((resolve, reject) => {
@@ -51,7 +48,7 @@ async function generateInlineTag({ specifier, type, content, stream, nonce }) {
     if (!content && !stream) {
         throw new Error(`Invalid inline Resource Definition: must have either "content" or "stream": "${specifier}"`);
     }
-    const code = content ? content : await streamToString(stream);
+    const code = stream ? await streamToString(stream()) : content;
     return `<${tag}${typeStr}${nonceStr}>${code}</${tag}>`;
 }
 export async function generateHtmlTag(definition) {
@@ -110,25 +107,6 @@ export function generatePageContext({ requestPath: url }, { id, contentTemplate,
 export function isViewResponse(response) {
     return response.body !== undefined;
 }
-/**
- * Load and cache a route handler function (for a view) from the fs
- * @param path - path to the route handle code on the fs
- * @param param1 - directories
- */
-export async function getRouteHandler(path, { cacheDir, rootDir }) {
-    try {
-        const fullPath = resolveFileExtension(path);
-        if (fullPath.endsWith('.ts')) {
-            path = await transpileTs(path, { rootDir, cacheDir: libPath.join(cacheDir, 'routeHandlers') });
-        }
-        const moduleEntry = await import(path);
-        return moduleEntry.default || moduleEntry;
-    }
-    catch (err) {
-        console.log(err);
-        throw new Error(`Unable to get routeHandler: ${path}`);
-    }
-}
 export async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironment, runtimeParams, moduleRegistry) {
     const { viewRecord } = viewDefinition;
     const { bootstrap, id: appName } = route;
@@ -213,10 +191,10 @@ export async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEn
         },
     };
 }
-export async function getModuleResource(moduleId, runtimeEnvironment, moduleResouceMeta, moduleRegistry, runtimeParams) {
+export async function getModuleResource(moduleId, runtimeEnvironment, moduleResouceMeta, defRegistry, runtimeParams) {
     const { format } = runtimeEnvironment;
     const { isSSR = false, isPreload = false } = moduleResouceMeta;
-    const moduleUri = await moduleRegistry.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams);
+    const moduleUri = await defRegistry.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams);
     return {
         src: moduleUri,
         type: format === 'amd' ? 'application/javascript' : 'module',
@@ -257,7 +235,7 @@ export async function createJsonModule(specifier, moduleRegistry, environment, p
         version,
         ownHash,
         links: {
-            self: moduleRegistry.resolveModuleUri(moduleIdentifier, environment, params, ownHash),
+            self: await moduleRegistry.resolveModuleUri(moduleIdentifier, environment, params, ownHash),
         },
     };
 }

package/build/es/view-handler.d.ts

@@ -1,14 +1,14 @@
-import { ViewRegistry, RuntimeEnvironment, NormalizedLwrGlobalConfig, ViewRequest, RuntimeParams, ViewResponse, LwrErrorRoute, LwrRoute, ModuleRegistry, RouteHandlerFunction } from '@lwrjs/types';
+import { ViewRegistry, RuntimeEnvironment, NormalizedLwrGlobalConfig, ViewRequest, RuntimeParams, ViewResponse, LwrRoute, LwrErrorRoute, ModuleRegistry, ViewHandler, RouteHandlers } from '@lwrjs/types';
 export interface ViewHandlerContext {
     viewRegistry: ViewRegistry;
     moduleRegistry: ModuleRegistry;
+    routeHandlers: RouteHandlers;
 }
-export declare class LwrViewHandler {
+export declare class LwrViewHandler implements ViewHandler {
+    globalConfig: NormalizedLwrGlobalConfig;
+    routeHandlers: RouteHandlers;
     viewRegistry: ViewRegistry;
     moduleRegistry: ModuleRegistry;
-    globalConfig: NormalizedLwrGlobalConfig;
-    inflightRouteHandlerEvalMap: Map<string, Promise<RouteHandlerFunction>>;
-    routeHandlerFunctionMap: Map<string, RouteHandlerFunction>;
     constructor(context: ViewHandlerContext, globalConfig: NormalizedLwrGlobalConfig);
     getViewContent(viewRequest: ViewRequest, route: LwrRoute | LwrErrorRoute, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): Promise<ViewResponse>;
     getViewJson(viewRequest: ViewRequest, route: LwrRoute | LwrErrorRoute, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): Promise<ViewResponse>;