mockaton 7.5.1 → 7.5.3

package/README.md

@@ -150,6 +150,8 @@ export default function optionalName(request, response) {
 }
 ```
 
+If you need to serve a static `.js` file, put it in `Config.staticDir`.
+
 
 ## File Name Convention
 
@@ -203,6 +205,16 @@ api/foo/.GET.200.json
 
 ---
 
+## `Config.staticDir`
+Files under `Config.staticDir` don’t use the filename convention.
+Also, they take precedence over the `GET` mocks in `Config.mockDir`.
+
+For example, if you have two files for `GET /foo/bar.jpg`
+```
+my-static-dir/foo/bar.jpg
+ my-mocks-dir/foo/bar.jpg.GET.200.jpg // Unreacheable
+```
+
 
 ## `Config.proxyFallback`
 Lets you specify a target server for serving routes you don’t have mocks for.
@@ -360,3 +372,4 @@ await mockaton.reset()
 ## TODO
 - Refactor Tests
 - Dashboard. List `staticDir` and indicate if it’s overriding some mock.
+- jsonc, json5

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "A deterministic server-side for developing and testing frontend clients",
 	"type": "module",
-	"version": "7.5.1",
+	"version": "7.5.3",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"license": "MIT",

package/src/Dashboard.css

@@ -10,7 +10,7 @@
 		--colorHeaderBackground: #eee;
 		--colorComboBoxBackground: #fafafa;
 		--colorComboBoxHeaderBackground: #fff;
-		--colorDisabled: #222;
+		--colorDisabled: #555;
 		--colorHover: #dfefff;
 		--colorLabel: #666;
 		--colorLightRed: #ffe4ee;
@@ -27,7 +27,7 @@
 		--colorHeaderBackground: #090909;
 		--colorComboBoxBackground: #252525;
 		--colorComboBoxHeaderBackground: #222;
-		--colorDisabled: #aaa;
+		--colorDisabled: #bbb;
 		--colorHover: #023661;
 		--colorLabel: #aaa;
 		--colorLightRed: #ffe4ee;
@@ -70,9 +70,7 @@ select {
 		background: var(--colorHover);
 	}
 	&:disabled {
-		background: transparent;
 		cursor: not-allowed;
-		color: var(--colorDisabled);
 	}
 }
 
@@ -86,7 +84,7 @@ menu {
 	align-items: flex-end;
 	padding: 20px 16px;
 	background: var(--colorHeaderBackground);
-	box-shadow: var(--boxShadow1);
+	border-bottom: 1px solid rgba(127, 127, 127, 0.17);
 	gap: 16px;
 
 	img {
@@ -150,7 +148,7 @@ main {
 		}
 
 		tr {
-			border-bottom: 2px solid transparent;
+			border-top: 1px solid transparent;
 		}
 	}
 }
@@ -215,6 +213,13 @@ main {
 	&.status4xx {
 		background: var(--color4xxBackground);
 	}
+	&:disabled {
+		appearance: none;
+		background: transparent;
+		cursor: default;
+		color: var(--colorDisabled);
+		opacity: 1;
+	}
 }
 
 .DelayToggler {

package/src/Dashboard.js

@@ -93,18 +93,22 @@ function CookieSelector({ list }) {
 }
 
 function BulkSelector({ comments }) {
+	const disabled = !comments.length
+	const list = disabled
+		? []
+		: [Strings.select_one].concat(comments)
 	return (
 		r('label', null,
 			r('span', null, Strings.bulk_select_by_comment),
 			r('select', {
 				autocomplete: 'off',
-				disabled: comments.length <= 1,
+				disabled,
 				onChange() {
 					mockaton.bulkSelectByComment(this.value)
 						.then(init)
 						.catch(console.error)
 				}
-			}, [Strings.select_one].concat(comments).map(item =>
+			}, list.map(item =>
 				r('option', {
 					value: item
 				}, item)))))

package/src/Mockaton.js

@@ -46,13 +46,13 @@ async function onRequest(req, response) {
 	if (isPreflight(req))
 		sendNoContent(response)
 
-	else if (method === 'GET' && apiGetRequests.has(url))
-		apiGetRequests.get(url)(req, response)
-
 	else if (method === 'PATCH' && apiPatchRequests.has(url))
 		await apiPatchRequests.get(url)(req, response)
 
-	else if (isStatic(req))
+	else if (method === 'GET' && apiGetRequests.has(url))
+		apiGetRequests.get(url)(req, response)
+
+	else if (method === 'GET' && isStatic(req)) // TESTME
 		await dispatchStatic(req, response)
 
 	else

package/src/mockaton-logo.svg

@@ -2,8 +2,8 @@
 <svg version="1.1" viewBox="0 0 570 100" xmlns="http://www.w3.org/2000/svg">
 	<style>
 		:root { --color: #000000; }
-		@media (prefers-color-scheme: light) { :root { --color: #000000 } }
-		@media (prefers-color-scheme: dark) { :root { --color: #fff } }
+		@media (prefers-color-scheme: light) { :root { --color: #444 } }
+		@media (prefers-color-scheme: dark) { :root { --color: #eee } }
 		path { fill: var(--color) }
 	</style>
 	<path