Merge pull request #152 from ator-dev/highlight-api-engine

HIGHLIGHT engine and major restructure
searchmarkers · Jun 14, 2024 · 395ed93 · 395ed93
2 parents 68f6537 + f67bda9
commit 395ed93
Show file tree

Hide file tree

Showing 81 changed files with 7,446 additions and 5,743 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,2 @@
 *.js
+*.mjs
diff --git a/lib/email.min.d.ts b/lib/email.min.d.ts
@@ -0,0 +1,41 @@
+/**
+ * An EmailJS library function which sends an email using the EmailJS service.
+ * @param service The name of a service category for the email.
+ * @param template The name of a template under the service for the email.
+ * @param details Custom template field entries.
+ * @param key The API key to use.
+ */
+declare const sendEmail: (
+	service: string,
+	template: string,
+	details: {
+		addon_version?: string
+		url?: string
+		phrases?: string
+		user_message?: string
+		user_email?: string
+		item_0_question?: string
+		item_1_question?: string
+		item_2_question?: string
+		item_3_question?: string
+		item_4_question?: string
+		item_5_question?: string
+		item_6_question?: string
+		item_7_question?: string
+		item_8_question?: string
+		item_9_question?: string
+		item_0_response?: string
+		item_1_response?: string
+		item_2_response?: string
+		item_3_response?: string
+		item_4_response?: string
+		item_5_response?: string
+		item_6_response?: string
+		item_7_response?: string
+		item_8_response?: string
+		item_9_response?: string
+	},
+	key: string,
+) => Promise<unknown>; // TODO check the actual return value in the EmailJS docs
+
+export { sendEmail };
diff --git a/lib/email.min.js b/lib/email.min.js
diff --git a/manifest/chromium.json b/manifest/chromium.json
@@ -2,7 +2,7 @@
 	"manifest_version": 3,
 	"name": "Mark My Search",
 	"description": "Highlight searched keywords. Find matches instantly.",
-	"version": "1.14.2",
+	"version": "2.0.0",
 
 	"icons": {
 		"16": "/icons/dist/mms-16.png",
@@ -24,18 +24,14 @@
 	],
 
 	"background": {
-		"service_worker": "/dist/background.js"
+		"type": "module",
+		"service_worker": "/dist/background.mjs"
 	},
 
 	"content_scripts": [
 		{
 			"matches": [ "*://*/*" ],
-			"js": [
-				"/dist/include/utility.js",
-				"/dist/include/pattern-stem.js",
-				"/dist/include/pattern-diacritic.js",
-				"/dist/content.js"
-			],
+			"js": [ "/dist/content-entry.js" ],
 			"run_at": "document_start"
 		}
 	],
@@ -57,17 +53,10 @@
 	"web_accessible_resources": [
 		{
 			"resources": [
+				"/icons/*.svg",
 				"/dist/paint.js",
-				"/icons/mms.svg",
-				"/icons/arrow.svg",
-				"/icons/close.svg",
-				"/icons/search.svg",
-				"/icons/show.svg",
-				"/icons/refresh.svg",
-				"/icons/create.svg",
-				"/icons/delete.svg",
-				"/icons/edit.svg",
-				"/icons/reveal.svg"
+				"/dist/content.mjs",
+				"/dist/modules/*.mjs"
 			],
 			"matches": [ "*://*/*" ]
 		}

diff --git a/manifest/firefox.json b/manifest/firefox.json
@@ -2,7 +2,7 @@
 	"manifest_version": 3,
 	"name": "Mark My Search",
 	"description": "Highlight searched keywords. Find matches instantly.",
-	"version": "1.14.2",
+	"version": "2.0.0",
 
 	"browser_specific_settings": { "gecko": { "id": "mark-my-search@searchmarkers.github.io" } },
 
@@ -28,25 +28,14 @@
 	],
 
 	"background": {
-		"scripts": [
-			"/dist/include/utility.js",
-			"/dist/include/pattern-stem.js",
-			"/dist/include/pattern-diacritic.js",
-			"/dist/include/util-privileged.js",
-			"/dist/include/storage.js",
-			"/dist/background.js"
-		]
+		"type": "module",
+		"scripts": [ "/dist/background.mjs" ]
 	},
 
 	"content_scripts": [
 		{
 			"matches": [ "*://*/*" ],
-			"js": [
-				"/dist/include/utility.js",
-				"/dist/include/pattern-stem.js",
-				"/dist/include/pattern-diacritic.js",
-				"/dist/content.js"
-			],
+			"js": [ "/dist/content-entry.js" ],
 			"run_at": "document_start"
 		}
 	],
