update: remove vue-demi

package.json

@@ -38,7 +38,7 @@
     "d3-zoom": "^3.0.0",
     "fast-deep-equal": "^3.1.3",
     "pinia": "^2.0.0-beta.3",
-    "vue-demi": "latest"
+    "vue": "^3.0.5"
   },
   "devDependencies": {
     "@babel/core": "^7.14.6",
@@ -74,18 +74,8 @@
     "rollup-plugin-typescript2": "^0.30.0",
     "typescript": "^4.3.5",
     "vite": "^2.3.8",
-    "vue": "^3.0.5",
     "vue-tsc": "^0.0.24"
   },
-  "peerDependencies": {
-    "@vue/composition-api": "^1.0.0-rc.13",
-    "vue": "^2.6.11 || >=3.0.5"
-  },
-  "peerDependenciesMeta": {
-    "@vue/composition-api": {
-      "optional": true
-    }
-  },
   "publishConfig": {
     "access": "public",
     "registry": "http://registry.npmjs.org/"

rollup.config.js

@@ -14,7 +14,7 @@ const processEnv = isProd || isTesting ? 'production' : 'development';
 
 export const baseConfig = ({ injectCSS = true } = {}) => ({
   input: 'src/index.ts',
-  external: ['vue-demi', (id) => id.includes('@babel/runtime')],
+  external: ['vue', (id) => id.includes('@babel/runtime')],
   onwarn(warning, rollupWarn) {
     if (warning.code !== 'CIRCULAR_DEPENDENCY') {
       rollupWarn(warning);

src/App.vue

@@ -6,7 +6,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue-demi';
+import { defineComponent } from 'vue';
 import Basic from './Basic';
 
 export default defineComponent({

src/Basic.tsx

@@ -2,7 +2,7 @@ import { Connection, Edge, Elements, FlowElement, Node, OnLoadParams } from './t
 import { addEdge, isNode, removeElements } from './utils/graph';
 import RevueFlow from './container/RevueFlow';
 import { MiniMap, Controls, Background } from './additional-components';
-import { defineComponent, ref } from 'vue-demi';
+import { defineComponent, ref } from 'vue';
 
 const onNodeDragStop = (_: MouseEvent, node: Node) => console.log('drag stop', node);
 const onElementClick = (_: MouseEvent, element: FlowElement) => console.log('click', element);

src/additional-components/Background/index.tsx

@@ -1,6 +1,6 @@
 import { BackgroundVariant } from '../../types';
 import { createGridDotsPath, createGridLinesPath } from './utils';
-import { computed, defineComponent, HTMLAttributes, PropType } from 'vue-demi';
+import { computed, defineComponent, HTMLAttributes, PropType } from 'vue';
 import store from '../../store';
 
 export interface BackgroundProps extends HTMLAttributes {

src/additional-components/Controls/index.tsx

@@ -1,6 +1,6 @@
 import useZoomPanHelper from '../../hooks/useZoomPanHelper';
 import { FitViewParams } from '../../types';
-import { defineComponent, HTMLAttributes, onMounted, PropType, ref } from 'vue-demi';
+import { defineComponent, HTMLAttributes, onMounted, PropType, ref } from 'vue';
 import store from '../../store';
 
 export interface ControlProps extends HTMLAttributes {

src/additional-components/MiniMap/MiniMapNode.tsx

@@ -1,4 +1,4 @@
-import { defineComponent, PropType } from 'vue-demi';
+import { defineComponent, PropType } from 'vue';
 
 interface MiniMapNodeProps {
   x: number;

src/additional-components/MiniMap/index.tsx

@@ -1,7 +1,7 @@
 import { getRectOfNodes, getBoundsofRects } from '../../utils/graph';
 import { Node, Rect } from '../../types';
 import MiniMapNode from './MiniMapNode';
-import { computed, defineComponent, HTMLAttributes, PropType } from 'vue-demi';
+import { computed, defineComponent, HTMLAttributes, PropType } from 'vue';
 import store from '../../store';
 
 type StringFunc = (node: Node) => string;

src/components/ConnectionLine/index.tsx

@@ -1,4 +1,4 @@
-import { ref, defineComponent, CSSProperties, PropType, computed } from 'vue-demi';
+import { ref, defineComponent, CSSProperties, PropType, computed } from 'vue';
 
 import { getBezierPath } from '../Edges/BezierEdge';
 import { getSmoothStepPath } from '../Edges/SmoothStepEdge';

src/components/Edges/BezierEdge.tsx

@@ -1,4 +1,4 @@
-import { computed, CSSProperties, defineComponent, PropType } from 'vue-demi';
+import { computed, CSSProperties, defineComponent, PropType } from 'vue';
 
 import EdgeText from './EdgeText';
 

src/components/Edges/EdgeAnchor.tsx

@@ -1,5 +1,5 @@
 import { Position } from '../../types';
-import { defineComponent, HTMLAttributes, PropType } from 'vue-demi';
+import { defineComponent, HTMLAttributes, PropType } from 'vue';
 
 const shiftX = (x: number, shift: number, position: Position): number => {
   if (position === Position.Left) return x - shift;

src/components/Edges/EdgeText.tsx

@@ -1,5 +1,5 @@
 import { EdgeTextProps, Rect } from '../../types';
-import { defineComponent, PropType, ref, watch } from 'vue-demi';
+import { defineComponent, PropType, ref, watch } from 'vue';
 
 const EdgeText = defineComponent({
   props: {

src/components/Edges/SmoothStepEdge.tsx

@@ -1,4 +1,4 @@
-import { defineComponent } from 'vue-demi';
+import { defineComponent } from 'vue';
 
 import EdgeText from './EdgeText';
 import { getMarkerEnd, getCenter } from './utils';

src/components/Edges/StepEdge.tsx

@@ -1,4 +1,4 @@
-import { defineComponent } from 'vue-demi';
+import { defineComponent } from 'vue';
 
 import { EdgeSmoothStepProps } from '../../types';
 import SmoothStepEdge from './SmoothStepEdge';

src/components/Edges/StraightEdge.tsx

@@ -1,4 +1,4 @@
-import { defineComponent } from 'vue-demi';
+import { defineComponent } from 'vue';
 
 import EdgeText from './EdgeText';
 import { getMarkerEnd } from './utils';

src/components/Edges/wrapEdge.tsx

@@ -1,4 +1,4 @@
-import { Component, computed, defineComponent, ref } from 'vue-demi';
+import { Component, computed, defineComponent, ref } from 'vue';
 
 import store from '../../store';
 import { Edge, EdgeProps, Position, WrapEdgeProps } from '../../types';

src/components/Handle/index.tsx

@@ -1,6 +1,6 @@
 import { Connection, ElementId, Position } from '../../types';
 import { onMouseDown, ValidConnectionFunc } from './handler';
-import { defineComponent, inject, PropType } from 'vue-demi';
+import { defineComponent, inject, PropType } from 'vue';
 import store from '../../store';
 
 const alwaysValid = () => true;

src/components/Nodes/DefaultNode.tsx

@@ -1,6 +1,6 @@
 import Handle from '../../components/Handle';
 import { NodeProps, Position } from '../../types';
-import { defineComponent, PropType } from 'vue-demi';
+import { defineComponent, PropType } from 'vue';
 
 const DefaultNode = defineComponent({
   name: 'DefaultNode',

src/components/Nodes/InputNode.tsx

@@ -1,6 +1,6 @@
 import Handle from '../../components/Handle';
 import { NodeProps, Position } from '../../types';
-import { defineComponent, PropType } from 'vue-demi';
+import { defineComponent, PropType } from 'vue';
 
 const InputNode = defineComponent({
   name: 'InputNode',

src/components/Nodes/OutputNode.tsx

@@ -1,6 +1,6 @@
 import Handle from '../../components/Handle';
 import { NodeProps, Position } from '../../types';
-import { defineComponent, PropType } from 'vue-demi';
+import { defineComponent, PropType } from 'vue';
 
 const OutputNode = defineComponent({
   name: 'OutputNode',

src/components/Nodes/wrapNode.tsx

@@ -1,5 +1,5 @@
 import { Node, WrapNodeProps } from '../../types';
-import { computed, CSSProperties, defineComponent, onMounted, provide, ref } from 'vue-demi';
+import { computed, CSSProperties, defineComponent, onMounted, provide, ref } from 'vue';
 import store from '../../store';
 
 export default (NodeComponent: any) => {

src/components/UserSelection/index.tsx

@@ -2,7 +2,7 @@
  * The user selection rectangle gets displayed when a user drags the mouse while pressing shift
  */
 import { XYPosition } from '../../types';
-import { defineComponent, PropType } from 'vue-demi';
+import { defineComponent, PropType } from 'vue';
 import store from '../../store';
 
 type UserSelectionProps = {

src/container/EdgeRenderer/MarkerDefinitions.tsx

@@ -1,4 +1,4 @@
-import { defineComponent, PropType } from 'vue-demi';
+import { defineComponent, PropType } from 'vue';
 
 interface MarkerProps {
   id: string;

src/container/EdgeRenderer/index.tsx

@@ -13,7 +13,7 @@ import {
   Transform,
   OnEdgeUpdateFunc
 } from '../../types';
-import { computed, CSSProperties, defineComponent, PropType } from 'vue-demi';
+import { computed, CSSProperties, defineComponent, PropType } from 'vue';
 import store from '../../store';
 
 interface EdgeRendererProps {

src/container/EdgeRenderer/utils.ts

@@ -3,7 +3,7 @@ import wrapEdge from '../../components/Edges/wrapEdge';
 import { rectToBox } from '../../utils/graph';
 
 import { EdgeTypesType, EdgeProps, Position, Node, XYPosition, ElementId, HandleElement, Transform, Edge } from '../../types';
-import { Component } from 'vue-demi';
+import { Component } from 'vue';
 
 export function createEdgeTypes(edgeTypes: EdgeTypesType): EdgeTypesType {
   const standardTypes: EdgeTypesType = {

src/container/FlowRenderer/index.tsx

@@ -1,7 +1,7 @@
 import { GraphViewProps } from '../GraphView';
 import ZoomPane from '../ZoomPane';
 import UserSelection from '../../components/UserSelection';
-import { defineComponent, PropType } from 'vue-demi';
+import { defineComponent, PropType } from 'vue';
 import store from '../../store';
 
 type FlowRendererProps = Omit<

src/container/GraphView/index.tsx

@@ -4,7 +4,7 @@ import EdgeRenderer from '../EdgeRenderer';
 import { onLoadProject, onLoadGetElements, onLoadToObject } from '../../utils/graph';
 import { RevueFlowProps } from '../RevueFlow';
 import { NodeTypesType, EdgeTypesType, ConnectionLineType, KeyCode } from '../../types';
-import { CSSProperties, defineComponent, onBeforeMount, onMounted, PropType, ref } from 'vue-demi';
+import { CSSProperties, defineComponent, onBeforeMount, onMounted, PropType, ref } from 'vue';
 import store from '../../store';
 import useZoomPanHelper from '../../hooks/useZoomPanHelper';
 

src/container/NodeRenderer/index.tsx

@@ -1,6 +1,6 @@
 import { getNodesInside } from '../../utils/graph';
 import { Node, NodeTypesType, Edge } from '../../types';
-import { computed, defineComponent, PropType } from 'vue-demi';
+import { computed, defineComponent, PropType } from 'vue';
 import store from '../../store';
 
 interface NodeRendererProps {

src/container/RevueFlow/index.tsx

@@ -1,4 +1,4 @@
-import { computed, CSSProperties, defineComponent, HTMLAttributes, onUpdated, PropType } from 'vue-demi';
+import { computed, CSSProperties, defineComponent, HTMLAttributes, onUpdated, PropType } from 'vue';
 import GraphView from '../GraphView';
 import DefaultNode from '../../components/Nodes/DefaultNode';
 import InputNode from '../../components/Nodes/InputNode';

src/container/ZoomPane/index.tsx

@@ -3,7 +3,7 @@ import { select, pointer } from 'd3-selection';
 
 import { clamp } from '../../utils';
 import { FlowTransform, TranslateExtent, PanOnScrollMode, KeyCode } from '../../types';
-import { defineComponent, onMounted, PropType, ref, watch } from 'vue-demi';
+import { defineComponent, onMounted, PropType, ref, watch } from 'vue';
 import store from '../../store';
 import useKeyPress from '../../hooks/useKeyPress';
 import useResizeHandler from '../../hooks/useResizeHandler';

src/hooks/useGlobalKeyHandler.ts

@@ -2,7 +2,7 @@ import useKeyPress from './useKeyPress';
 import { isNode, getConnectedEdges } from '../utils/graph';
 import { Elements, KeyCode, ElementId, FlowElement } from '../types';
 import store from '../store';
-import { onMounted } from 'vue-demi';
+import { onMounted } from 'vue';
 
 interface HookParams {
   deleteKeyCode: KeyCode;

src/hooks/useKeyPress.ts

@@ -1,6 +1,6 @@
 import { isInputDOMNode } from '../utils';
 import { KeyCode } from '../types';
-import { onMounted, ref } from 'vue-demi';
+import { onMounted, ref } from 'vue';
 
 export default (keyCode?: KeyCode): boolean => {
   const keyPressed = ref<boolean>(false);

src/main.ts

@@ -1,4 +1,4 @@
-import { createApp } from 'vue-demi';
+import { createApp } from 'vue';
 import App from './App.vue';
 
 const app = createApp(App);

src/shims-vue.d.ts

@@ -1,5 +1,5 @@
 declare module '*.vue' {
-  import { DefineComponent } from 'vue-demi';
+  import { DefineComponent } from 'vue';
   // eslint-disable-next-line @typescript-eslint/ban-types
   const component: DefineComponent<{}, {}, any>;
   export default component;

src/types/index.ts

@@ -1,5 +1,5 @@
 import { Selection as D3Selection, ZoomBehavior } from 'd3';
-import { Component, HTMLAttributes, PropType, VNode } from 'vue-demi';
+import { Component, HTMLAttributes, PropType, VNode } from 'vue';
 
 export type ElementId = string;
 

vite.config.ts

@@ -13,12 +13,12 @@ export default defineConfig({
     rollupOptions: {
       // make sure to externalize deps that shouldn't be bundled
       // into your library
-      external: ['vue-demi'],
+      external: ['vue'],
       output: {
         // Provide global variables to use in the UMD build
         // for externalized deps
         globals: {
-          'vue-demi': 'VueDemi'
+          'vue': 'Vue'
         },
         dir: 'dist',
         sourcemap: true,
@@ -28,7 +28,7 @@ export default defineConfig({
     }
   },
   optimizeDeps: {
-    exclude: ['vue-demi']
+    exclude: ['vue']
   },
   plugins: [
     vue(),

yarn.lock

@@ -6599,9 +6599,9 @@ vite@^2.3.8:
   optionalDependencies:
     fsevents "~2.3.2"
 
-vue-demi@latest:
+vue@latest:
   version "0.10.1"
-  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.10.1.tgz#229b81395510f02f4ee255344557a12cc0120930"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-0.10.1.tgz#229b81395510f02f4ee255344557a12cc0120930"
   integrity sha512-L6Oi+BvmMv6YXvqv5rJNCFHEKSVu7llpWWJczqmAQYOdmPPw5PNYoz1KKS//Fxhi+4QP64dsPjtmvnYGo1jemA==
 
 vue-eslint-parser@^7.0.0, vue-eslint-parser@^7.1.1, vue-eslint-parser@^7.6.0: