chore: drop vue 2 support

logaretm · logaretm · commit 5f6fd319499c · 2021-05-12T17:31:49.000+02:00
diff --git a/README.md b/README.md
@@ -61,10 +61,8 @@ npm install villus graphql --save
 Or because villus is so simple, you can use it via CDN:
 
 ```html
-<!-- Import Vue 2 or 3 -->
+<!-- Import Vue 3 -->
 <script src="https://unpkg.com/vue@3.0.2/dist/vue.global.js"></script>
-<!-- Vue Demi is needed for Vue 2 and 3 support -->
-<script src="https://unpkg.com/vue-demi@0.4.1/lib/index.iife.js"></script>
 <!-- Villus -->
 <script src="https://unpkg.com/villus@latest/dist/villus.min.js"></script>
 ```
diff --git a/package.json b/package.json
@@ -20,47 +20,47 @@
   "author": "Abdelrahman Awad <logaretm1@gmail.com>",
   "license": "MIT",
   "devDependencies": {
-    "@commitlint/cli": "^12.0.1",
+    "@commitlint/cli": "^12.1.3",
     "@graphql-typed-document-node/core": "^3.1.0",
     "@types/graphql": "^14.5.0",
-    "@types/jest": "^26.0.21",
+    "@types/jest": "^26.0.23",
     "@types/node-fetch": "^2.5.8",
-    "@typescript-eslint/eslint-plugin": "^4.18.0",
-    "@typescript-eslint/parser": "^4.18.0",
+    "@typescript-eslint/eslint-plugin": "^4.23.0",
+    "@typescript-eslint/parser": "^4.23.0",
     "babel-jest": "^26.6.3",
     "bundlesize": "^0.18.0",
-    "chalk": "^4.1.0",
-    "eslint": "^7.22.0",
-    "eslint-config-prettier": "^8.1.0",
+    "chalk": "^4.1.1",
+    "eslint": "^7.26.0",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-config-standard": "^16.0.2",
     "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-jest": "^24.3.2",
+    "eslint-plugin-jest": "^24.3.6",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-promise": "^4.3.1",
     "eslint-plugin-standard": "^5.0.0",
     "fast-json-stable-stringify": "^2.1.0",
-    "filesize": "^6.1.0",
+    "filesize": "^6.3.0",
     "flush-promises": "^1.0.2",
     "graphql": "^15.5.0",
-    "graphql-tag": "^2.11.0",
+    "graphql-tag": "^2.12.4",
     "gzip-size": "^6.0.0",
-    "husky": "^5.2.0",
+    "husky": "^6.0.0",
     "jest": "^26.6.3",
     "lerna": "^4.0.0",
-    "lint-staged": "^10.5.4",
+    "lint-staged": "^11.0.0",
     "mkdirp": "^1.0.4",
-    "msw": "^0.27.1",
+    "msw": "^0.28.2",
     "node-fetch": "^2.6.1",
-    "prettier": "^2.2.0",
-    "rollup": "^2.42.1",
+    "prettier": "^2.3.0",
+    "rollup": "^2.47.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-dts": "^3.0.1",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.2.0",
     "rollup-plugin-typescript2": "^0.30.0",
-    "terser": "^5.6.1",
-    "ts-jest": "^26.5.4",
+    "terser": "^5.7.0",
+    "ts-jest": "^26.5.6",
     "typescript": "^4.1.5",
     "vue": "^3.0.0",
     "vue-jest": "^3.0.7",
@@ -83,7 +83,5 @@
       "prettier --write"
     ]
   },
-  "dependencies": {
-    "vue-demi": "^0.7.3"
-  }
+  "dependencies": {}
 }
diff --git a/packages/villus/README.md b/packages/villus/README.md
@@ -61,10 +61,8 @@ npm install villus graphql --save
 Or because villus is so simple, you can use it via CDN:
 
 ```html
-<!-- Import Vue 2 or 3 -->
+<!-- Import Vue  3 -->
 <script src="https://unpkg.com/vue@3.0.2/dist/vue.global.js"></script>
-<!-- Vue Demi is needed for Vue 2 and 3 support -->
-<script src="https://unpkg.com/vue-demi@0.4.1/lib/index.iife.js"></script>
 <!-- Villus -->
 <script src="https://unpkg.com/villus@latest/dist/villus.min.js"></script>
 ```
diff --git a/packages/villus/package.json b/packages/villus/package.json
@@ -12,12 +12,8 @@
     "dist/*.js",
     "dist/villus.d.ts"
   ],
-  "dependencies": {
-    "vue-demi": "^0.7.3"
-  },
   "peerDependencies": {
-    "@vue/composition-api": "^1.0.0-beta.1",
     "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0",
-    "vue": "^2.0.0 || >=3.0.0"
+    "vue": "^3.0.0"
   }
 }
