npm - mockaton - Versions diffs - 12.1.1 → 12.2.0 - Mend

mockaton 12.1.1 → 12.2.0

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.

Files changed (7) hide show

package/package.json CHANGED Viewed

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "HTTP Mock Server",
 	"type": "module",
-	"version": "12.1.1",
+	"version": "12.2.0",
 	"exports": {
 		".": {
 			"import": "./index.js",

package/src/client/app-store.js CHANGED Viewed

@@ -26,13 +26,10 @@ export const store = {
 	getSyncVersion: api.getSyncVersion,
-	mockatonVersion: '',
 	async fetchState() {
 		try {
 			const response = await api.getState()
 			if (!response.ok) throw response
-			store.mockatonVersion = response.headers.get('server').split(' ').pop()
 			Object.assign(store, await response.json())
 			store.render()
 		}

package/src/client/app.js CHANGED Viewed

@@ -1,4 +1,8 @@
-import { createElement as r, createSvgElement as s, className, restoreFocus, Defer, Fragment, adoptCSS } from './dom-utils.js'
+import {
+	createElement as r,
+	createSvgElement as s,
+	className, restoreFocus, Fragment, adoptCSS
+} from './dom-utils.js'
 import { store } from './app-store.js'
 import { parseFilename } from './Filename.js'
@@ -70,7 +74,7 @@ function Header() {
 				CookieSelector(),
 				ProxyFallbackField(),
 				ResetButton(),
-				SettingsMenuTrigger()
+				HelpLink()
 			)))
 }
@@ -134,7 +138,6 @@ function GlobalDelayJitterField() {
 }
 function CookieSelector() {
 	const { cookies } = store
 	const disabled = cookies.length <= 1
@@ -200,45 +203,17 @@ function ResetButton() {
 }
-function SettingsMenuTrigger() {
-	const id = '_settings_menu_'
-	return (
-		r('button', {
-				title: t`Settings`,
-				popovertarget: id,
-				className: CSS.MenuTrigger
-			},
-			InfoIcon(),
-			Defer(() => SettingsMenu(id))))
-}
-function SettingsMenu(id) {
-	return (
-		r('menu', {
-				id,
-				popover: '',
-				className: CSS.SettingsMenu
-			},
-			r('div', null,
-				r('a', {
-					href: 'https://mockaton.com',
-					target: '_blank',
-					rel: 'noopener noreferrer'
-				}, t`Documentation`),
-				r('a', {
-					href: 'https://github.com/ericfortis/mockaton',
-					target: '_blank',
-					rel: 'noopener noreferrer'
-				}, t`Source Code`),
-				r('p', null, `v${store.mockatonVersion}`)
-			)))
+function HelpLink() {
+	return r('a', {
+			target: '_blank',
+			href: 'https://mockaton.com',
+			title: t`Documentation`,
+			className: CSS.HelpLink
+		},
+		HelpIcon())
 }
 /** # Left Side */
@@ -737,10 +712,10 @@ function CloudIcon() {
 			s('path', { d: 'm6.1 9.1c2.8 0 5 2.3 5 5' })))
 }
-function InfoIcon() {
+function HelpIcon() {
 	return (
 		s('svg', { viewBox: '0 0 24 24' },
-			s('path', { d: 'M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m1 15h-2v-6h2zm0-8h-2V7h2z' })))
+			s('path', { d: 'M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m1 17h-2v-2h2zm2.07-7.75-.9.92C13.45 12.9 13 13.5 13 15h-2v-.5c0-1.1.45-2.1 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41 0-1.1-.9-2-2-2s-2 .9-2 2H8c0-2.21 1.79-4 4-4s4 1.79 4 4c0 .88-.36 1.68-.93 2.25' })))
 }

package/src/client/dom-utils.js CHANGED Viewed

@@ -35,19 +35,6 @@ export function Fragment(...args) {
 }
