Skip to content

Commit 1a58931

Browse files
author
acailly
committed
🔨 Use canvas-prebuilt if canvas dependency is not found
1 parent 4de1e96 commit 1a58931

File tree

3 files changed

+60
-3
lines changed

3 files changed

+60
-3
lines changed

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"babel-register": "^6.18.0",
2727
"babelify": "^7.3.0",
2828
"brfs": "^1.4.3",
29-
"canvas": "^1.6.2",
29+
"canvas-prebuilt": "^1.6.5-prerelease.1",
3030
"chai": "^3.5.0",
3131
"chart.js": "^2.3.0",
3232
"cross-env": "^5.0.0",
@@ -44,6 +44,9 @@
4444
"react-dom": "^0.14 || ^15.0.0-rc || ^15.0",
4545
"sinon": "^1.17.6"
4646
},
47+
"optionalDependencies": {
48+
"canvas": "^1.6.2"
49+
},
4750
"peerDependencies": {
4851
"chart.js": "^2.3",
4952
"react": "^0.14 || ^15.0.0-rc || ^15.0",

test/config/setup.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
require('babel-register')();
22

3-
const canvas = require('canvas');
3+
let canvas
4+
try{
5+
canvas = require('canvas')
6+
}
7+
catch(e){
8+
canvas = require('canvas-prebuilt');
9+
}
410

511
const jsdom = require('jsdom');
612
const document = jsdom.jsdom();

yarn.lock

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1828,6 +1828,14 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
18281828
version "1.0.30000665"
18291829
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000665.tgz#e84f4277935f295f546f8533cb0b410a8415b972"
18301830

1831+
canvas-prebuilt@^1.6.5-prerelease.1:
1832+
version "1.6.5-prerelease.1"
1833+
resolved "https://registry.yarnpkg.com/canvas-prebuilt/-/canvas-prebuilt-1.6.5-prerelease.1.tgz#6814b20b9c80835dcc24bfd6199147288630521c"
1834+
dependencies:
1835+
node-pre-gyp "^0.6.29"
1836+
parse-css-font "^2.0.2"
1837+
units-css "^0.4.0"
1838+
18311839
canvas@^1.6.2:
18321840
version "1.6.5"
18331841
resolved "https://registry.yarnpkg.com/canvas/-/canvas-1.6.5.tgz#557f9988f5d2c95fdc247c61a5ee43de52f6717c"
@@ -2327,6 +2335,21 @@ create-react-class@^15.5.2:
23272335
fbjs "^0.8.9"
23282336
object-assign "^4.1.1"
23292337

2338+
cross-env@^5.0.0:
2339+
version "5.0.1"
2340+
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.0.1.tgz#ff4e72ea43b47da2486b43a7f2043b2609e44913"
2341+
dependencies:
2342+
cross-spawn "^5.1.0"
2343+
is-windows "^1.0.0"
2344+
2345+
cross-spawn@^5.1.0:
2346+
version "5.1.0"
2347+
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
2348+
dependencies:
2349+
lru-cache "^4.0.1"
2350+
shebang-command "^1.2.0"
2351+
which "^1.2.9"
2352+
23302353
23312354
version "2.0.5"
23322355
resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -4484,6 +4507,10 @@ is-windows@^0.2.0:
44844507
version "0.2.0"
44854508
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
44864509

4510+
is-windows@^1.0.0:
4511+
version "1.0.1"
4512+
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
4513+
44874514
[email protected], isarray@~0.0.1:
44884515
version "0.0.1"
44894516
resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -5155,6 +5182,13 @@ lru-cache@2:
51555182
version "2.7.3"
51565183
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
51575184

5185+
lru-cache@^4.0.1:
5186+
version "4.1.1"
5187+
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
5188+
dependencies:
5189+
pseudomap "^1.0.2"
5190+
yallist "^2.1.2"
5191+
51585192
macaddress@^0.2.8:
51595193
version "0.2.8"
51605194
resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
@@ -6225,6 +6259,10 @@ prr@~0.0.0:
62256259
version "0.0.0"
62266260
resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
62276261

6262+
pseudomap@^1.0.2:
6263+
version "1.0.2"
6264+
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
6265+
62286266
public-encrypt@^4.0.0:
62296267
version "4.0.0"
62306268
resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
@@ -6944,6 +6982,12 @@ shasum@^1.0.0:
69446982
json-stable-stringify "~0.0.0"
69456983
sha.js "~2.4.4"
69466984

6985+
shebang-command@^1.2.0:
6986+
version "1.2.0"
6987+
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
6988+
dependencies:
6989+
shebang-regex "^1.0.0"
6990+
69476991
shebang-regex@^1.0.0:
69486992
version "1.0.0"
69496993
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
@@ -7926,7 +7970,7 @@ whet.extend@~0.9.9:
79267970
version "0.9.9"
79277971
resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
79287972

7929-
which@^1.2.12:
7973+
which@^1.2.12, which@^1.2.9:
79307974
version "1.2.14"
79317975
resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
79327976
dependencies:
@@ -8014,6 +8058,10 @@ y18n@^3.2.0:
80148058
version "3.2.1"
80158059
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
80168060

8061+
yallist@^2.1.2:
8062+
version "2.1.2"
8063+
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
8064+
80178065
yargs@~3.10.0:
80188066
version "3.10.0"
80198067
resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"

0 commit comments

Comments
 (0)