@merkur/cli 0.37.8 → 0.37.12

package/bin/merkur.mjs

@@ -6,8 +6,12 @@ import { start } from '../src/commands/start.mjs';
 import { test } from '../src/commands/test.mjs';
 import { custom, CUSTOM_PART } from '../src/commands/custom.mjs';
 import { COMMAND_NAME } from '../src/commands/constant.mjs';
+import { userDefinedCommandsPaths } from '../src/commands/userDefined.mjs';
+import { createCommandConfig } from '../src/commandConfig.mjs';
 
-// eslint-disable-next-line 
+import path from 'node:path';
+
+// eslint-disable-next-line
 import packageFile from '../package.json' with { type: 'json' };
 
 const program = new Command();
@@ -102,7 +106,7 @@ program
   .addOption(verboseOption)
   .action(async (options, cmd) => {
   const args = {
-    ...{ watch: false, hasRunWidgetServer: true }, ...cmd.optsWithGlobals(), ...options
+    ...{ watch: false, hasRunWidgetServer: true, hasRunDevServer: true }, ...cmd.optsWithGlobals(), ...options
   };
   process.env.NODE_ENV = process.env.NODE_ENV ?? 'production';
 
@@ -138,4 +142,29 @@ program
     await custom({ args, commandArgs: cmd.args, command: COMMAND_NAME.CUSTOM });
   });
 
+// Load user-defined commands
+let userDefinedCommands = [];
+for (const { command, dir } of userDefinedCommandsPaths) {
+  const programCustom = new Command();
+  let commandName = '';
+
+  try {
+    const commandModule = await import(path.join(dir, command));
+    commandName = commandModule.default(({ program: programCustom, createCommandConfig })).name();
+  } catch (error) {
+    console.error(`Error loading command from ${dir}/${command} package:`, error);
+    continue;
+  }
+
+  if (userDefinedCommands.includes(commandName)) {
+    console.warn(`Command "${commandName}" from ${dir} package cannot be used.\nCommand with the same name already exists.`);
+    continue;
+  }
+
+  userDefinedCommands.push(commandName);
+  programCustom.commands.forEach(cmd => {
+    program.addCommand(cmd);
+  });
+};
+
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/cli",
-  "version": "0.37.8",
+  "version": "0.37.12",
   "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": "3a0dd00def5bb8bdcdc00c4ee10d4d151094fd94"
+  "gitHead": "a7a363751ea00c47e770dae4e9ad13503175043f"
 }

package/src/commands/start.mjs

@@ -11,6 +11,8 @@ export async function start({ args, command }) {
 
   await handleExit({ context });
 
-  await runDevServer({ merkurConfig, cliConfig, context });
-  await runWidgetServer({ merkurConfig, cliConfig, context });
+  cliConfig.hasRunDevServer &&
+    (await runDevServer({ merkurConfig, cliConfig, context }));
+  cliConfig.hasRunWidgetServer &&
+    (await runWidgetServer({ merkurConfig, cliConfig, context }));
 }

package/src/commands/userDefined.mjs

@@ -0,0 +1,45 @@
+import path from 'node:path';
+import fs from 'node:fs';
+
+let userDefinedCommandsPaths = [];
+
+/**
+ * Extend the commands from a directory
+ * @param {string} commandsDir - The directory containing the commands
+ * @returns {Promise<void>}
+ */
+const extendCommandsFromDir = async (commandsDir) => {
+  userDefinedCommandsPaths = userDefinedCommandsPaths.concat(
+    fs
+      .readdirSync(commandsDir)
+      .map((command) => ({ dir: commandsDir, command }))
+      .filter(({ command, dir }) => {
+        return (
+          fs.statSync(path.join(dir, command)).isFile() &&
+          (command.endsWith('.js') ||
+            command.endsWith('.mjs') ||
+            command.endsWith('.cjs'))
+        );
+      }),
+  );
+};
+
+const existsMerkurConfig = fs
+  .readdirSync(process.cwd())
+  .includes('merkur.config.mjs');
+
+if (existsMerkurConfig) {
+  const merkurDir = path.resolve(process.cwd(), 'node_modules/@merkur');
+  if (fs.existsSync(merkurDir)) {
+    let dirs = fs.readdirSync(merkurDir);
+
+    for (const dir of dirs) {
+      const fullPath = path.join(merkurDir, `${dir}/commands`);
+      if (fs.existsSync(fullPath)) {
+        await extendCommandsFromDir(fullPath);
+      }
+    }
+  }
+}
+
+export { userDefinedCommandsPaths };

package/src/merkurConfig.mjs

@@ -1,4 +1,5 @@
 import path from 'node:path';
+import { pathToFileURL } from 'node:url';
 
 import { EMITTER_EVENTS, emitter, RESULT_KEY } from './emitter.mjs';
 import { updateCLIConfig } from './CLIConfig.mjs';
@@ -20,7 +21,7 @@ export async function createMerkurConfig({ cliConfig, context, args } = {}) {
     );
 
     const file = await import(
-      path.resolve(`${projectFolder}/${MERKUR_CONFIG_FILE}`)
+      pathToFileURL(path.resolve(`${projectFolder}/${MERKUR_CONFIG_FILE}`))
     );
     merkurConfig = await file.default({
       cliConfig,