From 303444f74d0bca293040a65dc5132d46cb89c9a5 Mon Sep 17 00:00:00 2001 From: Braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Sat, 10 Jul 2021 00:01:10 +0200 Subject: [PATCH] fix: some prop type issues update: rollup.config.js & vite.config.ts & package.json --- package.json | 12 +++++++++--- rollup.config.js | 2 +- src/container/FlowRenderer/index.tsx | 8 ++++---- src/container/GraphView/index.tsx | 8 ++++---- src/container/RevueFlow/index.tsx | 8 ++++---- src/container/ZoomPane/index.tsx | 2 +- vite.config.ts | 2 +- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index f60d96de..c2cbb6ad 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,15 @@ }, "license": "MIT", "author": "Burak Cakmakoglu", - "main": "dist/revue-flow.es.js", + "main": "dist/index.js", "module": "dist/revue-flow.es.js", "types": "dist/index.d.ts", + "exports": { + ".": { + "import": "./dist/revue.flow.es.js", + "require": "./dist/index.js" + } + }, "files": [ "dist", "nocss" @@ -28,7 +34,7 @@ "dependencies": { "d3": "^7.0.0", "pinia": "^2.0.0-beta.3", - "vue-demi": "^0.10.1" + "vue-demi": "latest" }, "devDependencies": { "@babel/core": "^7.14.6", @@ -70,7 +76,7 @@ }, "peerDependencies": { "@vue/composition-api": "^1.0.0-rc.13", - "vue": "^2.0.0 || >=3.0.0" + "vue": "^2.6.11 || >=3.0.5" }, "peerDependenciesMeta": { "@vue/composition-api": { diff --git a/rollup.config.js b/rollup.config.js index 4e6d3f7b..7a5e7fa0 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -14,7 +14,7 @@ const processEnv = isProd || isTesting ? 'production' : 'development'; export const baseConfig = ({ injectCSS = true } = {}) => ({ input: 'src/index.ts', - external: ['vue', 'vue-demi', (id) => id.includes('@babel/runtime')], + external: ['vue-demi', (id) => id.includes('@babel/runtime')], onwarn(warning, rollupWarn) { if (warning.code !== 'CIRCULAR_DEPENDENCY') { rollupWarn(warning); diff --git a/src/container/FlowRenderer/index.tsx b/src/container/FlowRenderer/index.tsx index d8e2e73a..bb81644c 100644 --- a/src/container/FlowRenderer/index.tsx +++ b/src/container/FlowRenderer/index.tsx @@ -77,22 +77,22 @@ const FlowRenderer = defineComponent({ default: undefined as any }, deleteKeyCode: { - type: (Number || String) as PropType, + type: [Number, String] as PropType, required: false, default: undefined }, selectionKeyCode: { - type: (Number || String) as PropType, + type: [Number, String] as PropType, required: false, default: undefined }, multiSelectionKeyCode: { - type: (Number || String) as PropType, + type: [Number, String] as PropType, required: false, default: undefined }, zoomActivationKeyCode: { - type: (Number || String) as PropType, + type: [Number, String] as PropType, required: false, default: undefined }, diff --git a/src/container/GraphView/index.tsx b/src/container/GraphView/index.tsx index 2c84125b..9677d680 100644 --- a/src/container/GraphView/index.tsx +++ b/src/container/GraphView/index.tsx @@ -159,22 +159,22 @@ const GraphView = defineComponent({ default: undefined as any }, selectionKeyCode: { - type: (Number || String) as PropType, + type: [Number, String] as PropType, required: false, default: undefined }, multiSelectionKeyCode: { - type: (Number || String) as PropType, + type: [Number, String] as PropType, required: false, default: undefined }, zoomActivationKeyCode: { - type: (Number || String) as PropType, + type: [Number, String] as PropType, required: false, default: undefined }, deleteKeyCode: { - type: (Number || String) as PropType, + type: [Number, String] as PropType, required: false, default: undefined }, diff --git a/src/container/RevueFlow/index.tsx b/src/container/RevueFlow/index.tsx index 76e357b4..0cf03366 100644 --- a/src/container/RevueFlow/index.tsx +++ b/src/container/RevueFlow/index.tsx @@ -267,22 +267,22 @@ const RevueFlow = defineComponent({ default: undefined as any }, selectionKeyCode: { - type: (Number || String) as PropType, + type: [Number, String] as PropType, required: false, default: 'Shift' }, multiSelectionKeyCode: { - type: (Number || String) as PropType, + type: [Number, String] as PropType, required: false, default: 'Meta' }, zoomActivationKeyCode: { - type: (Number || String) as PropType, + type: [Number, String] as PropType, required: false, default: 'Meta' }, deleteKeyCode: { - type: (Number || String) as PropType, + type: [Number, String] as PropType, required: false, default: 'Backspace' }, diff --git a/src/container/ZoomPane/index.tsx b/src/container/ZoomPane/index.tsx index 7c15985e..76c4a8a2 100644 --- a/src/container/ZoomPane/index.tsx +++ b/src/container/ZoomPane/index.tsx @@ -114,7 +114,7 @@ const ZoomPane = defineComponent({ default: undefined }, zoomActivationKeyCode: { - type: (Number || String) as PropType, + type: [Number, String] as PropType, required: false, default: undefined } diff --git a/vite.config.ts b/vite.config.ts index 136d89d0..4c71a204 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -18,7 +18,7 @@ export default defineConfig({ // Provide global variables to use in the UMD build // for externalized deps globals: { - 'vue-demi': 'vue-demi' + 'vue-demi': 'VueDemi' }, dir: 'dist', sourcemap: true,