@lwrjs/core 0.12.0-alpha.10 → 0.12.0-alpha.12

package/build/cjs/context/provider.cjs

@@ -26,7 +26,9 @@ __markAsModule(exports);
 __export(exports, {
   createProviderContext: () => createProviderContext
 });
+var import_fs = __toModule(require("fs"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
+var import_site_metadata = __toModule(require("@lwrjs/static/site-metadata"));
 function createProviderContext(serverContext) {
   const {
     assets,
@@ -43,7 +45,8 @@ function createProviderContext(serverContext) {
     esmLoader,
     environment,
     basePath,
-    bundleConfig
+    bundleConfig,
+    staticSiteGenerator
   } = serverContext.appConfig;
   const {onModuleDefinitionChange, onModuleSourceChange} = serverContext.appObserver;
   const {
@@ -52,6 +55,7 @@ function createProviderContext(serverContext) {
     notifyViewSourceChanged,
     notifyAssetSourceChanged
   } = serverContext.appEmitter;
+  const siteMetadata = staticSiteGenerator.outputDir && import_fs.default.existsSync(staticSiteGenerator.outputDir) ? new import_site_metadata.SiteMetadataImpl({rootDir: staticSiteGenerator.outputDir}) : void 0;
   return {
     appObserver: (0, import_shared_utils.deepFreeze)({onModuleDefinitionChange, onModuleSourceChange}),
     appEmitter: {
@@ -83,6 +87,7 @@ function createProviderContext(serverContext) {
       bundleConfig
     }),
     runtimeEnvironment: (0, import_shared_utils.deepFreeze)(serverContext.runtimeEnvironment),
-    watcherFactory: serverContext.watcherFactory
+    watcherFactory: serverContext.watcherFactory,
+    siteMetadata
   };
 }

package/build/cjs/index.cjs

@@ -70,10 +70,15 @@ async function initContext(appConfig, runtimeEnvironment, globalData) {
     const skipValidation = true;
     await (0, import_config.executeConfigHooks)(hooks, appConfig, runtimeEnvironment, globalData, skipValidation);
     (0, import_config.executeInstrumentationHooks)(hooks);
-    (0, import_config.executeStartHooks)(hooks, appConfig, runtimeEnvironment);
   }
   const services = await (0, import_modules.loadServices)(appConfig);
   const serverContext = (0, import_instrumentation.getTracer)().trace({name: import_instrumentation.CoreSpan.CreateServerContext}, () => (0, import_server2.createServerContext)(appConfig, runtimeEnvironment, globalData));
+  const routeHandlers = await (0, import_modules.loadRouteHandlers)(appConfig);
+  serverContext.routeHandlers = routeHandlers;
+  if (hooks.length) {
+    await (0, import_config.executeContextHooks)(hooks, serverContext);
+    (0, import_config.executeStartHooks)(hooks, appConfig, runtimeEnvironment);
+  }
   const providerContext = (0, import_provider.createProviderContext)(serverContext);
   const {moduleRegistry, assetRegistry, resourceRegistry, viewRegistry, moduleBundler} = serverContext;
   const moduleProviders = createServices(services.moduleProviders, providerContext);
@@ -94,8 +99,6 @@ async function initContext(appConfig, runtimeEnvironment, globalData) {
   viewRegistry.addViewProviders(viewProviders);
   viewRegistry.addViewTransformers(viewTransformers);
   await serverContext.viewRegistry.initializeViewProviders();
-  const routeHandlers = await (0, import_modules.loadRouteHandlers)(appConfig);
-  serverContext.routeHandlers = routeHandlers;
   return serverContext;
 }
 var LwrApp = class {

package/build/cjs/middleware/asset-middleware.cjs

@@ -31,6 +31,24 @@ var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var import_identity = __toModule(require("./utils/identity.cjs"));
 var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
+var import_fs_extra = __toModule(require("fs-extra"));
+function assetMiddleware(app, context) {
+  const paths = context.appConfig.assets.map((config) => {
+    const assetDirConfig = config;
+    let urlPath = config.urlPath;
+    if (assetDirConfig.root) {
+      urlPath = "/:filename";
+    } else if (assetDirConfig.dir) {
+      urlPath += app.getRegexWildcard();
+    }
+    return urlPath;
+  });
+  app.get([
+    ...[...new Set(paths)],
+    "/:apiVersion/:assetType(asset|content-asset)/:immutable?/s/:signature/" + app.getRegexWildcard(),
+    "/:apiVersion/:assetType(asset|content-asset)/:immutable?/" + app.getRegexWildcard()
+  ], (0, import_error_handling.handleErrors)(createAssetMiddleware(context)));
+}
 function createAssetMiddleware(context) {
   const {
     assetRegistry,
@@ -43,24 +61,23 @@ function createAssetMiddleware(context) {
       assetId.specifier = import_path.default.join(basePath, assetId.specifier);
     }
     try {
+      let asset;
       const assetUri = await assetRegistry.resolveAssetUri(assetId, runtimeEnvironment);
       if (assetUri.external) {
-        res.set({
-          Location: assetUri.uri,
-          "cache-control": "public, max-age=60"
-        });
-        res.sendStatus(302);
-        return;
-      }
-      const asset = await (0, import_instrumentation.getTracer)().trace({
-        name: import_instrumentation.RequestHandlerSpan.GetAsset,
-        attributes: {
-          specifier: assetId.specifier,
-          url: req.originalUrl
+        try {
+          asset = await getAssetDefinition(assetId, req, assetRegistry, signature, runtimeEnvironment);
+          if (!import_fs_extra.default.existsSync(asset.entry)) {
+            return sendRedirect(res, assetUri);
+          }
+        } catch (error) {
+          if (import_path.default.dirname(assetId.specifier) === (basePath ? basePath : "/") && error instanceof import_diagnostics.DiagnosticsError && error?.diagnostics[0]?.description.category === "lwrUnresolvable/asset") {
+            return sendRedirect(res, assetUri);
+          }
+          throw error;
         }
-      }, () => {
-        return assetRegistry.getAsset({...assetId, signature}, runtimeEnvironment, req.isSiteGeneration());
-      });
+      } else {
+        asset = await getAssetDefinition(assetId, req, assetRegistry, signature, runtimeEnvironment);
+      }
       if (req.isSiteGeneration()) {
         res.setSiteGenerationMetadata({asset});
       }
@@ -82,20 +99,22 @@ function createAssetMiddleware(context) {
     }
   };
 }
-function assetMiddleware(app, context) {
-  const paths = context.appConfig.assets.map((config) => {
-    const assetDirConfig = config;
-    let urlPath = config.urlPath;
-    if (assetDirConfig.root) {
-      urlPath = "/:filename";
-    } else if (assetDirConfig.dir) {
-      urlPath += app.getRegexWildcard();
+async function getAssetDefinition(assetId, req, assetRegistry, signature, runtimeEnvironment) {
+  const asset = await (0, import_instrumentation.getTracer)().trace({
+    name: import_instrumentation.RequestHandlerSpan.GetAsset,
+    attributes: {
+      specifier: assetId.specifier,
+      url: req.originalUrl
     }
-    return urlPath;
+  }, () => {
+    return assetRegistry.getAsset({...assetId, signature}, runtimeEnvironment, req.isSiteGeneration());
   });
-  app.get([
-    ...[...new Set(paths)],
-    "/:apiVersion/:assetType(asset|content-asset)/:immutable?/s/:signature/" + app.getRegexWildcard(),
-    "/:apiVersion/:assetType(asset|content-asset)/:immutable?/" + app.getRegexWildcard()
-  ], (0, import_error_handling.handleErrors)(createAssetMiddleware(context)));
+  return asset;
+}
+function sendRedirect(res, assetUri) {
+  res.set({
+    Location: assetUri.uri,
+    "cache-control": "public, max-age=60"
+  });
+  res.sendStatus(302);
 }

package/build/es/context/provider.js

@@ -1,9 +1,14 @@
+import fs from 'fs';
 import { deepFreeze } from '@lwrjs/shared-utils';
+import { SiteMetadataImpl } from '@lwrjs/static/site-metadata';
 export function createProviderContext(serverContext) {
     // This is a subset of config to user-land code
-    const { assets, cacheDir, i18n, lwc: { modules = [] }, routes, errorRoutes, rootDir, contentDir, layoutsDir, locker, amdLoader, esmLoader, environment, basePath, bundleConfig, } = serverContext.appConfig;
+    const { assets, cacheDir, i18n, lwc: { modules = [] }, routes, errorRoutes, rootDir, contentDir, layoutsDir, locker, amdLoader, esmLoader, environment, basePath, bundleConfig, staticSiteGenerator, } = serverContext.appConfig;
     const { onModuleDefinitionChange, onModuleSourceChange } = serverContext.appObserver;
     const { notifyModuleDefinitionChanged, notifyModuleSourceChanged, notifyViewSourceChanged, notifyAssetSourceChanged, } = serverContext.appEmitter;
+    const siteMetadata = staticSiteGenerator.outputDir && fs.existsSync(staticSiteGenerator.outputDir)
+        ? new SiteMetadataImpl({ rootDir: staticSiteGenerator.outputDir })
+        : undefined;
     return {
         appObserver: deepFreeze({ onModuleDefinitionChange, onModuleSourceChange }),
         appEmitter: {
@@ -36,6 +41,7 @@ export function createProviderContext(serverContext) {
         }),
         runtimeEnvironment: deepFreeze(serverContext.runtimeEnvironment),
         watcherFactory: serverContext.watcherFactory,
+        siteMetadata,
     };
 }
 //# sourceMappingURL=provider.js.map

package/build/es/index.js

@@ -1,7 +1,7 @@
 import { getFeatureFlags, DEFAULT_LWR_BOOTSTRAP_CONFIG } from '@lwrjs/shared-utils';
 import { createInternalServer } from '@lwrjs/server';
 import { LwrServerError, createSingleDiagnosticError, descriptions, logger } from '@lwrjs/diagnostics';
-import { loadConfig, executeConfigHooks, executeStartHooks, executeInstrumentationHooks, } from '@lwrjs/config';
+import { loadConfig, executeConfigHooks, executeStartHooks, executeInstrumentationHooks, executeContextHooks, } from '@lwrjs/config';
 import { loadHooks, loadServices, loadRouteHandlers } from '@lwrjs/config/modules';
 import SiteGenerator from './tools/static-generation.js';
 import { warmupServer } from './tools/server-warmup.js';
@@ -47,12 +47,18 @@ async function initContext(appConfig, runtimeEnvironment, globalData) {
         const skipValidation = true; // skip for config hook, since `executeStartHooks` hook will validate
         await executeConfigHooks(hooks, appConfig, runtimeEnvironment, globalData, skipValidation);
         executeInstrumentationHooks(hooks);
-        executeStartHooks(hooks, appConfig, runtimeEnvironment);
     }
     // load all configurable modules
     const services = await loadServices(appConfig);
     // create all framework components(ie. registries)
     const serverContext = getTracer().trace({ name: CoreSpan.CreateServerContext }, () => createServerContext(appConfig, runtimeEnvironment, globalData));
+    // set routes on server context
+    const routeHandlers = await loadRouteHandlers(appConfig);
+    serverContext.routeHandlers = routeHandlers;
+    if (hooks.length) {
+        await executeContextHooks(hooks, serverContext);
+        executeStartHooks(hooks, appConfig, runtimeEnvironment);
+    }
     // create public subset of configurations
     const providerContext = createProviderContext(serverContext);
     const { moduleRegistry, assetRegistry, resourceRegistry, viewRegistry, moduleBundler } = serverContext;
@@ -82,9 +88,6 @@ async function initContext(appConfig, runtimeEnvironment, globalData) {
     viewRegistry.addViewTransformers(viewTransformers);
     // invoke async initialization
     await serverContext.viewRegistry.initializeViewProviders();
-    // set routes on server context
-    const routeHandlers = await loadRouteHandlers(appConfig);
-    serverContext.routeHandlers = routeHandlers;
     return serverContext;
 }
 export class LwrApp {

package/build/es/middleware/asset-middleware.js

@@ -3,6 +3,30 @@ import { DiagnosticsError } from '@lwrjs/diagnostics';
 import { RequestHandlerSpan, getTracer } from '@lwrjs/instrumentation';
 import { getAssetIdentity } from './utils/identity.js';
 import { handleErrors } from './utils/error-handling.js';
+import fs from 'fs-extra';
+export function assetMiddleware(app, context) {
+    const paths = context.appConfig.assets.map((config) => {
+        const assetDirConfig = config;
+        let urlPath = config.urlPath;
+        // If this is a root config add a /:filename path to match any file in the root.  The middleware will fall through if there is no match.
+        if (assetDirConfig.root) {
+            urlPath = '/:filename';
+        }
+        else if (assetDirConfig.dir) {
+            urlPath += app.getRegexWildcard();
+        }
+        return urlPath;
+    });
+    app.get([
+        // De-dupe paths (i.e. root path may have been added more than once)
+        ...[...new Set(paths)],
+        '/:apiVersion/:assetType(asset|content-asset)/:immutable?/s/:signature/' + app.getRegexWildcard(),
+        '/:apiVersion/:assetType(asset|content-asset)/:immutable?/' + app.getRegexWildcard(),
+    ], handleErrors(createAssetMiddleware(context)));
+}
+/**
+ * Create middleware function to handle get assets requests
+ */
 function createAssetMiddleware(context) {
     const { assetRegistry, runtimeEnvironment: { basePath }, } = context;
     return async (req, res, next) => {
@@ -12,25 +36,34 @@ function createAssetMiddleware(context) {
             assetId.specifier = path.join(basePath, assetId.specifier);
         }
         try {
-            // Redirect if this is an external asset
+            let asset;
             const assetUri = await assetRegistry.resolveAssetUri(assetId, runtimeEnvironment);
+            // Check if this asset is available externally
             if (assetUri.external) {
-                res.set({
-                    Location: assetUri.uri,
-                    'cache-control': 'public, max-age=60',
-                });
-                res.sendStatus(302);
-                return;
+                // This asset is marked external but hit the middleware anyway
+                // Check if we have this file locally, if not, send a 302 to
+                // redirect to the external URL
+                try {
+                    asset = await getAssetDefinition(assetId, req, assetRegistry, signature, runtimeEnvironment);
+                    // Verify the content actually exists locally
+                    if (!fs.existsSync(asset.entry)) {
+                        return sendRedirect(res, assetUri);
+                    }
+                }
+                catch (error) {
+                    // Expected asset not found locally re-direct to external URL
+                    if (path.dirname(assetId.specifier) === (basePath ? basePath : '/') &&
+                        error instanceof DiagnosticsError &&
+                        error?.diagnostics[0]?.description.category === 'lwrUnresolvable/asset') {
+                        return sendRedirect(res, assetUri);
+                    }
+                    // unexpected throw the error
+                    throw error;
+                }
+            }
+            else {
+                asset = await getAssetDefinition(assetId, req, assetRegistry, signature, runtimeEnvironment);
             }
-            const asset = await getTracer().trace({
-                name: RequestHandlerSpan.GetAsset,
-                attributes: {
-                    specifier: assetId.specifier,
-                    url: req.originalUrl,
-                },
-            }, () => {
-                return assetRegistry.getAsset({ ...assetId, signature }, runtimeEnvironment, req.isSiteGeneration());
-            });
             if (req.isSiteGeneration()) {
                 res.setSiteGenerationMetadata({ asset });
             }
@@ -59,24 +92,29 @@ function createAssetMiddleware(context) {
         }
     };
 }
-export function assetMiddleware(app, context) {
-    const paths = context.appConfig.assets.map((config) => {
-        const assetDirConfig = config;
-        let urlPath = config.urlPath;
-        // If this is a root config add a /:filename path to match any file in the root.  The middleware will fall through if there is no match.
-        if (assetDirConfig.root) {
-            urlPath = '/:filename';
-        }
-        else if (assetDirConfig.dir) {
-            urlPath += app.getRegexWildcard();
-        }
-        return urlPath;
+/**
+ * Get the asset definition if asset is local
+ */
+async function getAssetDefinition(assetId, req, assetRegistry, signature, runtimeEnvironment) {
+    const asset = await getTracer().trace({
+        name: RequestHandlerSpan.GetAsset,
+        attributes: {
+            specifier: assetId.specifier,
+            url: req.originalUrl,
+        },
+    }, () => {
+        return assetRegistry.getAsset({ ...assetId, signature }, runtimeEnvironment, req.isSiteGeneration());
     });
-    app.get([
-        // De-dupe paths (i.e. root path may have been added more than once)
-        ...[...new Set(paths)],
-        '/:apiVersion/:assetType(asset|content-asset)/:immutable?/s/:signature/' + app.getRegexWildcard(),
-        '/:apiVersion/:assetType(asset|content-asset)/:immutable?/' + app.getRegexWildcard(),
-    ], handleErrors(createAssetMiddleware(context)));
+    return asset;
+}
+/**
+ * Send a redirect (302) response
+ */
+function sendRedirect(res, assetUri) {
+    res.set({
+        Location: assetUri.uri,
+        'cache-control': 'public, max-age=60',
+    });
+    res.sendStatus(302);
 }
 //# sourceMappingURL=asset-middleware.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.10",
+    "version": "0.12.0-alpha.12",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -43,34 +43,34 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@lwrjs/app-service": "0.12.0-alpha.10",
-        "@lwrjs/asset-registry": "0.12.0-alpha.10",
-        "@lwrjs/asset-transformer": "0.12.0-alpha.10",
-        "@lwrjs/base-view-provider": "0.12.0-alpha.10",
-        "@lwrjs/base-view-transformer": "0.12.0-alpha.10",
-        "@lwrjs/client-modules": "0.12.0-alpha.10",
-        "@lwrjs/config": "0.12.0-alpha.10",
-        "@lwrjs/diagnostics": "0.12.0-alpha.10",
-        "@lwrjs/esbuild": "0.12.0-alpha.10",
-        "@lwrjs/fs-asset-provider": "0.12.0-alpha.10",
-        "@lwrjs/fs-watch": "0.12.0-alpha.10",
-        "@lwrjs/html-view-provider": "0.12.0-alpha.10",
-        "@lwrjs/instrumentation": "0.12.0-alpha.10",
-        "@lwrjs/loader": "0.12.0-alpha.10",
-        "@lwrjs/lwc-module-provider": "0.12.0-alpha.10",
-        "@lwrjs/lwc-ssr": "0.12.0-alpha.10",
-        "@lwrjs/markdown-view-provider": "0.12.0-alpha.10",
-        "@lwrjs/module-bundler": "0.12.0-alpha.10",
-        "@lwrjs/module-registry": "0.12.0-alpha.10",
-        "@lwrjs/npm-module-provider": "0.12.0-alpha.10",
-        "@lwrjs/nunjucks-view-provider": "0.12.0-alpha.10",
-        "@lwrjs/o11y": "0.12.0-alpha.10",
-        "@lwrjs/resource-registry": "0.12.0-alpha.10",
-        "@lwrjs/router": "0.12.0-alpha.10",
-        "@lwrjs/server": "0.12.0-alpha.10",
-        "@lwrjs/shared-utils": "0.12.0-alpha.10",
-        "@lwrjs/static": "0.12.0-alpha.10",
-        "@lwrjs/view-registry": "0.12.0-alpha.10",
+        "@lwrjs/app-service": "0.12.0-alpha.12",
+        "@lwrjs/asset-registry": "0.12.0-alpha.12",
+        "@lwrjs/asset-transformer": "0.12.0-alpha.12",
+        "@lwrjs/base-view-provider": "0.12.0-alpha.12",
+        "@lwrjs/base-view-transformer": "0.12.0-alpha.12",
+        "@lwrjs/client-modules": "0.12.0-alpha.12",
+        "@lwrjs/config": "0.12.0-alpha.12",
+        "@lwrjs/diagnostics": "0.12.0-alpha.12",
+        "@lwrjs/esbuild": "0.12.0-alpha.12",
+        "@lwrjs/fs-asset-provider": "0.12.0-alpha.12",
+        "@lwrjs/fs-watch": "0.12.0-alpha.12",
+        "@lwrjs/html-view-provider": "0.12.0-alpha.12",
+        "@lwrjs/instrumentation": "0.12.0-alpha.12",
+        "@lwrjs/loader": "0.12.0-alpha.12",
+        "@lwrjs/lwc-module-provider": "0.12.0-alpha.12",
+        "@lwrjs/lwc-ssr": "0.12.0-alpha.12",
+        "@lwrjs/markdown-view-provider": "0.12.0-alpha.12",
+        "@lwrjs/module-bundler": "0.12.0-alpha.12",
+        "@lwrjs/module-registry": "0.12.0-alpha.12",
+        "@lwrjs/npm-module-provider": "0.12.0-alpha.12",
+        "@lwrjs/nunjucks-view-provider": "0.12.0-alpha.12",
+        "@lwrjs/o11y": "0.12.0-alpha.12",
+        "@lwrjs/resource-registry": "0.12.0-alpha.12",
+        "@lwrjs/router": "0.12.0-alpha.12",
+        "@lwrjs/server": "0.12.0-alpha.12",
+        "@lwrjs/shared-utils": "0.12.0-alpha.12",
+        "@lwrjs/static": "0.12.0-alpha.12",
+        "@lwrjs/view-registry": "0.12.0-alpha.12",
         "chokidar": "^3.5.3",
         "esbuild": "^0.9.7",
         "fs-extra": "^11.1.1",
@@ -80,7 +80,7 @@
         "ws": "^8.8.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.12.0-alpha.10",
+        "@lwrjs/types": "0.12.0-alpha.12",
         "@types/ws": "^8.5.3"
     },
     "peerDependencies": {
@@ -92,5 +92,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "36759959f624aa40d371dc9ee698dd472813f19c"
+    "gitHead": "bc8a88bce246e9ec00641955152de526ea030ebb"
 }