diff --git a/docs/package.json b/docs/package.json index afaf4c05..9ea42549 100644 --- a/docs/package.json +++ b/docs/package.json @@ -25,7 +25,6 @@ "unplugin-icons": "^0.14.1", "unplugin-vue-components": "^0.18.5", "vite-plugin-windicss": "^1.8.3", - "vue-demi": "^0.12.5", "vuepress": "^2.0.0-beta.37", "windicss": "^3.5.1" } diff --git a/examples/package.json b/examples/package.json index e19c3636..e1add34f 100644 --- a/examples/package.json +++ b/examples/package.json @@ -15,13 +15,12 @@ "devDependencies": { "@types/dagre": "^0.7.46", "@vitejs/plugin-vue": "^2.2.0", - "@vue/compiler-sfc": "3.2.22", "dagre": "^0.8.5", "unplugin-auto-import": "^0.6.8", "vite": "2.5.x", "vite-plugin-vue-type-imports": "^0.1.3", "vite-svg-loader": "^3.1.2", - "vue": "3.2.21", + "vue": "^3.2.21", "vue-router": "^4.0.12" } } diff --git a/examples/vite.config.ts b/examples/vite.config.ts index b1f5e533..914bfbfb 100644 --- a/examples/vite.config.ts +++ b/examples/vite.config.ts @@ -7,6 +7,7 @@ import svgLoader from 'vite-svg-loader' export default defineConfig({ resolve: { + dedupe: ['vue'], alias: { '~': resolve('../package/src'), }, diff --git a/package/package.json b/package/package.json index bfb3e5a5..b5bfeb1c 100644 --- a/package/package.json +++ b/package/package.json @@ -43,7 +43,6 @@ "devDependencies": { "@rollup/plugin-replace": "^2.4.2", "@vitejs/plugin-vue": "^2.2.0", - "@vue/compiler-sfc": "3.2.22", "autoprefixer": "^10.3.7", "np": "^7.5.0", "postcss": "^8.4.8", @@ -53,7 +52,6 @@ "vite": "2.5.x", "vite-plugin-vue-type-imports": "^0.1.3", "vite-svg-loader": "^2.2.0", - "vue": "3.2.21", "vue-tsc": "^0.29.5" }, "peerDependencies": { diff --git a/package/src/components/Edges/BezierEdge.vue b/package/src/components/Edges/BezierEdge.vue index 9e4482cb..8d72b484 100644 --- a/package/src/components/Edges/BezierEdge.vue +++ b/package/src/components/Edges/BezierEdge.vue @@ -9,7 +9,7 @@ const props = withDefaults(defineProps(), { sourcePosition: 'bottom' as Position, targetPosition: 'top' as Position, labelStyle: () => ({}), - label: () => '', + label: '', labelShowBg: true, labelBgStyle: () => ({}), }) diff --git a/package/src/components/Edges/SimpleBezierEdge.vue b/package/src/components/Edges/SimpleBezierEdge.vue index 7e84e63e..ab68bc17 100644 --- a/package/src/components/Edges/SimpleBezierEdge.vue +++ b/package/src/components/Edges/SimpleBezierEdge.vue @@ -9,7 +9,7 @@ const props = withDefaults(defineProps(), { sourcePosition: 'bottom' as Position, targetPosition: 'top' as Position, labelStyle: () => ({}), - label: () => '', + label: '', labelShowBg: true, labelBgStyle: () => ({}), }) diff --git a/package/src/components/Edges/SmoothStepEdge.vue b/package/src/components/Edges/SmoothStepEdge.vue index 9c4df973..e79be58d 100644 --- a/package/src/components/Edges/SmoothStepEdge.vue +++ b/package/src/components/Edges/SmoothStepEdge.vue @@ -8,7 +8,7 @@ const props = withDefaults(defineProps(), { selected: false, sourcePosition: 'bottom' as Position, targetPosition: 'top' as Position, - label: () => '', + label: '', labelStyle: () => ({}), labelShowBg: true, labelBgStyle: () => ({}), diff --git a/package/src/components/Edges/StepEdge.vue b/package/src/components/Edges/StepEdge.vue index 83b55ac3..dcb3271c 100644 --- a/package/src/components/Edges/StepEdge.vue +++ b/package/src/components/Edges/StepEdge.vue @@ -7,7 +7,7 @@ const props = withDefaults(defineProps(), { selected: false, sourcePosition: 'bottom' as Position, targetPosition: 'top' as Position, - label: () => '', + label: '', labelStyle: () => ({}), labelShowBg: true, labelBgStyle: () => ({}), diff --git a/package/src/components/Edges/StraightEdge.vue b/package/src/components/Edges/StraightEdge.vue index cc6fd6ec..570e4ebe 100644 --- a/package/src/components/Edges/StraightEdge.vue +++ b/package/src/components/Edges/StraightEdge.vue @@ -7,7 +7,7 @@ const props = withDefaults(defineProps(), { selected: false, sourcePosition: 'bottom' as Position, targetPosition: 'top' as Position, - label: () => '', + label: '', labelStyle: () => ({}), labelShowBg: true, labelBgStyle: () => ({}), diff --git a/package/src/container/VueFlow/VueFlow.vue b/package/src/container/VueFlow/VueFlow.vue index 14be1c77..3cc604e7 100644 --- a/package/src/container/VueFlow/VueFlow.vue +++ b/package/src/container/VueFlow/VueFlow.vue @@ -23,7 +23,7 @@ const props = withDefaults(defineProps(), { applyDefault: undefined, fitViewOnInit: undefined, connectOnClick: undefined, - connectionLineStyle: () => null, + connectionLineStyle: null, }) const emit = defineEmits([...Object.keys(createHooks()), 'update:modelValue', 'update:edges', 'update:nodes']) diff --git a/yarn.lock b/yarn.lock index c9b84a62..579f4303 100644 --- a/yarn.lock +++ b/yarn.lock @@ -377,7 +377,7 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.15.0", "@babel/parser@^7.16.4", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6": +"@babel/parser@^7.16.4", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6": version "7.17.8" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240" integrity sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ== @@ -1191,26 +1191,6 @@ vscode-nls "^5.0.0" vscode-uri "^2.1.2" -"@vue/compiler-core@3.2.21": - version "3.2.21" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.21.tgz#26566c32b2ad838199d471ef5df620a83846f24e" - integrity sha512-NhhiQZNG71KNq1h5pMW/fAXdTF7lJRaSI7LDm2edhHXVz1ROMICo8SreUmQnSf4Fet0UPBVqJ988eF4+936iDQ== - dependencies: - "@babel/parser" "^7.15.0" - "@vue/shared" "3.2.21" - estree-walker "^2.0.2" - source-map "^0.6.1" - -"@vue/compiler-core@3.2.22": - version "3.2.22" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.22.tgz#5e3d3b983cc7f430ddbc6a8773c872dcf410dc89" - integrity sha512-uAkovrVeTcjzpiM4ECmVaMrv/bjdgAaLzvjcGqQPBEyUrcqsCgccT9fHJ/+hWVGhyMahmBwLqcn4guULNx7sdw== - dependencies: - "@babel/parser" "^7.15.0" - "@vue/shared" "3.2.22" - estree-walker "^2.0.2" - source-map "^0.6.1" - "@vue/compiler-core@3.2.31", "@vue/compiler-core@^3.2.21": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.31.tgz#d38f06c2cf845742403b523ab4596a3fda152e89" @@ -1221,22 +1201,6 @@ estree-walker "^2.0.2" source-map "^0.6.1" -"@vue/compiler-dom@3.2.21": - version "3.2.21" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.21.tgz#d6f6c85364ef8888f9c4e9122bfba11e78fb398c" - integrity sha512-gsJD3DpYZSYquiA7UIPsMDSlAooYWDvHPq9VRsqzJEk2PZtFvLvHPb4aaMD8Ufd62xzYn32cnnkzsEOJhyGilA== - dependencies: - "@vue/compiler-core" "3.2.21" - "@vue/shared" "3.2.21" - -"@vue/compiler-dom@3.2.22": - version "3.2.22" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.22.tgz#221cc358a6c0651c04e1dd22a8470b21e56ee1a5" - integrity sha512-VZdsw/VuO1ODs8K7NQwnMQzKITDkIFlYYC03SVnunuf6eNRxBPEonSyqbWNoo6qNaHAEBTG6VVcZC5xC9bAx1g== - dependencies: - "@vue/compiler-core" "3.2.22" - "@vue/shared" "3.2.22" - "@vue/compiler-dom@3.2.31", "@vue/compiler-dom@^3.2.21": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz#b1b7dfad55c96c8cc2b919cd7eb5fd7e4ddbf00e" @@ -1245,38 +1209,6 @@ "@vue/compiler-core" "3.2.31" "@vue/shared" "3.2.31" -"@vue/compiler-sfc@3.2.21": - version "3.2.21" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.21.tgz#42639ee49e725afb7d8f1d1940e75dc17a56002c" - integrity sha512-+yDlUSebKpz/ovxM2vLRRx7w/gVfY767pOfYTgbIhAs+ogvIV2BsIt4fpxlThnlCNChJ+yE0ERUNoROv2kEGEQ== - dependencies: - "@babel/parser" "^7.15.0" - "@vue/compiler-core" "3.2.21" - "@vue/compiler-dom" "3.2.21" - "@vue/compiler-ssr" "3.2.21" - "@vue/ref-transform" "3.2.21" - "@vue/shared" "3.2.21" - estree-walker "^2.0.2" - magic-string "^0.25.7" - postcss "^8.1.10" - source-map "^0.6.1" - -"@vue/compiler-sfc@3.2.22": - version "3.2.22" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.22.tgz#ffd0e5e35479b6ade18d12fefec369cbaf2f7718" - integrity sha512-tWRQ5ge1tsTDhUwHgueicKJ8rYm6WUVAPTaIpFW3GSwZKcOEJ2rXdfkHFShNVGupeRALz2ET2H84OL0GeRxY0A== - dependencies: - "@babel/parser" "^7.15.0" - "@vue/compiler-core" "3.2.22" - "@vue/compiler-dom" "3.2.22" - "@vue/compiler-ssr" "3.2.22" - "@vue/ref-transform" "3.2.22" - "@vue/shared" "3.2.22" - estree-walker "^2.0.2" - magic-string "^0.25.7" - postcss "^8.1.10" - source-map "^0.6.1" - "@vue/compiler-sfc@3.2.31", "@vue/compiler-sfc@^3.0.11", "@vue/compiler-sfc@^3.2.20", "@vue/compiler-sfc@^3.2.31": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.31.tgz#d02b29c3fe34d599a52c5ae1c6937b4d69f11c2f" @@ -1293,22 +1225,6 @@ postcss "^8.1.10" source-map "^0.6.1" -"@vue/compiler-ssr@3.2.21": - version "3.2.21" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.21.tgz#37d124f89e8adef9fd56b85775de4b5310a0436e" - integrity sha512-eU+A0iWYy+1zAo2CRIJ0zSVlv1iuGAIbNRCnllSJ31pV1lX3jypJYzGbJlSRAbB7VP6E+tYveVT1Oq8JKewa3g== - dependencies: - "@vue/compiler-dom" "3.2.21" - "@vue/shared" "3.2.21" - -"@vue/compiler-ssr@3.2.22": - version "3.2.22" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.22.tgz#23552c31b76b45baf5f244713c81d77ab59447d2" - integrity sha512-Cl6aoLJtXzzBkk1sKod8S0WBJLts3+ugVC91d22gGpbkw/64WnF12tOZi7Rg54PPLi1NovqyNWPsLH/SAFcu+w== - dependencies: - "@vue/compiler-dom" "3.2.22" - "@vue/shared" "3.2.22" - "@vue/compiler-ssr@3.2.31": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.31.tgz#4fa00f486c9c4580b40a4177871ebbd650ecb99c" @@ -1333,13 +1249,6 @@ estree-walker "^2.0.2" magic-string "^0.25.7" -"@vue/reactivity@3.2.21": - version "3.2.21" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.21.tgz#073ad144192ed78a07e151e95a3baa515e4099a2" - integrity sha512-7C57zFm/5E3SSTUhVuYj1InDwuJ+GIVQ/z+H43C9sST85gIThGXVhksl1yWTAadf8Yz4T5lSbqi5Ds8U/ueWcw== - dependencies: - "@vue/shared" "3.2.21" - "@vue/reactivity@3.2.31", "@vue/reactivity@^3.2.21": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.31.tgz#fc90aa2cdf695418b79e534783aca90d63a46bbd" @@ -1347,36 +1256,6 @@ dependencies: "@vue/shared" "3.2.31" -"@vue/ref-transform@3.2.21": - version "3.2.21" - resolved "https://registry.yarnpkg.com/@vue/ref-transform/-/ref-transform-3.2.21.tgz#b0c554c9f640c3f005f77e676066aa0faba90984" - integrity sha512-uiEWWBsrGeun9O7dQExYWzXO3rHm/YdtFNXDVqCSoPypzOVxWxdiL+8hHeWzxMB58fVuV2sT80aUtIVyaBVZgQ== - dependencies: - "@babel/parser" "^7.15.0" - "@vue/compiler-core" "3.2.21" - "@vue/shared" "3.2.21" - estree-walker "^2.0.2" - magic-string "^0.25.7" - -"@vue/ref-transform@3.2.22": - version "3.2.22" - resolved "https://registry.yarnpkg.com/@vue/ref-transform/-/ref-transform-3.2.22.tgz#16b03994eac71528cceff4cf76178ed9b44ac90a" - integrity sha512-qalVWbq5xWWxLZ0L9OroBg/JZhzavQuCcDXblfErxyDEH6Xc5gIJ4feo1SVCICFzhAUgLgQTdSFLpgjBawbFpw== - dependencies: - "@babel/parser" "^7.15.0" - "@vue/compiler-core" "3.2.22" - "@vue/shared" "3.2.22" - estree-walker "^2.0.2" - magic-string "^0.25.7" - -"@vue/runtime-core@3.2.21": - version "3.2.21" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.21.tgz#e12dac8c3893b7aebfc37e32066718d8aa686ac5" - integrity sha512-7oOxKaU0D2IunOAMOOHZgJVrHg63xwng8BZx3fbgmakqEIMwHhQcp+5GV1sOg/sWW7R4UhaRDIUCukO2GRVK2Q== - dependencies: - "@vue/reactivity" "3.2.21" - "@vue/shared" "3.2.21" - "@vue/runtime-core@3.2.31": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.31.tgz#9d284c382f5f981b7a7b5971052a1dc4ef39ac7a" @@ -1385,15 +1264,6 @@ "@vue/reactivity" "3.2.31" "@vue/shared" "3.2.31" -"@vue/runtime-dom@3.2.21": - version "3.2.21" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.21.tgz#33dd15bc85281e773177a30dc6931c294bd77aa1" - integrity sha512-apBdriD6QsI4ywbllY8kjr9/0scGuStDuvLbJULPQkFPtHzntd51bP5PQTQVAEIc9kwnTozmj6x6ZdX/cwo7xA== - dependencies: - "@vue/runtime-core" "3.2.21" - "@vue/shared" "3.2.21" - csstype "^2.6.8" - "@vue/runtime-dom@3.2.31": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.31.tgz#79ce01817cb3caf2c9d923f669b738d2d7953eff" @@ -1403,14 +1273,6 @@ "@vue/shared" "3.2.31" csstype "^2.6.8" -"@vue/server-renderer@3.2.21": - version "3.2.21" - resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.21.tgz#887d0a44de76f72313cff2686a24c0315231d634" - integrity sha512-QBgYqVgI7XCSBCqGa4LduV9vpfQFdZBOodFmq5Txk5W/v1KrJ1LoOh2Q0RHiRgtoK/UR9uyvRVcYqOmwHkZNEg== - dependencies: - "@vue/compiler-ssr" "3.2.21" - "@vue/shared" "3.2.21" - "@vue/server-renderer@3.2.31", "@vue/server-renderer@^3.2.31": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.31.tgz#201e9d6ce735847d5989403af81ef80960da7141" @@ -1419,16 +1281,6 @@ "@vue/compiler-ssr" "3.2.31" "@vue/shared" "3.2.31" -"@vue/shared@3.2.21": - version "3.2.21" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.21.tgz#4cd80c0e62cf65a7adab2449e86b6f0cb33a130b" - integrity sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA== - -"@vue/shared@3.2.22": - version "3.2.22" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.22.tgz#26dcbe5e530f6c1f2de5ca9aeab92ab00f523b41" - integrity sha512-qWVav014mpjEtbWbEgl0q9pEyrrIySKum8UVYjwhC6njrKzknLZPvfuYdQyVbApsqr94tf/3dP4pCuZmmjdCWQ== - "@vue/shared@3.2.31", "@vue/shared@^3.2.21", "@vue/shared@^3.2.31": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.31.tgz#c90de7126d833dcd3a4c7534d534be2fb41faa4e" @@ -7500,7 +7352,7 @@ vscode-vue-languageservice@0.29.8: vscode-pug-languageservice "0.29.8" vscode-typescript-languageservice "0.29.8" -vue-demi@*, vue-demi@^0.12.5, vue-demi@latest: +vue-demi@*, vue-demi@latest: version "0.12.5" resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.12.5.tgz#8eeed566a7d86eb090209a11723f887d28aeb2d1" integrity sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q== @@ -7533,18 +7385,7 @@ vue-tsc@^0.29.5: "@volar/shared" "0.29.8" vscode-vue-languageservice "0.29.8" -vue@3.2.21: - version "3.2.21" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.21.tgz#55f5665172d95cf97e806b9aad0a375180be23a1" - integrity sha512-jpy7ckXdyclfRzqLjL4mtq81AkzQleE54KjZsJg/9OorNVurAxdlU5XpD49GpjKdnftuffKUvx2C5jDOrgc/zg== - dependencies: - "@vue/compiler-dom" "3.2.21" - "@vue/compiler-sfc" "3.2.21" - "@vue/runtime-dom" "3.2.21" - "@vue/server-renderer" "3.2.21" - "@vue/shared" "3.2.21" - -vue@^3.2.31: +vue@^3.2.21, vue@^3.2.31: version "3.2.31" resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.31.tgz#e0c49924335e9f188352816788a4cca10f817ce6" integrity sha512-odT3W2tcffTiQCy57nOT93INw1auq5lYLLYtWpPYQQYQOOdHiqFct9Xhna6GJ+pJQaF67yZABraH47oywkJgFw==