@tilli-pro/cookieconsent-plugin 0.7.54 → 0.7.60

package/src/init/tilli-website.config.ts

@@ -0,0 +1,219 @@
+import type { CookieConsentConfig } from "@tilli-pro/cookieconsent";
+
+import _config from "../config";
+import { stripInvalidLinkedCategoriesFromTranslations } from "./utils";
+
+const categories: CookieConsentConfig["categories"] = {
+  necessary: {
+    enabled: true, // "necessary" category is always enabled.
+    readOnly: true,
+    services: {
+      "Session": {
+        label: "Session",
+        cookies: [
+          {
+            name: /^(_scc_session)/, // session ID for core functionality
+          },
+        ],
+      },
+    },
+  },
+  analytics: {
+    services: {
+      "Google Analytics": {
+        label: "Google Analytics",
+        cookies: [
+          {
+            name: /^(_ga_)/, // Google Analytics
+            domain: "tilli.pro",
+          },
+        ],
+      },
+      "TelemetryDeck": {
+        label: "TelemetryDeck",
+        cookies: [
+          {
+            name: /^(_tccl_)/, // TelemetryDeck
+            domain: "tilli.pro",
+          },
+        ],
+      },
+    },
+    autoClear: {
+      // TODO: DRY this with the services above
+      cookies: [
+        /** Google Analytics */
+        {
+          name: /^(_ga_)/, // Google Analytics
+          domain: "tilli.pro",
+        },
+
+        /** TelemetryDeck */
+        {
+          name: /^(_tccl_)/, // TelemetryDeck
+          domain: "tilli.pro",
+        },
+      ],
+    },
+  },
+  marketing: {
+    services: {
+      "Google Tag Manager": {
+        label: "Google Tag Manager",
+        cookies: [
+          {
+            name: /^(_gtm_)/, // Google Tag Manager
+            domain: "tilli.pro",
+          },
+          {
+            name: /^(_gat)/, // Google Tag Manager (analytics)
+            domain: "tilli.pro",
+          },
+          {
+            name: /^(_gid)/, // Google Tag Manager (session ID)
+            domain: "tilli.pro",
+          },
+        ],
+      },
+      "Hubspot": {
+        label: "Hubspot",
+        cookies: [
+          {
+            name: /^(__hs)/, // Hubspot (Session Tracking)
+            domain: "tilli.pro",
+          },
+          {
+            name: /^(hubspotutk)/, // Hubspot (User Tracking)
+            domain: "tilli.pro",
+          },
+          {
+            name: /^(__cf_bm)/, // Hubspot (Analytics - Cloudfare)
+            domain: ".hs-analytics.net",
+          },
+          {
+            name: /^(__cf_bm)/, // Hubspot (Banner - Cloudfare)
+            domain: ".hs-banner.com",
+          },
+          {
+            name: /^(__cf_bm)/, // Hubspot (Scripts - Cloudfare)
+            domain: ".hs-scripts.com",
+          },
+          {
+            name: /^(__cf_bm)/, // Hubspot (Adspixel - Cloudfare)
+            domain: ".hsadspixel.net",
+          },
+          {
+            name: /^(__cf_bm)/, // Hubspot (Twitter - Cloudfare)
+            domain: ".t.co",
+          },
+          {
+            name: /^(__cf_bm)/, // Hubspot (User Messages - Cloudfare)
+            domain: ".usermessages.com",
+          },
+          {
+            name: /^(_cfuvid)/, // Hubspot (Visitor ID - Cloudfare)
+            domain: ".hubspot.com",
+          },
+        ],
+      },
+      "Facebook": {
+        label: "Facebook",
+        cookies: [
+          {
+            name: /^(_fb)/, // Facebook (ads)
+            domain: "tilli.pro",
+          },
+        ],
+      },
+      "Twitter": {
+        label: "Twitter",
+        cookies: [
+          {
+            name: /^(muc_ads)/, // Twitter (ads)
+            domain: ".t.co",
+          },
+        ],
+      },
+    },
+    autoClear: {
+      // TODO: DRY this with the services above
+      cookies: [
+        /** Google Tag Manager */
+        {
+          name: /^(_gtm_)/, // Google Tag Manager
+          domain: "tilli.pro",
+        },
+        {
+          name: /^(_gat)/, // Google Tag Manager (analytics)
+          domain: "tilli.pro",
+        },
+        {
+          name: /^(_gid)/, // Google Tag Manager (session ID)
+          domain: "tilli.pro",
+        },
+
+        /** Hubspot */
+        {
+          name: /^(__hs)/, // Hubspot (Session Tracking)
+          domain: "tilli.pro",
+        },
+        {
+          name: /^(__cf_bm)/, // Hubspot (Analytics - Cloudfare)
+          domain: ".hs-analytics.net",
+        },
+        {
+          name: /^(__cf_bm)/, // Hubspot (Banner - Cloudfare)
+          domain: ".hs-banner.com",
+        },
+        {
+          name: /^(__cf_bm)/, // Hubspot (Scripts - Cloudfare)
+          domain: ".hs-scripts.com",
+        },
+        {
+          name: /^(__cf_bm)/, // Hubspot (Adspixel - Cloudfare)
+          domain: ".hsadspixel.net",
+        },
+        {
+          name: /^(__cf_bm)/, // Hubspot (Twitter - Cloudfare)
+          domain: ".t.co",
+        },
+        {
+          name: /^(__cf_bm)/, // Hubspot (User Messages - Cloudfare)
+          domain: ".usermessages.com",
+        },
+        {
+          name: /^(_cfuvid)/, // Hubspot (Visitor ID - Cloudfare)
+          domain: ".hubspot.com",
+        },
+
+        /** Facebook */
+        {
+          name: /^(_fb)/, // Facebook (ads)
+          domain: "tilli.pro",
+        },
+
+        /** Twitter */
+        {
+          name: /^(muc_ads)/, // Twitter (ads)
+          domain: ".t.co",
+        },
+      ],
+    },
+  },
+};
+
+// TODO: DRY further w/ `./brf.ts`
+const language: CookieConsentConfig["language"] = {
+  ..._config.language,
+  translations: stripInvalidLinkedCategoriesFromTranslations(
+    _config.language.translations,
+    categories,
+    true, // clear cookie tables // FIXME: refactor this to actually just use the proper cookie table accoring to the categories var
+  ),
+};
+
+export const config: CookieConsentConfig = {
+  ..._config,
+  categories,
+  language,
+};

