nuxt-yandex-metrika 1.2.2 → 1.2.4

package/dist/module.d.mts

@@ -0,0 +1,15 @@
+import * as _nuxt_schema from '@nuxt/schema';
+import { InitParameters } from '../dist/runtime/yandex-metrika/index.js';
+
+type YandexMetrikaModuleOptions = {
+    id: string;
+    debug: boolean;
+    cdn: boolean;
+    delay: number;
+    verification: null | string;
+    options: Partial<InitParameters>;
+};
+
+declare const _default: _nuxt_schema.NuxtModule<YandexMetrikaModuleOptions>;
+
+export { _default as default };

package/dist/module.d.ts

@@ -1,37 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
-
-declare global {
-    interface Window {
-        ym: ((...args: any[]) => void) & {
-            a: any[];
-            l: number;
-        };
-    }
-}
-interface VisitParameters {
-    order_price?: number;
-    currency?: string;
-    [key: string]: any;
-}
-interface UserParameters {
-    UserID?: number;
-    [key: string]: any;
-}
-interface InitParameters {
-    accurateTrackBounce?: boolean | number;
-    childIframe?: boolean;
-    clickmap?: boolean;
-    defer?: boolean;
-    ecommerce?: boolean | string | any[];
-    params?: VisitParameters | VisitParameters[];
-    userParams?: UserParameters;
-    trackHash?: boolean;
-    trackLinks?: boolean;
-    trustedDomains?: string[];
-    type?: number;
-    webvisor?: boolean;
-    triggerEvent?: boolean;
-}
+import { InitParameters } from '../dist/runtime/yandex-metrika/index.js';
 
 type YandexMetrikaModuleOptions = {
     id: string;

package/dist/module.json

@@ -1,8 +1,12 @@
 {
   "name": "nuxt-yandex-metrika",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "configKey": "yandexMetrika",
   "compatibility": {
     "nuxt": "^3"
+  },
+  "builder": {
+    "@nuxt/module-builder": "0.7.1",
+    "unbuild": "2.0.0"
   }
 }

package/dist/module.mjs

@@ -1,8 +1,8 @@
-import { defineNuxtModule, createResolver, addPlugin, addComponentsDir, addImportsDir } from '@nuxt/kit';
+import { defineNuxtModule, createResolver, addPlugin, addComponentsDir, addImports } from '@nuxt/kit';
 import { defu } from 'defu';
 
 const name = "nuxt-yandex-metrika";
-const version = "1.2.2";
+const version = "1.2.4";
 
 const module = defineNuxtModule({
   meta: {
@@ -20,7 +20,18 @@ const module = defineNuxtModule({
     delay: 0,
     cdn: false,
     verification: null,
-    options: {}
+    options: {
+      accurateTrackBounce: true,
+      childIframe: true,
+      clickmap: true,
+      defer: false,
+      ecommerce: false,
+      trackHash: false,
+      trackLinks: true,
+      webvisor: false,
+      triggerEvent: false,
+      sendTitle: true
+    }
   },
   setup(options, nuxt) {
     nuxt.options.runtimeConfig.public.yandexMetrika = defu(
@@ -35,7 +46,11 @@ const module = defineNuxtModule({
     void addComponentsDir({
       path: resolver.resolve("runtime/components")
     });
-    addImportsDir(resolver.resolve("runtime/composables"));
+    addImports({
+      name: "useYandexMetrika",
+      as: "useYandexMetrika",
+      from: resolver.resolve("runtime/composables/useYandexMetrika")
+    });
   }
 });
 

package/dist/runtime/components/yandex-metrika-informer.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { useYandexMetrika } from '../composables/useYandexMetrika';
+
 const { id } = useYandexMetrika();
 </script>
 
@@ -14,6 +15,6 @@ const { id } = useYandexMetrika();
 			class="ym-advanced-informer"
 			:data-cid="id"
 			data-lang="ru"
-	/></a>
+	></a>
 	<!-- /Yandex.Metrika informer -->
 </template>

package/dist/runtime/components/yandex-verification.vue

@@ -1,7 +1,8 @@
 <script setup lang="ts">
-import { useYandexMetrika } from '../composables/useYandexMetrika';
 import chalk from 'chalk';
 
+import { useYandexMetrika } from '../composables/useYandexMetrika';
+
 const { verification } = useYandexMetrika();
 
 if (!verification) {

package/dist/runtime/composables/useYandexMetrika.d.ts

@@ -1,2 +1,2 @@
-import { YandexMetrika } from '../yandex-metrika';
+import type { YandexMetrika } from '../yandex-metrika.js';
 export declare function useYandexMetrika(): YandexMetrika;

package/dist/runtime/{plugin.mjs → plugin.js}

@@ -1,21 +1,12 @@
-import { defineNuxtPlugin, useHead, useRouter, useRuntimeConfig } from "#app";
-import { Methods, YandexMetrika } from "./yandex-metrika/index.mjs";
+import { defineNuxtPlugin, useRouter, useRuntimeConfig } from "#app";
+import { useHead } from "#imports";
+import { Methods, YandexMetrika } from "./yandex-metrika/index.js";
 export default defineNuxtPlugin({
   parallel: true,
   setup() {
     const config = useRuntimeConfig().public.yandexMetrika;
     const { id, cdn = false, delay = 0, debug, verification = null, options = {} } = config;
-    if (!debug) {
-      useHead({
-        noscript: [
-          {
-            key: "yandex-metrika-noscript",
-            innerHTML: `<div><img src="https://mc.yandex.ru/watch/${id}" style="position:absolute; left:-9999px;" alt="" />`
-          }
-        ]
-      });
-    }
-    if (debug || delay) {
+    if (import.meta.dev) {
       useHead({
         script: [
           {
@@ -30,28 +21,39 @@ export default defineNuxtPlugin({
       });
     } else {
       useHead({
-        script: [
+        noscript: [
           {
-            key: "yandex-metrika",
-            innerHTML: `(function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)}; m[i].l=1*new Date(); for (var j = 0; j < document.scripts.length; j++) {if (document.scripts[j].src === r) { return; }} k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)}) (window, document, "script", "${YandexMetrika.src(
-              cdn
-            )}", "ym");`
+            key: "yandex-metrika-noscript",
+            innerHTML: `<div><img src="https://mc.yandex.ru/watch/${id}" style="position:absolute; left:-9999px;" alt="" />`
           }
         ]
       });
-    }
-    if (!debug && delay && process.client) {
-      setTimeout(() => {
-        const script = document.createElement("script");
-        script.defer = true;
-        script.src = YandexMetrika.src(cdn);
-        document.head.append(script);
-      }, delay);
+      if (delay && delay > 0) {
+        if (import.meta.client) {
+          setTimeout(() => {
+            const script = document.createElement("script");
+            script.defer = true;
+            script.src = YandexMetrika.src(cdn);
+            document.head.append(script);
+          }, delay);
+        }
+      } else {
+        useHead({
+          script: [
+            {
+              key: "yandex-metrika",
+              innerHTML: `(function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)}; m[i].l=1*new Date(); for (var j = 0; j < document.scripts.length; j++) {if (document.scripts[j].src === r) { return; }} k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)}) (window, document, "script", "${YandexMetrika.src(
+                cdn
+              )}", "ym");`
+            }
+          ]
+        });
+      }
     }
     const yandexMetrika = new YandexMetrika(id);
     yandexMetrika.debug = debug;
     yandexMetrika.verification = verification;
-    if (process.client) {
+    if (import.meta.client) {
       let ready = false;
       const router = useRouter();
       void router.isReady().then(() => {

package/dist/runtime/yandex-metrika/YandexMetrika.d.ts

@@ -1,5 +1,5 @@
-import { Events, HitOptions, InitParameters, People, UserParameters, VisitParameters } from './types';
-export * from './types';
+import type { Events, HitOptions, InitParameters, People, UserParameters, VisitParameters } from './types.js';
+export * from './types.js';
 export declare class YandexMetrika implements Events {
     #private;
     static src(cdn?: boolean): "https://cdn.jsdelivr.net/npm/yandex-metrica-watch/tag.js" | "https://mc.yandex.ru/metrika/tag.js";
@@ -9,7 +9,7 @@ export declare class YandexMetrika implements Events {
     get verification(): string | null;
     set verification(value: string | null);
     get id(): string;
-    init(options?: InitParameters): void;
+    init(options?: Partial<InitParameters>): void;
     addFileExtension(extensions?: string | string[]): void;
     extLink<CTX>(url: string, options?: Omit<HitOptions<CTX>, 'referer'>): void;
     file<CTX>(url: string, options?: HitOptions<CTX>): void;

package/dist/runtime/yandex-metrika/{YandexMetrika.mjs → YandexMetrika.js}

@@ -1,6 +1,6 @@
 import chalk from "chalk";
-import { Methods } from "./types.mjs";
-export * from "./types.mjs";
+import { Methods } from "./types.js";
+export * from "./types.js";
 export class YandexMetrika {
   #id;
   #debug = false;
@@ -67,7 +67,7 @@ export class YandexMetrika {
   }
   #call(type, ...args) {
     if (this.#debug) {
-      console.debug(`${chalk.bgGreen(chalk.black("[yandex-metrika]"))} ${chalk.blue(type)}`, ...args);
+      console.log(`${chalk.bgGreen(chalk.black("[yandex-metrika]"))} ${chalk.blue(type)}`, ...args);
     }
     if (typeof window !== "undefined" && window.ym) {
       window.ym(this.id, type, ...args);

package/dist/runtime/yandex-metrika/index.d.ts

@@ -1,2 +1,2 @@
-export { YandexMetrika } from './YandexMetrika';
-export * from './types';
+export * from './types.js';
+export { YandexMetrika } from './YandexMetrika.js';

package/dist/runtime/yandex-metrika/index.js

@@ -0,0 +1,2 @@
+export * from "./types.js";
+export { YandexMetrika } from "./YandexMetrika.js";

package/dist/runtime/yandex-metrika/types.d.ts

@@ -29,6 +29,7 @@ export interface InitParameters {
     type?: number;
     webvisor?: boolean;
     triggerEvent?: boolean;
+    sendTitle: boolean;
 }
 export interface HitOptions<CTX> {
     callback?: (this: CTX) => void;

package/dist/types.d.mts

@@ -0,0 +1,64 @@
+
+import type {  } from './module.js'
+
+  export interface ModuleOptions {
+ /** @default "xxx" */
+ id: string,
+
+ /** @default true */
+ debug: boolean,
+
+ /** @default 0 */
+ delay: number,
+
+ /** @default false */
+ cdn: boolean,
+
+ /** @default null */
+ verification: any,
+
+ options: {
+  /** @default true */
+  accurateTrackBounce: boolean,
+
+  /** @default true */
+  childIframe: boolean,
+
+  /** @default true */
+  clickmap: boolean,
+
+  /** @default false */
+  defer: boolean,
+
+  /** @default false */
+  ecommerce: boolean,
+
+  /** @default false */
+  trackHash: boolean,
+
+  /** @default true */
+  trackLinks: boolean,
+
+  /** @default false */
+  webvisor: boolean,
+
+  /** @default false */
+  triggerEvent: boolean,
+
+  /** @default true */
+  sendTitle: boolean,
+ },
+}
+
+declare module '@nuxt/schema' {
+  interface NuxtConfig { ['yandexMetrika']?: Partial<ModuleOptions> }
+  interface NuxtOptions { ['yandexMetrika']?: ModuleOptions }
+}
+
+declare module 'nuxt/schema' {
+  interface NuxtConfig { ['yandexMetrika']?: Partial<ModuleOptions> }
+  interface NuxtOptions { ['yandexMetrika']?: ModuleOptions }
+}
+
+
+export type { default } from './module.js'

package/dist/types.d.ts

@@ -1,7 +1,64 @@
 
-import {  } from './module'
+import type {  } from './module'
 
+  export interface ModuleOptions {
+ /** @default "xxx" */
+ id: string,
 
+ /** @default true */
+ debug: boolean,
 
+ /** @default 0 */
+ delay: number,
 
-export { default } from './module'
+ /** @default false */
+ cdn: boolean,
+
+ /** @default null */
+ verification: any,
+
+ options: {
+  /** @default true */
+  accurateTrackBounce: boolean,
+
+  /** @default true */
+  childIframe: boolean,
+
+  /** @default true */
+  clickmap: boolean,
+
+  /** @default false */
+  defer: boolean,
+
+  /** @default false */
+  ecommerce: boolean,
+
+  /** @default false */
+  trackHash: boolean,
+
+  /** @default true */
+  trackLinks: boolean,
+
+  /** @default false */
+  webvisor: boolean,
+
+  /** @default false */
+  triggerEvent: boolean,
+
+  /** @default true */
+  sendTitle: boolean,
+ },
+}
+
+declare module '@nuxt/schema' {
+  interface NuxtConfig { ['yandexMetrika']?: Partial<ModuleOptions> }
+  interface NuxtOptions { ['yandexMetrika']?: ModuleOptions }
+}
+
+declare module 'nuxt/schema' {
+  interface NuxtConfig { ['yandexMetrika']?: Partial<ModuleOptions> }
+  interface NuxtOptions { ['yandexMetrika']?: ModuleOptions }
+}
+
+
+export type { default } from './module'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-yandex-metrika",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Add Yandex Metrika to your Nuxt 3 application.",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
     "dist"
   ],
   "scripts": {
-    "prepack": "nuxt-module-build",
+    "prepack": "nuxt-module-build build",
     "dev": "nuxi dev playground",
-    "dev:build": "nuxi build playground",
-    "dev:prepare": "nuxt-module-build --stub && nuxi prepare playground",
+    "dev:build": "nuxi build playground build",
+    "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground",
     "release": "npm run lint && npm run prepack && changelogen --release && npm publish && git push --follow-tags",
     "prettier": "prettier --write .",
     "lint": "eslint --fix .",
@@ -39,27 +39,24 @@
     "access": "public"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.7.0",
+    "@nuxt/kit": "^3.12.1",
     "chalk": "^5.3.0",
-    "defu": "^6.1.2"
+    "defu": "^6.1.4"
   },
   "devDependencies": {
     "@nuxt/devtools": "latest",
-    "@nuxt/eslint-config": "^0.2.0",
-    "@nuxt/module-builder": "^0.4.0",
-    "@nuxt/schema": "^3.7.0",
-    "@taknepoidet-config/prettier": "^2.1.0",
-    "@types/node": "^18.17.3",
-    "changelogen": "^0.5.4",
-    "eslint": "^8.48.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "husky": "^8.0.3",
-    "lint-staged": "^14.0.1",
-    "nuxt": "^3.7.0",
-    "prettier": "^3.0.3"
+    "@nuxt/eslint-config": "^0.3.13",
+    "@nuxt/module-builder": "^0.7.1",
+    "@nuxt/schema": "^3.12.1",
+    "@poidet/prettier": "^0.8.0",
+    "@types/node": "^20.14.2",
+    "changelogen": "^0.5.5",
+    "eslint": "^9.4.0",
+    "husky": "^9.0.11",
+    "lint-staged": "^15.2.7",
+    "nuxt": "^3.12.1",
+    "prettier": "^3.3.2"
   },
-  "packageManager": "pnpm@7.17.1",
   "lint-staged": {
     "**/*.(ts|vue)": [
       "eslint --fix",

package/dist/runtime/yandex-metrika/index.mjs

@@ -1,2 +0,0 @@
-export { YandexMetrika } from "./YandexMetrika.mjs";
-export * from "./types.mjs";