Replace deprecated context properties and support webpack 4.x (QingWei-Li#40)

moyus · QingWei-Li · commit 84b294f8c1ff · 2018-03-06T10:04:37.000+08:00
* upgrade loader-utils

* webpack 4.x support
diff --git a/lib/core.js b/lib/core.js
@@ -6,8 +6,12 @@ var markdownCompilerPath = path.resolve(__dirname, 'markdown-compiler.js');
 module.exports = function(source) {
   this.cacheable();
 
-  this.options.__vueMarkdownOptions__ =
-    this.query || this.vueMarkdown || this.options.vueMarkdown || {};
+  var options = loaderUtils.getOptions(this) || {};
+  Object.defineProperty(this._compilation, '__vueMarkdownOptions__', {
+    value: options,
+    enumerable: false,
+    configurable: true
+  })
 
   var filePath = this.resourcePath;
 
diff --git a/lib/markdown-compiler.js b/lib/markdown-compiler.js
@@ -63,8 +63,8 @@ var renderVueTemplate = function(html, wrapper) {
 module.exports = function(source) {
   this.cacheable && this.cacheable();
   var parser, preprocess;
-  var params = loaderUtils.parseQuery(this.query) || {};
-  var vueMarkdownOptions = this.options.__vueMarkdownOptions__;
+  var params = loaderUtils.getOptions(this) || {};
+  var vueMarkdownOptions = this._compilation.__vueMarkdownOptions__;
   var opts = Object.create(vueMarkdownOptions.__proto__); // inherit prototype
   var preventExtract = false;
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "cheerio": "^0.20.0",
     "highlight.js": "^9.4.0",
-    "loader-utils": "^0.2.15",
+    "loader-utils": "^1.1.0",
     "markdown-it": "^8.4.0"
   },
   "peerDependencies": {
