scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-23 05:52:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #880 from fsih/rollForward

Browse source 
Roll updated deps back forward
This commit is contained in:
DD Liu 2019-08-02 14:45:06 -04:00 committed by GitHub
commit 0b94b93ae3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
package.json
View file

@ -57,14 +57,14 @@
"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": "^2.0.0-alpha.14", "canvas-prebuilt": "^1.6.11",
"css-loader": "1.0.0", "css-loader": "3.1.0",
"enzyme": "^3.6.0", "enzyme": "^3.6.0",
"enzyme-adapter-react-16": "^1.5.0", "enzyme-adapter-react-16": "^1.5.0",
"eslint": "^4.4.1", "eslint": "^4.4.1",
"eslint-config-import": "^0.13.0", "eslint-config-import": "^0.13.0",
"eslint-config-scratch": "^5.0.0", "eslint-config-scratch": "^5.0.0",
"eslint-plugin-import": "^2.9.0", "eslint-plugin-import": "^2.18.2",
"eslint-plugin-react": "^7.2.1", "eslint-plugin-react": "^7.2.1",
"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",
@ -76,11 +76,11 @@
"postcss-simple-vars": "^5.0.1", "postcss-simple-vars": "^5.0.1",
"raf": "^3.4.0", "raf": "^3.4.0",
"react": "16.2.0", "react": "16.2.0",
"react-dom": "16.4.0", "react-dom": "16.2.0",
"react-intl": "2.7.2", "react-intl": "2.9.0",
"react-intl-redux": "2.0.0", "react-intl-redux": "2.0.0",
"react-popover": "0.5.10", "react-popover": "0.5.10",
"react-redux": "5.1.0", "react-redux": "5.0.7",
"react-responsive": "4.1.0", "react-responsive": "4.1.0",
"react-style-proptype": "3.2.2", "react-style-proptype": "3.2.2",
"react-test-renderer": "^16.0.0", "react-test-renderer": "^16.0.0",
@ -92,10 +92,10 @@
"rimraf": "^2.6.1", "rimraf": "^2.6.1",
"scratch-l10n": "3.1.20181129221712", "scratch-l10n": "3.1.20181129221712",
"style-loader": "^0.23.1", "style-loader": "^0.23.1",
"svg-url-loader": "^2.3.2", "svg-url-loader": "^3.0.0",
"tap": "^11.1.0", "tap": "^14.4.3",
"uglifyjs-webpack-plugin": "^2.0.1", "uglifyjs-webpack-plugin": "^2.0.1",
"url-loader": "^1.0.1", "url-loader": "^2.1.0",
"webpack": "^4.8.0", "webpack": "^4.8.0",
"webpack-cli": "^3.1.0", "webpack-cli": "^3.1.0",
"webpack-dev-server": "^3.1.9" "webpack-dev-server": "^3.1.9"

7
webpack.config.js
View file

@ -30,10 +30,11 @@ const base = {
}, { }, {
loader: 'css-loader', loader: 'css-loader',
options: { options: {
modules: true,
importLoaders: 1, importLoaders: 1,
localIdentName: '[name]_[local]_[hash:base64:5]', modules: {
camelCase: true localIdentName: '[name]_[local]_[hash:base64:5]'
},
localsConvention: 'camelCase'
} }
}, { }, {
loader: 'postcss-loader', loader: 'postcss-loader',