Merge pull request #16 from andreysgra/dev

Версия 5.5.0
andreysgra · Feb 5, 2021 · f3ce18f · f3ce18f
2 parents 1a156d1 + 43f7286
commit f3ce18f
Show file tree

Hide file tree

Showing 4 changed files with 4,340 additions and 6,107 deletions.
diff --git a/gulpfile.js/settings.js b/gulpfile.js/settings.js
@@ -1,32 +1,29 @@
 'use strict';
 
-const dirs = {
-  src: './source/',
-  dest: './build/'
-};
+const [source, desination] = ['./source/', './build/'];
 
 module.exports = {
   paths: {
     source: {
-      root: dirs.src,
-      styles: dirs.src + 'styles/',
-      scripts: dirs.src + 'js/',
+      root: source,
+      styles: `${source}styles/`,
+      scripts: `${source}js/`,
       images: {
-        all: dirs.src + 'img/',
-        icons: dirs.src + 'img/icons/',
-        content: dirs.src + 'img/content/'
+        all: `${source}img/`,
+        icons: `${source}img/icons/`,
+        content: `${source}img/content/`
       },
-      fonts: dirs.src + 'fonts/'
+      fonts: `${source}fonts/`
     },
     desination: {
-      root: dirs.dest,
-      styles: dirs.dest + 'css/',
-      scripts: dirs.dest + 'js/',
+      root: desination,
+      styles: `${desination}css/`,
+      scripts: `${desination}js/`,
       images: {
-        all: dirs.dest + 'img/',
-        content: dirs.dest + 'img/content/'
+        all: `${desination}img/`,
+        content: `${desination}img/content/`
       },
-      fonts: dirs.dest + 'fonts/'
+      fonts: `${desination}fonts/`
     },
     dist: './dist'
   }

diff --git a/gulpfile.js/tasks/styles.js b/gulpfile.js/tasks/styles.js
@@ -3,7 +3,6 @@
 const { paths: { source, desination } } = require('../settings');
 const { src, dest } = require('gulp');
 const gulpIf = require('gulp-if');
-const plumber = require('gulp-plumber');
 const rename = require('gulp-rename');
 const less = require('gulp-less');
 const postcss = require('gulp-postcss');
@@ -18,7 +17,6 @@ const styles = () => {
   const pluginsPostcss = [autoprefixer()];
 
   return src(`${source.styles}style.less`, { sourcemaps: true })
-    .pipe(plumber())
     .pipe(less())
     .pipe(postcss(pluginsPostcss))
     .pipe(csso({ forceMediaMerge: true, comments: false }))