From b979bd5861e4193cfb122d7578d59d62cee0bfdd Mon Sep 17 00:00:00 2001 From: Andrea Bogazzi Date: Tue, 14 Mar 2017 12:37:07 +0100 Subject: [PATCH] switch to canvas prebuilt (#3757) * swithced to canvas prebuilt * try 2 * remove toolchanin needed to setup canvas --- .travis.yml | 11 ----------- HEADER.js | 2 +- package.json | 2 +- src/node.js | 4 ++-- test/unit/canvas.js | 2 +- test/unit/canvas_static.js | 2 +- test/unit/group.js | 2 +- test/unit/image.js | 4 ++-- test/unit/image_filters.js | 2 +- test/unit/object.js | 2 +- test/unit/pattern.js | 2 +- test/unit/util.js | 2 +- 12 files changed, 13 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9eef96a9..c068c831 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,15 +3,4 @@ node_js: - "7" - "6" - "4" -env: - - CXX=g++-4.9 -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.9 -before_install: - - sudo apt-get update -qq - - sudo apt-get install -qq libgif-dev libpng-dev libjpeg8-dev libpango1.0-dev libcairo2-dev script: 'npm run build && npm run test && npm run lint && npm run lint_tests' diff --git a/HEADER.js b/HEADER.js index 70f0300e..f3b944d2 100644 --- a/HEADER.js +++ b/HEADER.js @@ -61,7 +61,7 @@ fabric.DPI = 96; fabric.reNum = '(?:[-+]?(?:\\d+|\\d*\\.\\d+)(?:e[-+]?\\d+)?)'; fabric.fontPaths = { }; fabric.iMatrix = [1, 0, 0, 1, 0, 0]; - +fabric.canvasModule = 'canvas-prebuilt'; /** * Cache Object for widths of chars in text rendering. */ diff --git a/package.json b/package.json index a5d6fc21..6fa2c8f8 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "all": "npm run build && npm run test && npm run lint && npm run lint_tests && npm run export_dist_to_site && npm run export_tests_to_site" }, "optionalDependencies": { - "canvas": "1.6.x", + "canvas-prebuilt": "1.6.x", "jsdom": "9.x.x", "xmldom": "0.1.x" }, diff --git a/src/node.js b/src/node.js index 2cc6f3a9..aaf02217 100644 --- a/src/node.js +++ b/src/node.js @@ -9,8 +9,8 @@ HTTP = require('http'), HTTPS = require('https'), - Canvas = require('canvas'), - Image = require('canvas').Image; + Canvas = require(fabric.canvasModule), + Image = require(fabric.canvasModule).Image; /** @private */ function request(url, encoding, callback) { diff --git a/test/unit/canvas.js b/test/unit/canvas.js index 89ddc5b0..11f54087 100644 --- a/test/unit/canvas.js +++ b/test/unit/canvas.js @@ -64,7 +64,7 @@ '"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"rx":0,"ry":0}],"background":"#ff5555","overlay":"rgba(0,0,0,0.2)"}'; function _createImageElement() { - return fabric.isLikelyNode ? new (require('canvas').Image)() : fabric.document.createElement('img'); + return fabric.isLikelyNode ? new (require(fabric.canvasModule).Image)() : fabric.document.createElement('img'); } function getAbsolutePath(path) { diff --git a/test/unit/canvas_static.js b/test/unit/canvas_static.js index 94d591ac..7a069d33 100644 --- a/test/unit/canvas_static.js +++ b/test/unit/canvas_static.js @@ -109,7 +109,7 @@ }; function _createImageElement() { - return fabric.isLikelyNode ? new (require('canvas').Image)() : fabric.document.createElement('img'); + return fabric.isLikelyNode ? new (require(fabric.canvasModule).Image)() : fabric.document.createElement('img'); } function _createImageObject(width, height, callback) { diff --git a/test/unit/group.js b/test/unit/group.js index 090fb81a..47cfe6a2 100644 --- a/test/unit/group.js +++ b/test/unit/group.js @@ -6,7 +6,7 @@ var canvas = this.canvas = fabric.isLikelyNode ? fabric.createCanvasForNode(600, 600, {enableRetinaScaling: false}) : new fabric.Canvas(el, {enableRetinaScaling: false}); // function _createImageElement() { - // return fabric.isLikelyNode ? new (require('canvas').Image)() : fabric.document.createElement('img'); + // return fabric.isLikelyNode ? new (require(fabric.canvasModule).Image)() : fabric.document.createElement('img'); // } function makeGroupWith2Objects() { diff --git a/test/unit/image.js b/test/unit/image.js index aa3dd31b..e20ca562 100644 --- a/test/unit/image.js +++ b/test/unit/image.js @@ -54,7 +54,7 @@ }; function _createImageElement() { - return fabric.isLikelyNode ? new (require('canvas').Image)() : fabric.document.createElement('img'); + return fabric.isLikelyNode ? new (require(fabric.canvasModule).Image)() : fabric.document.createElement('img'); } function _createImageObject(width, height, callback, options) { @@ -62,7 +62,7 @@ setSrc(elImage, IMG_SRC, function() { if (width != elImage.width || height != elImage.height) { if (fabric.isLikelyNode) { - var Canvas = require('canvas'); + var Canvas = require(fabric.canvasModule); var canvas = new Canvas(width, height); canvas.getContext('2d').drawImage(elImage, 0, 0, width, height); elImage._src = canvas.toDataURL(); diff --git a/test/unit/image_filters.js b/test/unit/image_filters.js index e846c12d..88c54927 100644 --- a/test/unit/image_filters.js +++ b/test/unit/image_filters.js @@ -49,7 +49,7 @@ // }; function _createImageElement() { - return fabric.isLikelyNode ? new (require('canvas').Image)() : fabric.document.createElement('img'); + return fabric.isLikelyNode ? new (require(fabric.canvasModule).Image)() : fabric.document.createElement('img'); } function _createImageObject(width, height, callback) { diff --git a/test/unit/object.js b/test/unit/object.js index b75c81a0..637f3b5f 100644 --- a/test/unit/object.js +++ b/test/unit/object.js @@ -19,7 +19,7 @@ IMG_HEIGHT = 110; function _createImageElement() { - return fabric.isLikelyNode ? new (require('canvas').Image)() : fabric.document.createElement('img'); + return fabric.isLikelyNode ? new (require(fabric.canvasModule).Image)() : fabric.document.createElement('img'); } function createImageObject(callback) { diff --git a/test/unit/pattern.js b/test/unit/pattern.js index fcdbedf6..1dbccca5 100644 --- a/test/unit/pattern.js +++ b/test/unit/pattern.js @@ -3,7 +3,7 @@ function createImageElement() { return fabric.isLikelyNode - ? new (require('canvas').Image)() + ? new (require(fabric.canvasModule).Image)() : fabric.document.createElement('img'); } function setSrc(img, src, callback) { diff --git a/test/unit/util.js b/test/unit/util.js index 291361f6..2bbcb1d4 100644 --- a/test/unit/util.js +++ b/test/unit/util.js @@ -6,7 +6,7 @@ function _createImageElement() { return fabric.isLikelyNode - ? new (require('canvas').Image)() + ? new (require(fabric.canvasModule).Image)() : fabric.document.createElement('img'); }