diff --git a/packages/villus/src/Mutation.ts b/packages/villus/src/Mutation.ts
@@ -1,4 +1,4 @@
-import { defineComponent } from 'vue-demi';
+import { defineComponent } from 'vue';
 import { useMutation } from './useMutation';
 import { normalizeChildren } from './utils';
 
diff --git a/packages/villus/src/Provider.ts b/packages/villus/src/Provider.ts
@@ -1,4 +1,4 @@
-import { defineComponent, h, SetupContext } from 'vue-demi';
+import { defineComponent, h, SetupContext } from 'vue';
 import { normalizeChildren } from './utils';
 import { useClient } from './useClient';
 import { CachePolicy, ClientPlugin } from './types';
diff --git a/packages/villus/src/Query.ts b/packages/villus/src/Query.ts
@@ -1,4 +1,4 @@
-import { defineComponent, Ref, toRef, watch } from 'vue-demi';
+import { defineComponent, Ref, toRef, watch } from 'vue';
 import { CachePolicy } from './types';
 import { useQuery, BaseQueryApi } from './useQuery';
 import { normalizeChildren } from './utils';
diff --git a/packages/villus/src/Subscription.ts b/packages/villus/src/Subscription.ts
@@ -1,4 +1,4 @@
-import { defineComponent, toRef, watch } from 'vue-demi';
+import { defineComponent, toRef, watch } from 'vue';
 import { normalizeChildren } from './utils';
 import { useSubscription, defaultReducer, Reducer } from './useSubscription';
 
diff --git a/packages/villus/src/client.ts b/packages/villus/src/client.ts
@@ -17,7 +17,7 @@ import {
   QueryExecutionContext,
 } from './types';
 import { VILLUS_CLIENT } from './symbols';
