From 0831a4de822a2bda5944db410659a0048381337d Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 4 Dec 2023 14:57:41 +0000 Subject: [PATCH 1/2] chore: use module-builder stub mode for more accurate types --- package.json | 2 +- tsconfig.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e4ee3e5..9ba909c 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "prepack": "nuxt-module-build", "dev": "nuxi dev playground", "dev:build": "nuxi build playground", - "dev:prepare": "nuxt-module-build --stub && nuxi prepare playground", + "dev:prepare": "nuxt-module-build --stub && nuxt-module-build prepare && nuxi prepare playground", "lint": "eslint .", "lint:fix": "eslint . --fix", "test:types": "tsc --noEmit", diff --git a/tsconfig.json b/tsconfig.json index 9dd826f..4b34df1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "./playground/.nuxt/tsconfig.json" + "extends": "./.nuxt/tsconfig.json" } From 2ca42d248cf6ff2e8400e70cf5281d6546f43a92 Mon Sep 17 00:00:00 2001 From: Johann Schopplich Date: Tue, 5 Dec 2023 09:57:29 +0100 Subject: [PATCH 2/2] chore: update types for module-builder stub --- .nuxtrc | 1 - package.json | 4 ++-- src/module.ts | 2 +- src/runtime/plugin.client.ts | 3 ++- 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 .nuxtrc diff --git a/.nuxtrc b/.nuxtrc deleted file mode 100644 index 820d356..0000000 --- a/.nuxtrc +++ /dev/null @@ -1 +0,0 @@ -typescript.includeWorkspace=true diff --git a/package.json b/package.json index 9ba909c..9398a32 100644 --- a/package.json +++ b/package.json @@ -31,10 +31,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 && nuxt-module-build prepare && nuxi prepare playground", + "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground", "lint": "eslint .", "lint:fix": "eslint . --fix", "test:types": "tsc --noEmit", diff --git a/src/module.ts b/src/module.ts index d34a69e..992d56e 100644 --- a/src/module.ts +++ b/src/module.ts @@ -82,7 +82,7 @@ export default defineNuxtModule({ // Add module options to public runtime config nuxt.options.runtimeConfig.public.plausible = defu( - nuxt.options.runtimeConfig.public.plausible, + nuxt.options.runtimeConfig.public.plausible as ModuleOptions, options, ) diff --git a/src/runtime/plugin.client.ts b/src/runtime/plugin.client.ts index 58342ab..2709387 100644 --- a/src/runtime/plugin.client.ts +++ b/src/runtime/plugin.client.ts @@ -1,8 +1,9 @@ import Plausible from 'plausible-tracker' import { defineNuxtPlugin, useRuntimeConfig } from '#imports' +import type { ModuleOptions } from '../module' export default defineNuxtPlugin(() => { - const { plausible: options } = useRuntimeConfig().public + const options = useRuntimeConfig().public.plausible as ModuleOptions const plausible = Plausible({ ...options,