lwr 0.7.0-alpha.9 → 0.7.0

package/build/cjs/cli/cli.cjs

@@ -38,7 +38,7 @@ cli.command("serve", "Starts an LWR server (defaults to dev mode)").alias("dev")
   try {
     const server = await createServer({port, serverMode: mode});
     await server.listen(async ({serverMode, port: port2}) => {
-      console.log(import_chalk.default.green(` server running at: port: ${port2} | mode: ${serverMode}`));
+      console.log(import_chalk.default.green(`Running LWR v${version} at: http://localhost:${port2} | mode: ${serverMode}`));
       if (open) {
         await (0, import_utils.launch)(port2);
       }
@@ -53,15 +53,12 @@ cli.command("serve", "Starts an LWR server (defaults to dev mode)").alias("dev")
   }
 });
 cli.command("build", "Builds a static LWR site").alias("static-build").option("--outputDir <directory>", `[string] output directory`).action(async (options) => {
-  const {output = "__generated_site__"} = options;
+  const {outputDir, mode = process.env.MODE || "prod"} = options;
   const {generateStaticSite} = await Promise.resolve().then(() => __toModule(require("@lwrjs/core")));
   try {
     await generateStaticSite({
-      staticSiteGenerator: {
-        outputDir: output,
-        locales: ["en-US"],
-        _additionalRoutePaths: []
-      }
+      serverMode: mode,
+      staticSiteGenerator: {outputDir}
     });
   } catch (error) {
     if (error instanceof import_diagnostics.DiagnosticsError) {
@@ -72,11 +69,12 @@ cli.command("build", "Builds a static LWR site").alias("static-build").option("-
     }
   }
 });
-cli.command("bundle-lambda", "Bundles the lambda source").option("--entryPoint <entry>", "[string] bundling entry point").action(async (options) => {
+cli.command("bundle-lambda", "Bundles the lambda source").option("--entryPoint <entry>", "[string] bundling entry point").option("--format <format>", "[string] bundle output format").action(async (options) => {
   const entryPoint = options.entryPoint || "./src/index.ts";
+  const format = options.format || "esm";
   try {
     const {bundleLambda} = await Promise.resolve().then(() => __toModule(require("./commands/bundle-lambda.cjs")));
-    await bundleLambda(entryPoint);
+    await bundleLambda({entryPoint, format});
   } catch (error) {
     if (error instanceof import_diagnostics.DiagnosticsError) {
       console.log(error.diagnostics);

package/build/cjs/cli/commands/bundle-lambda.cjs

@@ -33,7 +33,7 @@ var import_vm2 = __toModule(require("vm2"));
 var import_core = __toModule(require("@lwrjs/core"));
 var import_esm_require_shim = __toModule(require("./shims/esm-require-shim.cjs"));
 var import_lwr_lambda_shim = __toModule(require("./shims/lwr-lambda-shim.cjs"));
-async function bundleLambda(entryPoint) {
+async function bundleLambda({entryPoint, format}) {
   const arg = await getConfigArg(entryPoint);
   const server = (0, import_core.createServer)(arg);
   const config = server.getConfig();
@@ -42,21 +42,22 @@ async function bundleLambda(entryPoint) {
   const lambdaShimPath = import_path.default.join(buildDir, "lwr-lambda-shim.js");
   import_fs.default.mkdirSync(buildDir, {recursive: true});
   import_fs.default.writeFileSync(lambdaShimPath, lambdaShim);
-  const handlerPath = entryPoint;
-  (0, import_esbuild.build)({
+  const options = {
     bundle: true,
-    format: "esm",
+    format,
     treeShaking: true,
-    splitting: true,
-    entryPoints: [handlerPath],
+    entryPoints: [entryPoint],
     outdir: "./build",
     platform: "node",
-    banner: {
-      js: import_esm_require_shim.default
-    },
-    external: ["fsevents", "esbuild", "rollup", "esinstall"],
+    external: ["fsevents", "esbuild", "iltorb", "rollup", "esinstall", "rollup-plugin-node-polyfills"],
     inject: [lambdaShimPath]
-  });
+  };
+  if (format === "esm") {
+    options.banner = {
+      js: import_esm_require_shim.default
+    };
+  }
+  (0, import_esbuild.build)(options);
 }
 async function getConfigArg(entryPoint) {
   const result = await (0, import_esbuild.build)({
@@ -64,8 +65,9 @@ async function getConfigArg(entryPoint) {
     bundle: true,
     write: false,
     format: "cjs",
+    platform: "node",
     external: [
-      "@lwrjs/lambda"
+      "@lwrjs/lambda/aws"
     ]
   });
   const lambda = result.outputFiles[0].text;
@@ -77,7 +79,7 @@ async function getConfigArg(entryPoint) {
       builtin: ["*"],
       root: [import_path.default.dirname(entryPoint)],
       mock: {
-        "@lwrjs/lambda": {
+        "@lwrjs/lambda/aws": {
           createHandler: (arg) => {
             return arg;
           }
@@ -98,10 +100,17 @@ function generateLambdaShim(config) {
   const services = [];
   const serviceConfigs = [];
   for (const [index, [servicePath, serviceConfig = {}]] of config.moduleProviders.entries()) {
-    serviceCtors.push(`import ServiceCtor${index} from '${servicePath}';
-`);
+    serviceCtors.push(`import ServiceCtor${index} from '${servicePath}';`);
     services.push(`ServiceCtor${index}`);
     serviceConfigs.push(JSON.stringify(serviceConfig));
   }
-  return import_lwr_lambda_shim.default.replace("{ serviceCtors }", serviceCtors.join("\n")).replace("{ services }", services.join()).replace("{ serviceConfigs }", serviceConfigs.join());
+  const hookCtors = [];
+  const hooks = [];
+  const hookConfigs = [];
+  for (const [index, [hookPath, hookConfig = {}]] of config.moduleProviders.entries()) {
+    hookCtors.push(`import HookCtor${index} from '${hookPath}';`);
+    hooks.push(`HookCtor${index}`);
+    hookConfigs.push(JSON.stringify(hookConfig));
+  }
+  return import_lwr_lambda_shim.default.replace("{ serviceCtors }", serviceCtors.join("\n")).replace("{ services }", services.join()).replace("{ serviceConfigs }", serviceConfigs.join()).replace("{ hookCtors }", hookCtors.join("\n")).replace("{ hooks }", hooks.join()).replace("{ hookConfigs }", hookConfigs.join());
 }

package/build/cjs/cli/commands/shims/lwr-lambda-shim.cjs

@@ -12,11 +12,19 @@ __export(exports, {
 });
 var lwr_lambda_shim_default = `
 { serviceCtors }
+{ hookCtors }
 export const LWR = {
-    getModuleProviders: function (context) {
+    getModuleProviders: (context) => {
+        const serviceConfigs = [{ serviceConfigs }];
         return [{ services }].map((ServiceCtor, index) => {
-            return new ServiceCtor(this.serviceConfigs[index], context);
+            return new ServiceCtor(serviceConfigs[index], context);
         });
-    }.bind({ serviceConfigs: [{ serviceConfigs }] })
+    },
+    getHooks: () => {
+        const hookConfigs = [{ hookConfigs }];
+        return [{ hooks }].map((HookCtor, index) => {
+            return new HookCtor(hookConfigs[index]);
+        });
+    }
 };
 `;

package/build/es/cli/cli.js

@@ -34,7 +34,7 @@ cli.command('serve', 'Starts an LWR server (defaults to dev mode)')
     try {
         const server = await createServer({ port, serverMode: mode });
         await server.listen(async ({ serverMode, port }) => {
-            console.log(chalk.green(` server running at: port: ${port} | mode: ${serverMode}`));
+            console.log(chalk.green(`Running LWR v${version} at: http://localhost:${port} | mode: ${serverMode}`));
             if (open) {
                 await launch(port);
             }
@@ -54,15 +54,12 @@ cli.command('build', 'Builds a static LWR site') // default command
     .alias('static-build')
     .option('--outputDir <directory>', `[string] output directory`)
     .action(async (options) => {
-    const { output = '__generated_site__' } = options;
+    const { outputDir, mode = process.env.MODE || 'prod' } = options;
     const { generateStaticSite } = await import('@lwrjs/core');
     try {
         await generateStaticSite({
-            staticSiteGenerator: {
-                outputDir: output,
-                locales: ['en-US'],
-                _additionalRoutePaths: [],
-            },
+            serverMode: mode,
+            staticSiteGenerator: { outputDir },
         });
     }
     catch (error) {
@@ -77,11 +74,13 @@ cli.command('build', 'Builds a static LWR site') // default command
 });
 cli.command('bundle-lambda', 'Bundles the lambda source')
     .option('--entryPoint <entry>', '[string] bundling entry point')
+    .option('--format <format>', '[string] bundle output format')
     .action(async (options) => {
     const entryPoint = options.entryPoint || './src/index.ts';
+    const format = options.format || 'esm';
     try {
         const { bundleLambda } = await import('./commands/bundle-lambda.js');
-        await bundleLambda(entryPoint);
+        await bundleLambda({ entryPoint, format });
     }
     catch (error) {
         if (error instanceof DiagnosticsError) {

package/build/es/cli/commands/bundle-lambda.d.ts

@@ -1,2 +1,8 @@
-export declare function bundleLambda(entryPoint: string): Promise<void>;
+import { Format } from 'esbuild';
+interface BundleOptions {
+    entryPoint: string;
+    format: Format;
+}
+export declare function bundleLambda({ entryPoint, format }: BundleOptions): Promise<void>;
+export {};
 //# sourceMappingURL=bundle-lambda.d.ts.map

package/build/es/cli/commands/bundle-lambda.js

@@ -5,33 +5,35 @@ import { NodeVM } from 'vm2';
 import { createServer } from '@lwrjs/core';
 import ESM_REQUIRE_SHIM from './shims/esm-require-shim.js';
 import LWR_LAMBDA_SHIM from './shims/lwr-lambda-shim.js';
-export async function bundleLambda(entryPoint) {
+export async function bundleLambda({ entryPoint, format }) {
     // get createHandler config argument
     const arg = await getConfigArg(entryPoint);
     // HACK: creating server just for config loading
     const server = createServer(arg);
     const config = server.getConfig();
+    // generate the lambda shim source
     const lambdaShim = generateLambdaShim(config);
     const buildDir = path.resolve('./build/generated');
     const lambdaShimPath = path.join(buildDir, 'lwr-lambda-shim.js');
     fs.mkdirSync(buildDir, { recursive: true });
     fs.writeFileSync(lambdaShimPath, lambdaShim);
     // bundle lambda handler and inject the lwr shim
-    const handlerPath = entryPoint;
-    build({
+    const options = {
         bundle: true,
-        format: 'esm',
+        format,
         treeShaking: true,
-        splitting: true,
-        entryPoints: [handlerPath],
+        entryPoints: [entryPoint],
         outdir: './build',
         platform: 'node',
-        banner: {
-            js: ESM_REQUIRE_SHIM,
-        },
-        external: ['fsevents', 'esbuild', 'rollup', 'esinstall'],
+        external: ['fsevents', 'esbuild', 'iltorb', 'rollup', 'esinstall', 'rollup-plugin-node-polyfills'],
         inject: [lambdaShimPath],
-    });
+    };
+    if (format === 'esm') {
+        options.banner = {
+            js: ESM_REQUIRE_SHIM,
+        };
+    }
+    build(options);
 }
 async function getConfigArg(entryPoint) {
     // bundle lambda source for execution in a sandbox
@@ -40,9 +42,10 @@ async function getConfigArg(entryPoint) {
         bundle: true,
         write: false,
         format: 'cjs',
+        platform: 'node',
         external: [
-            // skip @lwrjs/lambda because it will be mocked at execution
-            '@lwrjs/lambda',
+            // skip @lwrjs/lambda/aws because it will be mocked at execution
+            '@lwrjs/lambda/aws',
         ],
     });
     // execute lambda source with mocked createHandler to capture config
@@ -55,7 +58,7 @@ async function getConfigArg(entryPoint) {
             builtin: ['*'],
             root: [path.dirname(entryPoint)],
             mock: {
-                '@lwrjs/lambda': {
+                '@lwrjs/lambda/aws': {
                     createHandler: (arg) => {
                         return arg;
                     },
@@ -76,13 +79,26 @@ function generateLambdaShim(config) {
     const serviceCtors = [];
     const services = [];
     const serviceConfigs = [];
+    // module provider generation
     for (const [index, [servicePath, serviceConfig = {}]] of config.moduleProviders.entries()) {
-        serviceCtors.push(`import ServiceCtor${index} from '${servicePath}';\n`);
+        serviceCtors.push(`import ServiceCtor${index} from '${servicePath}';`);
         services.push(`ServiceCtor${index}`);
         serviceConfigs.push(JSON.stringify(serviceConfig));
     }
+    const hookCtors = [];
+    const hooks = [];
+    const hookConfigs = [];
+    // hooks generation
+    for (const [index, [hookPath, hookConfig = {}]] of config.moduleProviders.entries()) {
+        hookCtors.push(`import HookCtor${index} from '${hookPath}';`);
+        hooks.push(`HookCtor${index}`);
+        hookConfigs.push(JSON.stringify(hookConfig));
+    }
     return LWR_LAMBDA_SHIM.replace('{ serviceCtors }', serviceCtors.join('\n'))
         .replace('{ services }', services.join())
-        .replace('{ serviceConfigs }', serviceConfigs.join());
+        .replace('{ serviceConfigs }', serviceConfigs.join())
+        .replace('{ hookCtors }', hookCtors.join('\n'))
+        .replace('{ hooks }', hooks.join())
+        .replace('{ hookConfigs }', hookConfigs.join());
 }
 //# sourceMappingURL=bundle-lambda.js.map

package/build/es/cli/commands/shims/lwr-lambda-shim.d.ts

@@ -1,3 +1,3 @@
-declare const _default: "\n{ serviceCtors }\nexport const LWR = {\n    getModuleProviders: function (context) {\n        return [{ services }].map((ServiceCtor, index) => {\n            return new ServiceCtor(this.serviceConfigs[index], context);\n        });\n    }.bind({ serviceConfigs: [{ serviceConfigs }] })\n};\n";
+declare const _default: "\n{ serviceCtors }\n{ hookCtors }\nexport const LWR = {\n    getModuleProviders: (context) => {\n        const serviceConfigs = [{ serviceConfigs }];\n        return [{ services }].map((ServiceCtor, index) => {\n            return new ServiceCtor(serviceConfigs[index], context);\n        });\n    },\n    getHooks: () => {\n        const hookConfigs = [{ hookConfigs }];\n        return [{ hooks }].map((HookCtor, index) => {\n            return new HookCtor(hookConfigs[index]);\n        });\n    }\n};\n";
 export default _default;
 //# sourceMappingURL=lwr-lambda-shim.d.ts.map

package/build/es/cli/commands/shims/lwr-lambda-shim.js

@@ -1,11 +1,19 @@
 export default `
 { serviceCtors }
+{ hookCtors }
 export const LWR = {
-    getModuleProviders: function (context) {
+    getModuleProviders: (context) => {
+        const serviceConfigs = [{ serviceConfigs }];
         return [{ services }].map((ServiceCtor, index) => {
-            return new ServiceCtor(this.serviceConfigs[index], context);
+            return new ServiceCtor(serviceConfigs[index], context);
         });
-    }.bind({ serviceConfigs: [{ serviceConfigs }] })
+    },
+    getHooks: () => {
+        const hookConfigs = [{ hookConfigs }];
+        return [{ hooks }].map((HookCtor, index) => {
+            return new HookCtor(hookConfigs[index]);
+        });
+    }
 };
 `;
 //# sourceMappingURL=lwr-lambda-shim.js.map

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, Compiler, FsModuleEntry, GlobalData, HandlerContext, HooksPlugin, Json, 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, ClientBootstrapConfig, CompiledView, Compiler, 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';
 //# sourceMappingURL=index.d.ts.map

package/package.json

@@ -18,7 +18,7 @@
     },
     "type": "module",
     "types": "build/es/index.d.ts",
-    "version": "0.7.0-alpha.9",
+    "version": "0.7.0",
     "module": "build/es/index.js",
     "main": "build/cjs/index.cjs",
     "files": [
@@ -38,11 +38,11 @@
         }
     },
     "dependencies": {
-        "@lwrjs/core": "0.7.0-alpha.9",
-        "@lwrjs/types": "0.7.0-alpha.9",
+        "@lwrjs/core": "0.7.0",
+        "@lwrjs/types": "0.7.0",
         "cac": "^6.7.8",
         "esbuild": "^0.14.38",
         "vm2": "^3.9.9"
     },
-    "gitHead": "522665298cc74f1898da6ed018fa72504bd72645"
+    "gitHead": "c6dcb52144a8da80170e30d49a87e29d2da30f9b"
 }