Fix the build for node 13.x, make travis test 10, 12, 13, stable (#263)

@JustinBeckwith pointed out in #262 that `npm install` was broken in node 13.x, and @DanielRuf pointed in #254 that test fail for node 11+ because of a change to stability of sorting. This PR seeks to address both of those. The installation issue was fixed by just regenerating `package-lock.json` without needing to bump any of the direct dependency versions. The test failure issue requires manual intervention. To fix the sort stability issue, I updated the tests to use the stable sort values (these were all the correct values, though some of the test values were incorrect). To make the suite still pass for node 10, I added a hack where I override `Array.prototype.sort` with a stable implementation that's *only* used in tests (See comments in code for a justification for why) ## Test Plan Before this PR: `npm install` on node 13.x fails & `npm run jest` results in test failures After this PR: `npm install` on node 13.x passes & `npm run jest` passes for node 10, 12, and 13.
jlfwong · Apr 20, 2020 · d30bb2e · d30bb2e
1 parent fd4195d
commit d30bb2e
Show file tree

Hide file tree

Showing 27 changed files with 366 additions and 911 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,6 @@
 language: node_js
 node_js:
-  - '9'
+  - '10'
+  - '12'
+  - '13'
+  - 'node'
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "parcel-bundler": "1.9.2",
     "preact": "8.2.7",
     "preact-redux": "jlfwong/preact-redux#a56dcc4",
-    "prettier": "1.12.0",
+    "prettier": "2.0.4",
     "protobufjs": "6.8.8",
     "quicktype": "15.0.209",
     "redux": "^4.0.0",
@@ -57,6 +57,9 @@
     "transform": {
       "^.+\\.tsx?$": "ts-jest"
     },
+    "setupFilesAfterEnv": [
+      "./src/jest-setup.js"
+    ],
     "testRegex": "\\.test\\.tsx?$",
     "collectCoverageFrom": [
       "**/*.{ts,tsx}",
@@ -73,4 +76,4 @@
   "dependencies": {
     "opn": "5.3.0"
   }
-}
+}
diff --git a/prettier.config.js b/prettier.config.js
@@ -4,4 +4,5 @@ module.exports = {
   semi: false,
   singleQuote: true,
   trailingComma: 'all',
-};
+  arrowParens: 'avoid'
+}
diff --git a/src/gl/canvas-context.ts b/src/gl/canvas-context.ts
@@ -24,9 +24,7 @@ export class CanvasContext {
     const webGLInfo = this.gl.getWebGLInfo()
     if (webGLInfo) {
       console.log(
-        `WebGL initialized. renderer: ${webGLInfo.renderer}, vendor: ${
-          webGLInfo.vendor
-        }, version: ${webGLInfo.version}`,
+        `WebGL initialized. renderer: ${webGLInfo.renderer}, vendor: ${webGLInfo.vendor}, version: ${webGLInfo.version}`,
       )
     }
     ;(window as any)['testContextLoss'] = () => {

diff --git a/src/gl/flamechart-renderer.ts b/src/gl/flamechart-renderer.ts
@@ -175,8 +175,8 @@ export class FlamechartRenderer {
         // and the blue channel to indicate the color bucket to render.
         // We add one to each so we have zero reserved for the background color.
         const color = new Color(
-          (1 + i % 255) / 256,
-          (1 + stackDepth % 255) / 256,
+          (1 + (i % 255)) / 256,
+          (1 + (stackDepth % 255)) / 256,
           (1 + this.flamechart.getColorBucketForFrame(frame.node.frame)) / 256,
         )
         batch.addRect(configSpaceBounds, color)
@@ -288,10 +288,10 @@ export class FlamechartRenderer {
     const configSpaceContentWidth = this.flamechart.getTotalWeight()
     const numAtlasEntriesPerLayer = Math.pow(2, zoomLevel)
     const left = Math.floor(
-      numAtlasEntriesPerLayer * configSpaceSrcRect.left() / configSpaceContentWidth,
+      (numAtlasEntriesPerLayer * configSpaceSrcRect.left()) / configSpaceContentWidth,
     )
     const right = Math.ceil(
-      numAtlasEntriesPerLayer * configSpaceSrcRect.right() / configSpaceContentWidth,
+      (numAtlasEntriesPerLayer * configSpaceSrcRect.right()) / configSpaceContentWidth,
     )
 
     const nLayers = this.flamechart.getLayers().length

diff --git a/src/gl/overlay-rectangle-renderer.ts b/src/gl/overlay-rectangle-renderer.ts
@@ -65,7 +65,12 @@ export class ViewportRectangleRenderer {
   private buffer: Graphics.VertexBuffer
 
   constructor(private gl: Graphics.Context) {
-    const vertices = [[-1, 1], [1, 1], [-1, -1], [1, -1]]
+    const vertices = [
+      [-1, 1],
+      [1, 1],
+      [-1, -1],
+      [1, -1],
+    ]
     const floats: number[] = []
     for (let v of vertices) {
       floats.push(v[0])

diff --git a/src/gl/rectangle-batch-renderer.ts b/src/gl/rectangle-batch-renderer.ts
@@ -45,7 +45,14 @@ export class RectangleBatch {
       return this.buffer
     }
 
-    const corners = [[0, 0], [1, 0], [0, 1], [1, 0], [0, 1], [1, 1]]
+    const corners = [
+      [0, 0],
+      [1, 0],
+      [0, 1],
+      [1, 0],
+      [0, 1],
+      [1, 1],
+    ]
 
     const bytes = new Uint8Array(vertexFormat.stride * corners.length * this.rects.length)
     const floats = new Float32Array(bytes.buffer)

diff --git a/src/import/__snapshots__/chrome.test.ts.snap b/src/import/__snapshots__/chrome.test.ts.snap
@@ -516,97 +516,6 @@ exports[`importFromChromeTimeline Chrome 69: indexToView 1`] = `0`;
 exports[`importFromChromeTimeline Chrome 69: profileGroup.name 1`] = `"simple.json"`;
 
 exports[`importFromChromeTimeline Workers Chrome 66 1`] = `
-Object {
-  "frames": Array [
-    Frame {
-      "col": -1,
-      "file": "",
-      "key": "(program)::-1:-1",
-      "line": -1,
-      "name": "(program)",
-      "selfWeight": 819120,
-      "totalWeight": 819120,
-    },
-    Frame {
-      "col": 20,
-      "file": "http://172.30.3.176:7777/worker.js",
-      "key": "onmessage:http://172.30.3.176:7777/worker.js:14:20",
-      "line": 14,
-      "name": "onmessage",
-      "selfWeight": 639,
-      "totalWeight": 857719,
-    },
-    Frame {
-      "col": 14,
-      "file": "http://172.30.3.176:7777/worker.js",
-      "key": "alpha:http://172.30.3.176:7777/worker.js:8:14",
-      "line": 8,
-      "name": "alpha",
-      "selfWeight": 19976,
-      "totalWeight": 835149,
-    },
-    Frame {
-      "col": 14,
-      "file": "http://172.30.3.176:7777/worker.js",
-      "key": "gamma:http://172.30.3.176:7777/worker.js:0:14",
-      "line": 0,
-      "name": "gamma",
-      "selfWeight": 22197,
-      "totalWeight": 30000,
-    },
-    Frame {
-      "col": -1,
-      "file": "",
-      "key": "postMessage::-1:-1",
-      "line": -1,
-      "name": "postMessage",
-      "selfWeight": 1278,
-      "totalWeight": 21931,
-    },
-  ],
-  "name": "worker.json - DedicatedWorker thread",
-  "stacks": Array [
-    " 9.07ms",
-    "(program) 5.49ms",
-    "onmessage;alpha;gamma 3.69ms",
-    "onmessage;postMessage 212.00µs",
-    "onmessage;postMessage;(program) 3.97ms",
-    "onmessage;alpha;gamma 3.82ms",
-    "onmessage;postMessage 414.00µs",
-    "onmessage;postMessage;(program) 3.71ms",
-    "onmessage;alpha;gamma 1.13ms",
-    "onmessage 188.00µs",
-    "onmessage;alpha;gamma 2.48ms",
-    "onmessage;alpha;gamma;(program) 3.89ms",
-    "onmessage;alpha;gamma 373.00µs",
-    "onmessage;alpha 184.00µs",
-    "onmessage;alpha;gamma 3.36ms",
-    "onmessage;alpha;gamma;(program) 3.91ms",
-    "onmessage;alpha;gamma 3.94ms",
-    "onmessage;postMessage 205.00µs",
-    "onmessage;postMessage;(program) 3.91ms",
-    "onmessage 451.00µs",
-    "onmessage;alpha;gamma 566.00µs",
-    "onmessage;alpha 194.00µs",
-    "onmessage;alpha;gamma 2.09ms",
-    "onmessage;alpha 189.00µs",
-    "onmessage;alpha;gamma 746.00µs",
-    "onmessage;postMessage 211.00µs",
-    "onmessage;postMessage;(program) 4.00ms",
-    "onmessage;alpha 4.80ms",
-    "onmessage;alpha;(program) 5.28ms",
-    "onmessage;alpha 4.70ms",
-    "onmessage;postMessage 236.00µs",
-    "onmessage;postMessage;(program) 5.06ms",
-    "onmessage;alpha 5.07ms",
-    "onmessage;alpha;(program) 4.81ms",
-    "onmessage;alpha 4.84ms",
-    "onmessage;alpha;(program) 775.08ms",
-  ],
-}
-`;
-
-exports[`importFromChromeTimeline Workers Chrome 66 2`] = `
 Object {
   "frames": Array [
     Frame {
@@ -913,7 +822,98 @@ Object {
 }
 `;
 
-exports[`importFromChromeTimeline Workers Chrome 66: indexToView 1`] = `1`;
+exports[`importFromChromeTimeline Workers Chrome 66 2`] = `
+Object {
+  "frames": Array [
+    Frame {
+      "col": -1,
+      "file": "",
+      "key": "(program)::-1:-1",
+      "line": -1,
+      "name": "(program)",
+      "selfWeight": 819120,
+      "totalWeight": 819120,
+    },
+    Frame {
+      "col": 20,
+      "file": "http://172.30.3.176:7777/worker.js",
+      "key": "onmessage:http://172.30.3.176:7777/worker.js:14:20",
+      "line": 14,
+      "name": "onmessage",
+      "selfWeight": 639,
+      "totalWeight": 857719,
+    },
+    Frame {
+      "col": 14,
+      "file": "http://172.30.3.176:7777/worker.js",
+      "key": "alpha:http://172.30.3.176:7777/worker.js:8:14",
+      "line": 8,
+      "name": "alpha",
+      "selfWeight": 19976,
+      "totalWeight": 835149,
+    },
+    Frame {
+      "col": 14,
+      "file": "http://172.30.3.176:7777/worker.js",
+      "key": "gamma:http://172.30.3.176:7777/worker.js:0:14",
+      "line": 0,
+      "name": "gamma",
+      "selfWeight": 22197,
+      "totalWeight": 30000,
+    },
+    Frame {
+      "col": -1,
+      "file": "",
+      "key": "postMessage::-1:-1",
+      "line": -1,
+      "name": "postMessage",
+      "selfWeight": 1278,
+      "totalWeight": 21931,
+    },
+  ],
+  "name": "worker.json - DedicatedWorker thread",
+  "stacks": Array [
+    " 9.07ms",
+    "(program) 5.49ms",
+    "onmessage;alpha;gamma 3.69ms",
+    "onmessage;postMessage 212.00µs",
+    "onmessage;postMessage;(program) 3.97ms",
+    "onmessage;alpha;gamma 3.82ms",
+    "onmessage;postMessage 414.00µs",
+    "onmessage;postMessage;(program) 3.71ms",
+    "onmessage;alpha;gamma 1.13ms",
+    "onmessage 188.00µs",
+    "onmessage;alpha;gamma 2.48ms",
+    "onmessage;alpha;gamma;(program) 3.89ms",
+    "onmessage;alpha;gamma 373.00µs",
+    "onmessage;alpha 184.00µs",
+    "onmessage;alpha;gamma 3.36ms",
+    "onmessage;alpha;gamma;(program) 3.91ms",
+    "onmessage;alpha;gamma 3.94ms",
+    "onmessage;postMessage 205.00µs",
+    "onmessage;postMessage;(program) 3.91ms",
+    "onmessage 451.00µs",
+    "onmessage;alpha;gamma 566.00µs",
+    "onmessage;alpha 194.00µs",
+    "onmessage;alpha;gamma 2.09ms",
+    "onmessage;alpha 189.00µs",
+    "onmessage;alpha;gamma 746.00µs",
+    "onmessage;postMessage 211.00µs",
+    "onmessage;postMessage;(program) 4.00ms",
+    "onmessage;alpha 4.80ms",
+    "onmessage;alpha;(program) 5.28ms",
+    "onmessage;alpha 4.70ms",
+    "onmessage;postMessage 236.00µs",
+    "onmessage;postMessage;(program) 5.06ms",
+    "onmessage;alpha 5.07ms",
+    "onmessage;alpha;(program) 4.81ms",
+    "onmessage;alpha 4.84ms",
+    "onmessage;alpha;(program) 775.08ms",
+  ],
+}
+`;
+
+exports[`importFromChromeTimeline Workers Chrome 66: indexToView 1`] = `0`;
 
 exports[`importFromChromeTimeline Workers Chrome 66: profileGroup.name 1`] = `"worker.json"`;
 

diff --git a/src/import/__snapshots__/trace-event.test.ts.snap b/src/import/__snapshots__/trace-event.test.ts.snap
@@ -44,26 +44,26 @@ Object {
       "key": "A",
       "line": undefined,
       "name": "A",
-      "selfWeight": 1,
-      "totalWeight": 10,
+      "selfWeight": 2,
+      "totalWeight": 6,
     },
     Frame {
       "col": undefined,
       "file": undefined,
-      "key": "C",
+      "key": "B",
       "line": undefined,
-      "name": "C",
-      "selfWeight": 3,
-      "totalWeight": 10,
+      "name": "B",
+      "selfWeight": 2,
+      "totalWeight": 4,
     },
     Frame {
       "col": undefined,
       "file": undefined,
-      "key": "B",
+      "key": "C",
       "line": undefined,
-      "name": "B",
-      "selfWeight": 3,
-      "totalWeight": 4,
+      "name": "C",
+      "selfWeight": 2,
+      "totalWeight": 2,
     },
     Frame {
       "col": undefined,
@@ -77,12 +77,14 @@ Object {
   ],
   "name": "pid 0, tid 1",
   "stacks": Array [
-    "A;C;B 2.00µs",
-    "A;C 2.00µs",
-    "A;C;A 1.00µs",
-    "A;C;A;B 1.00µs",
-    "A;C;A;B;C 1.00µs",
-    "A;C;X 3.00µs",
+    "A;B;C 1.00µs",
+    "A;B 1.00µs",
+    "A 1.00µs",
+    " 1.00µs",
+    "A 1.00µs",
+    "A;B 1.00µs",
+    "A;B;C 1.00µs",
+    "X 3.00µs",
   ],
 }
 `;