Bump webgpu type version

gavinyork · Apr 19, 2024 · 2787e7d · 2787e7d
1 parent adc46a4
commit 2787e7d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 31 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/libs/backend-webgl/package.json b/libs/backend-webgl/package.json
@@ -65,12 +65,7 @@
     "@zephyr3d/device": "workspace:^0.2.1"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@types/node": "^18.13.0",
-    "@webgpu/types": "^0.1.31"
-=======
-    "@webgpu/types": "^0.1.40",
-    "@types/node": "^18.13.0"
->>>>>>> develop
+    "@webgpu/types": "^0.1.40"
   }
 }
diff --git a/libs/backend-webgpu/package.json b/libs/backend-webgpu/package.json
@@ -65,12 +65,7 @@
     "@zephyr3d/device": "workspace:^0.2.1"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@types/node": "^18.13.0",
-    "@webgpu/types": "^0.1.31"
-=======
-    "@webgpu/types": "^0.1.40",
-    "@types/node": "^18.13.0"
->>>>>>> develop
+    "@webgpu/types": "^0.1.40"
   }
 }
diff --git a/libs/device/package.json b/libs/device/package.json
@@ -63,12 +63,7 @@
     "@zephyr3d/base": "workspace:^0.1.3"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@types/node": "^18.13.0",
-    "@webgpu/types": "^0.1.31"
-=======
-    "@webgpu/types": "^0.1.40",
-    "@types/node": "^18.13.0"
->>>>>>> develop
+    "@webgpu/types": "^0.1.40"
   }
 }
diff --git a/libs/imgui/package.json b/libs/imgui/package.json
@@ -63,12 +63,8 @@
     "@zephyr3d/device": "workspace:^0.2.1"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@types/emscripten": "^1.39.6",
-=======
-    "@webgpu/types": "^0.1.40",
->>>>>>> develop
     "@types/node": "^18.13.0",
-    "@webgpu/types": "^0.1.31"
+    "@webgpu/types": "^0.1.40"
   }
 }