Merge branch 'hotfix/1.5.1'

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "snowdog/frontools",
     "description": "Set of front-end tools for Magento 2, based on Gulp.js",
-    "version": "1.5.0",
+    "version": "1.5.1",
     "license": "MIT",
     "type": "magento2-component"
 }

config/svg-sprite.yml.sample

@@ -1,4 +1,3 @@
-mode:
-  symbol:
-    dest: 'images'
-    sprite: 'icons-sprite.svg'
+symbol:
+  dest: 'images'
+  sprite: 'icons-sprite.svg'

helper/svg.js

@@ -5,11 +5,13 @@ module.exports = function(gulp, plugins, config, name) { // eslint-disable-line
         dest      = [],
         svgConfig = require('../helper/config-loader')('svg-sprite.yml', plugins, config);
 
+  plugins.path = require('path');
+
   theme.locale.forEach(locale => {
     dest.push(config.projectPath + theme.dest + '/' + locale);
   });
 
-  return gulp.src(srcBase + '/**/icons/**/*.svg', { base: srcBase })
+  return gulp.src(srcBase + '/**/icons/**/*.svg')
     .pipe(
       plugins.if(
         !plugins.util.env.ci,
@@ -18,7 +20,14 @@ module.exports = function(gulp, plugins, config, name) { // eslint-disable-line
         })
       )
     )
-    .pipe(plugins.svgSprite(svgConfig))
+    .pipe(plugins.svgSprite({
+      shape: {
+        id: {
+          generator: file => plugins.path.basename(file, '.svg')
+        }
+      },
+      mode: svgConfig
+    }))
     .pipe(plugins.multiDest(dest))
     .pipe(plugins.logger({
       display   : 'name',

package.json

@@ -1,5 +1,6 @@
 {
   "name": "magento2-frontools",
+  "version": "1.5.1",
   "author": {
     "name": "Bartek Igielski",
     "email": "[email protected]"