mirror of
https://github.com/scratchfoundation/scratch-paint.git
synced 2025-01-24 05:09:52 -05:00
Merge pull request #1017 from fsih/fixNode12
Fix Scratch paint building in node 12
This commit is contained in:
commit
480e215fb3
2 changed files with 3 additions and 11 deletions
|
@ -9,18 +9,9 @@ env:
|
||||||
cache:
|
cache:
|
||||||
directories:
|
directories:
|
||||||
- node_modules
|
- node_modules
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
packages:
|
|
||||||
- libcairo2-dev
|
|
||||||
- libpango1.0-dev
|
|
||||||
- libssl-dev
|
|
||||||
- libjpeg62-dev
|
|
||||||
- libgif-dev
|
|
||||||
install:
|
install:
|
||||||
- npm --production=false install
|
- npm --production=false install
|
||||||
- npm --production=false update
|
- npm --production=false update
|
||||||
- npm install --no-save canvas@1.6.11
|
|
||||||
script: npm run $NPM_SCRIPT
|
script: npm run $NPM_SCRIPT
|
||||||
jobs:
|
jobs:
|
||||||
include:
|
include:
|
||||||
|
|
|
@ -57,7 +57,6 @@
|
||||||
"babel-plugin-transform-object-rest-spread": "^6.22.0",
|
"babel-plugin-transform-object-rest-spread": "^6.22.0",
|
||||||
"babel-preset-env": "^1.6.1",
|
"babel-preset-env": "^1.6.1",
|
||||||
"babel-preset-react": "^6.22.0",
|
"babel-preset-react": "^6.22.0",
|
||||||
"canvas-prebuilt": "^1.6.11",
|
|
||||||
"css-loader": "3.4.0",
|
"css-loader": "3.4.0",
|
||||||
"enzyme": "^3.6.0",
|
"enzyme": "^3.6.0",
|
||||||
"enzyme-adapter-react-16": "^1.5.0",
|
"enzyme-adapter-react-16": "^1.5.0",
|
||||||
|
@ -69,6 +68,7 @@
|
||||||
"gh-pages": "github:rschamp/gh-pages#publish-branch-to-subfolder",
|
"gh-pages": "github:rschamp/gh-pages#publish-branch-to-subfolder",
|
||||||
"html-webpack-plugin": "3.2.0",
|
"html-webpack-plugin": "3.2.0",
|
||||||
"jest": "^22.2.2",
|
"jest": "^22.2.2",
|
||||||
|
"jest-canvas-mock": "^2.2.0",
|
||||||
"lodash.defaultsdeep": "4.6.1",
|
"lodash.defaultsdeep": "4.6.1",
|
||||||
"mkdirp": "^1.0.3",
|
"mkdirp": "^1.0.3",
|
||||||
"postcss-import": "^12.0.0",
|
"postcss-import": "^12.0.0",
|
||||||
|
@ -103,7 +103,8 @@
|
||||||
"jest": {
|
"jest": {
|
||||||
"setupFiles": [
|
"setupFiles": [
|
||||||
"raf/polyfill",
|
"raf/polyfill",
|
||||||
"<rootDir>/test/helpers/enzyme-setup.js"
|
"<rootDir>/test/helpers/enzyme-setup.js",
|
||||||
|
"jest-canvas-mock"
|
||||||
],
|
],
|
||||||
"testURL": "http://localhost",
|
"testURL": "http://localhost",
|
||||||
"moduleNameMapper": {
|
"moduleNameMapper": {
|
||||||
|
|
Loading…
Reference in a new issue