@merkur/cli 0.35.3 → 0.35.4

package/bin/merkur.mjs

@@ -23,12 +23,24 @@ program
   .option('--buildFolder <string>', 'Build folder.')
   .option('--staticFolder <string>', 'Static folder.')
   .option('--staticPath <string>', 'The static path for dev server and widget server.')
+  .option('--hasRunDevServer', 'Flag for starting dev server')
+  .option('--hasRunWidgetServer', 'Flag for starting widget server')
   .option('--inspect', 'Debugging widget server')
   .option('--verbose', 'Verbose mode which show debug information.')
   .version(packageFile.version);
 
 program.command(COMMAND_NAME.DEV).description('Dev command').action(async (options, cmd) => {
-  const args = { ...{ writeToDisk: false, watch: true, runTask: ['node', 'es13'] }, ...cmd.optsWithGlobals(), ...options };
+  const args = {
+    ...{
+      writeToDisk: false,
+      watch: true,
+      runTask: ['node', 'es13'],
+      hasRunDevServer: true,
+      hasRunWidgetServer: true,
+    },
+    ...cmd.optsWithGlobals(),
+    ...options,
+  };
   process.env.NODE_ENV = process.env.NODE_ENV ?? 'development';
 
   dev({ args, command: COMMAND_NAME.DEV });
@@ -45,7 +57,7 @@ program.command(COMMAND_NAME.BUILD).action(async (options, cmd) => {
 
 program.command(COMMAND_NAME.START).action(async (options, cmd) => {
   const args = {
-    ...{ watch: false }, ...cmd.optsWithGlobals(), ...options
+    ...{ watch: false, hasRunWidgetServer: true }, ...cmd.optsWithGlobals(), ...options
   };
   process.env.NODE_ENV = process.env.NODE_ENV ?? 'production';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/cli",
-  "version": "0.35.3",
+  "version": "0.35.4",
   "description": "Merkur is tiny and extensible library for creating front-end microservices.",
   "bin": {
     "merkur": "./bin/merkur.mjs"
@@ -65,5 +65,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "6b65a5581c1c32a14479c3bb4702c394592d0a20"
+  "gitHead": "a78cf3d373ad20dbb2700e4070a52965cebd5a17"
 }

package/src/CLIConfig.mjs

@@ -20,6 +20,8 @@ export async function createCLIConfig({ args, context, command } = {}) {
       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,
     },

package/src/commands/dev.mjs

@@ -53,7 +53,9 @@ export async function dev({ args, command }) {
 
   await Promise.all(Object.values(task));
 
-  await runDevServer({ merkurConfig, cliConfig, context });
+  cliConfig.hasRunDevServer &&
+    (await runDevServer({ merkurConfig, cliConfig, context }));
   await runSocketServer({ merkurConfig, cliConfig, context });
-  await runWidgetServer({ merkurConfig, cliConfig, context });
+  cliConfig.hasRunWidgetServer &&
+    (await runWidgetServer({ merkurConfig, cliConfig, context }));
 }

package/src/devServer.mjs

@@ -84,17 +84,17 @@ export async function runDevServer({ context, merkurConfig, cliConfig }) {
                   }
 
                   if (asset.type.includes('inline')) {
-                    const path = asset.source.replace(origin, '');
+                    const assetPath = asset.source.replace(origin, '');
                     if (writeToDisk) {
                       asset.source = fs.readFileSync(
                         path.join(
                           path.resolve(projectFolder, buildFolder),
-                          path,
+                          assetPath,
                         ),
                         'utf8',
                       );
                     } else {
-                      asset.source = context.memory[path]?.text;
+                      asset.source = context.memory[assetPath]?.text;
                     }
                   }
                 });

package/src/merkurConfig.mjs

@@ -186,8 +186,10 @@ emitter.on(
       widgetHandler: async (req) => {
         const { protocol, host } = merkurConfig.widgetServer;
         let widgetProperties = null;
+        const params = merkurConfig.playground.widgetParams(req);
+
         const response = await fetch(
-          `${protocol}//${host}/widget?${new URLSearchParams(req.params)}`,
+          `${protocol}//${host}/widget${params?.size > 0 ? `?${params}` : ``}`,
         );
 
         widgetProperties = await response.json();
@@ -199,6 +201,9 @@ emitter.on(
 
         return widgetProperties;
       },
+      widgetParams: (req) => {
+        return new URLSearchParams(req.query);
+      },
       ...merkurConfig.playground,
     };
 

package/src/templates/head.ejs

@@ -11,7 +11,7 @@
   <% } %>
   <%if (asset.type==='inlineStyle' ) { %>
     <style data-name="<%= asset.name %>">
-      <%= asset.source %>
+      <%- asset.source %>
     </style>
   <% } %>