@merkur/cli 0.41.0 → 0.41.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/cli",
-  "version": "0.41.0",
+  "version": "0.41.1",
   "description": "Merkur is tiny and extensible library for creating front-end microservices.",
   "bin": {
     "merkur": "./bin/merkur.mjs"
@@ -64,5 +64,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "dc4b714d1a572843c3a8f9a4c4895891d182edef"
+  "gitHead": "6f84047abdcb3731f35377790cdafe9e7d491c40"
 }

package/src/devServer.mjs

@@ -1,5 +1,6 @@
 import path from 'node:path';
 import fs from 'node:fs';
+import https from 'node:https';
 import ejs from 'ejs';
 import chalk from 'chalk';
 
@@ -21,8 +22,16 @@ function asyncMiddleware(fn) {
 
 export async function runDevServer({ context, merkurConfig, cliConfig }) {
   const logger = createLogger('devServer', cliConfig);
-  const { protocol, host, port, staticPath, staticFolder, origin } =
-    merkurConfig.devServer;
+  const {
+    protocol,
+    host,
+    port,
+    staticPath,
+    staticFolder,
+    origin,
+    httpsKey,
+    httpsCert,
+  } = merkurConfig.devServer;
   const {
     template,
     templateFolder,
@@ -36,7 +45,7 @@ export async function runDevServer({ context, merkurConfig, cliConfig }) {
   return new Promise((resolve, reject) => {
     const app = express();
 
-    const server = app
+    app
       .use((req, res, next) => {
         const headerOrigin = req.get('Origin');
         // Allow cors
@@ -204,15 +213,28 @@ export async function runDevServer({ context, merkurConfig, cliConfig }) {
             stack: error.stack,
           },
         });
-      })
-      .listen({ port }, () => {
-        logger.info(`Playground: ${chalk.green(`${protocol}//${host}`)}`);
-        resolve(app);
       });
 
-    context.server.devServer = server;
+    // Create HTTPS server if protocol is https:
+    let server;
+    if (protocol === 'https:') {
+      const httpsOptions = {
+        key: httpsKey,
+        cert: httpsCert,
+      };
+      server = https.createServer(httpsOptions, app);
+    } else {
+      server = app;
+    }
+
+    const httpServer = server.listen({ port }, () => {
+      logger.info(`Playground: ${chalk.green(`${protocol}//${host}`)}`);
+      resolve(app);
+    });
+
+    context.server.devServer = httpServer;
 
-    server.on('error', (error) => {
+    httpServer.on('error', (error) => {
       reject(error);
     });
   });