package/src/init/tilli-website.ts

@@ -1,227 +1,7 @@
-import type { CookieConsentConfig } from "@tilli-pro/cookieconsent";
-
-import _config from "../config";
 import { run } from "../init";
-import {
-  makeInitFn,
-  stripInvalidLinkedCategoriesFromTranslations,
-} from "./utils";
+import { makeInitFn } from "./utils";
 import { showPreferences } from "../config/gui-options/scripts/showPreferences.mjs";
-
-const categories: CookieConsentConfig["categories"] = {
-  necessary: {
-    enabled: true, // "necessary" category is always enabled.
-    readOnly: true,
-    services: {
-      "Session": {
-        label: "Session",
-        cookies: [
-          {
-            name: /^(_scc_session)/, // session ID for core functionality
-          },
-        ],
-      },
-    },
-  },
-  analytics: {
-    services: {
-      "Google Analytics": {
-        label: "Google Analytics",
-        cookies: [
-          {
-            name: /^(_ga_)/, // Google Analytics
-            domain: "tilli.pro",
-          },
-        ],
-      },
-      "TelemetryDeck": {
-        label: "TelemetryDeck",
-        cookies: [
-          {
-            name: /^(_tccl_)/, // TelemetryDeck
-            domain: "tilli.pro",
-          },
-        ],
-      },
-    },
-    autoClear: {
-      // TODO: DRY this with the services above
-      cookies: [
-        /** Google Analytics */
-        {
-          name: /^(_ga_)/, // Google Analytics
-          domain: "tilli.pro",
-        },
-
-        /** TelemetryDeck */
-        {
-          name: /^(_tccl_)/, // TelemetryDeck
-          domain: "tilli.pro",
-        },
-      ],
-    },
-  },
-  marketing: {
-    services: {
-      "Google Tag Manager": {
-        label: "Google Tag Manager",
-        cookies: [
-          {
-            name: /^(_gtm_)/, // Google Tag Manager
-            domain: "tilli.pro",
-          },
-          {
-            name: /^(_gat)/, // Google Tag Manager (analytics)
-            domain: "tilli.pro",
-          },
-          {
-            name: /^(_gid)/, // Google Tag Manager (session ID)
-            domain: "tilli.pro",
-          },
-        ],
-      },
-      "Hubspot": {
-        label: "Hubspot",
-        cookies: [
-          {
-            name: /^(__hs)/, // Hubspot (Session Tracking)
-            domain: "tilli.pro",
-          },
-          {
-            name: /^(hubspotutk)/, // Hubspot (User Tracking)
-            domain: "tilli.pro",
-          },
-          {
-            name: /^(__cf_bm)/, // Hubspot (Analytics - Cloudfare)
-            domain: ".hs-analytics.net",
-          },
-          {
-            name: /^(__cf_bm)/, // Hubspot (Banner - Cloudfare)
-            domain: ".hs-banner.com",
-          },
-          {
-            name: /^(__cf_bm)/, // Hubspot (Scripts - Cloudfare)
-            domain: ".hs-scripts.com",
-          },
-          {
-            name: /^(__cf_bm)/, // Hubspot (Adspixel - Cloudfare)
-            domain: ".hsadspixel.net",
-          },
-          {
-            name: /^(__cf_bm)/, // Hubspot (Twitter - Cloudfare)
-            domain: ".t.co",
-          },
-          {
-            name: /^(__cf_bm)/, // Hubspot (User Messages - Cloudfare)
-            domain: ".usermessages.com",
-          },
-          {
-            name: /^(_cfuvid)/, // Hubspot (Visitor ID - Cloudfare)
-            domain: ".hubspot.com",
-          },
-        ],
-      },
-      "Facebook": {
-        label: "Facebook",
-        cookies: [
-          {
-            name: /^(_fb)/, // Facebook (ads)
-            domain: "tilli.pro",
-          },
-        ],
-      },
-      "Twitter": {
-        label: "Twitter",
-        cookies: [
-          {
-            name: /^(muc_ads)/, // Twitter (ads)
-            domain: ".t.co",
-          },
-        ],
-      },
-    },
-    autoClear: {
-      // TODO: DRY this with the services above
-      cookies: [
-        /** Google Tag Manager */
-        {
-          name: /^(_gtm_)/, // Google Tag Manager
-          domain: "tilli.pro",
-        },
-        {
-          name: /^(_gat)/, // Google Tag Manager (analytics)
-          domain: "tilli.pro",
-        },
-        {
-          name: /^(_gid)/, // Google Tag Manager (session ID)
-          domain: "tilli.pro",
-        },
-
-        /** Hubspot */
-        {
-          name: /^(__hs)/, // Hubspot (Session Tracking)
-          domain: "tilli.pro",
-        },
-        {
-          name: /^(__cf_bm)/, // Hubspot (Analytics - Cloudfare)
-          domain: ".hs-analytics.net",
-        },
-        {
-          name: /^(__cf_bm)/, // Hubspot (Banner - Cloudfare)
-          domain: ".hs-banner.com",
-        },
-        {
-          name: /^(__cf_bm)/, // Hubspot (Scripts - Cloudfare)
-          domain: ".hs-scripts.com",
-        },
-        {
-          name: /^(__cf_bm)/, // Hubspot (Adspixel - Cloudfare)
-          domain: ".hsadspixel.net",
-        },
-        {
-          name: /^(__cf_bm)/, // Hubspot (Twitter - Cloudfare)
-          domain: ".t.co",
-        },
-        {
-          name: /^(__cf_bm)/, // Hubspot (User Messages - Cloudfare)
-          domain: ".usermessages.com",
-        },
-        {
-          name: /^(_cfuvid)/, // Hubspot (Visitor ID - Cloudfare)
-          domain: ".hubspot.com",
-        },
-
-        /** Facebook */
-        {
-          name: /^(_fb)/, // Facebook (ads)
-          domain: "tilli.pro",
-        },
-
-        /** Twitter */
-        {
-          name: /^(muc_ads)/, // Twitter (ads)
-          domain: ".t.co",
-        },
-      ],
-    },
-  },
-};
-
-// TODO: DRY further w/ `./brf.ts`
-const language: CookieConsentConfig["language"] = {
-  ..._config.language,
-  translations: stripInvalidLinkedCategoriesFromTranslations(
-    _config.language.translations,
-    categories,
-    true, // clear cookie tables // FIXME: refactor this to actually just use the proper cookie table accoring to the categories var
-  ),
-};
-
-const config: CookieConsentConfig = {
-  ..._config,
-  categories,
-  language,
-};
+import { config } from "./tilli-website.config";
 
 // console.debug({ config }, "Initializing Cookie Consent (tilli Website)...");
 const init = makeInitFn(run, config, showPreferences);

