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

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

@@ -40,27 +40,17 @@ function processHooks(hooksConfig, hooks, rootDir) {
     }
     return output;
 }
-function processRoutes(routes, rootDir) {
+function processRouteHandlers(routeHandlers, rootDir) {
     const output = {
         imports: [],
-        routes: [],
+        routeHandlers: {},
     };
-    const handlers = {};
-    for (const route of routes) {
-        if (!route.routeHandler) {
-            output.routes.push(route);
-            continue;
-        }
-        const handler = route.routeHandler;
-        if (!handlers[handler]) {
-            const name = `routeHandler${Object.keys(handlers).length}`;
-            handlers[handler] = name;
-            output.imports.push(`import ${name} from '${normalizeDirectory(handler, rootDir)}';`);
+    for (const [id, handlerPath] of Object.entries(routeHandlers)) {
+        if (!output.routeHandlers[id]) {
+            const name = `routeHandler${output.imports.length}`;
+            output.imports.push(`import ${name} from '${normalizeDirectory(handlerPath, rootDir)}';`);
+            output.routeHandlers[id] = name;
         }
-        output.routes.push({
-            ...route,
-            routeHandler: handlers[handler],
-        });
     }
     return output;
 }
@@ -79,19 +69,12 @@ function printHooks(hooks) {
     })
         .join(',')}]`;
 }
-function printRoutes(routes) {
-    return `[${routes
-        .map((route) => {
-        return `{${Object.entries(route)
-            .map(([key, value]) => {
-            if (key !== 'routeHandler') {
-                return `${key}: ${JSON.stringify(value)}`;
-            }
-            return `${key}: ${value}`;
-        })
-            .join(',')}}`;
+function printRouteHandlers(routeHandlers) {
+    return `{${Object.entries(routeHandlers)
+        .map(([id, handler]) => {
+        return `'${id}': ${handler}`;
     })
-        .join(',')}]`;
+        .join(',')}}`;
 }
 /**
  * Creates an esbuild plugin that generates a server build module
@@ -140,21 +123,18 @@ export default function buildLwrServer(config) {
                     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);
+                const routeHandlersConfig = processRouteHandlers(appConfig.routeHandlers, appConfig.rootDir);
                 return {
                     contents: [
                         ...serviceImports,
                         ...hooksConfig.imports,
-                        ...routesConfig.imports,
-                        ...errorRoutesConfig.imports,
+                        ...routeHandlersConfig.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)};`,
+                        `export const routeHandlers = ${printRouteHandlers(routeHandlersConfig.routeHandlers)};`,
                     ].join('\n'),
                     loader: 'ts',
                     resolveDir: path.dirname(args.path),

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.16",
+    "version": "0.9.0-alpha.18",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -32,11 +32,11 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/core": "0.9.0-alpha.16",
+        "@lwrjs/core": "0.9.0-alpha.18",
         "esbuild": "^0.17.4"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.16"
+        "@lwrjs/types": "0.9.0-alpha.18"
     },
     "peerDependencies": {
         "lwc": "2.x"
@@ -44,5 +44,5 @@
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "03fe3982780e7c63b96ef0733b58529057db61fa"
+    "gitHead": "0d612ec0c74c679ce422f7bbae9fae14134f7d9f"
 }