Skip to content

Commit 5a8d9b7

Browse files
committed
fix: removed wrapper code
1 parent 1a6796d commit 5a8d9b7

File tree

3 files changed

+18
-59
lines changed

3 files changed

+18
-59
lines changed

src/index.ts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import Vue from 'vue'
2+
import defu from 'defu'
3+
import chalk from 'chalk'
24
import { resolve } from 'path'
35
import { Module, Plugin } from '@nuxt/types'
46
import { IDeliveryClientConfig } from '@kentico/kontent-delivery'
5-
import defu from 'defu'
67
import { logger } from './utilties/logger'
7-
import chalk from 'chalk'
8-
import { NuxtDeliveryClient } from './runtime/nuxt-delivery-client'
8+
import { INuxtDeliveryClient } from "./runtime/inuxt-delivery-client-interface";
99

1010
type Exclude<T, U> = T extends U ? never : T
1111

@@ -47,11 +47,11 @@ const deliveryClientModule: Module<IDeliveryClientConfig> = function (moduleOpti
4747

4848
declare module '@nuxt/types' {
4949
interface Context {
50-
$nuxtDeliveryClient: NuxtDeliveryClient
50+
$nuxtDeliveryClient: INuxtDeliveryClient
5151
}
5252

5353
interface NuxtAppOptions {
54-
$nuxtDeliveryClient: NuxtDeliveryClient
54+
$nuxtDeliveryClient: INuxtDeliveryClient
5555
}
5656

5757
interface Configuration {
@@ -61,13 +61,10 @@ declare module '@nuxt/types' {
6161

6262
declare module 'vue/types/vue' {
6363
interface Vue {
64-
$nuxtDeliveryClient: NuxtDeliveryClient;
64+
$nuxtDeliveryClient: INuxtDeliveryClient;
6565
}
6666
}
6767

68-
export { NuxtDeliveryClient }
69-
7068
export default deliveryClientModule
71-
7269
export const meta = require('../package.json')
7370

src/runtime/nuxt-delivery-client.ts

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/runtime/plugin.template.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
import { DeliveryClient, IContentItem, MultipleItemsQuery } from '@kentico/kontent-delivery';
12
import { Plugin } from '@nuxt/types'
2-
import { NuxtDeliveryClient } from '~deliveryclientruntime/nuxt-delivery-client'
3+
import { INuxtDeliveryClient } from "~deliveryclientruntime/inuxt-delivery-client-interface";
4+
import { CacheService } from "~deliveryclientruntime/cache-service"
35

46
// Default configuration
57
let config = {
@@ -19,22 +21,22 @@ try {
1921

2022
declare module 'vue/types/vue' {
2123
interface Vue {
22-
$nuxtDeliveryClient: NuxtDeliveryClient
24+
$nuxtDeliveryClient: INuxtDeliveryClient
2325
}
2426
}
2527

2628
declare module '@nuxt/types' {
2729
interface NuxtAppOptions {
28-
$nuxtDeliveryClient: NuxtDeliveryClient
30+
$nuxtDeliveryClient: INuxtDeliveryClient
2931
}
3032
interface Context {
31-
$nuxtDeliveryClient: NuxtDeliveryClient
33+
$nuxtDeliveryClient: INuxtDeliveryClient
3234
}
3335
}
3436

3537
declare module 'vuex/types/index' {
3638
interface Store<S> {
37-
$nuxtDeliveryClient: NuxtDeliveryClient
39+
$nuxtDeliveryClient: INuxtDeliveryClient
3840
}
3941
}
4042

@@ -58,7 +60,11 @@ const deliveryClientPlugin: Plugin = (context, inject) => {
5860
});
5961
}
6062

61-
const nuxtDeliveryClient = new NuxtDeliveryClient(config.kenticokontent);
63+
const deliveryClient = new DeliveryClient(config.kenticokontent);
64+
const cacheService = new CacheService(deliveryClient);
65+
66+
const nuxtDeliveryClient = deliveryClient as any as INuxtDeliveryClient;
67+
nuxtDeliveryClient.viaCache = <TContentItem extends IContentItem>(query: MultipleItemsQuery<TContentItem>, seconds: number, cacheKey?: string, isServerProcess?: boolean) => cacheService.viaCache(query, seconds, cacheKey, isServerProcess);
6268

6369
inject('nuxtDeliveryClient', nuxtDeliveryClient)
6470
}

0 commit comments

Comments
 (0)