Merge pull request #1017 from fsih/fixNode12

Fix Scratch paint building in node 12
This commit is contained in:
DD Liu 2020-04-29 18:02:09 -04:00 committed by GitHub
commit 480e215fb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 11 deletions

View file

@ -9,18 +9,9 @@ env:
cache:
directories:
- node_modules
addons:
apt:
packages:
- libcairo2-dev
- libpango1.0-dev
- libssl-dev
- libjpeg62-dev
- libgif-dev
install:
- npm --production=false install
- npm --production=false update
- npm install --no-save canvas@1.6.11
script: npm run $NPM_SCRIPT
jobs:
include:

View file

@ -57,7 +57,6 @@
"babel-plugin-transform-object-rest-spread": "^6.22.0",
"babel-preset-env": "^1.6.1",
"babel-preset-react": "^6.22.0",
"canvas-prebuilt": "^1.6.11",
"css-loader": "3.4.0",
"enzyme": "^3.6.0",
"enzyme-adapter-react-16": "^1.5.0",
@ -69,6 +68,7 @@
"gh-pages": "github:rschamp/gh-pages#publish-branch-to-subfolder",
"html-webpack-plugin": "3.2.0",
"jest": "^22.2.2",
"jest-canvas-mock": "^2.2.0",
"lodash.defaultsdeep": "4.6.1",
"mkdirp": "^1.0.3",
"postcss-import": "^12.0.0",
@ -103,7 +103,8 @@
"jest": {
"setupFiles": [
"raf/polyfill",
"<rootDir>/test/helpers/enzyme-setup.js"
"<rootDir>/test/helpers/enzyme-setup.js",
"jest-canvas-mock"
],
"testURL": "http://localhost",
"moduleNameMapper": {