package/src/init/tilliX.config.ts

@@ -0,0 +1,29 @@
+import type { CookieConsentConfig } from "@tilli-pro/cookieconsent";
+
+import _config from "../config";
+import { stripInvalidLinkedCategoriesFromTranslations } from "./utils";
+
+const categories: CookieConsentConfig["categories"] = {
+  necessary: {
+    enabled: true, // "necessary" category is always enabled.
+    readOnly: true,
+  },
+  functional: {},
+  analytics: {},
+};
+
+// TODO: DRY further w/ `./brf.ts`
+const language: CookieConsentConfig["language"] = {
+  ..._config.language,
+  translations: stripInvalidLinkedCategoriesFromTranslations(
+    _config.language.translations,
+    categories,
+    true, // clear cookie tables // FIXME: refactor this to actually just use the proper cookie table accoring to the categories var
+  ),
+};
+
+export const config: CookieConsentConfig = {
+  ..._config,
+  categories,
+  language,
+};

package/src/init/tilliX.ts

@@ -1,37 +1,7 @@
-import type { CookieConsentConfig } from "@tilli-pro/cookieconsent";
-
-import _config from "../config";
 import { run } from "../init";
-import {
-  makeInitFn,
-  stripInvalidLinkedCategoriesFromTranslations,
-} from "./utils";
+import { makeInitFn } from "./utils";
 import { showPreferences } from "../config/gui-options/scripts/showPreferences.mjs";
