mirror of
https://github.com/scratchfoundation/scratch-paint.git
synced 2024-12-22 13:32:28 -05:00
Update to react 16
This commit is contained in:
parent
4001a24bf5
commit
1d6e854e4a
2 changed files with 17 additions and 7 deletions
20
package.json
20
package.json
|
@ -23,8 +23,8 @@
|
||||||
"url": "git+ssh://git@github.com/LLK/scratch-paint.git"
|
"url": "git+ssh://git@github.com/LLK/scratch-paint.git"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"react": "^15",
|
"react": "^16",
|
||||||
"react-dom": "^15"
|
"react-dom": "^16"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"autoprefixer": "7.1.2",
|
"autoprefixer": "7.1.2",
|
||||||
|
@ -39,7 +39,8 @@
|
||||||
"babel-preset-react": "^6.22.0",
|
"babel-preset-react": "^6.22.0",
|
||||||
"classnames": "2.2.5",
|
"classnames": "2.2.5",
|
||||||
"css-loader": "0.28.3",
|
"css-loader": "0.28.3",
|
||||||
"enzyme": "^2.8.2",
|
"enzyme": "^3.1.0",
|
||||||
|
"enzyme-adapter-react-16": "^1.0.1",
|
||||||
"eslint": "^4.4.1",
|
"eslint": "^4.4.1",
|
||||||
"eslint-config-import": "^0.13.0",
|
"eslint-config-import": "^0.13.0",
|
||||||
"eslint-config-scratch": "^4.0.0",
|
"eslint-config-scratch": "^4.0.0",
|
||||||
|
@ -58,12 +59,13 @@
|
||||||
"postcss-loader": "^2.0.5",
|
"postcss-loader": "^2.0.5",
|
||||||
"postcss-simple-vars": "^4.0.0",
|
"postcss-simple-vars": "^4.0.0",
|
||||||
"prop-types": "^15.5.10",
|
"prop-types": "^15.5.10",
|
||||||
"react": "15.6.1",
|
"raf": "^3.4.0",
|
||||||
"react-dom": "15.6.1",
|
"react": "16.0.0",
|
||||||
"react-intl": "2.3.0",
|
"react-dom": "16.0.0",
|
||||||
|
"react-intl": "2.4.0",
|
||||||
"react-intl-redux": "0.6.0",
|
"react-intl-redux": "0.6.0",
|
||||||
"react-redux": "5.0.5",
|
"react-redux": "5.0.5",
|
||||||
"react-test-renderer": "^15.5.4",
|
"react-test-renderer": "^16.0.0",
|
||||||
"redux": "3.7.0",
|
"redux": "3.7.0",
|
||||||
"redux-mock-store": "^1.2.3",
|
"redux-mock-store": "^1.2.3",
|
||||||
"redux-throttle": "0.1.1",
|
"redux-throttle": "0.1.1",
|
||||||
|
@ -75,6 +77,10 @@
|
||||||
"webpack-dev-server": "^2.7.0"
|
"webpack-dev-server": "^2.7.0"
|
||||||
},
|
},
|
||||||
"jest": {
|
"jest": {
|
||||||
|
"setupFiles": [
|
||||||
|
"raf/polyfill",
|
||||||
|
"<rootDir>/test/helpers/enzyme-setup.js"
|
||||||
|
],
|
||||||
"moduleNameMapper": {
|
"moduleNameMapper": {
|
||||||
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/test/__mocks__/fileMock.js",
|
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/test/__mocks__/fileMock.js",
|
||||||
"\\.(css|less)$": "<rootDir>/test/__mocks__/styleMock.js"
|
"\\.(css|less)$": "<rootDir>/test/__mocks__/styleMock.js"
|
||||||
|
|
4
test/helpers/enzyme-setup.js
Normal file
4
test/helpers/enzyme-setup.js
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
import Enzyme from 'enzyme';
|
||||||
|
import Adapter from 'enzyme-adapter-react-16';
|
||||||
|
|
||||||
|
Enzyme.configure({adapter: new Adapter()});
|
Loading…
Reference in a new issue