@merkur/cli 0.37.5 → 0.37.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/cli",
-  "version": "0.37.5",
+  "version": "0.37.8",
   "description": "Merkur is tiny and extensible library for creating front-end microservices.",
   "bin": {
     "merkur": "./bin/merkur.mjs"
@@ -67,5 +67,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "af943715deec4b2e509eab4c2a8f6389fd1d4822"
+  "gitHead": "3a0dd00def5bb8bdcdc00c4ee10d4d151094fd94"
 }

package/src/commandConfig.mjs

@@ -0,0 +1,16 @@
+import { createCLIConfig } from './CLIConfig.mjs';
+import { createContext } from './context.mjs';
+import { createMerkurConfig } from './merkurConfig.mjs';
+
+export async function createCommandConfig({ args, command }) {
+  const context = await createContext();
+  const baseCliConfig = await createCLIConfig({ args, command });
+
+  const { merkurConfig, cliConfig } = await createMerkurConfig({
+    args,
+    cliConfig: baseCliConfig,
+    context,
+  });
+
+  return { context, merkurConfig, cliConfig };
+}

package/src/commands/build.mjs

@@ -1,9 +1,7 @@
 import chalk from 'chalk';
 
-import { createCLIConfig } from '../CLIConfig.mjs';
-import { createContext } from '../context.mjs';
+import { createCommandConfig } from '../commandConfig.mjs';
 import { runTask } from '../runTask.mjs';
-import { createMerkurConfig } from '../merkurConfig.mjs';
 import { createLogger } from '../logger.mjs';
 import { time } from '../utils.mjs';
 import { handleExit } from '../handleExit.mjs';
