diff --git a/CHANGELOG.md b/CHANGELOG.md index 83ceb2bbc..58d54e5b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,19 @@ - Disable dev server running? check if no dev server config is present in that environment [#1179](https://github.com/rails/webpacker/pull/1179) +- Fix checking 'webpack' binstub on Windows [#1123](https://github.com/rails/webpacker/pull/1123) + +- silence yarn output if checking is successfull [#1131](https://github.com/rails/webpacker/pull/1131) + +- Update uglifyJs plugin to support ES6 [#1194](https://github.com/rails/webpacker/pull/1194) + +- Add typescript installer [#1145](https://github.com/rails/webpacker/pull/1145) + +- Update default extensions and move to installer [#1181](https://github.com/rails/webpacker/pull/1181) + +- Revert file loader [#1196](https://github.com/rails/webpacker/pull/1196) + + ## [3.2.0] - 2017-12-16 ### To upgrade: diff --git a/docs/webpack.md b/docs/webpack.md index 89aec10e9..e1fb45de8 100644 --- a/docs/webpack.md +++ b/docs/webpack.md @@ -142,7 +142,10 @@ environment.loaders.insert('svg', { } } ]) -}, { before: 'file' }) +}, { after: 'file' }) + +const fileLoader = environment.loaders.get('file') +fileLoader.exclude = /\.(svg)$/i ``` diff --git a/package/rules/file.js b/package/rules/file.js index bd7690a06..3988e2bec 100644 --- a/package/rules/file.js +++ b/package/rules/file.js @@ -2,7 +2,7 @@ const { join } = require('path') const { source_path } = require('../config') module.exports = { - exclude: /\.(js|jsx|coffee|ts|tsx|vue|elm|scss|sass|css|html|json)?(\.erb)?$/, + test: /\.(jpg|jpeg|png|gif|tiff|ico|svg|eot|otf|ttf|woff|woff2)$/i, use: [{ loader: 'file-loader', options: {