Skip to content

Commit f5f71b2

Browse files
author
Valentyn
authored
Merge pull request #22 from donaldpipowitch/patch-1
fixed #20 - DeprecationWarning: loaderUtils.parseQuery()
2 parents 84a8e0a + 66fb7c5 commit f5f71b2

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

index.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
var _ = require('lodash');
2-
var utils = require('loader-utils');
2+
var loaderUtils = require('loader-utils');
33

4-
function processQuery(source, query) {
5-
if (!_.isUndefined(query.search) && !_.isUndefined(query.replace)) {
6-
if (!_.isUndefined(query.flags)) {
7-
query.search = new RegExp(query.search, query.flags);
4+
function processOptions(source, options) {
5+
if (!_.isUndefined(options.search) && !_.isUndefined(options.replace)) {
6+
if (!_.isUndefined(options.flags)) {
7+
options.search = new RegExp(options.search, options.flags);
88
}
99

10-
source = source.replace(query.search, query.replace);
10+
source = source.replace(options.search, options.replace);
1111
}
1212

1313
return source;
@@ -16,14 +16,14 @@ function processQuery(source, query) {
1616
module.exports = function (source) {
1717
this.cacheable();
1818

19-
var query = utils.parseQuery(this.query);
19+
var options = loaderUtils.getOptions(this);
2020

21-
if (_.isArray(query.multiple)) {
22-
query.multiple.forEach(function (subquery) {
23-
source = processQuery(source, subquery);
21+
if (_.isArray(options.multiple)) {
22+
options.multiple.forEach(function (suboptions) {
23+
source = processOptions(source, suboptions);
2424
});
2525
} else {
26-
source = processQuery(source, query);
26+
source = processOptions(source, options);
2727
}
2828

2929
return source;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"main": "index.js",
1717
"dependencies": {
18-
"loader-utils": "^0.2.11",
18+
"loader-utils": "^1.1.0",
1919
"lodash": "^3.10.1"
2020
},
2121
"devDependencies": {

0 commit comments

Comments
 (0)