Skip to content

Commit 9ca96a5

Browse files
committed
Encore.configureUrlLoader() - Move url-loader to dev dependencies
1 parent 69e2cfe commit 9ca96a5

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

lib/config-generator.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
const extractText = require('./loaders/extract-text');
1313
const pathUtil = require('./config/path-util');
14+
const loaderFeatures = require('./features');
1415
// loaders utils
1516
const cssLoaderUtil = require('./loaders/css');
1617
const sassLoaderUtil = require('./loaders/sass');
@@ -158,6 +159,7 @@ class ConfigGenerator {
158159
};
159160

160161
if (this.webpackConfig.urlLoaderOptions.images) {
162+
loaderFeatures.ensurePackagesExist('urlloader');
161163
loaderName = 'url-loader';
162164
Object.assign(loaderOptions, this.webpackConfig.urlLoaderOptions.images);
163165
}
@@ -185,6 +187,7 @@ class ConfigGenerator {
185187
};
186188

187189
if (this.webpackConfig.urlLoaderOptions.fonts) {
190+
loaderFeatures.ensurePackagesExist('urlloader');
188191
loaderName = 'url-loader';
189192
Object.assign(loaderOptions, this.webpackConfig.urlLoaderOptions.fonts);
190193
}

lib/features.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ const features = {
7272
method: 'enableBuildNotifications()',
7373
packages: ['webpack-notifier'],
7474
description: 'display build notifications'
75+
},
76+
urlloader: {
77+
method: 'configureUrlLoader()',
78+
packages: ['url-loader'],
79+
description: 'use the url-loader'
7580
}
7681
};
7782

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
"pretty-error": "^2.1.1",
4444
"resolve-url-loader": "^2.0.2",
4545
"style-loader": "^0.13.2",
46-
"url-loader": "^1.0.1",
4746
"webpack": ">=2.2.0 <4",
4847
"webpack-chunk-hash": "^0.5.0",
4948
"webpack-dev-server": "^2.4.5",
@@ -77,6 +76,7 @@
7776
"stylus-loader": "^3.0.1",
7877
"ts-loader": "^2.1.0",
7978
"typescript": "^2.3.4",
79+
"url-loader": "^1.0.1",
8080
"vue": "^2.3.4",
8181
"vue-loader": "^12.2.1",
8282
"vue-template-compiler": "^2.3.4",

yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4115,8 +4115,8 @@ mime@^1.2.11, mime@^1.3.4, mime@^1.5.0:
41154115
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
41164116

41174117
mime@^2.0.3:
4118-
version "2.2.2"
4119-
resolved "https://registry.yarnpkg.com/mime/-/mime-2.2.2.tgz#6b4c109d88031d7b5c23635f5b923da336d79121"
4118+
version "2.3.1"
4119+
resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
41204120

41214121
mimic-fn@^1.0.0:
41224122
version "1.2.0"

0 commit comments

Comments
 (0)