Skip to content

Commit

Permalink
Merge pull request #66 from kiki-le-singe/upgrade_packages
Browse files Browse the repository at this point in the history
Upgrade packages
  • Loading branch information
kiki-le-singe authored Jan 18, 2017
2 parents 63a0181 + 06173ea commit da2f85d
Show file tree
Hide file tree
Showing 4 changed files with 182 additions and 211 deletions.
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"babel-runtime": "^6.20.0",
"better-npm-run": "0.0.14",
"debug": "^2.6.0",
"extract-text-webpack-plugin": "^2.0.0-beta.3",
"fs-extra": "^1.0.0",
"extract-text-webpack-plugin": "^2.0.0-beta.5",
"fs-extra": "^2.0.0",
"globby": "^6.1.0",
"inquirer": "^2.0.0",
"ip": "^1.1.4",
Expand All @@ -72,15 +72,15 @@
"purifycss-webpack-plugin": "^2.0.3",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"react-helmet": "^3.3.0",
"react-helmet": "^4.0.0",
"react-hot-loader": "^3.0.0-beta.6",
"react-redux": "^5.0.2",
"react-router": "^3.0.1",
"react-router-redux": "^4.0.7",
"redux": "^3.6.0",
"serialize-javascript": "^1.3.0",
"source-map-support": "^0.4.8",
"webpack": "^2.2.0-rc.4",
"source-map-support": "^0.4.10",
"webpack": "^2.2.0",
"webpack-isomorphic-tools": "^2.6.6",
"webpack-md5-hash": "^0.0.5",
"why-did-you-update": "^0.0.8"
Expand Down Expand Up @@ -110,7 +110,7 @@
"file-loader": "^0.9.0",
"image-webpack-loader": "^3.1.0",
"json-loader": "^0.5.4",
"karma": "^1.3.0",
"karma": "^1.4.0",
"karma-chrome-launcher": "^2.0.0",
"karma-coverage": "^1.1.1",
"karma-mocha": "^1.3.0",
Expand All @@ -119,9 +119,9 @@
"karma-spec-reporter": "^0.0.26",
"karma-webpack": "^2.0.1",
"mocha": "^3.2.0",
"node-sass": "^4.2.0",
"node-sass": "^4.3.0",
"nodemon": "^1.11.0",
"npm-run-all": "^4.0.0",
"npm-run-all": "^4.0.1",
"postcss": "^5.2.10",
"postcss-cssnext": "^2.9.0",
"postcss-loader": "^1.2.2",
Expand Down
2 changes: 1 addition & 1 deletion webpack/dev.config.cssnext.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const config = {
},
{
test: /common\/styles\/global\/app\.css$/,
include: [globalStylesDir],
include: [srcDir],
loaders: [
'style-loader',
{
Expand Down
2 changes: 1 addition & 1 deletion webpack/prod.config.cssnext.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const config = {
},
{
test: /common\/styles\/global\/app\.css$/,
include: [globalStylesDir],
include: [srcDir],
loader: ExtractTextPlugin.extract({
fallbackLoader: 'style-loader',
loader: `css-loader?${cssLoaderOptions()}!postcss-loader`
Expand Down
Loading

0 comments on commit da2f85d

Please sign in to comment.