mockaton 13.9.2 → 13.9.3

package/index.d.ts

@@ -46,6 +46,7 @@ export declare interface Config {
 	onReady?: (address: string) => void
 
 	hotReload?: boolean // For UI dev purposes only
+	bypassImportCache?: boolean 
 }
 
 

package/package.json

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

package/src/server/Mockaton.js

@@ -25,9 +25,12 @@ export function Mockaton(options) {
 		setup(options)
 		cookie.init(config.cookies)
 		mockBrokerCollection.init()
-		register('./importResolver.js', import.meta.url)
 
-		if (config.watcherEnabled) 
+		register('./resolverResolveExtensionless.js', import.meta.url)
+		if (config.bypassImportCache)
+			register('./resolverBypassImportCache.js', import.meta.url)
+
+		if (config.watcherEnabled)
 			watchMocksDir()
 
 		if (config.hotReload)

package/src/server/config.js

@@ -54,7 +54,8 @@ const schema = {
 
 	onReady: [await openInBrowser, is(Function)],
 
-	hotReload: [false, is(Boolean)]
+	hotReload: [false, is(Boolean)],
+	bypassImportCache: [true, is(Boolean)]
 }
 
 

package/src/server/resolverBypassImportCache.js

@@ -0,0 +1,20 @@
+import { resolve as _resolve } from 'node:path'
+
+const mockatonSrcRoot = `file://${_resolve(import.meta.dirname, '..')}`
+
+
+// We register this hook at runtime so it doesn’t interfere with non-dynamic imports. 
+// Cache bust by appending timestamp query param
+export async function resolve(specifier, context, nextResolve) {
+	const result = await nextResolve(specifier, context)
+	if (result.url?.startsWith('file://') && !result.url.startsWith(mockatonSrcRoot)) {
+		const url = new URL(result.url)
+		url.searchParams.set('t', performance.now())
+		return {
+			...result,
+			url: url.href,
+			shortCircuit: true
+		}
+	}
+	return result
+}

package/src/server/{importResolver.js → resolverResolveExtensionless.js}

@@ -1,14 +1,10 @@
 import { existsSync } from 'node:fs'
-import { resolve as _resolve, join, dirname } from 'node:path'
+import { join, dirname } from 'node:path'
 import { fileURLToPath, pathToFileURL } from 'node:url'
 
-const mockatonSrcRoot = `file://${_resolve(import.meta.dirname, '..')}`
-
-// We register this hook at runtime so it doesn’t interfere with non-dynamic imports. 
 export async function resolve(specifier, context, nextResolve) {
-	let result
 	try {
-		result = await nextResolve(specifier, context)
+		return await nextResolve(specifier, context)
 	}
 	catch (error) {
 		// Attempt to resolve imports as .ts and .js
@@ -20,16 +16,4 @@ export async function resolve(specifier, context, nextResolve) {
 		}
 		throw error
 	}
-
-	// Cache bust by appending timestamp query param
-	if (result.url?.startsWith('file://') && !result.url.startsWith(mockatonSrcRoot)) {
-		const url = new URL(result.url)
-		url.searchParams.set('t', performance.now())
-		return {
-			...result,
-			url: url.href,
-			shortCircuit: true
-		}
-	}
-	return result
 }