@@ -12,14 +10,11 @@ import { clearBuildFolder } from '../clearBuildFolder.mjs';
 export async function build({ args, command }) {
   const buildTime = time();
 
-  const context = await createContext();
-  const baseCliConfig = await createCLIConfig({ args, command });
-
-  const { merkurConfig, cliConfig } = await createMerkurConfig({
+  const { context, cliConfig, merkurConfig } = await createCommandConfig({
     args,
-    cliConfig: baseCliConfig,
-    context,
+    command,
   });
+
   const logger = createLogger(undefined, cliConfig);
 
   await handleExit({ context });

package/src/commands/custom.mjs

@@ -3,10 +3,8 @@ import path from 'node:path';
 
 import chalk from 'chalk';
 
-import { createCLIConfig } from '../CLIConfig.mjs';
-import { createContext } from '../context.mjs';
+import { createCommandConfig } from '../commandConfig.mjs';
 import { createLogger } from '../logger.mjs';
-import { createMerkurConfig } from '../merkurConfig.mjs';
 import { handleExit } from '../handleExit.mjs';
 
 export const CUSTOM_PART = {
@@ -15,15 +13,10 @@ export const CUSTOM_PART = {
 };
 
 export async function custom({ args, command }) {
-  const context = await createContext();
-  let baseCliConfig = await createCLIConfig({ args, command });
-
-  const { merkurConfig, cliConfig } = await createMerkurConfig({
+  const { context, cliConfig, merkurConfig } = await createCommandConfig({
     args,
-    cliConfig: baseCliConfig,
-    context,
+    command,
   });
-
   const logger = createLogger('Custom command:', cliConfig);
 
   await handleExit({ context });

package/src/commands/dev.mjs

@@ -1,21 +1,15 @@
-import { createCLIConfig } from '../CLIConfig.mjs';
-import { createContext } from '../context.mjs';
+import { createCommandConfig } from '../commandConfig.mjs';
 import { runDevServer } from '../devServer.mjs';
 import { runTask } from '../runTask.mjs';
-import { createMerkurConfig } from '../merkurConfig.mjs';
 import { runSocketServer } from '../websocket.mjs';
 import { runWidgetServer } from '../widgetServer.mjs';
 import { handleExit } from '../handleExit.mjs';
 import { clearBuildFolder } from '../clearBuildFolder.mjs';
 
 export async function dev({ args, command }) {
-  const context = await createContext();
-  const baseCliConfig = await createCLIConfig({ args, command });
-
-  const { merkurConfig, cliConfig } = await createMerkurConfig({
+  const { context, cliConfig, merkurConfig } = await createCommandConfig({
     args,
-    cliConfig: baseCliConfig,
-    context,
+    command,
   });
 
   await handleExit({ context });

package/src/commands/start.mjs

@@ -1,18 +1,12 @@
-import { createCLIConfig } from '../CLIConfig.mjs';
-import { createContext } from '../context.mjs';
+import { createCommandConfig } from '../commandConfig.mjs';
 import { runDevServer } from '../devServer.mjs';
-import { createMerkurConfig } from '../merkurConfig.mjs';
 import { runWidgetServer } from '../widgetServer.mjs';
 import { handleExit } from '../handleExit.mjs';
 
 export async function start({ args, command }) {
-  const context = await createContext();
-  let baseCliConfig = await createCLIConfig({ args, command });
-
-  const { merkurConfig, cliConfig } = await createMerkurConfig({
+  const { context, cliConfig, merkurConfig } = await createCommandConfig({
     args,
-    cliConfig: baseCliConfig,
-    context,
+    command,
   });
 
   await handleExit({ context });

package/src/commands/test.mjs

@@ -3,20 +3,14 @@ import process from 'node:process';
 
 import { npmRunPath } from 'npm-run-path';
 
-import { createCLIConfig } from '../CLIConfig.mjs';
-import { createContext } from '../context.mjs';
+import { createCommandConfig } from '../commandConfig.mjs';
 import { createLogger } from '../logger.mjs';
-import { createMerkurConfig } from '../merkurConfig.mjs';
 import { handleExit } from '../handleExit.mjs';
 
 export async function test({ args, commandArgs, command }) {
-  const context = await createContext();
-  let baseCliConfig = await createCLIConfig({ args, command });
-
-  const { merkurConfig, cliConfig } = await createMerkurConfig({
+  const { context, cliConfig, merkurConfig } = await createCommandConfig({
     args,
-    cliConfig: baseCliConfig,
-    context,
+    command,
   });
   const logger = createLogger('testRunner', cliConfig);
 

package/src/devServer.mjs

@@ -27,6 +27,7 @@ export async function runDevServer({ context, merkurConfig, cliConfig }) {
     template,
     templateFolder,
     serverTemplateFolder,
+    templateFolders,
     path: playgroundPath,
     widgetHandler,
   } = merkurConfig.playground;
@@ -52,7 +53,11 @@ export async function runDevServer({ context, merkurConfig, cliConfig }) {
         asyncMiddleware(async (req, res) => {
           const isDevCommand = command === COMMAND_NAME.DEV;
 
-          const widgetProperties = await widgetHandler(req, res);
+          const widgetProperties = await widgetHandler(req, res, {
+            context,
+            merkurConfig,
+            cliConfig,
+          });
 
           // TODO refactor
           if (isDevCommand) {
@@ -127,9 +132,12 @@ export async function runDevServer({ context, merkurConfig, cliConfig }) {
             fs.readFileSync(template, 'utf8'),
             {
               views: [
-                serverTemplateFolder,
-                path.dirname(template),
-                templateFolder,
+                ...new Set([
+                  serverTemplateFolder,
+                  path.dirname(template),
+                  templateFolder,
+                  ...templateFolders,
+                ]),
               ],
             },
           );
@@ -169,7 +177,8 @@ export async function runDevServer({ context, merkurConfig, cliConfig }) {
         }
 
         logger.error(error);
-        res.status(500).json({
+        // TODO send html page with preview of error for better DX
+        res.status(error?.status ?? 500).json({
           error: {
             message: `Something is wrong with the @merkur/cli/devServer: ${error.message}`,
             stack: error.stack,

package/src/merkurConfig.mjs

@@ -189,12 +189,22 @@ emitter.on(
   function playground({ merkurConfig, cliConfig }) {
     merkurConfig.playground = {
       template: path.resolve(`${cliConfig.cliFolder}/templates/playground.ejs`),
+      // @deprecated Use templateFolders instead.
       templateFolder: path.resolve(`${cliConfig.cliFolder}/templates`),
+      // @deprecated Use templateFolders instead.
       serverTemplateFolder: path.resolve(
         `${cliConfig.projectFolder}/server/playground/templates`,
       ),
+      /**
+       * This new variable will replace the old templateFolders. So we already
+       * include all of the default folders in here.
+       */
+      templateFolders: [
+        path.resolve(`${cliConfig.cliFolder}/templates`),
+        path.resolve(`${cliConfig.projectFolder}/server/playground/templates`),
+      ],
       path: '/',
-      widgetHandler: async (req) => {
+      widgetHandler: async (req, res, { merkurConfig }) => {
         const { protocol, host } = merkurConfig.widgetServer;
         let widgetProperties = null;
         const params = merkurConfig.playground.widgetParams(req);
@@ -207,6 +217,7 @@ emitter.on(
         if (!response.ok) {
           const error = new Error(widgetProperties?.error?.message);
           error.stack = widgetProperties?.error?.stack;
+          error.status = response.status ?? 500;
           throw error;
         }
 

package/types.d.ts

@@ -47,8 +47,15 @@ export interface DevServer {
 
 export interface Playground {
   template: string;
+  /**
+   * @deprecated Use templateFolders instead.
+   */
   templateFolder: string;
+  /**
+   * @deprecated Use templateFolders instead.
+   */
   serverTemplateFolder: string;
+  templateFolders: string[];
   path: string;
   widgetHandler(req: Request, res: Response): Record<string, unknown>;
   widgetParams(req: Request): URLSearchParams;