@merkur/cli 0.37.0 → 0.37.3

package/lib/devClient.mjs

@@ -1 +1 @@
-"use strict";(()=>{var l=class{#e=[];pipe(...t){return x(...t)(this)}next(...t){this.#e.forEach(e=>{typeof e=="function"?e(...t):e.next(...t)})}error(...t){this.#e.forEach(e=>{e?.error?.(...t),this.unsubscribe(e)})}complete(...t){this.#e.forEach(e=>{e?.complete?.(...t),this.unsubscribe(e)})}subscribe(t){return this.#e.push(t),{unsubscribe:()=>{this.unsubscribe(t)}}}unsubscribe(t){let e=this.#e.indexOf(t);this.#e.splice(e,1)}};function x(...t){return e=>Array.from(t).reduce((s,a)=>a(s),e)}var S=5,m=class extends l{#e=null;#t=0;#r={};constructor(e){super(),this.#r=e}init(){return this.#n(),this}send(e){return this.#e&&this.#e.send(e),this}destroy(){return this.#e&&(this.#e.close(),this.#e=null),this}#n(){this.#e=Reflect.construct(WebSocket,[`${this.#r.protocol}//${this.#r.host}`]),this.#e.onopen=()=>{this.#t=0},this.#e.onmessage=e=>{try{let s=JSON.parse(e.data);this.next(s)}catch(s){console.error(s)}},this.#e.onerror=e=>{console.error(e)},this.#e.onclose=()=>{this.#t>=S||(this.#t+=1,setTimeout(()=>{this.#n()},this.#t*500))}}};async function w({to:t,command:e}){t==="browser"&&e==="reload"&&location.reload()}async function p({to:t,command:e,changed:s}){if(t==="browser"&&e==="refresh"){if(await Promise.all(s.map(async o=>new Promise(c=>{let r=document.querySelector(`[data-name="${o.name}"]`);if(!r||r.nodeName==="STYLE"){location.reload();return}let n=null,u=new URLSearchParams({version:Math.random()});if(r.nodeName==="LINK"){let i=new URL(r.href);n=r.cloneNode(),n.onload=()=>{r.remove(),c()},n.onerror=()=>{r.remove(),c()},n.href=new URL(`${i.origin}${i.pathname}?${u.toString()}`)}if(r.nodeName==="SCRIPT"){let i=new URL(r.src);n=document.createElement("script"),n.setAttribute("data-name",o.name),n.onload=()=>{r.remove(),c()},n.onerror=()=>{r.remove(),c()},n.src=new URL(`${i.origin}${i.pathname}?${u.toString()}`)}r.parentNode.insertBefore(n,r.nextSibling)}))),!s.some(o=>o.name.endsWith(".js")))return;let a=window.__merkur_dev__.widgets;window.__merkur_dev__.widgets=[],a.forEach(async o=>{let{props:c,state:r,$external:n,name:u,version:i,containerSelector:f,container:_,slot:b}=o,k={props:c,state:r,$external:n,name:u,version:i,containerSelector:f,container:_,slot:b},g=await window.__merkur__.create(k);await o.unmount(),await g.mount()})}}var{__merkur_dev__:h}=window,d=new m(h.merkurConfig.socketServer);h.webSocket=d;h.widgets=[];d.init();d.subscribe(w);d.subscribe(p);addEventListener("load",function(){let e=window.__merkur__.create;window.__merkur__.create=async function(...a){let o=await e(...a);return h.widgets.push(o),o}});})();
+"use strict";(()=>{var l=class{#e=[];pipe(...t){return x(...t)(this)}next(...t){this.#e.forEach(e=>{typeof e=="function"?e(...t):e.next(...t)})}error(...t){this.#e.forEach(e=>{e?.error?.(...t),this.unsubscribe(e)})}complete(...t){this.#e.forEach(e=>{e?.complete?.(...t),this.unsubscribe(e)})}subscribe(t){return this.#e.push(t),{unsubscribe:()=>{this.unsubscribe(t)}}}unsubscribe(t){let e=this.#e.indexOf(t);this.#e.splice(e,1)}};function x(...t){return e=>Array.from(t).reduce((i,a)=>a(i),e)}var S=5,m=class extends l{#e=null;#t=0;#r={};constructor(e){super(),this.#r=e}init(){return this.#n(),this}send(e){return this.#e&&this.#e.send(e),this}destroy(){return this.#e&&(this.#e.close(),this.#e=null),this}#n(){this.#e=Reflect.construct(WebSocket,[`${this.#r.protocol}//${this.#r.host}`]),this.#e.onopen=()=>{this.#t=0},this.#e.onmessage=e=>{try{let i=JSON.parse(e.data);this.next(i)}catch(i){console.error(i)}},this.#e.onerror=e=>{console.error(e)},this.#e.onclose=()=>{this.#t>=S||(this.#t+=1,setTimeout(()=>{this.#n()},this.#t*500))}}};async function w({to:t,command:e}){t==="browser"&&e==="reload"&&location.reload()}async function f({to:t,command:e,changed:i}){if(t==="browser"&&e==="refresh"){if(await Promise.all(i.map(async o=>new Promise(c=>{let r=document.querySelector(`[data-name="${o.name}"]`);if(!r||r.nodeName==="STYLE"){location.reload();return}let n=null,u=new URLSearchParams({version:Math.random()});if(r.nodeName==="LINK"){let s=new URL(r.href);n=r.cloneNode(),n.onload=()=>{r.remove(),c()},n.onerror=()=>{r.remove(),c()},n.href=new URL(`${s.origin}${s.pathname}?${u.toString()}`)}if(r.nodeName==="SCRIPT"){let s=new URL(r.src);n=document.createElement("script"),n.setAttribute("data-name",o.name),n.onload=()=>{r.remove(),c()},n.onerror=()=>{r.remove(),c()},n.src=new URL(`${s.origin}${s.pathname}?${u.toString()}`)}r.parentNode.insertBefore(n,r.nextSibling)}))),!i.some(o=>o.name.endsWith(".js")))return;let a=window.__merkur_dev__.widgets;window.__merkur_dev__.widgets=[],a.forEach(async o=>{let{props:c,state:r,$external:n,name:u,version:s,containerSelector:p,container:_,slot:b}=o,k={props:c,state:r,$external:n,name:u,version:s,containerSelector:p,container:_,slot:b},g=await window.__merkur__.create(k);await o.unmount(),await g.mount()})}}var{__merkur_dev__:h}=window,d=new m(h.merkurConfig.socketServer);h.webSocket=d;h.widgets=[];d.init();d.subscribe(w);d.subscribe(f);addEventListener("load",function(){if(window?.__merkur__?.create){let e=window.__merkur__.create;window.__merkur__.create=async function(...a){let o=await e(...a);return h.widgets.push(o),o}}});})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/cli",
-  "version": "0.37.0",
+  "version": "0.37.3",
   "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": "af826493e5ed4b37602dd43ce89a59baeeb1bada"
+  "gitHead": "7237693f163d80defa4a19071419c697cc8785fa"
 }

package/src/commands/build.mjs

@@ -1,9 +1,7 @@
 import chalk from 'chalk';
 
-import { createBuildConfig } from '../buildConfig.mjs';
 import { createCLIConfig } from '../CLIConfig.mjs';
 import { createContext } from '../context.mjs';
-import { createTaskConfig } from '../taskConfig.mjs';
 import { runTask } from '../runTask.mjs';
 import { createMerkurConfig } from '../merkurConfig.mjs';
 import { createLogger } from '../logger.mjs';
@@ -28,36 +26,7 @@ export async function build({ args, command }) {
 
   await clearBuildFolder({ merkurConfig, cliConfig });
 
-  const task = await Object.keys(merkurConfig.task).reduce(
-    async (result, key) => {
-      const definition = merkurConfig.task[key];
-
-      const config = await createTaskConfig({
-        definition,
-        merkurConfig,
-        cliConfig,
-        context,
-      });
-      const build = await createBuildConfig({
-        definition,
-        config,
-        merkurConfig,
-        cliConfig,
-        context,
-      });
-      result[definition.name] = await runTask({
-        definition,
-        build,
-        merkurConfig,
-        cliConfig,
-        config,
-        context,
-      });
-
-      return result;
-    },
-    context.task,
-  );
+  const task = await runTask({ merkurConfig, cliConfig, context });
 
   await Promise.all(Object.values(task));
 

package/src/commands/dev.mjs

@@ -1,8 +1,6 @@
-import { createBuildConfig } from '../buildConfig.mjs';
 import { createCLIConfig } from '../CLIConfig.mjs';
 import { createContext } from '../context.mjs';
 import { runDevServer } from '../devServer.mjs';
-import { createTaskConfig } from '../taskConfig.mjs';
 import { runTask } from '../runTask.mjs';
 import { createMerkurConfig } from '../merkurConfig.mjs';
 import { runSocketServer } from '../websocket.mjs';
@@ -24,36 +22,7 @@ export async function dev({ args, command }) {
 
   await clearBuildFolder({ merkurConfig, cliConfig });
 
-  const task = await Object.keys(merkurConfig.task).reduce(
-    async (result, key) => {
-      const definition = merkurConfig.task[key];
-
-      const config = await createTaskConfig({
-        definition,
-        merkurConfig,
-        cliConfig,
-        context,
-      });
-      const build = await createBuildConfig({
-        definition,
-        config,
-        merkurConfig,
-        cliConfig,
-        context,
-      });
-      result[definition.name] = await runTask({
-        definition,
-        build,
-        merkurConfig,
-        cliConfig,
-        config,
-        context,
-      });
-
-      return result;
-    },
-    context.task,
-  );
+  const task = await runTask({ merkurConfig, cliConfig, context });
 
   await Promise.all(Object.values(task));
 

package/src/devClient/index.mjs

@@ -15,12 +15,14 @@ webSocket.subscribe(reload);
 webSocket.subscribe(hmr);
 
 addEventListener('load', function hookMerkurCreate() {
-  const originalMerkurCreate = window.__merkur__.create;
-  window.__merkur__.create = async function devClientHook(...rest) {
-    const widget = await originalMerkurCreate(...rest);
+  if (window?.__merkur__?.create) {
+    const originalMerkurCreate = window.__merkur__.create;
+    window.__merkur__.create = async function devClientHook(...rest) {
+      const widget = await originalMerkurCreate(...rest);
 
-    __merkur_dev__.widgets.push(widget);
+      __merkur_dev__.widgets.push(widget);
 
-    return widget;
-  };
+      return widget;
+    };
+  }
 });

package/src/merkurConfig.mjs

@@ -87,7 +87,7 @@ async function registerHooks({ merkurConfig }) {
 emitter.on(
   EMITTER_EVENTS.MERKUR_CONFIG,
   function defaultTask({ merkurConfig, cliConfig }) {
-    const { staticFolder, runTasks } = cliConfig;
+    const { staticFolder } = cliConfig;
 
     merkurConfig.task = merkurConfig.task ?? {};
 
@@ -134,14 +134,6 @@ emitter.on(
       );
     });
 
-    if (runTasks.length !== 0) {
-      Object.keys(merkurConfig.task)
-        .filter((taskName) => !runTasks.includes(taskName))
-        .forEach((taskKey) => {
-          delete merkurConfig.task[taskKey];
-        });
-    }
-
     return merkurConfig;
   },
 );

package/src/plugins/excludeVendorsFromSourceMapPlugin.mjs

@@ -4,7 +4,7 @@ export function excludeVendorsFromSourceMapPlugin() {
   return {
     name: 'excludeVendorsFromSourceMapPlugin',
     setup(build) {
-      build.onLoad({ filter: /node_modules/ }, async (args) => {
+      build.onLoad({ filter: /\/node_modules\/.*\.js?$/ }, async (args) => {
         const contents = await fs.readFile(args.path, { encoding: 'utf8' });
 
         return {

package/src/runBuild.mjs

@@ -0,0 +1,40 @@
+import fs from 'node:fs/promises';
+
+import esbuild from 'esbuild';
+import { createLogger } from './logger.mjs';
+
+export async function runBuild({ cliConfig, build, config }) {
+  const logger = createLogger(undefined, cliConfig);
+  const { watch } = cliConfig;
+
+  //es6 === es2015, es9 === es2018, es11 === es2020 es13 ===es2022
+  try {
+    const result = await (watch
+      ? esbuild.context(build)
+      : esbuild.build(build));
+
+    if (config.analyze && result.metafile) {
+      logger.log(
+        await esbuild.analyzeMetafile(result.metafile, {
+          verbose: cliConfig.verbose,
+        }),
+      );
+
+      if (build.outdir) {
+        await fs.writeFile(
+          `${build.outdir}/${build.entryNames ?? config.name}.meta.json`,
+          JSON.stringify(result.metafile),
+        );
+      }
+    }
+
+    if (watch) {
+      await result.watch();
+    }
+
+    return result;
+  } catch (error) {
+    console.error(error);
+    process.exit(1);
+  }
+}

package/src/runTask.mjs

@@ -1,40 +1,44 @@
-import fs from 'node:fs/promises';
+import { createBuildConfig } from './buildConfig.mjs';
+import { createTaskConfig } from './taskConfig.mjs';
+import { runBuild } from './runBuild.mjs';
 
-import esbuild from 'esbuild';
-import { createLogger } from './logger.mjs';
+export async function runTask({ cliConfig, merkurConfig, context }) {
+  const { runTasks } = cliConfig;
+  let task = { ...merkurConfig.task };
 
-export async function runTask({ cliConfig, build, config }) {
-  const logger = createLogger(undefined, cliConfig);
-  const { watch } = cliConfig;
-
-  //es6 === es2015, es9 === es2018, es11 === es2020 es13 ===es2022
-  try {
-    const result = await (watch
-      ? esbuild.context(build)
-      : esbuild.build(build));
-
-    if (config.analyze && result.metafile) {
-      logger.log(
-        await esbuild.analyzeMetafile(result.metafile, {
-          verbose: cliConfig.verbose,
-        }),
-      );
+  if (runTasks.length !== 0) {
+    Object.keys(task)
+      .filter((taskName) => !runTasks.includes(taskName))
+      .forEach((taskKey) => {
+        delete task[taskKey];
+      });
+  }
 
-      if (build.outdir) {
-        await fs.writeFile(
-          `${build.outdir}/${build.entryNames ?? config.name}.meta.json`,
-          JSON.stringify(result.metafile),
-        );
-      }
-    }
+  return Object.keys(task).reduce(async (result, key) => {
+    const definition = task[key];
 
-    if (watch) {
-      await result.watch();
-    }
+    const config = await createTaskConfig({
+      definition,
+      merkurConfig,
+      cliConfig,
+      context,
+    });
+    const build = await createBuildConfig({
+      definition,
+      config,
+      merkurConfig,
+      cliConfig,
+      context,
+    });
+    result[definition.name] = await runBuild({
+      definition,
+      build,
+      merkurConfig,
+      cliConfig,
+      config,
+      context,
+    });
 
     return result;
-  } catch (error) {
-    console.error(error);
-    process.exit(1);
-  }
+  }, context.task);
 }

package/src/templates/footer.ejs

@@ -1,6 +1,11 @@
 <script>
   window.addEventListener('load', function () {
-    __merkur__.create(<%- escapeToJSON(widgetProperties) %>)
+    if (!window.__merkur__) {
+      console.error('Merkur is not available in the global scope. Make sure you have included Merkur in your project.');
+      return;
+    }
+
+    window.__merkur__.create(<%- escapeToJSON(widgetProperties) %>)
       .then(function (widget) {
         widget.containerSelector = widget.containerSelector ?? '.merkur-main';
 

package/types.d.ts

@@ -108,7 +108,4 @@ export interface MerkurConfig {
   }) => Partial<BuildOptions>;
 }
 
-export function defineConfig({
-  merkurConfig: MerkurConfig,
-  cliConfig: CLIConfig,
-}): Partial<MerkurConfig>;
+export function defineConfig({ cliConfig: CLIConfig }): Partial<MerkurConfig>;