Upgrade canvas to 2.6.0 to support Node 12 (#180)

* canvas@2.6.0 + ESlint --fix
rsmbl · Aug 5, 2019 · 5249810 · 5249810
1 parent db6f0b8
commit 5249810
Show file tree

Hide file tree

Showing 8 changed files with 3,904 additions and 7,925 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -13,17 +13,17 @@
             "error",
             {
                 "singleQuote": true,
-                "tabWidth": "4",
-                "printWidth": "160"
+                "tabWidth": 4,
+                "printWidth": 160
             }
         ],
         "no-console": "off",
         "no-use-before-define": ["error", { "functions": false }],
         "func-names": ["off"],
-        "complexity": ["error", 16],
+        "complexity": ["error", 26],
         "curly": ["error", "all"],
         "dot-location":  ["error", "property"],
-        "dot-notation": ["error", { "allowKeywords": false }],
+        "dot-notation": ["error"],
         "eqeqeq": ["error", "always"],
         "guard-for-in": "error",
         "no-alert": "error",
@@ -37,7 +37,8 @@
         "no-shadow": "error",
         "global-require": "error",
         "comma-dangle": ["error", "never"],
-        "camelcase": ["error",{"properties": "always"}]
+        "camelcase": ["error",{"properties": "always"}],
+        "no-prototype-builtins": "off"
     },
     "env": {
         "amd": true,

diff --git a/dockerfile b/dockerfile
@@ -1,4 +1,4 @@
-FROM node:10
+FROM node:12
 
 RUN apt-get update \
     && apt-get install -qq libcairo2-dev libjpeg-dev libpango1.0-dev libgif-dev librsvg2-dev build-essential g++

diff --git a/memory-leak-test.js b/memory-leak-test.js
@@ -1,5 +1,3 @@
-/* eslint no-process-exit: "warn"*/
-
 // node --expose-gc memory-leak-test.js
 
 const fs = require("fs");
@@ -33,5 +31,5 @@ function compare() {
 
 function log() {
     console.timeEnd(timerLabel);
-    process.exit(0);
+    process.exit(0); //eslint-disable-line
 }
diff --git a/nodejs-tests/errorPixelTransform.test.js b/nodejs-tests/errorPixelTransform.test.js
@@ -24,7 +24,7 @@ const testErrorPixelTransform = transform => {
 
                 expect(buffer).toBeInstanceOf(Buffer);
 
-                //fs.writeFileSync(`./nodejs-tests/assets/pixelErrorTransform/${transform}.new.png`, buffer);
+                // fs.writeFileSync(`./nodejs-tests/assets/pixelErrorTransform/${transform}.new.png`, buffer);
 
                 const comparison = fs.readFileSync(
                     `./nodejs-tests/assets/pixelErrorTransform/${transform}.png`

diff --git a/nodejs-tests/ignore.test.js b/nodejs-tests/ignore.test.js
@@ -1,24 +1,24 @@
 /* eslint-env jest*/
 
-const resemble = require('../resemble');
-const fs = require('fs');
+const resemble = require("../resemble");
+const fs = require("fs");
 
-describe('ignore', () => {
-    test('ignore antialiasing on', async () => {
-        const text = fs.readFileSync('./nodejs-tests/assets/text.png');
-        const textAa = fs.readFileSync('./nodejs-tests/assets/textAa.png');
+describe("ignore", () => {
+    test("ignore antialiasing on", async () => {
+        const text = fs.readFileSync("./nodejs-tests/assets/text.png");
+        const textAa = fs.readFileSync("./nodejs-tests/assets/textAa.png");
 
         return new Promise(resolve => {
-            const opts = { ignore: 'antialiasing' };
+            const opts = { ignore: "antialiasing" };
 
             resemble.compare(text, textAa, opts, (_x, data) => {
-                expect(data.misMatchPercentage).toBe('0.00');
+                expect(data.misMatchPercentage).toBe("0.00");
                 const buffer = data.getBuffer();
 
                 expect(buffer).toBeInstanceOf(Buffer);
 
                 const comparison = fs.readFileSync(
-                    './nodejs-tests/assets/isAntialiased/diffOn.png'
+                    "./nodejs-tests/assets/isAntialiased/diffOn.png"
                 );
 
                 expect(buffer.equals(comparison)).toBe(true);
@@ -27,19 +27,19 @@ describe('ignore', () => {
         });
     });
 
-    test('ignore antialiasing off', async () => {
-        const text = fs.readFileSync('./nodejs-tests/assets/text.png');
-        const textAa = fs.readFileSync('./nodejs-tests/assets/textAa.png');
+    test("ignore antialiasing off", async () => {
+        const text = fs.readFileSync("./nodejs-tests/assets/text.png");
+        const textAa = fs.readFileSync("./nodejs-tests/assets/textAa.png");
 
         return new Promise(resolve => {
             resemble.compare(text, textAa, {}, (_x, data) => {
-                expect(data.misMatchPercentage).toBe('5.19');
+                expect(data.misMatchPercentage).toBe("5.19");
                 const buffer = data.getBuffer();
 
                 expect(buffer).toBeInstanceOf(Buffer);
 
                 const comparison = fs.readFileSync(
-                    './nodejs-tests/assets/isAntialiased/diffOff.png'
+                    "./nodejs-tests/assets/isAntialiased/diffOff.png"
                 );
 
                 expect(buffer.equals(comparison)).toBe(true);