From 60b3c50f61c97142d456704563ebca8504015d1c Mon Sep 17 00:00:00 2001 From: DD Liu Date: Tue, 6 Aug 2019 12:16:28 -0400 Subject: [PATCH] Revert "Roll updated deps back forward" --- package.json | 18 +++++++++--------- webpack.config.js | 7 +++---- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index b7731151..b9108499 100644 --- a/package.json +++ b/package.json @@ -57,14 +57,14 @@ "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.1.0", + "canvas-prebuilt": "^2.0.0-alpha.14", + "css-loader": "1.0.0", "enzyme": "^3.6.0", "enzyme-adapter-react-16": "^1.5.0", "eslint": "^4.4.1", "eslint-config-import": "^0.13.0", "eslint-config-scratch": "^5.0.0", - "eslint-plugin-import": "^2.18.2", + "eslint-plugin-import": "^2.9.0", "eslint-plugin-react": "^7.2.1", "gh-pages": "github:rschamp/gh-pages#publish-branch-to-subfolder", "html-webpack-plugin": "3.2.0", @@ -76,11 +76,11 @@ "postcss-simple-vars": "^5.0.1", "raf": "^3.4.0", "react": "16.2.0", - "react-dom": "16.2.0", - "react-intl": "2.9.0", + "react-dom": "16.4.0", + "react-intl": "2.7.2", "react-intl-redux": "2.0.0", "react-popover": "0.5.10", - "react-redux": "5.0.7", + "react-redux": "5.1.0", "react-responsive": "4.1.0", "react-style-proptype": "3.2.2", "react-test-renderer": "^16.0.0", @@ -92,10 +92,10 @@ "rimraf": "^2.6.1", "scratch-l10n": "3.1.20181129221712", "style-loader": "^0.23.1", - "svg-url-loader": "^3.0.0", - "tap": "^14.4.3", + "svg-url-loader": "^2.3.2", + "tap": "^11.1.0", "uglifyjs-webpack-plugin": "^2.0.1", - "url-loader": "^2.1.0", + "url-loader": "^1.0.1", "webpack": "^4.8.0", "webpack-cli": "^3.1.0", "webpack-dev-server": "^3.1.9" diff --git a/webpack.config.js b/webpack.config.js index 6d2d8a45..e352299f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -30,11 +30,10 @@ const base = { }, { loader: 'css-loader', options: { + modules: true, importLoaders: 1, - modules: { - localIdentName: '[name]_[local]_[hash:base64:5]' - }, - localsConvention: 'camelCase' + localIdentName: '[name]_[local]_[hash:base64:5]', + camelCase: true } }, { loader: 'postcss-loader',