lwr 0.10.0-alpha.8 → 0.10.0

package/build/cjs/cli/commands/build.cjs

@@ -37,7 +37,11 @@ function createBuildCommand() {
     import_shared_utils.logger.info("[build] Building lwr application");
     const {rootDir, config, output, mode, clean, target, minify, routes, modules, locales} = cmd.optsWithGlobals();
     const outputDir = output ? output : (0, import_utils.getDefaultBuildDirectory)(rootDir, config, target);
-    const aConfig = (0, import_config.loadConfig)();
+    const aConfig = (0, import_config.loadConfig)({rootDir, lwrConfigFile: config});
+    let ssrFunctionNodeVersion;
+    if (target === "mrt") {
+      ssrFunctionNodeVersion = getSuggestedNodeVersion();
+    }
     if (clean) {
       import_shared_utils.logger.info(`[build] Clearing output directory: ${outputDir}`);
       import_fs_extra.default.rmSync(outputDir, {recursive: true, force: true});
@@ -134,7 +138,7 @@ function createBuildCommand() {
             ],
             ssrShared: [],
             ssrParameters: {
-              ssrFunctionNodeVersion: "16.x",
+              ssrFunctionNodeVersion,
               proxyConfigs: []
             }
           };
@@ -155,3 +159,13 @@ function createBuildCommand() {
     }
   });
 }
+var MRT_VERSIONS = [16, 18];
+function getSuggestedNodeVersion() {
+  const nodeVersion = process.version;
+  const majorVersion = parseInt(nodeVersion.slice(1).split(".")[0]);
+  if (!MRT_VERSIONS.includes(majorVersion)) {
+    import_shared_utils.logger.error(`Node Version ${nodeVersion} is not one of LWR Lambda's supported versions ${MRT_VERSIONS.join(", ")}`);
+    process.exit(1);
+  }
+  return `${majorVersion}.x`;
+}

package/build/cjs/cli/commands/cli.cjs

