@kirby-tools/licensing 0.6.1 → 0.6.3

package/dist/components/LicensingButtonGroup.vue

@@ -40,12 +40,7 @@ onMounted(() => {
 })
 
 async function handleRegistration() {
-  const { isLicenseActive } = await openLicenseModal()
-
-  if (isLicenseActive) {
-    // Force a reload to refresh the plugin's cached context
-    window.location.reload()
-  }
+  await openLicenseModal()
 }
 </script>
 

package/dist/components/LicensingDropdownItems.vue

@@ -32,12 +32,7 @@ const { openLicenseModal } = useLicense({
 const currentLicenseStatus = ref(props.licenseStatus)
 
 async function handleRegistration() {
-  const { isLicenseActive } = await openLicenseModal()
-
-  if (isLicenseActive) {
-    // Force a reload to refresh the plugin's cached context
-    window.location.reload()
-  }
+  await openLicenseModal()
 }
 </script>
 

package/dist/constants.js

@@ -1,5 +1,13 @@
 //#region src/constants.ts
-const TRANSLATIONS = {
+const ERROR_KEY_MAP = {
+	"Unauthorized": "errors.validation.invalidCredentials",
+	"License key not valid for this plugin": "errors.license.invalidPlugin",
+	"License key not valid for this plugin version": "errors.license.versionMismatch",
+	"License key not valid for this plugin version, please upgrade your license": "errors.license.needsUpgrade",
+	"License key already activated": "errors.activation.alreadyUsed"
+};
+const INTEGRITY_ERROR = "The activation buttons appear to be hidden. Please purchase a license.";
+const I18N_MESSAGES = {
 	en: {
 		"modal.fields.info": "Thanks for purchasing {label}! Please enter your email address and order ID to activate your license.",
 		"modal.fields.orderId.help": "<a href=\"https://app.lemonsqueezy.com/my-orders\" target=\"_blank\">Find your order number</a> on Lemon Squeezy or <a href=\"mailto:hello@kirby.tools\">contact us</a> if you cannot find it.",
@@ -47,9 +55,9 @@ const TRANSLATIONS = {
 		"modal.fields.orderId.help": "<a href=\"https://app.lemonsqueezy.com/my-orders\" target=\"_blank\">Vind je bestelnummer</a> op Lemon Squeezy of <a href=\"mailto:hello@kirby.tools\">neem contact met ons op</a> als je het niet kunt vinden.",
 		"errors.validation.missingFields": "E-mailadres en bestelnummer zijn verplicht",
 		"errors.validation.invalidCredentials": "E-mailadres of bestelnummer is onjuist",
-		"errors.license.invalidPlugin": "Licentiesleutel ongeldig voor dit plug-in",
-		"errors.license.versionMismatch": "Licentiesleutel ongeldig voor deze plug-inversie",
-		"errors.license.needsUpgrade": "Licentiesleutel ongeldig voor deze plug-inversie. Upgrade nu op https://hub.kirby.tools.",
+		"errors.license.invalidPlugin": "Licentiesleutel ongeldig voor deze plugin",
+		"errors.license.versionMismatch": "Licentiesleutel ongeldig voor deze pluginversie",
+		"errors.license.needsUpgrade": "Licentiesleutel ongeldig voor deze pluginversie. Upgrade nu op https://hub.kirby.tools.",
 		"errors.activation.alreadyUsed": "Licentiesleutel al geactiveerd",
 		"activate": "Activeren",
 		"activated": "Plugin geactiveerd",
@@ -59,4 +67,4 @@ const TRANSLATIONS = {
 };
 
 //#endregion
-export { TRANSLATIONS };
+export { ERROR_KEY_MAP, I18N_MESSAGES, INTEGRITY_ERROR };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 import { License, LicenseKey, LicenseStatus } from "./types.js";
 import { LicenseModalResult, LicenseOptions, useLicense } from "./license.js";
-import { isLocal } from "./utils.js";
-export { type License, type LicenseKey, LicenseModalResult, LicenseOptions, type LicenseStatus, isLocal, useLicense };
+import { isLocalHost } from "./utils.js";
+export { type License, type LicenseKey, LicenseModalResult, LicenseOptions, type LicenseStatus, isLocalHost, useLicense };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { isLocal } from "./utils.js";
+import { isLocalHost } from "./utils.js";
 import { useLicense } from "./license.js";
 
-export { isLocal, useLicense };
+export { isLocalHost, useLicense };

package/dist/license.js

@@ -1,19 +1,12 @@
-import { isLocal, t } from "./utils.js";
+import { ERROR_KEY_MAP, INTEGRITY_ERROR } from "./constants.js";
+import { isLocalHost, t } from "./utils.js";
 import { unref, useDialog, usePanel } from "kirbyuse";
 
 //#region src/license.ts
-const ERROR_MESSAGE_TRANSLATIONS = {
-	"Unauthorized": "errors.validation.invalidCredentials",
-	"License key not valid for this plugin": "errors.license.invalidPlugin",
-	"License key not valid for this plugin version": "errors.license.versionMismatch",
-	"License key not valid for this plugin version, please upgrade your license": "errors.license.needsUpgrade",
-	"License key already activated": "errors.activation.alreadyUsed"
-};
-const INTEGRITY_ERROR = "The activation buttons appear to be hidden. Please purchase a license.";
 function useLicense(licenseOptions) {
 	const panel = usePanel();
 	const { openFieldsDialog } = useDialog();
-	const isLocalhost = isLocal();
+	const isLocalhost = isLocalHost();
 	const openLicenseModal = async () => {
 		const { label } = licenseOptions;
 		return { isLicenseActive: (await openFieldsDialog({
@@ -41,6 +34,8 @@ function useLicense(licenseOptions) {
 				const isLicenseActive = await activateLicense(value, licenseOptions);
 				if (!isLicenseActive) return false;
 				panel.notification.success(t("activated"));
+				await new Promise((resolve) => setTimeout(resolve, 250));
+				window.location.reload();
 				return { isLicenseActive };
 			}
 		}))?.isLicenseActive ?? false };
@@ -75,7 +70,7 @@ async function activateLicense(event, licenseOptions) {
 		return true;
 	} catch (error) {
 		const message = error.message;
-		panel.notification.error(ERROR_MESSAGE_TRANSLATIONS[message] ? t(ERROR_MESSAGE_TRANSLATIONS[message]) : message);
+		panel.notification.error(ERROR_KEY_MAP[message] ? t(ERROR_KEY_MAP[message]) : message);
 		return false;
 	}
 }

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
 //#region src/utils.d.ts
 
-declare function isLocal(): boolean;
+declare function isLocalHost(): boolean;
 //#endregion
-export { isLocal };
+export { isLocalHost };

package/dist/utils.js

@@ -1,30 +1,35 @@
-import { TRANSLATIONS } from "./constants.js";
+import { I18N_MESSAGES } from "./constants.js";
 
 //#region src/utils.ts
 const LOCALHOST_HOSTNAMES = [
 	"localhost",
 	"127.0.0.1",
-	"[::1]"
+	"[::1]",
+	"0.0.0.0"
 ];
-const LOCAL_DOMAINS = [
+const LOCAL_TLD_SUFFIXES = [
+	"localhost",
 	"local",
 	"test",
-	"ddev.site"
+	"ddev.site",
+	"lndo.site",
+	"nitro",
+	"dev.cc"
 ];
 function template(input, values, fallback) {
 	return input.replace(/\{(\w+)\}/g, (_, key) => values[key] || ((typeof fallback === "function" ? fallback(key) : fallback) ?? key));
 }
-function t(key = "", data) {
+function t(key, data) {
 	const languageCode = window.panel.translation.code;
-	const translation = TRANSLATIONS?.[languageCode]?.[key] ?? key;
+	const translation = I18N_MESSAGES?.[languageCode]?.[key] ?? key;
 	return data ? template(translation, data) : translation;
 }
-function isLocal() {
+function isLocalHost() {
 	const { hostname } = window.location;
-	const isLocalhost = LOCALHOST_HOSTNAMES.includes(hostname);
-	const isLocalDomain = LOCAL_DOMAINS.some((domain) => hostname.endsWith(`.${domain}`));
-	return isLocalhost || isLocalDomain;
+	const isLocalHostname = LOCALHOST_HOSTNAMES.includes(hostname);
+	const isLocalTld = LOCAL_TLD_SUFFIXES.some((suffix) => hostname.endsWith(`.${suffix}`));
+	return isLocalHostname || isLocalTld;
 }
 
 //#endregion
-export { isLocal, t };
+export { isLocalHost, t };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kirby-tools/licensing",
   "type": "module",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "packageManager": "pnpm@10.28.0",
   "description": "License system for Kirby Tools plugins within the Kirby Panel",
   "author": "Johann Schopplich <hello@johannschopplich.com>",
@@ -33,6 +33,7 @@
     "build": "tsdown",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
+    "test:types": "tsc --noEmit",
     "release": "bumpp"
   },
   "peerDependencies": {