Merge pull request #428 from helloyou2012/master

fix deprecation warning (loader-utils)
webpack-contrib · Feb 24, 2017 · 7732614 · 7732614
2 parents 7c45e94 + f8cdaca
commit 7732614
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/loader.js b/lib/loader.js
@@ -12,7 +12,7 @@ var compileExports = require("./compile-exports");
 module.exports = function(content, map) {
 	if(this.cacheable) this.cacheable();
 	var callback = this.async();
-	var query = loaderUtils.parseQuery(this.query);
+	var query = loaderUtils.getOptions(this) || {};
 	var root = query.root;
 	var moduleMode = query.modules || query.module;
 	var camelCaseKeys = query.camelCase || query.camelcase;

diff --git a/lib/localsLoader.js b/lib/localsLoader.js
@@ -11,7 +11,7 @@ var compileExports = require("./compile-exports");
 module.exports = function(content) {
 	if(this.cacheable) this.cacheable();
 	var callback = this.async();
-	var query = loaderUtils.parseQuery(this.query);
+	var query = loaderUtils.getOptions(this) || {};
 	var moduleMode = query.modules || query.module;
 	var camelCaseKeys = query.camelCase || query.camelcase;
 

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "babel-code-frame": "^6.11.0",
     "css-selector-tokenizer": "^0.7.0",
     "cssnano": ">=2.6.1 <4",
-    "loader-utils": "~0.2.2",
+    "loader-utils": "^1.0.2",
     "lodash.camelcase": "^4.3.0",
     "object-assign": "^4.0.1",
     "postcss": "^5.0.6",