@merkur/cli 0.35.7 → 0.35.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@merkur/cli",
3
- "version": "0.35.7",
3
+ "version": "0.35.9",
4
4
  "description": "Merkur is tiny and extensible library for creating front-end microservices.",
5
5
  "bin": {
6
6
  "merkur": "./bin/merkur.mjs"
@@ -66,5 +66,5 @@
66
66
  "engines": {
67
67
  "node": ">=20"
68
68
  },
69
- "gitHead": "bf576b075a378e60de283d2ef9ad4ece3a0ac5c4"
69
+ "gitHead": "34f20dd9fbab5b648d9f99df8f2cfad8e749cb56"
70
70
  }
@@ -0,0 +1,10 @@
1
+ import { rm } from 'node:fs/promises';
2
+
3
+ export async function clearBuildFolder({ merkurConfig }) {
4
+ try {
5
+ await rm(merkurConfig.widgetServer.buildFolder, {
6
+ recursive: true,
7
+ force: true,
8
+ });
9
+ } catch {} //eslint-disable-line no-empty
10
+ }
@@ -9,6 +9,7 @@ import { createMerkurConfig } from '../merkurConfig.mjs';
9
9
  import { createLogger } from '../logger.mjs';
10
10
  import { time } from '../utils.mjs';
11
11
  import { handleExit } from '../handleExit.mjs';
12
+ import { clearBuildFolder } from '../clearBuildFolder.mjs';
12
13
 
13
14
  export async function build({ args, command }) {
14
15
  const buildTime = time();
@@ -25,6 +26,8 @@ export async function build({ args, command }) {
25
26
 
26
27
  await handleExit({ context });
27
28
 
29
+ await clearBuildFolder({ merkurConfig, cliConfig });
30
+
28
31
  const task = await Object.keys(merkurConfig.task).reduce(
29
32
  async (result, key) => {
30
33
  const definition = merkurConfig.task[key];
@@ -8,6 +8,7 @@ import { createMerkurConfig } from '../merkurConfig.mjs';
8
8
  import { runSocketServer } from '../websocket.mjs';
9
9
  import { runWidgetServer } from '../widgetServer.mjs';
10
10
  import { handleExit } from '../handleExit.mjs';
11
+ import { clearBuildFolder } from '../clearBuildFolder.mjs';
11
12
 
12
13
  export async function dev({ args, command }) {
13
14
  const context = await createContext();
@@ -21,6 +22,8 @@ export async function dev({ args, command }) {
21
22
 
22
23
  await handleExit({ context });
23
24
 
25
+ await clearBuildFolder({ merkurConfig, cliConfig });
26
+
24
27
  const task = await Object.keys(merkurConfig.task).reduce(
25
28
  async (result, key) => {
26
29
  const definition = merkurConfig.task[key];
package/src/devServer.mjs CHANGED
@@ -119,9 +119,9 @@ export async function runDevServer({ context, merkurConfig, cliConfig }) {
119
119
  fs.readFileSync(template, 'utf8'),
120
120
  {
121
121
  views: [
122
+ `${projectFolder}/server/playground/templates/`,
122
123
  path.dirname(template),
123
124
  templateFolder,
124
- `${projectFolder}/server/playground/templates/`,
125
125
  ],
126
126
  },
127
127
  );