Merge branch 'hotfix/1.5.10'

SnowdogApps · Dec 4, 2017 · 95e1668 · 95e1668
2 parents 07629ed + f1463a7
commit 95e1668
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/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.9",
+    "version": "1.5.10",
     "license": "MIT",
     "type": "magento2-component"
 }
diff --git a/helper/babel.js b/helper/babel.js
@@ -29,7 +29,7 @@ module.exports = function(gulp, plugins, config, name, file) { // eslint-disable
               config.projectPath + theme.dest + '/' + locale
             )
             .replace(
-              new RegExp('web\/([^_]*)$'),
+              new RegExp('web/([^_]*)$'),
               '$1'
             )
         );

diff --git a/helper/dependency-tree-builder.js b/helper/dependency-tree-builder.js
@@ -16,7 +16,7 @@ module.exports = function(plugins, file) { // eslint-disable-line func-names
               filePath   = result[1];
 
           while (filePath.includes('../')) {
-            parentPath = parentPath.replace(/\/[^\/]+$/g, '');
+            parentPath = parentPath.replace(/\/[^/]+$/g, '');
             filePath = filePath.replace(/\.\.\//, '');
             const filePathParts = /(.*)\/(.*)/g.exec(filePath);
             if (filePathParts) {