Skip to content

Commit

Permalink
upgrade webpack-related deps and config to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
jerodsanto committed Dec 6, 2016
1 parent d5eab68 commit 3ed2647
Show file tree
Hide file tree
Showing 3 changed files with 318 additions and 367 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
"babel-core": "^6.17.0",
"babel-loader": "^6.2.4",
"babel-preset-es2015": "^6.16.0",
"copy-webpack-plugin": "^3.0.1",
"css-loader": "^0.25.0",
"copy-webpack-plugin": "^4.0.1",
"css-loader": "^0.26.1",
"extract-text-webpack-plugin": "^2.0.0-beta.4",
"file-loader": "^0.9.0",
"handlebars-loader": "^1.3.0",
"node-sass": "^3.11.2",
"sass-loader": "^4.0.0",
"style-loader": "^0.13.1",
"webpack": "^2.1.0-beta.25",
"webpack-merge": "^0.14.0"
"webpack": "^2.1.0-beta.27",
"webpack-merge": "^1.0.2"
},
"scripts": {
"start": "webpack --watch-stdin --color",
Expand Down
8 changes: 4 additions & 4 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var common = {
{
test: /\.js$/,
exclude: [/node_modules/, /semantic/, /uploads/],
loader: "babel",
loader: "babel-loader",
options: {
presets: ["es2015"]
}
Expand All @@ -20,15 +20,15 @@ var common = {
},
{
test: [/\.sass$/, /\.css$/],
loader: ExtractTextPlugin.extract({fallbackLoader: "style", loader: "css!sass"})
loader: ExtractTextPlugin.extract({fallbackLoader: "style-loader", loader: "css-loader!sass-loader"})
},
{
test: /\.(png|jpg|gif|svg)$/,
loader: "file?name=/images/[name].[ext]"
loader: "file-loader?name=/images/[name].[ext]"
},
{
test: /\.(ttf|eot|svg|woff2?)$/,
loader: "file?name=/fonts/[name].[ext]",
loader: "file-loader?name=/fonts/[name].[ext]",
}
]
},
Expand Down
Loading

0 comments on commit 3ed2647

Please sign in to comment.