@merkur/cli 0.35.6 → 0.35.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/cli",
-  "version": "0.35.6",
+  "version": "0.35.8",
   "description": "Merkur is tiny and extensible library for creating front-end microservices.",
   "bin": {
     "merkur": "./bin/merkur.mjs"
@@ -66,5 +66,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "0b561365fceb97789e3c626dddb068b8c0e2a5d0"
+  "gitHead": "9c99e3f25e9afa6f94a5907facec8419fbaed59e"
 }

package/src/CLIConfig.mjs

@@ -1,30 +1,34 @@
 import { EMITTER_EVENTS, emitter, RESULT_KEY } from './emitter.mjs';
 
-export async function createCLIConfig({ args, context, command } = {}) {
+export async function createCLIConfig({ args, command } = {}) {
   const environment = process.env.NODE_ENV;
   const isProduction = environment === 'production';
 
+  return {
+    environment,
+    isProduction,
+    command: command ?? 'unknown',
+    watch: args?.watch ?? !isProduction,
+    writeToDisk: args?.writeToDisk ?? isProduction,
+    outFile: args?.outFile ?? './build/widget.cjs',
+    port: args?.port ?? 4444,
+    runTask: args?.runTask ?? [],
+    devServerPort: args?.devServerPort ?? 4445,
+    projectFolder: args?.projectFolder ?? process.cwd(),
+    cliFolder: import.meta.dirname,
+    buildFolder: args?.buildFolder ?? './build',
+    staticFolder: args?.staticFolder ?? './build/static',
+    staticPath: args?.staticPath ?? '/static',
+    hasRunDevServer: args?.hasRunDevServer ?? false,
+    hasRunWidgetServer: args?.hasRunWidgetServer ?? false,
+    inspect: args.inspect ?? false,
+    verbose: args.verbose ?? false,
+  };
+}
+
+export async function updateCLIConfig({ cliConfig, context, args }) {
   let event = {
-    cliConfig: {
-      environment,
-      isProduction,
-      command: command ?? 'unknown',
-      watch: args?.watch ?? !isProduction,
-      writeToDisk: args?.writeToDisk ?? isProduction,
-      outFile: args?.outFile ?? './build/widget.cjs',
-      port: args?.port ?? 4444,
-      runTask: args?.runTask ?? [],
-      devServerPort: args?.devServerPort ?? 4445,
-      projectFolder: args?.projectFolder ?? process.cwd(),
-      cliFolder: import.meta.dirname,
-      buildFolder: args?.buildFolder ?? './build',
-      staticFolder: args?.staticFolder ?? './build/static',
-      staticPath: args?.staticPath ?? '/static',
-      hasRunDevServer: args?.hasRunDevServer ?? false,
-      hasRunWidgetServer: args?.hasRunWidgetServer ?? false,
-      inspect: args.inspect ?? false,
-      verbose: args.verbose ?? false,
-    },
+    cliConfig,
     context,
     args,
     [RESULT_KEY]: 'cliConfig',

package/src/commands/build.mjs

@@ -14,9 +14,10 @@ export async function build({ args, command }) {
   const buildTime = time();
 
   const context = await createContext();
-  const baseCliConfig = await createCLIConfig({ args, context, command });
+  const baseCliConfig = await createCLIConfig({ args, command });
 
   const { merkurConfig, cliConfig } = await createMerkurConfig({
+    args,
     cliConfig: baseCliConfig,
     context,
   });

package/src/commands/dev.mjs

@@ -11,9 +11,10 @@ import { handleExit } from '../handleExit.mjs';
 
 export async function dev({ args, command }) {
   const context = await createContext();
-  const baseCliConfig = await createCLIConfig({ args, context, command });
+  const baseCliConfig = await createCLIConfig({ args, command });
 
   const { merkurConfig, cliConfig } = await createMerkurConfig({
+    args,
     cliConfig: baseCliConfig,
     context,
   });

package/src/commands/start.mjs

@@ -7,9 +7,10 @@ import { handleExit } from '../handleExit.mjs';
 
 export async function start({ args, command }) {
   const context = await createContext();
-  let baseCliConfig = await createCLIConfig({ args, context, command });
+  let baseCliConfig = await createCLIConfig({ args, command });
 
   const { merkurConfig, cliConfig } = await createMerkurConfig({
+    args,
     cliConfig: baseCliConfig,
     context,
   });

package/src/commands/test.mjs

@@ -11,9 +11,10 @@ import { handleExit } from '../handleExit.mjs';
 
 export async function test({ args, command }) {
   const context = await createContext();
-  let baseCliConfig = await createCLIConfig({ args, context, command });
+  let baseCliConfig = await createCLIConfig({ args, command });
 
   const { merkurConfig, cliConfig } = await createMerkurConfig({
+    args,
     cliConfig: baseCliConfig,
     context,
   });

package/src/devServer.mjs

@@ -25,7 +25,7 @@ export async function runDevServer({ context, merkurConfig, cliConfig }) {
     path: playgroundPath,
     widgetHandler,
   } = merkurConfig.playground;
-  const { cliFolder, command, writeToDisk } = cliConfig;
+  const { cliFolder, projectFolder, command, writeToDisk } = cliConfig;
 
   return new Promise((resolve, reject) => {
     const app = express();
@@ -118,7 +118,11 @@ export async function runDevServer({ context, merkurConfig, cliConfig }) {
           const playgroundTemplate = ejs.compile(
             fs.readFileSync(template, 'utf8'),
             {
-              views: [path.dirname(template), templateFolder],
+              views: [
+                `${projectFolder}/server/playground/templates/`,
+                path.dirname(template),
+                templateFolder,
+              ],
             },
           );
 

package/src/merkurConfig.mjs

@@ -1,6 +1,7 @@
 import path from 'node:path';
 
 import { EMITTER_EVENTS, emitter, RESULT_KEY } from './emitter.mjs';
+import { updateCLIConfig } from './CLIConfig.mjs';
 import { createLogger } from './logger.mjs';
 import { devPlugin } from './plugins/devPlugin.mjs';
 import { deepMerge } from './utils.mjs';
@@ -8,7 +9,7 @@ import { COMMAND_NAME } from './commands/constant.mjs';
 
 const MERKUR_CONFIG_FILE = 'merkur.config.mjs';
 
-export async function createMerkurConfig({ cliConfig, context } = {}) {
+export async function createMerkurConfig({ cliConfig, context, args } = {}) {
   const logger = createLogger('merkurConfig', cliConfig);
   const { projectFolder } = cliConfig;
   let merkurConfig;
@@ -29,12 +30,14 @@ export async function createMerkurConfig({ cliConfig, context } = {}) {
     logger.error(error);
   }
 
-  cliConfig = { ...(merkurConfig?.cliConfig ?? {}), ...cliConfig };
+  cliConfig = { ...cliConfig, ...(merkurConfig?.cliConfig ?? {}), ...args };
 
   await loadExtender({ merkurConfig, cliConfig, logger, context });
 
   await registerHooks({ merkurConfig });
 
+  cliConfig = await updateCLIConfig({ args, cliConfig, context });
+
   let event = {
     merkurConfig: {
       ...merkurConfig,

package/src/templates/body.ejs

@@ -0,0 +1,18 @@
+<% if(widgetProperties?.slot?.headline?.html){ %>
+  <div class="headline-view"><%- widgetProperties && widgetProperties.slot && widgetProperties.slot.headline &&
+      widgetProperties.slot.headline.html %></div>
+<% } %>
+<div class="merkur-view"><%- html %></div>
+<script>
+  window.addEventListener('load', function () {
+    __merkur__.create(<% - JSON.stringify(widgetProperties) %>)
+      .then(function (widget) {
+        widget.containerSelector = '.merkur-view';
+        if (widget?.slot?.headline) {
+          widget.slot.headline.containerSelector = '.headline-view';
+        }
+
+        widget.mount();
+      });
+  });
+</script>

package/src/templates/playground.ejs

@@ -9,25 +9,8 @@
 </head>
 
 <body>
-  <% if(widgetProperties?.slot?.headline?.html){ %>
-    <div class="headline-view"><%- widgetProperties && widgetProperties.slot && widgetProperties.slot.headline && widgetProperties.slot.headline.html %>
-  <% } %>
-  </div>
-  <div class="merkur-view"><%- html %></div>
-  <script>
-    window.addEventListener('load', function () {
-      __merkur__.create(<%- JSON.stringify(widgetProperties) %>)
-        .then(function (widget) {
-          widget.containerSelector = '.merkur-view';
-          if (widget?.slot?.headline) {
-            widget.slot.headline.containerSelector = '.headline-view';
-          }
-
-          widget.mount();
-        });
-    });
-  </script>
-    <%- include('./footer.ejs', {assets, merkurConfig, devClient, widgetProperties}) %>
+  <%- include('./body.ejs', {assets, merkurConfig, devClient, widgetProperties}) %>
+  <%- include('./footer.ejs', {assets, merkurConfig, devClient, widgetProperties}) %>
 </body>
 
 </html>