Skip to content

Commit

Permalink
update 0.1.5 (mate-academy#444)
Browse files Browse the repository at this point in the history
  • Loading branch information
YuriiHoliuk authored May 22, 2020
1 parent b10bff2 commit aae1b0d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
end_of_line = lf
end_of_line = lf
1 change: 0 additions & 1 deletion .stylelintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
/backstop_data/
/dist

14 changes: 7 additions & 7 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ const parseCommandLineOptions = (argList) => {
const args = parseCommandLineOptions(process.argv);

const distDirectory = args.destination || args.d || 'dist';
const htmlBlob = 'src/*.html';
const htmlBlob = 'src/**/*.html';
const imagesBlob = 'src/images/**';
const fontsBlob = 'src/fonts/**';
const stylesBlob = 'src/styles/**';
const jsBlob = 'src/scripts/**';
const stylesBlob = ['src/**/*.css', 'src/**/*.scss'];
const jsBlob = 'src/**/*.js';

gulpLintHTML.description = "Analyse all HTML files using linthtml";
gulpLintHTML.description = 'Analyse all HTML files using linthtml';

/**
* Clean
Expand Down Expand Up @@ -110,10 +110,10 @@ task('buildStyles', () => (
src(stylesBlob)
.pipe(sourcemaps.init())
.pipe(sass())
.pipe(gulpReplacePath(/(?:\.\.\/){2,}images/g, '../images'))
.pipe(gulpReplacePath(/(?:\.\.\/)+images/g, './images'))
.pipe(autoprefixer())
.pipe(sourcemaps.write('.'))
.pipe(dest(`${distDirectory}/styles`))
.pipe(dest(distDirectory))
// NOTE: need to leave here to pass changed styles to the BrowserSync
.pipe(browserSync.reload({ stream: true }))
));
Expand All @@ -131,7 +131,7 @@ task('lintJavascript', () => (

task('buildJavascript', () => (
src(jsBlob)
.pipe(dest(`${distDirectory}/scripts/`))
.pipe(dest(distDirectory))
));

task('processJavascript', series('lintJavascript', 'buildJavascript'));
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@mate-academy/backstop-config": "*",
"@mate-academy/eslint-config": "*",
"@mate-academy/linthtml-config": "0.0.1",
"@mate-academy/scripts": "^0.1.3",
"@mate-academy/scripts": "^0.1.5",
"@mate-academy/stylelint-config": "0.0.9",
"backstopjs": "^4.0.3",
"browser-sync": "^2.1.6",
Expand Down

0 comments on commit aae1b0d

Please sign in to comment.