@@ -34,7 +34,7 @@ var import_getVersion = __toModule(require("../utils/getVersion.cjs"));
 function createCLI() {
   const cli = new import_commander.Command("lwr");
   cli.description("LWR command line");
-  cli.addOption(new import_commander.Option("-c, --config <file>", `[string] use specified lwr.config.json file`).default("lwr.config.json")).addOption(new import_commander.Option("--rootDir <directory>", `[string] use specified root directory`).default("."));
+  cli.addOption(new import_commander.Option("-c, --config <file>", `[string] use specified lwr.config.json file`).default("lwr.config.json")).addOption(new import_commander.Option("--rootDir <directory>", `[string] use specified root directory`).default(process.cwd(), '"."'));
   cli.addCommand((0, import_dev.createDevCommand)());
   cli.addCommand((0, import_build.createBuildCommand)());
   cli.addCommand((0, import_preview.createPreviewCommand)());

package/build/cjs/cli/commands/dev.cjs

@@ -33,9 +33,9 @@ var import_utils = __toModule(require("../utils.cjs"));
 function createDevCommand() {
   return new import_commander.Command("dev").description("Starts an LWR server (defaults to dev mode)").addOption((0, import_utils.getPortOption)()).addOption((0, import_utils.getModeOption)().default("dev")).option("-o, --open", `[boolean] open browser on startup`, false).action(async (options, cmd) => {
     const {createServer} = await Promise.resolve().then(() => __toModule(require("@lwrjs/core")));
-    const {port, mode, open} = cmd.optsWithGlobals();
+    const {port, mode, rootDir, config, open} = cmd.optsWithGlobals();
     try {
-      const server = createServer({port, serverMode: mode});
+      const server = createServer({port, serverMode: mode, rootDir, lwrConfigFile: config});
       await server.listen(async ({serverMode, port: port2}) => {
         console.log(import_chalk.default.green(`Running LWR at: http://localhost:${port2} | mode: ${serverMode}`));
         if (open) {

package/build/cjs/cli/commands/preview.cjs

@@ -57,7 +57,7 @@ function createPreviewCommand() {
         }
       } else {
         const {createServer} = await Promise.resolve().then(() => __toModule(require("@lwrjs/core")));
-        const server = createServer({port, serverMode});
+        const server = createServer({port, serverMode, rootDir, lwrConfigFile: config});
         const internalServer = server.getInternalServer();
         if (import_fs_extra.default.existsSync(dir)) {
           import_shared_utils.logger.info("Using prebuilt content from directory: " + dir);

package/build/es/cli/commands/build.js

@@ -19,7 +19,12 @@ export function createBuildCommand() {
         logger.info('[build] Building lwr application');
         const { rootDir, config, output, mode, clean, target, minify, routes, modules, locales } = cmd.optsWithGlobals();
         const outputDir = output ? output : getDefaultBuildDirectory(rootDir, config, target);
-        const aConfig = loadConfig(); // TODO should factor in rootDir
+        const aConfig = loadConfig({ rootDir, lwrConfigFile: config });
+        let ssrFunctionNodeVersion;
+        if (target === 'mrt') {
+            // Check the node version (to fail early)
+            ssrFunctionNodeVersion = getSuggestedNodeVersion();
+        }
         if (clean) {
             logger.info(`[build] Clearing output directory: ${outputDir}`);
             fs.rmSync(outputDir, { recursive: true, force: true });
@@ -146,7 +151,7 @@ export function createBuildCommand() {
                         ssrShared: [],
                         // Additional parameters that configure Express app behavior.
                         ssrParameters: {
-                            ssrFunctionNodeVersion: '16.x',
+                            ssrFunctionNodeVersion,
                             proxyConfigs: [],
                         },
                     };
@@ -175,4 +180,14 @@ export function createBuildCommand() {
         }
     });
 }
+const MRT_VERSIONS = [16, 18];
+function getSuggestedNodeVersion() {
+    const nodeVersion = process.version;
+    const majorVersion = parseInt(nodeVersion.slice(1).split('.')[0]);
+    if (!MRT_VERSIONS.includes(majorVersion)) {
+        logger.error(`Node Version ${nodeVersion} is not one of LWR Lambda's supported versions ${MRT_VERSIONS.join(', ')}`);
+        process.exit(1);
+    }
+    return `${majorVersion}.x`;
+}
 //# sourceMappingURL=build.js.map

package/build/es/cli/commands/cli.js

@@ -6,7 +6,7 @@ import { getVersion } from '../utils/getVersion.js';
 export function createCLI() {
     const cli = new Command('lwr');
     cli.description('LWR command line');
-    cli.addOption(new Option('-c, --config <file>', `[string] use specified lwr.config.json file`).default('lwr.config.json')).addOption(new Option('--rootDir <directory>', `[string] use specified root directory`).default('.'));
+    cli.addOption(new Option('-c, --config <file>', `[string] use specified lwr.config.json file`).default('lwr.config.json')).addOption(new Option('--rootDir <directory>', `[string] use specified root directory`).default(process.cwd(), '"."'));
     cli.addCommand(createDevCommand());
     cli.addCommand(createBuildCommand());
     cli.addCommand(createPreviewCommand());

package/build/es/cli/commands/dev.js

@@ -10,9 +10,9 @@ export function createDevCommand() {
         .option('-o, --open', `[boolean] open browser on startup`, false)
         .action(async (options, cmd) => {
         const { createServer } = await import('@lwrjs/core');
-        const { port, mode, open } = cmd.optsWithGlobals();
+        const { port, mode, rootDir, config, open } = cmd.optsWithGlobals();
         try {
-            const server = createServer({ port, serverMode: mode });
+            const server = createServer({ port, serverMode: mode, rootDir, lwrConfigFile: config });
             await server.listen(async ({ serverMode, port }) => {
                 console.log(chalk.green(`Running LWR at: http://localhost:${port} | mode: ${serverMode}`));
                 if (open) {

package/build/es/cli/commands/preview.js

@@ -48,7 +48,7 @@ export function createPreviewCommand() {
             else {
                 // Not mrt, just launch LWR server
                 const { createServer } = await import('@lwrjs/core');
-                const server = createServer({ port, serverMode });
+                const server = createServer({ port, serverMode, rootDir, lwrConfigFile: config });
                 const internalServer = server.getInternalServer();
                 // TODO we could just run a static server vs running LWR services here
                 if (fs.existsSync(dir)) {

package/build/es/index.d.ts

@@ -1,5 +1,5 @@
 export { createServer, generateStaticSite } from '@lwrjs/core';
 export { DiagnosticsError } from '@lwrjs/diagnostics';
 export type { LwrApp } from '@lwrjs/core';
-export type { AbstractModuleId, AssetProvider, ClientBootstrapConfig, CompiledView, FsModuleEntry, GlobalData, HandlerContext, HooksPlugin, Json, LocalizedViewRequest, LwrAppBootstrapConfig, LwrAppEmitter, LwrAppObserver, LwrErrorRoute, LwrGlobalConfig, LwrRoute, ModuleCompiled, ModuleEntry, ModuleProvider, ModuleSource, NormalizedLwrGlobalConfig, ProviderAppConfig, ProviderContext, PublicModuleRegistry, PublicResourceRegistry, PublicViewRegistry, PublicAssetRegistry, ResourceDefinition, ResourceIdentifier, ResourceProvider, RouteHandlerFunction, RouteHandlerView, RouteHandlerViewApi, RouteHandlerViewResponse, RuntimeEnvironment, RuntimeParams, ViewIdentity, ViewParams, ViewProvider, ViewRequest, ViewResponse, Watcher, AssetTransformPlugin, } from '@lwrjs/types';
+export type { AbstractModuleId, AssetProvider, AssetTransformPlugin, ClientBootstrapConfig, CompiledView, FsModuleEntry, GlobalData, HandlerContext, HooksPlugin, Json, LocalizedViewRequest, LwrAppBootstrapConfig, LwrAppEmitter, LwrAppObserver, LwrErrorRoute, LwrGlobalConfig, LwrRoute, ModuleCompiled, ModuleEntry, ModuleProvider, ModuleSource, NormalizedLwrGlobalConfig, ProviderAppConfig, ProviderContext, PublicModuleRegistry, PublicResourceRegistry, PublicViewRegistry, PublicAssetRegistry, ResourceDefinition, ResourceIdentifier, ResourceProvider, RouteHandlerFunction, RouteHandlerView, RouteHandlerViewApi, RouteHandlerViewResponse, RuntimeEnvironment, RuntimeParams, ViewIdentity, ViewParams, ViewProvider, ViewRequest, ViewResponse, Watcher, } from '@lwrjs/types';
 //# sourceMappingURL=index.d.ts.map

package/package.json

@@ -18,7 +18,7 @@
     },
     "type": "module",
     "types": "build/es/index.d.ts",
-    "version": "0.10.0-alpha.8",
+    "version": "0.10.0",
     "module": "build/es/index.js",
     "main": "build/cjs/index.cjs",
     "files": [
@@ -41,21 +41,21 @@
         }
     },
     "dependencies": {
-        "@lwrjs/config": "0.10.0-alpha.8",
-        "@lwrjs/core": "0.10.0-alpha.8",
-        "@lwrjs/diagnostics": "0.10.0-alpha.8",
-        "@lwrjs/shared-utils": "0.10.0-alpha.8",
-        "@lwrjs/tools": "0.10.0-alpha.8",
+        "@lwrjs/config": "0.10.0",
+        "@lwrjs/core": "0.10.0",
+        "@lwrjs/diagnostics": "0.10.0",
+        "@lwrjs/shared-utils": "0.10.0",
+        "@lwrjs/tools": "0.10.0",
         "chalk": "^4.1.0",
         "commander": "^10.0.0",
-        "fs-extra": "^11.1.0"
+        "fs-extra": "^11.1.1"
     },
     "devDependencies": {
         "@commander-js/extra-typings": "^10.0.2",
-        "@lwrjs/types": "0.10.0-alpha.8"
+        "@lwrjs/types": "0.10.0"
     },
     "engines": {
-        "node": ">=16.0.0 <20"
+        "node": ">=16.0.0"
     },
-    "gitHead": "46bd72343e1db7c72470033320921df3a7eff18a"
+    "gitHead": "e6deaeef3db8aa079acefed508897eca19b3218a"
 }