Skip to content

Commit

Permalink
Merge pull request #5546 from camptocamp/dependabot/npm_and_yarn/file…
Browse files Browse the repository at this point in the history
…-loader-5.1.0

Bump file-loader from 4.2.0 to 5.1.0
  • Loading branch information
sbrunner committed Mar 10, 2020
2 parents c3e6902 + 5d299f9 commit 97f8501
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 12 deletions.
16 changes: 10 additions & 6 deletions buildtools/webpack.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ process.traceDeprecation = true;

const resourcesRule = {
test: /\.(jpeg|png|ico|cur|eot|ttf|woff|woff2)$/,
use: {
loader: 'file-loader',
options: {
name: '[name].[ext]'
},
}
use: [
{
loader: 'file-loader',
options: {
esModule: false,
name: '[name].[ext]'
}
}
]
};

const svgRule = {
Expand All @@ -20,6 +23,7 @@ const svgRule = {
{
loader: 'file-loader',
options: {
esModule: false,
name: '[name].[ext]'
},
},
Expand Down
14 changes: 9 additions & 5 deletions buildtools/webpack.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ const TerserPlugin = require('terser-webpack-plugin');

const resourcesRule = {
test: /\.(jpeg|png|ico|cur|eot|ttf|woff|woff2)$/,
use: {
loader: 'file-loader',
options: {
name: '[name].[hash:6].[ext]'
use: [
{
loader: 'file-loader',
options: {
esModule: false,
name: '[name].[hash:6].[ext]'
}
}
}
]
};

const svgRule = {
Expand All @@ -20,6 +23,7 @@ const svgRule = {
{
loader: 'file-loader',
options: {
esModule: false,
name: '[name].[hash:6].[ext]'
},
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"expose-loader": "0.7.5",
"extract-loader": "5.0.1",
"fast-sass-loader": "1.5.0",
"file-loader": "4.2.0",
"file-loader": "5.1.0",
"file-saver": "2.0.2",
"floatthead": "2.1.4",
"fs-extra": "8.1.0",
Expand Down

0 comments on commit 97f8501

Please sign in to comment.