@merkur/cli 0.44.0-rc.3 → 0.44.0-rc.5

package/README.md

@@ -60,8 +60,11 @@ npm run release
   npx lerna version <preminor | prepatch | prerelease> --no-git-tag-version --no-push
   // prerelease increments the pre* version's last number, e.g. v0.44.0-rc.0 => v0.44.0-rc.1
   ```
-2. restore all files not related to the package you intend to release (the whole lerna repo, `@merkur/create-widget`, other dependent packages).
-3. Commit the changes. 
+2. Restore all files not related to the package you intend to release. These files should remain:
+  - the package's own `package.json`
+  - `lerna.json` (otherwise lerna will stop incrementing the pre-version's number, for some reason)
+  - `package-lock.json`
+3. Commit the changes (must still be a conventional commit. Suggested: `chore(release): publish`). 
 4. Tag the commit with the version (e.g. `v0.44.0-rc.0`). 
 5. Push the commit to the repo.
 6. Push the tag to the repo: `git push origin tag <tagname>` (e.g. `git push origin tag v0.44.0-rc.0`).

package/bin/merkur.mjs

@@ -33,6 +33,7 @@ const sourcemapOption = new Option('--sourcemap', 'Generate sourcemap.');
 const staticFolderOption = new Option('--staticFolder <string>', 'Static folder.');
 const staticPathOption = new Option('--staticPath <string>', 'The static path for dev server and widget server.');
 const staticPlaygroundOption = new Option('--staticPlayground <string>', 'Static playground folder.');
+const playgroundPathOption = new Option('--playgroundPath <string>', `Relative path the playground is served at. Set if your 'path' is a RegExp.`);
 const verboseOption = new Option('--verbose', 'Verbose mode which show debug information.');
 const writeToDiskOption = new Option('--writeToDisk', 'Write built files to disk.');
 
@@ -103,6 +104,7 @@ program
   .command(COMMAND_NAME.BUILD_PLAYGROUND)
   .addOption(buildFolderOption)
   .addOption(hasRunWidgetServerOption)
+  .addOption(playgroundPathOption)
   .addOption(quietOption)
   .addOption(silentOption)
   .addOption(staticPlaygroundOption)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/cli",
-  "version": "0.44.0-rc.3",
+  "version": "0.44.0-rc.5",
   "description": "Merkur is tiny and extensible library for creating front-end microservices.",
   "bin": {
     "merkur": "./bin/merkur.mjs"
@@ -21,7 +21,7 @@
     "build": "node ./scripts/build.mjs",
     "test": "NODE_OPTIONS='--experimental-vm-modules' jest --no-watchman -c ./jest.config.js",
     "dev": "node ./scripts/build.mjs --watch",
-    "postrelease": "node ../../utils/restoreLatestTag.mjs"
+    "postpublish": "node ../../utils/restoreLatestTag.mjs"
   },
   "repository": {
     "type": "git",
@@ -66,5 +66,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "8700b703054116843d43fe1de42df6e70418cea9"
+  "gitHead": "9ca8e3b478b9ee42567b0c06f8588a616c893201"
 }

package/src/CLIConfig.mjs

@@ -16,6 +16,7 @@ export async function createCLIConfig({ args, command } = {}) {
     inspect: args.inspect ?? false,
     isProduction,
     outFile: args?.outFile ?? './build/widget.cjs',
+    playgroundPath: args?.playgroundPath,
     port: args?.port ?? 4444,
     projectFolder: args?.projectFolder ?? process.cwd(),
     quiet: args?.quiet ?? false,

package/src/commands/buildPlayground.mjs

@@ -82,7 +82,7 @@ export async function buildPlayground({ args, command }) {
 
   const {
     devServer: { origin: devServerOrigin },
-    playground: { path: playgroundPath },
+    playground,
     widgetServer: { origin: widgetServerOrigin },
   } = merkurConfig;
 
@@ -125,6 +125,20 @@ export async function buildPlayground({ args, command }) {
     process.exit(1);
   }
 
+  let playgroundPath;
+
+  if (typeof playground?.path === 'string') {
+    playgroundPath = playground.path;
+  } else if (cliConfig.playgroundPath) {
+    playgroundPath = cliConfig.playgroundPath;
+  } else {
+    const isRegeExp = playground?.path?.constructor?.name === 'RegExp';
+    logger.warn(
+      `Static build requires a string playground path, but your path is ${isRegeExp ? 'a RegExp' : 'undefined'}. Using '/' as fallback; you can set the path path through the --playgroundPath CLI option.`,
+    );
+    playgroundPath = '/';
+  }
+
   const playgroundUrl = path.join(devServerOrigin, playgroundPath);
 
   logger.info(`Building playground`);
@@ -132,7 +146,12 @@ export async function buildPlayground({ args, command }) {
   try {
     const response = await fetch(playgroundUrl);
     if (!response.ok) {
-      throw new Error('Failed to fetch playground', response.body);
+      if (cliConfig.verbose) {
+        console.log(response); // eslint-disable-line no-console -- Debug log with maintained build-in code highlighting.
+      }
+      throw new Error(
+        `Failed to fetch playground (${response.status} ${response.statusText}).`,
+      );
     }
 
     let playgroundHtml = await response.text();