-import { App } from 'vue-demi';
+import { App } from 'vue';
 
 export interface ClientOptions {
   url: string;
@@ -137,7 +137,7 @@ export class Client {
   public async executeSubscription<TData = any, TVars = QueryVariables>(operation: Operation<TData, TVars>) {
     const result = await this.execute<TData, TVars>(operation, 'subscription');
 
-    return (result as unknown) as ObservableLike<StandardOperationResult<TData>>;
+    return result as unknown as ObservableLike<StandardOperationResult<TData>>;
   }
 }
 
diff --git a/packages/villus/src/symbols.ts b/packages/villus/src/symbols.ts
@@ -1,4 +1,4 @@
-import { InjectionKey } from 'vue-demi';
+import { InjectionKey } from 'vue';
 import { Client } from './client';
 
 export const VILLUS_CLIENT: InjectionKey<Client> = Symbol('villus.client');
diff --git a/packages/villus/src/types.ts b/packages/villus/src/types.ts
@@ -1,7 +1,7 @@
-import { ComputedRef, Ref } from 'vue-demi';
+import { ComputedRef, Ref } from 'vue';
+import type { ExecutionResult } from 'graphql';
 import { CombinedError } from './utils/error';
 import { ParsedResponse, FetchOptions, Operation } from '../../shared/src';
-import type { ExecutionResult } from 'graphql';
 
 export interface OperationResult<TData = any> {
   data: TData | null;
diff --git a/packages/villus/src/useClient.ts b/packages/villus/src/useClient.ts
@@ -1,4 +1,4 @@
-import { provide } from 'vue-demi';
+import { provide } from 'vue';
 import { createClient, ClientOptions } from './client';
 import { VILLUS_CLIENT } from './symbols';
 
diff --git a/packages/villus/src/useMutation.ts b/packages/villus/src/useMutation.ts
@@ -1,4 +1,4 @@
-import { ref, Ref, unref } from 'vue-demi';
+import { ref, Ref, unref } from 'vue';
 import { MaybeReactive, OperationResult, QueryExecutionContext, QueryVariables } from './types';
 import { CombinedError, injectWithSelf } from './utils';
 import { VILLUS_CLIENT } from './symbols';
diff --git a/packages/villus/src/useQuery.ts b/packages/villus/src/useQuery.ts
@@ -1,4 +1,4 @@
-import { isReactive, isRef, onMounted, Ref, ref, unref, watch } from 'vue-demi';
+import { isReactive, isRef, onMounted, Ref, ref, unref, watch } from 'vue';
 import stringify from 'fast-json-stable-stringify';
 import { CachePolicy, MaybeReactive, OperationResult, QueryExecutionContext, QueryVariables } from './types';
 import { hash, CombinedError, toWatchableSource, injectWithSelf } from './utils';
diff --git a/packages/villus/src/useSubscription.ts b/packages/villus/src/useSubscription.ts
@@ -1,4 +1,4 @@
-import { ref, Ref, onMounted, unref, onBeforeUnmount, watch, isRef } from 'vue-demi';
+import { ref, Ref, onMounted, unref, onBeforeUnmount, watch, isRef } from 'vue';
 import { VILLUS_CLIENT } from './symbols';
 import { Unsubscribable, OperationResult, QueryVariables, MaybeReactive, StandardOperationResult } from './types';
 import { CombinedError, injectWithSelf } from './utils';
diff --git a/packages/villus/src/utils/common.ts b/packages/villus/src/utils/common.ts
@@ -1,4 +1,4 @@
-import { getCurrentInstance, inject, InjectionKey, isReactive, isRef, Ref, toRefs, WatchSource } from 'vue-demi';
+import { getCurrentInstance, inject, InjectionKey, isReactive, isRef, Ref, toRefs, WatchSource } from 'vue';
 
 export function toWatchableSource<T = any>(value: Ref<T> | Record<string, any>): WatchSource | WatchSource[] {
   if (isRef(value)) {
diff --git a/packages/villus/src/utils/vnode.ts b/packages/villus/src/utils/vnode.ts
@@ -1,4 +1,4 @@
-import { SetupContext } from 'vue-demi';
+import { SetupContext } from 'vue';
 
 export function normalizeChildren(context: SetupContext, slotProps: any) {
   if (!context.slots.default) {
diff --git a/scripts/config.js b/scripts/config.js
@@ -23,15 +23,14 @@ const pkgBannerMap = {
 };
 
 const pkgExternals = {
-  villus: ['vue', 'graphql', 'vue-demi'],
+  villus: ['vue', 'graphql'],
   multipart: ['extract-files', 'villus'],
   batch: ['villus', 'graphql'],
 };
 
 const pkgGlobals = {
   villus: {
     vue: 'Vue',
-    'vue-demi': 'VueDemi',
     graphql: 'graphql',
   },
   multipart: {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,8 @@`
`12`	`12`	`"dist/*.js",`
`13`	`13`	`"dist/villus.d.ts"`
`14`	`14`	`],`
`15`		`- "dependencies": {`
`16`		`- "vue-demi": "^0.7.3"`
`17`		`- },`
`18`	`15`	`"peerDependencies": {`
`19`		`- "@vue/composition-api": "^1.0.0-beta.1",`
`20`	`16`	`"graphql": "^0.11.0 \|\| ^0.12.0 \|\| ^0.13.0 \|\| ^14.0.0 \|\| ^15.0.0",`
`21`		`- "vue": "^2.0.0 \|\| >=3.0.0"`
	`17`	`+ "vue": "^3.0.0"`
`22`	`18`	`}`
`23`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { defineComponent } from 'vue-demi';`
	`1`	`+import { defineComponent } from 'vue';`
`2`	`2`	`import { useMutation } from './useMutation';`
`3`	`3`	`import { normalizeChildren } from './utils';`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { defineComponent, h, SetupContext } from 'vue-demi';`
	`1`	`+import { defineComponent, h, SetupContext } from 'vue';`
`2`	`2`	`import { normalizeChildren } from './utils';`
`3`	`3`	`import { useClient } from './useClient';`
`4`	`4`	`import { CachePolicy, ClientPlugin } from './types';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { defineComponent, Ref, toRef, watch } from 'vue-demi';`
	`1`	`+import { defineComponent, Ref, toRef, watch } from 'vue';`
`2`	`2`	`import { CachePolicy } from './types';`
`3`	`3`	`import { useQuery, BaseQueryApi } from './useQuery';`
`4`	`4`	`import { normalizeChildren } from './utils';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { defineComponent, toRef, watch } from 'vue-demi';`
	`1`	`+import { defineComponent, toRef, watch } from 'vue';`
`2`	`2`	`import { normalizeChildren } from './utils';`
`3`	`3`	`import { useSubscription, defaultReducer, Reducer } from './useSubscription';`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import {`
`17`	`17`	`QueryExecutionContext,`
`18`	`18`	`} from './types';`
`19`	`19`	`import { VILLUS_CLIENT } from './symbols';`
`20`		`-import { App } from 'vue-demi';`
	`20`	`+import { App } from 'vue';`
`21`	`21`
`22`	`22`	`export interface ClientOptions {`
`23`	`23`	`url: string;`
`@@ -137,7 +137,7 @@ export class Client {`
`137`	`137`	`public async executeSubscription<TData = any, TVars = QueryVariables>(operation: Operation<TData, TVars>) {`
`138`	`138`	`const result = await this.execute<TData, TVars>(operation, 'subscription');`
`139`	`139`
`140`		`- return (result as unknown) as ObservableLike<StandardOperationResult<TData>>;`
	`140`	`+ return result as unknown as ObservableLike<StandardOperationResult<TData>>;`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`