v0.5.0

Author: visualfanatic

.jshintrc

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 Damian
+Copyright (c) 2016-2018 Damian Stasik <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -1,32 +1,29 @@
-const svg = require('svgo');
+const svgo = require('svgo');
 const loaderUtils = require('loader-utils');
 const compiler = require('vue-template-compiler');
+const transpile = require('vue-template-es2015-compiler');
 
 module.exports = function (content) {
   const options = loaderUtils.getOptions(this) || {};
-  const query = loaderUtils.parseQuery(this.resourceQuery || '?');
-  const svgo = new svg(options.svgo || {
-    plugins: [{ removeDoctype: true }, { removeComments: true }],
-  });
+  const svg = new svgo(options.svgo || {});
+  const path = this.resourcePath;
 
   this.cacheable && this.cacheable(true);
   this.addDependency(this.resourcePath);
 
   const cb = this.async();
+  let component;
 
-  svgo.optimize(content, (result) => {
-    if (result.error) {
-      return cb(result.error);
-    }
+  svg
+    .optimize(content, { path: path })
+    .then((result) => {
+      const compiled = compiler.compile(result.data, { preserveWhitespace: false });
 
-    const compiled = compiler.compile(result.data, { preserveWhitespace: false });
-    let component = `render: function () {${compiled.render}}`;
+      component = transpile(`var render = function () {${compiled.render}};`);
+      component += `var toString = function () {return ${JSON.stringify(path)}};`;
+      component += `module.exports = { render: render, toString: toString };`;
 
-    if (options.includePath || query.includePath) {
-      const filename = loaderUtils.interpolateName(this, '[path][name].[ext]', { context: this.options.context });
-      component = `${component}, path:${JSON.stringify(filename)}`;
-    }
-
-    cb(null, `module.exports = {${component}};`);
-  });
+      cb(null, component);
+    })
+    .catch(cb);
 };

index.js

@@ -1,24 +1,24 @@
 {
   "name": "vue-svg-loader",
   "description": "Use SVG files as Vue Components",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "keywords": [
     "vue-svg-loader",
     "svg",
+    "svgo",
     "loader",
     "webpack",
     "vue"
   ],
   "bugs": "https://github.com/visualfanatic/vue-svg-loader/issues",
   "repository": "visualfanatic/vue-svg-loader",
   "license": "MIT",
-  "author": "visualfanatic",
+  "author": "Damian Stasik <[email protected]>",
   "main": "index.js",
-  "peerDependencies": {
-    "vue-template-compiler": "^2.0.0"
-  },
   "dependencies": {
     "loader-utils": "^1.1.0",
-    "svgo": "^0.7.2"
+    "svgo": "^1.0.4",
+    "vue-template-es2015-compiler": "^1.6.0",
+    "vue-template-compiler": "^2.5.13"
   }
 }