Merge pull request #35 from react-spring/bugfix/node-performance-api

Bugfix/node performance api
pmndrs · Jun 18, 2020 · 52cac8d · 52cac8d
2 parents 3d5556b + 4b6246e
commit 52cac8d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/dist/cannon-es.cjs.js b/dist/cannon-es.cjs.js
@@ -13026,8 +13026,12 @@ var World = /*#__PURE__*/function (_EventTarget) {
 var tmpAABB1 = new AABB();
 var tmpRay$1 = new Ray(); // performance.now()
 
-if (typeof performance === 'undefined') {
-  performance = {};
+var performance = {};
+
+if (typeof window !== 'undefined') {
+  performance = window.performance;
+} else {
+  performance = require('perf_hooks').performance;
 }
 
 if (!performance.now) {

diff --git a/dist/cannon-es.js b/dist/cannon-es.js
@@ -12194,8 +12194,12 @@ class World extends EventTarget {
 const tmpAABB1 = new AABB();
 const tmpRay$1 = new Ray(); // performance.now()
 
-if (typeof performance === 'undefined') {
-  performance = {};
+let performance = {};
+
+if (typeof window !== 'undefined') {
+  performance = window.performance;
+} else {
+  performance = require('perf_hooks').performance;
 }
 
 if (!performance.now) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cannon-es",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "A lightweight 3D physics engine written in JavaScript.",
   "homepage": "https://github.com/schteppe/cannon.js",
   "author": "Stefan Hedman <schteppe@gmail.com> (http://steffe.se)",

diff --git a/src/world/World.ts b/src/world/World.ts
@@ -800,9 +800,14 @@ const tmpArray1 = []
 const tmpRay = new Ray()
 
 // performance.now()
-if (typeof performance === 'undefined') {
-  ;(performance as any) = {}
+let performance = {} as Performance
+
+if (typeof window !== 'undefined') {
+  performance = window.performance
+} else {
+  performance = require('perf_hooks').performance
 }
+
 if (!performance.now) {
   let nowOffset = Date.now()
   if (performance.timing && performance.timing.navigationStart) {