diff --git a/package.json b/package.json index 40b9c90b..f5070a2e 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,6 @@ "babel-eslint": "latest", "eslint": "^7.29.0", "eslint-config-prettier": "^8.1.0", - "eslint-plugin-nuxt": "^2.0.0", "eslint-plugin-prettier": "^3.3.1", "eslint-plugin-vue": "^7.12.1", "np": "^7.5.0", @@ -66,13 +65,10 @@ "postcss-nested": "^5.0.5", "prettier": "^2.2.1", "rollup": "^2.52.2", - "rollup-plugin-bundle-size": "^1.0.3", - "rollup-plugin-livereload": "^2.0.0", "rollup-plugin-postcss": "^4.0.0", "rollup-plugin-serve": "^1.1.0", "rollup-plugin-terser": "^7.0.2", "rollup-plugin-typescript2": "^0.30.0", - "rollup-plugin-vue": "^6.0.0", "typescript": "^4.3.5", "vite": "^2.3.8", "vue": "^3.0.5", diff --git a/rollup.config.js b/rollup.config.js index 1895b640..8e578a1e 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -92,17 +92,16 @@ function createConfig(format, output, plugins = []) { if (isGlobalBuild) output.name = pascalcase(pkg.name); - const shouldEmitDeclarations = !hasTSChecked; - const tsPlugin = ts({ check: !hasTSChecked, + clean: !hasTSChecked, tsconfig: path.resolve(__dirname, 'tsconfig.json'), cacheRoot: path.resolve(__dirname, 'node_modules/.rts2_cache'), tsconfigOverride: { compilerOptions: { - sourceMap: true, - declaration: shouldEmitDeclarations, - declarationMap: shouldEmitDeclarations + sourceMap: !hasTSChecked, + declaration: !hasTSChecked, + declarationMap: !hasTSChecked }, exclude: ['__tests__', 'test-dts'] } diff --git a/src/container/EdgeRenderer/index.tsx b/src/container/EdgeRenderer/index.tsx index c962dff3..b700990d 100644 --- a/src/container/EdgeRenderer/index.tsx +++ b/src/container/EdgeRenderer/index.tsx @@ -101,8 +101,8 @@ const EdgeCmp = defineComponent({ } }, setup(props) { - const sourceHandleId = computed(() => props.edge.sourceHandle ?? null); - const targetHandleId = computed(() => props.edge.targetHandle ?? null); + const sourceHandleId = computed(() => props.edge.sourceHandle || null); + const targetHandleId = computed(() => props.edge.targetHandle || null); const nodes = computed(() => getSourceTargetNodes(props.edge, props.nodes)); const onConnectEdge = (connection: Connection) => { diff --git a/src/hooks/useZoomPanHelper.ts b/src/hooks/useZoomPanHelper.ts index b7f35306..fb88e8dc 100644 --- a/src/hooks/useZoomPanHelper.ts +++ b/src/hooks/useZoomPanHelper.ts @@ -42,9 +42,9 @@ const useZoomPanHelper = (): ZoomPanHelperFunctions => { bounds, width, height, - options.minZoom ?? minZoom, - options.maxZoom ?? maxZoom, - options.padding ?? DEFAULT_PADDING + options.minZoom || minZoom, + options.maxZoom || maxZoom, + options.padding || DEFAULT_PADDING ); const transform = zoomIdentity.translate(x, y).scale(zoom); diff --git a/src/store/configure-store.ts b/src/store/configure-store.ts index cb91b3f7..d8042a62 100644 --- a/src/store/configure-store.ts +++ b/src/store/configure-store.ts @@ -174,8 +174,8 @@ export default function configureStore( }; }, updateUserSelection(mousePos) { - const startX = this.userSelectionRect.startX ?? 0; - const startY = this.userSelectionRect.startY ?? 0; + const startX = this.userSelectionRect.startX || 0; + const startY = this.userSelectionRect.startY || 0; const nextUserSelectRect: ReactFlowState['userSelectionRect'] = { ...this.userSelectionRect, diff --git a/src/utils/graph.ts b/src/utils/graph.ts index ff571568..675c938b 100644 --- a/src/utils/graph.ts +++ b/src/utils/graph.ts @@ -268,14 +268,14 @@ const parseElements = (nodes: Node[], edges: Edge[]): Elements => { export const onLoadGetElements = (currentStore: Store<'revue-flow', ReactFlowState>) => { return (): Elements => { - return parseElements(currentStore.nodes ?? [], currentStore.edges ?? []); + return parseElements(currentStore.nodes || [], currentStore.edges || []); }; }; export const onLoadToObject = (currentStore: Store<'revue-flow', ReactFlowState>) => { return (): FlowExportObject => { return { - elements: parseElements(currentStore.nodes ?? [], currentStore.edges ?? []), + elements: parseElements(currentStore.nodes || [], currentStore.edges || []), position: [currentStore.transform[0], currentStore.transform[1]], zoom: currentStore.transform[2] };