Skip to content

Commit

Permalink
Remove resolve-url loader
Browse files Browse the repository at this point in the history
Clearly I was doing something incorrect, as npm was telling me that
window wasn't defined at one point. Ha.
  • Loading branch information
mileszs committed Jul 25, 2016
1 parent 2914cce commit 47ef663
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
9 changes: 7 additions & 2 deletions config/webpack.config.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const plugins = [
const sassLoaders = [
'style-loader',
'css-loader?sourceMap',
'resolve-url',
'postcss-loader',
'sass-loader?outputStyle=expanded'
];

Expand Down Expand Up @@ -64,7 +64,7 @@ module.exports = {
},
{
test: /\.css$/,
loader: 'style-loader!css-loader!resolve-url!'
loader: 'style-loader!css-loader!postcss-loader'
},
{
test: /\.woff(\?v=\d+\.\d+\.\d+)?$/,
Expand Down Expand Up @@ -94,6 +94,11 @@ module.exports = {
]
},
plugins: plugins,
postcss: function () {
return [autoprefixer({
browsers: ['last 2 versions']
})];
},
sassLoader: {
indentedSyntax: true
},
Expand Down
7 changes: 3 additions & 4 deletions config/webpack.config.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ const plugins = [
];

const sassLoaders = [
'style-loader',
'css-loader?sourceMap',
'resolve-url',
'sass-loader?outputStyle=expanded'
'postcss-loader',
'sass-loader?outputStyle=compressed'
];

module.exports = {
Expand Down Expand Up @@ -82,7 +81,7 @@ module.exports = {
{
test: /\.css$/,
include: PATHS.styles,
loader: ExtractTextPlugin.extract('style-loader', 'css-loader!resolve-url')
loader: ExtractTextPlugin.extract('style-loader', 'css-loader!postcss-loader')
},
{
test: /\.woff(\?v=\d+\.\d+\.\d+)?$/,
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
"react-redux": "4.4.5",
"react-router": "2.3.0",
"react-router-bootstrap": "0.23.0",
"redux": "3.5.2",
"resolve-url-loader": "1.6.0"
"redux": "3.5.2"
}
}

0 comments on commit 47ef663

Please sign in to comment.