-export function Defer(cb) {
-	const placeholder = document.createComment('')
-	deferred(() => placeholder.replaceWith(cb()))
-	return placeholder
-}
-export function deferred(cb) {
-	return window.requestIdleCallback
-		? requestIdleCallback(cb)
-		: setTimeout(cb, 100) // Safari
-}
 export function restoreFocus(cb) {
 	const focusQuery = selectorFor(document.activeElement)
 	cb()
@@ -94,7 +81,6 @@ export function adoptCSS(sheet) {
 export function extractClassNames({ cssRules }) {
 	// Class names must begin with _ or a letter, then it can have numbers and hyphens
 	const reClassName = /(?:^|[\s,{>])&?\s*\.([a-zA-Z_][\w-]*)/g
 	const cNames = {}
 	let match
 	for (const rule of cssRules)

package/src/client/indexHtml.js CHANGED Viewed

@@ -8,7 +8,7 @@ export const CSP = [
 // language=html
-export const IndexHtml = hotReloadEnabled => `
+export const IndexHtml = (hotReloadEnabled, version) => `
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
@@ -21,7 +21,7 @@ export const IndexHtml = hotReloadEnabled => `
   <link rel="icon" href="data:image/svg+xml,%3Csvg viewBox='0 0 256 256' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m235 33.7v202c0 9.19-5.81 14-17.4 14-11.6 0-17.4-4.83-17.4-14v-151c-0.115-4.49-6.72-5.88-8.46-0.87l-48.3 155c-2.22 7.01-7.72 10.1-16 9.9-3.63-0.191-7.01-1.14-9.66-2.89-2.89-1.72-4.83-4.34-5.57-7.72-11.1-37-22.6-74.3-34.1-111-4.34-14-8.95-31.4-14-48.3-1.82-4.83-8.16-5.32-8.46 1.16v156c0 9.19-5.81 14-17.4 14-11.6 0-17.4-4.83-17.4-14v-207c0-5.74 2.62-13.2 9.39-16.3 7.5-3.14 15-4.05 21.8-3.8 3.14 0 6.03 0.686 8.95 1.46 3.14 0.797 6.03 1.98 8.7 3.63 2.65 1.38 5.32 3.14 7.5 5.57 2.22 2.22 3.87 4.83 5.07 7.72l45.8 157c4.63-15.9 32.4-117 33.3-121 4.12-13.8 7.72-26.5 10.9-38.7 1.16-2.65 2.89-5.32 5.07-7.5 2.15-2.15 4.58-4.12 7.5-5.32 2.65-1.57 5.57-2.89 8.46-3.63 3.14-0.797 9.44-0.988 12.1-0.988 11.6 1.07 29.4 9.14 29.4 27z' fill='%23808080'/%3E%3C/svg%3E">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="description" content="HTTP Mock Server">
-  <title>Mockaton</title>
+  <title>Mockaton v${version}</title>
 </head>
 <body>
 ${hotReloadEnabled

package/src/client/styles.css CHANGED Viewed

@@ -163,7 +163,7 @@ header {
 		gap: 16px 12px;
 		@media (max-width: 590px) {
-			.MenuTrigger {
+			.HelpLink {
 				margin-left: unset;
 			}
 		}
@@ -192,16 +192,13 @@ header {
 		}
 	}
-	.MenuTrigger {
+	.HelpLink {
 		width: 24px;
 		height: 24px;
 		flex-shrink: 0;
 		align-self: end;
-		margin-bottom: 2px;
 		margin-left: auto;
 		fill: var(--colorSecondaryAction);
-		background: transparent;
-		border-radius: 50%;
 		&:hover {
 			fill: var(--colorAccent);
@@ -310,27 +307,6 @@ header {
 	}
 }
-.SettingsMenu {
-	position: absolute;
-	top: 62px;
-	right: 10px;
-	left: auto;
-	border: 1px solid var(--colorSecondaryActionBorder);
-	color: var(--colorText);
-	border-radius: var(--radius);
-	box-shadow: var(--boxShadow1);
-	background: var(--colorHeaderBackground);
-	> div {
-		display: inline-flex;
-		flex-direction: column;
-		padding: 20px;
-		cursor: auto;
-		gap: 12px;
-		text-align: left;
-	}
-}
 main {
 	display: flex;

package/src/server/Api.js CHANGED Viewed

@@ -12,6 +12,7 @@ import {
 } from './WatcherDevClient.js'
 import { longPollClientSyncVersion } from './Watcher.js'
+import pkgJSON from '../../package.json' with { type: 'json' }
 import { IndexHtml, CSP } from '../client/indexHtml.js'
 import { API } from './ApiConstants.js'
@@ -59,7 +60,7 @@ export const apiPatchReqs = new Map([
 /** # GET */
 function serveDashboard(_, response) {
-	response.html(IndexHtml(config.hotReload), CSP)
+	response.html(IndexHtml(config.hotReload, pkgJSON.version), CSP)
 }
 function serveStatic(f) {