-
-const categories: CookieConsentConfig["categories"] = {
-  necessary: {
-    enabled: true, // "necessary" category is always enabled.
-    readOnly: true,
-  },
-  functional: {},
-  analytics: {},
-};
-
-// TODO: DRY further w/ `./brf.ts`
-const language: CookieConsentConfig["language"] = {
-  ..._config.language,
-  translations: stripInvalidLinkedCategoriesFromTranslations(
-    _config.language.translations,
-    categories,
-    true, // clear cookie tables // FIXME: refactor this to actually just use the proper cookie table accoring to the categories var
-  ),
-};
-
-const config: CookieConsentConfig = {
-  ..._config,
-  categories,
-  language,
-};
+import { config } from "./tilliX.config";
 
 // console.debug({ config }, "Initializing Cookie Consent (tilli Website)...");
 const init = makeInitFn(run, config, showPreferences);

package/src/init.ts

@@ -1,4 +1,4 @@
-import "https://cdn.jsdelivr.net/gh/tilli-pro/cookieconsent@49b255420f7606d2a641e5294a5a9c09db612cca/dist/cookieconsent.umd.js";
+import "https://cdn.jsdelivr.net/gh/tilli-pro/cookieconsent@95beecd12c0b52ac7b01a40f5a04ca8dff865bfb/dist/cookieconsent.umd.js";
 
 import type * as _CookieConsent from "@tilli-pro/cookieconsent";
 import type { CookieConsentConfig } from "@tilli-pro/cookieconsent";
