@lwrjs/tools 0.11.0-alpha.0 → 0.11.0-alpha.10

package/build/cjs/plugins/build-server-plugin.cjs

@@ -29,6 +29,7 @@ __export(exports, {
 var import_path = __toModule(require("path"));
 var import_config = __toModule(require("@lwrjs/config"));
 var import_modules = __toModule(require("@lwrjs/config/modules"));
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 function getServices(t) {
   return t;
@@ -65,7 +66,7 @@ function processHooks(hooksConfig, hooks, rootDir) {
       continue;
     }
     if (hooks[index].initConfigs) {
-      import_shared_utils.logger.warn("Consider splitting `initConfigs` hooks to a separate file.");
+      import_diagnostics.logger.warn("Consider splitting `initConfigs` hooks to a separate file.");
     }
     const name = "hook" + index;
     output.imports.push(`import ${name} from '${(0, import_shared_utils.normalizeDirectory)(entry, rootDir)}';`);
@@ -78,11 +79,11 @@ function processRouteHandlers(routeHandlers, rootDir) {
     imports: [],
     routeHandlers: {}
   };
-  for (const [id, [handler, options]] of Object.entries(routeHandlers)) {
+  for (const [id, handler] of Object.entries(routeHandlers)) {
     if (!output.routeHandlers[id]) {
       const name = `routeHandler${output.imports.length}`;
-      output.imports.push(`import ${name} from '${(0, import_shared_utils.normalizeDirectory)(handler, rootDir)}';`);
-      output.routeHandlers[id] = [name, options];
+      output.imports.push(`import ${name} from '${(0, import_shared_utils.normalizeDirectory)(handler || id, rootDir)}';`);
+      output.routeHandlers[id] = name;
     }
   }
   return output;
@@ -99,8 +100,8 @@ function printHooks(hooks) {
   }).join(",")}]`;
 }
 function printRouteHandlers(routeHandlers) {
-  return `{${Object.entries(routeHandlers).map(([id, [handler, options]]) => {
-    return `'${id}': [${handler}, ${JSON.stringify(options)}]`;
+  return `{${Object.entries(routeHandlers).map(([id, handler]) => {
+    return `'${id}': ${handler}`;
   }).join(",")}}`;
 }
 function buildLwrServer(config, buildDir) {

package/build/cjs/plugins/generate-entry-plugin.cjs

@@ -42,6 +42,7 @@ function generateLwrEntry() {
       build.onLoad({filter: /.*/, namespace: "lwr-entry"}, (args) => ({
         contents: [
           `/* This module is generated */`,
+          `import 'source-map-support/register'`,
           `import { createHandler } from '@lwrjs/lambda';`,
           `import * as build from './lwr.build.js';`,
           `const handler = createHandler(build);`,

package/build/cjs/server-build.cjs

@@ -30,6 +30,7 @@ var import_path = __toModule(require("path"));
 var import_fs_extra = __toModule(require("fs-extra"));
 var import_esbuild = __toModule(require("esbuild"));
 var import_perf_hooks = __toModule(require("perf_hooks"));
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_config = __toModule(require("@lwrjs/config"));
 var import_generate_entry_plugin = __toModule(require("./plugins/generate-entry-plugin.cjs"));
@@ -41,6 +42,7 @@ async function build(buildOptions, config) {
     bundle: true,
     minify,
     sourcemap: true,
+    sourcesContent: false,
     format: "cjs",
     platform: "node",
     logLevel: "silent",
@@ -48,8 +50,6 @@ async function build(buildOptions, config) {
     external: [
       "node:*",
       "fsevents",
-      "iltorb",
-      "shrink-ray-current",
       "esbuild*",
       "esinstall",
       "@lwrjs/loader"
@@ -69,7 +69,7 @@ async function buildServer(configArg, options) {
   await build({outputDir, normalizedOutputDir, minify: !!options?.minify}, configArg);
   const endTime = import_perf_hooks.performance.now();
   const timeDiff = endTime - startTime;
-  import_shared_utils.logger.info(`[Server Build] successfully built the server in ${Math.round(timeDiff)} ms`);
+  import_diagnostics.logger.info(`[Server Build] successfully built the server in ${Math.round(timeDiff)} ms`);
 }
 function createEnvVarHeader() {
   const currentFeatureFlags = (0, import_shared_utils.getFeatureFlags)();

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

@@ -1,7 +1,8 @@
 import path from 'path';
 import { executeConfigHooks, loadConfig } from '@lwrjs/config';
 import { loadHooks } from '@lwrjs/config/modules';
-import { logger, normalizeDirectory } from '@lwrjs/shared-utils';
+import { logger } from '@lwrjs/diagnostics';
+import { normalizeDirectory } from '@lwrjs/shared-utils';
 function getServices(t) {
     return t;
 }
@@ -50,11 +51,11 @@ function processRouteHandlers(routeHandlers, rootDir) {
         imports: [],
         routeHandlers: {},
     };
-    for (const [id, [handler, options]] of Object.entries(routeHandlers)) {
+    for (const [id, handler] of Object.entries(routeHandlers)) {
         if (!output.routeHandlers[id]) {
             const name = `routeHandler${output.imports.length}`;
-            output.imports.push(`import ${name} from '${normalizeDirectory(handler, rootDir)}';`);
-            output.routeHandlers[id] = [name, options];
+            output.imports.push(`import ${name} from '${normalizeDirectory(handler || id, rootDir)}';`);
+            output.routeHandlers[id] = name;
         }
     }
     return output;
@@ -76,8 +77,8 @@ function printHooks(hooks) {
 }
 function printRouteHandlers(routeHandlers) {
     return `{${Object.entries(routeHandlers)
-        .map(([id, [handler, options]]) => {
-        return `'${id}': [${handler}, ${JSON.stringify(options)}]`;
+        .map(([id, handler]) => {
+        return `'${id}': ${handler}`;
     })
         .join(',')}}`;
 }

package/build/es/plugins/generate-entry-plugin.js

@@ -24,6 +24,11 @@ export default function generateLwrEntry() {
             build.onLoad({ filter: /.*/, namespace: 'lwr-entry' }, (args) => ({
                 contents: [
                     `/* This module is generated */`,
+                    // This package is not technically necessary as node 12 includes this functionality, but in the
+                    // LWR@MRT environment, we have no control over environment variables so we have no way to configure
+                    // NODE_OPTIONS='--enable-source-maps'. So this is a necessary workaround for now with minimal downside.
+                    // See: https://nodejs.org/docs/latest-v18.x/api/cli.html#--enable-source-maps
+                    `import 'source-map-support/register'`,
                     `import { createHandler } from '@lwrjs/lambda';`,
                     // Importing the server build module at this point enables support for ESM bundling.
                     // If the server build module was imported in `createHandler`, it would need to be exposed

package/build/es/server-build.js

@@ -2,7 +2,8 @@ import path from 'path';
 import fs from 'fs-extra';
 import esbuild from 'esbuild';
 import { performance } from 'perf_hooks';
-import { getFeatureFlags, logger } from '@lwrjs/shared-utils';
+import { logger } from '@lwrjs/diagnostics';
+import { getFeatureFlags } from '@lwrjs/shared-utils';
 import { LWR_VERSION, LWC_VERSION } from '@lwrjs/config';
 import generateLwrEntry from './plugins/generate-entry-plugin.js';
 import buildLwrServer from './plugins/build-server-plugin.js';
@@ -14,6 +15,7 @@ async function build(buildOptions, config) {
         bundle: true,
         minify,
         sourcemap: true,
+        sourcesContent: false,
         format: 'cjs',
         platform: 'node',
         logLevel: 'silent',
@@ -24,9 +26,6 @@ async function build(buildOptions, config) {
             'node:*',
             // fsevents used by chokidar used by nunjucks
             'fsevents',
-            // Used for express compression.  Should be an optional dependency and should be omitted at runtime
-            'iltorb',
-            'shrink-ray-current',
             // 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*',

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.11.0-alpha.0",
+    "version": "0.11.0-alpha.10",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -32,11 +32,12 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/core": "0.11.0-alpha.0",
+        "@lwrjs/core": "0.11.0-alpha.10",
+        "@lwrjs/diagnostics": "0.11.0-alpha.10",
         "esbuild": "^0.17.4"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.11.0-alpha.0"
+        "@lwrjs/types": "0.11.0-alpha.10"
     },
     "peerDependencies": {
         "lwc": "2.x || 3.x"
@@ -44,5 +45,5 @@
     "engines": {
         "node": ">=16.0.0"
     },
-    "gitHead": "6917abefe32752eeed0f9ba98505ca2b76f1df9d"
+    "gitHead": "34b1e289e8de12531f5624b64512e870157195d4"
 }