Merge pull request #75 from AegisJSProject/bug/unset-signal

shgysk8zer0 · web-flow · commit 345e904b8d77 · 2025-04-25T09:21:59.000-07:00
Do not add listener on missing signal
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.1.11] - 2025-04-25
+
+### Fixed
+- Check for `passedSignal` being given before adding listener
+- Do not handle link clicks with modifier keys (eg to open in new tab)
+
 ## [v1.1.10] - 2025-04-24
 
 ### Fixed
diff --git a/http.config.js b/http.config.js
@@ -1,8 +1,23 @@
+import { readFile } from 'node:fs/promises';
+const home = await readFile('./test/index.html');
+const getHome = () => new Response(home, { headers: { 'Content-Type': 'text/html' }});
 const cache = new Map();
 
 export default {
 	open: true,
 	pathname: '/test/',
+	routes: {
+		'/favicon.svg': () => new Response(`<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 10 10">
+	<rect x="0" y="0" rx="10" ry="10" width="10" height="10" fill="#${crypto.getRandomValues(new Uint8Array(3)).toHex()}"></rect>
+</svg>`, { headers: { 'Content-Type': 'image/svg+xml' }}),
+		'/product/:productId': getHome,
+		'/page/markdown': getHome,
+		'/test/': getHome,
+		'/search?q=:query': getHome,
+		'/img/:fill([A-Fa-f\\d]{3,6})?/:size(\\d+)?/:radius(\\d+)?': getHome,
+		'/page/bacon/:lines(\\d+)': getHome,
+		'/github/:username(\\w+)': getHome,
+	},
 	requestPreprocessors: [
 		req => {
 			if (cache.has(req.url)) {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aegisjsproject/router",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "A simple but powerful router module",
   "keywords": [
     "router",
diff --git a/router.js b/router.js
@@ -234,9 +234,11 @@ function _loadLink(href, {
 			const controller = new AbortController();
 			const signal = passedSignal instanceof AbortSignal ? AbortSignal.any([controller.signal, passedSignal]) : controller.signal;
 
-			passedSignal.addEventListener('abort', ({ target }) => {
-				reject(target.reason);
-			}, { signal: controller.signal });
+			if (passedSignal instanceof AbortSignal) {
+				passedSignal.addEventListener('abort', ({ target }) => {
+					reject(target.reason);
+				}, { signal: controller.signal, once: true  });
+			}
 
 			link.referrerPolicy = referrerPolicy;
 
@@ -307,7 +309,11 @@ function _getLinkStateData(a) {
 function _interceptLinkClick(event) {
 	if (event.target.classList.contains('no-router') || event.target.hasAttribute(onClick)) {
 		event.target.removeEventListener(_interceptLinkClick);
-	} else if (event.isTrusted && event.currentTarget.href.startsWith(location.origin)) {
+	} else if (
+		event.isTrusted
+		&& event.currentTarget.href.startsWith(location.origin)
+		&& ! (event.metaKey || event.ctrlKey || event.shiftKey)
+	) {
 		event.preventDefault();
 		const state = _getLinkStateData(event.currentTarget);
 		navigate(event.currentTarget.href, state, {
@@ -316,7 +322,7 @@ function _interceptLinkClick(event) {
 			referrerPolicy: event.currentTarget.dataset.referrerPolicy,
 		});
 	}
-};
+}
 
 async function _interceptFormSubmit(event) {
 	if (event.target.classList.contains('no-router') || event.target.hasAttribute(onSubmit)) {
diff --git a/test/index.html b/test/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" dir="ltr" class="preload-x">
+<html lang="en" dir="ltr" class="preload">
 	<head>
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width" />
@@ -26,8 +26,9 @@
 			}
 		</script>
 		<!-- <script type="application/javascript" defer="" referrerpolicy="no-referrer" fetchpriority="auto" crossorigin="anonymous" integrity="sha384-uaVA9Le/fIJMMUrQHZyGJ+aAH3EdIhOLxPl+cuBCvvZBltVoc+Kemy4t8KLX3/aF" src="https://unpkg.com/@shgysk8zer0/polyfills@0.4.2/all.min.js"></script> -->
-		<script type="application/javascript" defer="" referrerpolicy="no-referrer" fetchpriority="auto" crossorigin="anonymous" integrity="sha384-1saT/U4nXVBbxQeMGiDxcWp3S9u8rT3rkBuRH7vV0DsGqV6jqGPp6ZNEEvsIWpWQ" src="https://unpkg.com/@shgysk8zer0/polyfills@0.4.5/all.min.js"></script>
+		<script type="application/javascript" defer="" referrerpolicy="no-referrer" fetchpriority="high" crossorigin="anonymous" integrity="sha384-X8d55dt38lBIY87GNkg6Upb9pjtwYlhEoKtw9Sfsbj/XCDV4W+g0kdx4X1Bo/EaO" src="https://unpkg.com/@shgysk8zer0/polyfills@0.4.11/browser.min.js"></script>
 		<script type="module" src="./index.js"></script>
+		<link rel="icon" href="/favicon.svg" sizes="any" type="image/svg+xml" />
 		<!-- <script src="./index.min.js" defer=""></script> -->
 		<!-- <script type="application/json" id="routes">
 			{

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@aegisjsproject/router",`
`3`		`- "version": "1.1.10",`
	`3`	`+ "version": "1.1.11",`
`4`	`4`	`"description": "A simple but powerful router module",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"router",`