@@ -18,7 +18,7 @@ declare global {
   }
 }
 
-const GIT_SHA = "49b255420f7606d2a641e5294a5a9c09db612cca";
+const GIT_SHA = "95beecd12c0b52ac7b01a40f5a04ca8dff865bfb";
 const GIT_REPO = "tilli-pro/cookieconsent";
 const GIT_CDN_BASE_URL = "https://cdn.jsdelivr.net/gh";
 const GIT_CDN_URL = `${GIT_CDN_BASE_URL}/${GIT_REPO}@${GIT_SHA}`;

package/src/react-components/CookieConsentInit.client.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import { ConfigId } from "../init/_configs";
 import { useCookieConsent } from "./hooks/useCookieConsent";
 
 import "@tilli-pro/cookieconsent/dist/cookieconsent.css";
@@ -12,8 +13,14 @@ import "../styles/tenants/frontier.css";
 import "../styles/tenants/con-edison.css";
 import "../styles/tenants/oru.css";
 
-export default function CookieConsentInit() {
-  useCookieConsent();
+interface CookieConsentInitProps {
+  config: ConfigId;
+}
+
+export default function CookieConsentInit({
+  config,
+}: Readonly<CookieConsentInitProps>) {
+  useCookieConsent(config);
 
   return null;
 }

package/src/react-components/CookieConsentInit.server.tsx

@@ -1,10 +1,19 @@
 import "server-only";
 
+import type { ConfigId } from "../init/_configs";
 import { COOKIE_CONSENT_ENABLED } from "../_consts";
 import CookieConsentInitClient from "./CookieConsentInit.client";
 
+interface CookieConsentInitProps {
+  config: ConfigId;
+}
+
 /** we use a server component to handle dynamic injection of the script all together
  * > basically, there's no need to inject the client-side cookie-consent script if it's not in scope */
-export default function CookieConsentInit() {
-  return COOKIE_CONSENT_ENABLED ? <CookieConsentInitClient /> : null;
+export default function CookieConsentInit({
+  config,
+}: Readonly<CookieConsentInitProps>) {
+  return COOKIE_CONSENT_ENABLED ? (
+    <CookieConsentInitClient {...{ config }} />
+  ) : null;
 }

package/src/react-components/hooks/useCookieConsent.ts

@@ -4,14 +4,21 @@ import { useEffect } from "react";
 
 import { run } from "@tilli-pro/cookieconsent";
 
+import type { ConfigId } from "../../init/_configs";
 import { COOKIE_CONSENT_ENABLED } from "../../_consts";
-import config from "../../config";
-import { makeInitFn } from "../../init/utils";
 import { showPreferences } from "../../config/gui-options/scripts/showPreferences.node";
+import { getConfig } from "../../init/_configs";
+import { makeInitFn } from "../../init/utils";
 
-export function useCookieConsent() {
+export function useCookieConsent(configId: ConfigId) {
   useEffect(() => {
     if (!COOKIE_CONSENT_ENABLED) return;
+    
+    const config = getConfig(configId);
+    if (!config)
+      throw new Error(
+        `Unable to initialize the cookie consent banner (unable to find specified config: "${configId}")`,
+      );
 
     const init = makeInitFn(run, config, showPreferences);
     void init();