@dargmuesli/nuxt-cookie-control 6.1.0 → 6.1.2

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@dargmuesli/nuxt-cookie-control",
-  "version": "6.1.0",
+  "version": "6.1.2",
   "configKey": "cookieControl",
   "compatibility": {
     "nuxt": "^3.0.0"

package/dist/module.mjs

@@ -1,9 +1,9 @@
 import { resolve } from 'node:path';
 import { pathToFileURL } from 'node:url';
-import { createResolver, defineNuxtModule, addPlugin, addImports, addTemplate, extendWebpackConfig, resolvePath } from '@nuxt/kit';
+import { createResolver, defineNuxtModule, addPlugin, addImports, addTemplate, extendWebpackConfig, extendViteConfig, resolvePath } from '@nuxt/kit';
 
 const name = "@dargmuesli/nuxt-cookie-control";
-const version = "6.1.0";
+const version = "6.1.2";
 
 const en = {
   accept: "Accept",
@@ -77,6 +77,47 @@ const DEFAULTS = {
   localeTexts: { en }
 };
 
+const execSrcReplacements = (src, replacements) => {
+  for (const replacement of replacements) {
+    if ((typeof replacement.from === "string" || replacement.from instanceof RegExp) === false) {
+      throw new TypeError(
+        "[vite-plugin-replace]: The replacement option 'from' is not of type 'string' or 'RegExp'."
+      );
+    } else if ((typeof replacement.to === "string" || replacement.to instanceof Function) === false) {
+      throw new TypeError(
+        "[vite-plugin-replace]: The replacement option 'to' is not of type 'string' or 'Function'"
+      );
+    } else
+      src = src.replace(replacement.from, replacement.to);
+  }
+  return src;
+};
+const replaceCodePlugin = (config) => {
+  if (config === void 0) {
+    config = {
+      replacements: []
+    };
+  } else if ((typeof config === "object" || config !== null) === false) {
+    throw new TypeError(
+      "[vite-plugin-replace]: The configuration is not of type 'Object'."
+    );
+  } else if (Array.isArray(config.replacements) === false) {
+    throw new TypeError(
+      "[vite-plugin-replace]: The configuration option 'replacement' is not of type 'Array'."
+    );
+  }
+  return {
+    name: "transform-file",
+    enforce: "pre",
+    transform: function(src) {
+      return {
+        code: execSrcReplacements(src, config.replacements),
+        map: null
+      };
+    }
+  };
+};
+
 const resolver = createResolver(import.meta.url);
 const runtimeDir = resolver.resolve("./runtime");
 const module = defineNuxtModule({
@@ -146,6 +187,18 @@ const blockIframes = (moduleOptions) => {
         }
       });
     });
