From 135514b9945aee884c78b1a3747baae3de0f1eeb Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Sun, 7 Mar 2021 11:04:46 +0000 Subject: [PATCH 1/2] feat!: support for vue3 --- package.json | 10 ++++++++-- src/cache.ts | 7 ++++--- src/image.ts | 2 +- src/index.ts | 2 +- src/query.ts | 9 +-------- yarn.lock | 22 +++++++++++++++++++++- 6 files changed, 36 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index d402ea4f..187729d4 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,8 @@ }, "dependencies": { "minify-groq": "^1.0.0", - "sanity-typed-queries": "^0.7.5" + "sanity-typed-queries": "^0.7.5", + "vue-demi": "^0.7.1" }, "devDependencies": { "@babel/core": "^7.15.0", @@ -103,6 +104,11 @@ }, "peerDependencies": { "@vue/composition-api": "1.0.5", - "vue": "^2" + "vue": "^2.0.0 || >=3.0.0-rc.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } } } diff --git a/src/cache.ts b/src/cache.ts index 520ef5f8..5e345e18 100644 --- a/src/cache.ts +++ b/src/cache.ts @@ -1,15 +1,16 @@ -import { VueConstructor } from 'vue' +import type { VueConstructor } from 'vue' import { computed, getCurrentInstance, isRef, - onServerPrefetch, reactive, Ref, set, unref, watch, -} from '@vue/composition-api' + onServerPrefetch, + Vue2, +} from 'vue-demi' /** * Cached data, status of fetch, timestamp of last fetch, error diff --git a/src/image.ts b/src/image.ts index 61189ba1..84f82439 100644 --- a/src/image.ts +++ b/src/image.ts @@ -1,4 +1,4 @@ -import { Ref, inject, computed, InjectionKey } from '@vue/composition-api' +import { Ref, inject, computed, InjectionKey } from 'vue-demi' import { FitMode, diff --git a/src/index.ts b/src/index.ts index 0b0f8f6d..db06c209 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,4 @@ -import { provide, inject } from '@vue/composition-api' +import { provide, inject } from 'vue-demi' import { ClientConfig } from '@sanity/client' diff --git a/src/query.ts b/src/query.ts index 9ba7fb8e..d56d8e5a 100644 --- a/src/query.ts +++ b/src/query.ts @@ -1,11 +1,4 @@ -import { - computed, - inject, - watch, - InjectionKey, - Ref, - isRef, -} from '@vue/composition-api' +import { computed, inject, watch, InjectionKey, Ref, isRef } from 'vue-demi' import minifier from 'minify-groq' import type { SanityClient } from '@sanity/client' import type { QueryBuilder } from 'sanity-typed-queries' diff --git a/yarn.lock b/yarn.lock index 96d91a51..6dfb72f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9961,6 +9961,22 @@ typescript@^4.3.5: languageName: node linkType: hard +"vue-demi@npm:^0.7.1": + version: 0.7.1 + resolution: "vue-demi@npm:0.7.1" + peerDependencies: + "@vue/composition-api": ^1.0.0-beta.1 + vue: ^2.6.0 || >=3.0.0-rc.1 + peerDependenciesMeta: + "@vue/composition-api": + optional: true + bin: + vue-demi-fix: bin/vue-demi-fix.js + vue-demi-switch: bin/vue-demi-switch.js + checksum: 5eea3d8e1a410fe1ab78f0b347fd43317995bfe14e9137072e8b6de5425777cbf4142e2a6d93d8124d8d8b1dbeaa47fe90378d3697c52f1fb67e8b1d05faf23b + languageName: node + linkType: hard + "vue-sanity@workspace:.": version: 0.0.0-use.local resolution: "vue-sanity@workspace:." @@ -10005,11 +10021,15 @@ typescript@^4.3.5: siroc: ^0.15.0 typescript: ^4.3.5 vue: 2.6.14 + vue-demi: ^0.7.1 vue-server-renderer: ^2.6.14 vue-template-compiler: ^2.6.14 peerDependencies: "@vue/composition-api": 1.0.5 - vue: ^2 + vue: ^2.0.0 || >=3.0.0-rc.0 + peerDependenciesMeta: + "@vue/composition-api": + optional: true languageName: unknown linkType: soft From 170049a267df871133257d77efefc210450f00b2 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 16 Aug 2021 11:29:53 +0200 Subject: [PATCH 2/2] fix: remove unused import --- src/cache.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/cache.ts b/src/cache.ts index 5e345e18..a007489e 100644 --- a/src/cache.ts +++ b/src/cache.ts @@ -3,13 +3,12 @@ import { computed, getCurrentInstance, isRef, + onServerPrefetch, reactive, Ref, set, unref, watch, - onServerPrefetch, - Vue2, } from 'vue-demi' /**