@kirby-tools/licensing 0.4.0 → 0.4.2

package/dist/components/LicensingButtonGroup.vue

@@ -40,10 +40,15 @@ onMounted(() => {
 })
 
 async function handleRegistration() {
-  const { isRegistered } = await openLicenseModal()
-  if (isRegistered) {
-    currentLicenseStatus.value = 'active'
-  }
+  const { isLicenseActive } = await openLicenseModal()
+
+  if (!isLicenseActive)
+    return
+
+  // currentLicenseStatus.value = 'active'
+
+  // Force a reload to refresh the plugin's cached context
+  window.location.reload()
 }
 </script>
 
@@ -54,22 +59,12 @@ async function handleRegistration() {
     layout="collapsed"
   >
     <k-button
-      v-if="currentLicenseStatus === 'upgradeable'"
-      theme="notice"
-      variant="filled"
-      size="xs"
-      link="https://hub.kirby.tools"
-      target="_blank"
-      :text="t('upgrade')"
-    />
-    <k-button
-      v-else
       theme="love"
       variant="filled"
       size="xs"
-      :link="pricingUrl"
+      :link="currentLicenseStatus === 'upgradeable' ? 'https://hub.kirby.tools' : pricingUrl"
       target="_blank"
-      :text="t('buy')"
+      :text="currentLicenseStatus === 'upgradeable' ? t('upgrade') : t('buy')"
     />
     <k-button
       theme="love"

package/dist/license.d.ts

@@ -5,7 +5,7 @@ export interface LicenseOptions {
     apiNamespace: string;
 }
 export interface LicenseModalResult {
-    isRegistered: boolean;
+    isLicenseActive: boolean;
 }
 export declare function useLicense(licenseOptions: LicenseOptions): {
     isLocalhost: any;

package/dist/license.mjs

@@ -1,7 +1,5 @@
 import { unref, usePanel } from "kirbyuse";
-import { t } from "./utils.mjs";
-const LOCALHOST_HOSTNAMES = ["localhost", "127.0.0.1", "[::1]"];
-const LOCAL_DOMAINS = ["local", "test", "ddev.site"];
+import { isLocal, t } from "./utils.mjs";
 const ERROR_MESSAGE_TRANSLATIONS = {
   "Unauthorized": "modal.error.invalid.unauthorized",
   "License key not valid for this plugin": "modal.error.invalid.licenseKey",
@@ -13,7 +11,7 @@ export function useLicense(licenseOptions) {
   const panel = usePanel();
   const isLocalhost = isLocal();
   const openLicenseModal = () => {
-    let isRegistered = false;
+    let isLicenseActive = false;
     const { label } = licenseOptions;
     const fields = {
       info: {
@@ -44,11 +42,11 @@ export function useLicense(licenseOptions) {
         on: {
           // Close event will always be triggered, even on submit
           close: () => {
-            resolve({ isRegistered });
+            resolve({ isLicenseActive });
           },
           submit: async (event) => {
-            isRegistered = await registerLicense(event, licenseOptions);
-            if (isRegistered) {
+            isLicenseActive = await registerLicense(event, licenseOptions);
+            if (isLicenseActive) {
               panel.dialog.close();
               panel.notification.success(t("activated"));
             }
@@ -94,9 +92,3 @@ async function registerLicense(event, licenseOptions) {
     return false;
   }
 }
-function isLocal() {
-  const { hostname } = window.location;
-  const isLocalhost = LOCALHOST_HOSTNAMES.includes(hostname);
-  const isLocalDomain = LOCAL_DOMAINS.some((domain) => hostname.endsWith(`.${domain}`));
-  return isLocalhost || isLocalDomain;
-}

package/dist/utils.d.ts

@@ -1,2 +1,3 @@
 export declare function t(key?: string, data?: Record<string, string>): string;
 export declare function template(input: string, values: Record<string, string>, fallback?: string | ((key: string) => string)): string;
+export declare function isLocal(): any;

package/dist/utils.mjs

@@ -1,4 +1,6 @@
 import { TRANSLATIONS } from "./constants.mjs";
+const LOCALHOST_HOSTNAMES = ["localhost", "127.0.0.1", "[::1]"];
+const LOCAL_DOMAINS = ["local", "test", "ddev.site"];
 export function t(key = "", data) {
   const languageCode = window.panel.translation.code;
   const translation = TRANSLATIONS?.[languageCode]?.[key] ?? key;
@@ -10,3 +12,9 @@ export function template(input, values, fallback) {
     (_, key) => values[key] || ((typeof fallback === "function" ? fallback(key) : fallback) ?? key)
   );
 }
+export function isLocal() {
+  const { hostname } = window.location;
+  const isLocalhost = LOCALHOST_HOSTNAMES.includes(hostname);
+  const isLocalDomain = LOCAL_DOMAINS.some((domain) => hostname.endsWith(`.${domain}`));
+  return isLocalhost || isLocalDomain;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kirby-tools/licensing",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "packageManager": "pnpm@9.15.0",
   "description": "Shared tooling for Kirby Tools licensing in the Kirby Panel",
   "author": "Johann Schopplich <hello@johannschopplich.com>",
@@ -42,11 +42,11 @@
     "vue": "^2.7.16"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^3.11.2",
-    "bumpp": "^9.9.0",
-    "eslint": "^9.16.0",
-    "kirbyuse": "^0.9.1",
+    "@antfu/eslint-config": "^3.12.0",
+    "bumpp": "^9.9.1",
+    "eslint": "^9.17.0",
+    "kirbyuse": "^0.9.2",
     "typescript": "^5.7.2",
-    "unbuild": "^3.0.0-rc.11"
+    "unbuild": "3.0.0-rc.11"
   }
 }