+    extendViteConfig((config) => {
+      config?.plugins?.push(
+        replaceCodePlugin({
+          replacements: [
+            {
+              from: /<iframe[^>]*.*|<\/iframe>/g,
+              to: (match) => match.includes("cookie-enabled") ? match : match.replace(/<iframe/g, "<CookieIframe").replace(/iframe>/g, "CookieIframe>")
+            }
+          ]
+        })
+      );
+    });
   }
 };
 const loadLocales = async (moduleOptions) => {

package/dist/runtime/components/CookieControl.vue

@@ -186,6 +186,7 @@
 <script setup lang="ts">
 import { ref, computed, onBeforeMount, watch } from 'vue'
 
+import { useNuxtApp } from '#app'
 import { Cookie, CookieType, Locale, Translatable } from '../types'
 import {
   getAllCookieIdsString,
@@ -212,6 +213,7 @@ const {
   isModalActive,
   moduleOptions,
 } = useCookieControl()
+const nuxtApp = useNuxtApp()
 
 // data
 const expires = new Date(Date.now() + moduleOptions.cookieExpiryOffsetMs)
@@ -278,6 +280,9 @@ const getName = (name: Translatable) => {
     ? localeStrings.value?.cookiesFunctional
     : resolveTranslatable(name, props.locale)
 }
+const init = () => {
+  nuxtApp.$cookies.locale.value = props.locale
+}
 const onModalClick = () => {
   if (moduleOptions.closeModalOnClickOutside) {
     isModalActive.value = false
@@ -392,6 +397,7 @@ watch(
   },
   { deep: true },
 )
+
 watch(isConsentGiven, (current, _previous) => {
   if (current === undefined) {
     cookieIsConsentGiven.value = undefined
@@ -400,6 +406,16 @@ watch(isConsentGiven, (current, _previous) => {
   }
 })
 
+watch(
+  () => props.locale,
+  (locale) => {
+    nuxtApp.$cookies.locale.value = locale
+  },
+)
+
+// initialization
+init()
+
 defineExpose({
   accept,
   acceptPartial,

package/dist/runtime/components/CookieIframe.vue

@@ -1,6 +1,10 @@
 <template>
-  <client-only>
-    <iframe v-if="isCookieFunctionalEnabled" />
+  <ClientOnly>
+    <iframe
+      v-if="isCookieFunctionalEnabled"
+      :cookie-enabled="null"
+      v-bind="$attrs"
+    />
     <div v-else class="cookieControl__BlockedIframe">
       <p>
         {{ localeStrings?.iframeBlocked }}
@@ -11,25 +15,18 @@
         />
       </p>
     </div>
-  </client-only>
+  </ClientOnly>
 </template>
 
 <script setup lang="ts">
 import { computed } from 'vue'
 
-import { LOCALE_DEFAULT } from '../constants'
-import { Cookie, Locale } from '../types'
-
+import { useNuxtApp } from '#app'
+import { Cookie } from '../types'
 import { useCookieControl } from '#imports'
 
-export interface Props {
-  locale?: Locale
-}
-const props = withDefaults(defineProps<Props>(), {
-  locale: LOCALE_DEFAULT,
-})
-
 const { cookiesEnabled, isModalActive, moduleOptions } = useCookieControl()
+const nuxtApp = useNuxtApp()
 
 // computations
 const isCookieFunctionalEnabled = computed(
@@ -38,5 +35,7 @@ const isCookieFunctionalEnabled = computed(
       (cookieEnabled: Cookie) => cookieEnabled.name === 'functional',
     ).length > 0,
 )
-const localeStrings = computed(() => moduleOptions.localeTexts[props.locale])
+const localeStrings = computed(
+  () => moduleOptions.localeTexts[nuxtApp.$cookies.locale.value],
+)
 </script>

package/dist/runtime/plugin.mjs

@@ -26,11 +26,13 @@ export default defineNuxtPlugin((_nuxtApp) => {
   );
   const cookiesEnabledIds = ref(cookieCookiesEnabledIds);
   const isModalActive = ref();
+  const locale = ref();
   const state = {
-    isConsentGiven,
     cookiesEnabled,
     cookiesEnabledIds,
+    isConsentGiven,
     isModalActive,
+    locale,
     moduleOptions
   };
   return {

package/dist/runtime/types.d.ts

@@ -61,5 +61,6 @@ export interface State {
     cookiesEnabledIds: Ref<string[] | undefined>;
     isConsentGiven: Ref<boolean | undefined>;
     isModalActive: Ref<boolean>;
+    locale: Ref<Locale>;
     moduleOptions: ModuleOptions;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dargmuesli/nuxt-cookie-control",
-  "version": "6.1.0",
+  "version": "6.1.2",
   "description": "Nuxt Cookie Control Module",
   "author": "Dario Ferderber <dario.ferderber@broj42.com>",
   "maintainers": [
@@ -18,7 +18,7 @@
   "engines": {
     "node": ">=16"
   },
-  "packageManager": "pnpm@8.6.7",
+  "packageManager": "pnpm@8.6.9",
   "exports": {
     ".": {
       "import": "./dist/module.mjs",
@@ -40,28 +40,28 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@nuxt/kit": "3.6.2",
+    "@nuxt/kit": "3.6.3",
     "@sindresorhus/slugify": "2.2.1",
     "css-vars-ponyfill": "2.4.8",
     "string-replace-loader": "3.1.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.6.6",
-    "@commitlint/config-conventional": "17.6.6",
+    "@commitlint/cli": "17.6.7",
+    "@commitlint/config-conventional": "17.6.7",
     "@dargmuesli/nuxt-cookie-control": "link:.",
     "@nuxt/module-builder": "0.4.0",
     "@nuxtjs/eslint-config-typescript": "12.0.0",
-    "eslint": "8.44.0",
+    "eslint": "8.45.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-prettier": "5.0.0",
     "husky": "8.0.3",
     "lint-staged": "13.2.3",
-    "nuxt": "3.6.2",
+    "nuxt": "3.6.3",
     "prettier": "3.0.0",
     "typescript": "5.1.6",
     "vue": "3.3.4",
-    "vue-tsc": "1.8.4",
-    "webpack": "5.88.1"
+    "vue-tsc": "1.8.5",
+    "webpack": "5.88.2"
   },
   "publishConfig": {
     "access": "public"