@@ -65,17 +54,10 @@
 	"web_accessible_resources": [
 		{
 			"resources": [
+				"/icons/*.svg",
 				"/dist/paint.js",
-				"/icons/mms.svg",
-				"/icons/arrow.svg",
-				"/icons/close.svg",
-				"/icons/search.svg",
-				"/icons/show.svg",
-				"/icons/refresh.svg",
-				"/icons/create.svg",
-				"/icons/delete.svg",
-				"/icons/edit.svg",
-				"/icons/reveal.svg"
+				"/dist/content.mjs",
+				"/dist/modules/*.mjs"
 			],
 			"matches": [ "*://*/*" ]
 		}

diff --git a/pages/options.html b/pages/options.html
@@ -2,11 +2,13 @@
 <html>
 	<head>
 		<meta charset="utf-8">
+		<style>
+			body {
+				background: hsl(300 100% 6%);
+			}
+		</style>
 	</head>
 	<body>
-		<script src="/dist/include/utility.js"></script>
-		<script src="/dist/include/util-privileged.js"></script>
-		<script src="/dist/include/storage.js"></script>
-		<script src="/dist/pages/options.js"></script>
+		<script src="/dist/pages/options.mjs" type="module"></script>
 	</body>
 </html>
diff --git a/pages/popup.html b/pages/popup.html
@@ -2,15 +2,13 @@
 <html>
 	<head>
 		<meta charset="utf-8">
+		<style>
+			body {
+				background: hsl(300 100% 6%);
+			}
+		</style>
 	</head>
 	<body>
-		<script src="/dist/include/utility.js"></script>
-		<script src="/dist/include/pattern-stem.js"></script>
-		<script src="/dist/include/pattern-diacritic.js"></script>
-		<script src="/dist/include/util-privileged.js"></script>
-		<script src="/dist/include/storage.js"></script>
-		<script src="/lib/email.min.js"></script>
-		<script src="/dist/include/page-build.js"></script>
-		<script src="/dist/pages/popup.js"></script>
+		<script src="/dist/pages/popup.mjs" type="module"></script>
 	</body>
 </html>
diff --git a/pages/sendoff.html b/pages/sendoff.html
@@ -2,15 +2,13 @@
 <html>
 	<head>
 		<meta charset="utf-8">
+		<style>
+			body {
+				background: hsl(300 100% 6%);
+			}
+		</style>
 	</head>
 	<body>
-		<script src="/dist/include/utility.js"></script>
-		<script src="/dist/include/pattern-stem.js"></script>
-		<script src="/dist/include/pattern-diacritic.js"></script>
-		<script src="/dist/include/util-privileged.js"></script>
-		<script src="/dist/include/storage.js"></script>
-		<script src="/lib/email.min.js"></script>
-		<script src="/dist/include/page-build.js"></script>
-		<script src="/dist/pages/sendoff.js"></script>
+		<script src="/dist/pages/sendoff.mjs" type="module"></script>
 	</body>
 </html>
diff --git a/pages/startpage.html b/pages/startpage.html
@@ -2,16 +2,14 @@
 <html>
 	<head>
 		<meta charset="utf-8">
+		<style>
+			body {
+				background: hsl(300 100% 6%);
+			}
+		</style>
 	</head>
 	<body>
-		<script src="/dist/include/utility.js"></script>
-		<script src="/dist/include/pattern-stem.js"></script>
-		<script src="/dist/include/pattern-diacritic.js"></script>
-		<script src="/dist/include/util-privileged.js"></script>
-		<script src="/dist/include/storage.js"></script>
-		<script src="/lib/email.min.js"></script>
-		<script src="/dist/include/page-build.js"></script>
-		<script src="/dist/pages/startpage.js"></script>
-		<script src="/dist/content.js"></script>
+		<script src="/dist/pages/startpage.mjs" type="module"></script>
+		<!--<script src="/dist/content.mjs" type="module"></script>-->
 	</body>
 </html>