@lwrjs/tools 0.9.0-alpha.14 → 0.9.0-alpha.16

package/build/es/plugins/build-server-plugin.js

@@ -1,6 +1,7 @@
 import path from 'path';
-import { loadConfig } from '@lwrjs/config';
-import { normalizeDirectory } from '@lwrjs/shared-utils';
+import { executeConfigHooks, loadConfig } from '@lwrjs/config';
+import { loadHooks } from '@lwrjs/config/modules';
+import { logger, normalizeDirectory } from '@lwrjs/shared-utils';
 const services = [
     'moduleProviders',
     'assetProviders',
@@ -21,6 +22,24 @@ function processServices(kind, entries, rootDir) {
     }
     return output;
 }
+function processHooks(hooksConfig, hooks, rootDir) {
+    const output = {
+        imports: [],
+        entries: [],
+    };
+    for (const [index, [entry, config]] of hooksConfig.entries()) {
+        if (!hooks[index].onStart) {
+            continue;
+        }
+        if (hooks[index].initConfigs) {
+            logger.warn('Consider splitting `initConfigs` hooks to a file separate from `onStart`.');
+        }
+        const name = 'hook' + index;
+        output.imports.push(`import ${name} from '${normalizeDirectory(entry, rootDir)}';`);
+        output.entries.push([name, config]);
+    }
+    return output;
+}
 function processRoutes(routes, rootDir) {
     const output = {
         imports: [],
@@ -53,6 +72,13 @@ function printServices(config) {
     })
         .join(',')}}`;
 }
+function printHooks(hooks) {
+    return `[${hooks
+        .map(([ctor, config = {}]) => {
+        return `new ${ctor}(${JSON.stringify(config)})`;
+    })
+        .join(',')}]`;
+}
 function printRoutes(routes) {
     return `[${routes
         .map((route) => {
@@ -95,6 +121,11 @@ export default function buildLwrServer(config) {
                 const { appConfig, runtimeEnvironment, globalData } = await loadConfig(config, {
                     skipDirNormalization: true,
                 });
+                // apply config hooks at build time
+                const hooks = await loadHooks(appConfig);
+                if (hooks.length) {
+                    await executeConfigHooks(hooks, appConfig, runtimeEnvironment, globalData);
+                }
                 const remoteAppConfig = {
                     ...appConfig,
                     ignoreLwrConfigFile: true,
@@ -108,17 +139,20 @@ export default function buildLwrServer(config) {
                     serviceImports.push(...entries.imports);
                     serviceConfig[service] = entries.entries;
                 }
+                const hooksConfig = processHooks(appConfig.hooks, hooks, appConfig.rootDir);
                 const routesConfig = processRoutes(appConfig.routes, appConfig.rootDir);
                 const errorRoutesConfig = processRoutes(appConfig.errorRoutes, appConfig.rootDir);
                 return {
                     contents: [
                         ...serviceImports,
+                        ...hooksConfig.imports,
                         ...routesConfig.imports,
                         ...errorRoutesConfig.imports,
                         `export const appConfig = ${JSON.stringify(remoteAppConfig)};`,
                         `export const runtimeEnvironment = ${JSON.stringify(runtimeEnvironment)};`,
                         `export const globalData = ${JSON.stringify(globalData)};`,
                         `export const services = ${printServices(serviceConfig)};`,
+                        `export const hooks = ${printHooks(hooksConfig.entries)};`,
                         `export const routes = ${printRoutes(routesConfig.routes)};`,
                         `export const errorRoutes = ${printRoutes(errorRoutesConfig.routes)};`,
                     ].join('\n'),

package/build/es/server-build.js

@@ -11,6 +11,8 @@ async function build(outputDir, config) {
     await esbuild.build({
         entryPoints: ['./lwr.entry.js'],
         bundle: true,
+        // TODO default to minify and no source map.  Enable a debug build mode to set these up
+        minify: true,
         sourcemap: true,
         format: 'cjs',
         platform: 'node',
@@ -22,16 +24,16 @@ async function build(outputDir, config) {
             'node:*',
             // fsevents used by chokidar used by nunjucks
             'fsevents',
-            // Used for express compression.  Should be an optional dependency ans should be omitted at runtime
+            // Used for express compression.  Should be an optional dependency and should be omitted at runtime
             'iltorb',
             'shrink-ray-current',
-            // Work in progress to isolate
-            'esbuild*',
-            // Used in the NPM module provider.  Once Static Module Bundler is done we should be able to remove this
-            'esinstall',
             // Rollup resolves plugins in node_modules at runtime.  More investigation needed.
             'rollup',
             'rollup-plugin-*',
+            // These dependencies are not needed to serve a basic generated site, but they are still excluded
+            // in case there is a need to add a custom module provider.
+            'esbuild*',
+            'esinstall',
             // We can remove this once we have the module bundler working
             '@lwrjs/loader',
         ],
@@ -65,12 +67,12 @@ export async function buildServer(configArg, options) {
 function createEnvVarHeader() {
     // Setup global environment variables
     const currentFeatureFlags = getFeatureFlags();
-    let initFatureFlagsString = '';
+    let initFeatureFlagsString = '';
     for (const [key, val] of Object.entries(currentFeatureFlags)) {
         if (val) {
-            initFatureFlagsString += `process.env.${key} = 'true'`;
+            initFeatureFlagsString += `process.env.${key} = 'true';`;
         }
     }
-    return `globalThis.LWR_VERSION='${LWR_VERSION}';${initFatureFlagsString}`;
+    return `globalThis.LWR_VERSION='${LWR_VERSION}';${initFeatureFlagsString}`;
 }
 //# sourceMappingURL=server-build.js.map

package/package.json

@@ -4,15 +4,15 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.14",
+    "version": "0.9.0-alpha.16",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
-        "url": "https://github.com/salesforce/lwr.git",
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr.git",
         "directory": "packages/@lwrjs/tools"
     },
     "bugs": {
-        "url": "https://github.com/salesforce/lwr/issues"
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr/issues"
     },
     "type": "module",
     "types": "build/es/index.d.ts",
@@ -32,11 +32,11 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/core": "0.9.0-alpha.14",
+        "@lwrjs/core": "0.9.0-alpha.16",
         "esbuild": "^0.17.4"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.14"
+        "@lwrjs/types": "0.9.0-alpha.16"
     },
     "peerDependencies": {
         "lwc": "2.x"
@@ -44,5 +44,5 @@
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "64e0ba617151429da6e09f1a9686628f64183d25"
+    "gitHead": "03fe3982780e7c63b96ef0733b58529057db61fa"
 }