most compile errors fixed.

bhouston · Jun 18, 2023 · 31ac88c · 31ac88c
1 parent 640bbb9
commit 31ac88c
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 13 deletions.
diff --git a/apps/exec-graph/package.json b/apps/exec-graph/package.json
@@ -7,8 +7,8 @@
   "module": "./dist/index.js",
   "source": "./src/index.ts",
   "scripts": {
-    "build": "tsc --noEmit && esbuild src/index.ts --format=cjs --platform=node --bundle --outfile=dist/index.js",
-    "dev": "tsc --noEmit --watch & esbuild src/index.ts --format=cjs --platform=node --bundle --sourcemap --outfile=dist/index.js --watch"
+    "build": "tsc --noEmit && esbuild src/index.ts --target=es2020 --format=cjs --platform=node --bundle --outfile=dist/index.js",
+    "dev": "tsc --noEmit --watch & esbuild src/index.ts --target=es2020 --format=cjs --platform=node --bundle --sourcemap --outfile=dist/index.js --watch"
   },
   "devDependencies": {
     "@types/glob": "^8.0.0"

diff --git a/apps/exec-graph/src/index.ts b/apps/exec-graph/src/index.ts
@@ -75,10 +75,10 @@ async function execGraph({
 
   if (programOptions.trace) {
     engine.onNodeExecutionStart.addListener((node) =>
-      Logger.verbose(`<< ${node.description.typeName}:${node.id} >> START`)
+      Logger.verbose(`<< ${node.description.typeName} >> START`)
     );
     engine.onNodeExecutionEnd.addListener((node) =>
-      Logger.verbose(`<< ${node.description.typeName}:${node.id} >> END`)
+      Logger.verbose(`<< ${node.description.typeName} >> END`)
     );
   }
 

diff --git a/apps/export-node-spec/package.json b/apps/export-node-spec/package.json
@@ -7,8 +7,8 @@
   "module": "./dist/index.js",
   "source": "./src/index.ts",
   "scripts": {
-    "build": "tsc --noEmit && esbuild src/index.ts --format=cjs --platform=node --bundle --outfile=dist/index.js",
-    "dev": "tsc --noEmit --watch & esbuild src/index.ts --format=cjs --platform=node --bundle --sourcemap --outfile=dist/index.js --watch"
+    "build": "tsc --noEmit && esbuild src/index.ts --target=es2020 --format=cjs --platform=node --bundle --outfile=dist/index.js",
+    "dev": "tsc --noEmit --watch & esbuild src/index.ts --target=es2020 --format=cjs --platform=node --bundle --sourcemap --outfile=dist/index.js --watch"
   },
   "devDependencies": {
     "@types/glob": "^8.0.0"

diff --git a/apps/graph-editor/package.json b/apps/graph-editor/package.json
@@ -2,8 +2,8 @@
   "name": "graph-editor",
   "version": "1.0.0",
   "scripts": {
-    "build": "tsc --noEmit && esbuild src/index.tsx --bundle --minify --outfile=public/js/index.js",
-    "dev": "tsc --noEmit --watch & esbuild src/index.tsx --bundle --sourcemap --outfile=public/js/index.js --watch --serve=8001 --servedir=public"
+    "build": "tsc --noEmit && esbuild src/index.tsx --target=es2020 --bundle --minify --outfile=public/js/index.js",
+    "dev": "tsc --noEmit --watch & esbuild src/index.tsx --target=es2020 --bundle --sourcemap --outfile=public/js/index.js --watch --serve=8001 --servedir=public"
   },
   "dependencies": {
     "@behave-graph/core": "*",

diff --git a/apps/three-viewer/package.json b/apps/three-viewer/package.json
@@ -3,11 +3,14 @@
   "version": "1.0.0",
   "type": "module",
   "scripts": {
-    "build": "tsc --noEmit && esbuild src/index.tsx --bundle --minify --outfile=public/js/index.js",
-    "dev": "tsc --noEmit --watch & esbuild src/index.tsx --bundle --sourcemap --outfile=public/js/index.js --watch --serve=8001 --servedir=public"
+    "build": "tsc --noEmit && esbuild src/index.ts --target=es2020 --bundle --minify --outfile=public/js/index.js",
+    "dev": "tsc --noEmit --watch & esbuild src/index.ts --target=es2020 --bundle --sourcemap --outfile=public/js/index.js --watch --serve=8001 --servedir=public"
   },
   "dependencies": {
     "@behave-graph/core": "*",
     "three": "^0.145.0"
+  },
+  "devDependencies": {
+    "@types/three": "^0.152.1"
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/flow/src/components/Flow.tsx b/packages/flow/src/components/Flow.tsx
@@ -2,6 +2,7 @@ import { GraphJSON } from '@behave-graph/core';
 import {
   FC,
   MouseEvent as ReactMouseEvent,
+  TouchEvent as ReactTouchEvent,
   useCallback,
   useMemo,
   useState
@@ -110,15 +111,18 @@ export const Flow: FC<FlowProps> = ({ graph, examples }) => {
   );
 
   const handleStartConnect = (
-    e: ReactMouseEvent,
+    e: ReactMouseEvent | ReactTouchEvent,
     params: OnConnectStartParams
   ) => {
     setLastConnectStart(params);
   };
 
-  const handleStopConnect = (e: MouseEvent) => {
+  const handleStopConnect = (e: MouseEvent | TouchEvent) => {
     const element = e.target as HTMLElement;
-    if (element.classList.contains('react-flow__pane')) {
+    if (
+      element.classList.contains('react-flow__pane') &&
+      e instanceof MouseEvent
+    ) {
       setNodePickerVisibility({ x: e.clientX, y: e.clientY });
     } else {
       setLastConnectStart(undefined);