Skip to content

Commit

Permalink
Merge branch 'hotfix/1.5.12'
Browse files Browse the repository at this point in the history
  • Loading branch information
Igloczek committed Mar 27, 2018
2 parents 927d63b + b86b030 commit af39ea0
Show file tree
Hide file tree
Showing 8 changed files with 1,152 additions and 1,083 deletions.
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
>=6.9.1 <7.0.0
>=8.9.0 <9.0.0
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: node_js
node_js: 6
node_js: 8
cache:
yarn: true
directories:
Expand Down
1 change: 0 additions & 1 deletion _config.yml

This file was deleted.

1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "snowdog/frontools",
"description": "Set of front-end tools for Magento 2, based on Gulp.js",
"version": "1.5.11",
"license": "MIT",
"type": "magento2-component"
}
4 changes: 2 additions & 2 deletions helper/scss.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ module.exports = function(gulp, plugins, config, name, file) { // eslint-disable
})
)
)
.pipe(plugins.if(!disableMaps && !production, plugins.sourcemaps.init()))
.pipe(plugins.if(!disableMaps, plugins.sourcemaps.init()))
.pipe(
plugins.sass()
.on('error', plugins.sassError.gulpSassError(plugins.util.env.ci || false))
)
.pipe(plugins.if(production, plugins.postcss([plugins.cssnano()])))
.pipe(plugins.if(postcss.length, plugins.postcss(postcss || [])))
.pipe(plugins.if(!disableMaps && !production, plugins.sourcemaps.write()))
.pipe(plugins.if(production && !disableSuffix, plugins.rename({ suffix: '.min' })))
.pipe(plugins.if(!disableMaps, plugins.sourcemaps.write('.', { includeContent: true })))
.pipe(plugins.rename(adjustDestinationDirectory))
.pipe(plugins.multiDest(dest))
.pipe(plugins.logger({
Expand Down
26 changes: 19 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "magento2-frontools",
"version": "1.5.11",
"version": "1.5.12",
"author": {
"name": "Bartek Igielski",
"email": "[email protected]"
Expand All @@ -12,7 +12,7 @@
},
"license": "MIT",
"dependencies": {
"autoprefixer": "~8.0.0",
"autoprefixer": "~8.2.0",
"babel-core": "~6.26.0",
"babel-preset-env": "~1.6.1",
"browser-sync": "~2.23.6",
Expand All @@ -34,24 +34,36 @@
"gulp-postcss": "~7.0.1",
"gulp-rename": "~1.2.2",
"gulp-rimraf": "~0.2.2",
"gulp-sass": "~3.1.0",
"gulp-sass": "~3.2.1",
"gulp-sass-error": "~1.0.5",
"gulp-sass-lint": "~1.3.4",
"gulp-sourcemaps": "~2.6.4",
"gulp-svg-sprite": "~1.3.7",
"gulp-svg-sprite": "~1.4.0",
"gulp-task-loader": "~1.4.4",
"gulp-uglify": "~3.0.0",
"gulp-util": "~3.0.8",
"js-yaml": "~3.10.0",
"js-yaml": "~3.11.0",
"marked": "~0.3.12",
"marked-terminal": "~2.0.0",
"merge-stream": "~1.0.1",
"postcss-reporter": "~5.0.0",
"run-sequence": "~2.2.1",
"stylelint": "~8.4.0",
"stylelint-config-standard": "~18.0.0"
"stylelint": "~9.1.3",
"stylelint-config-standard": "~18.2.0"
},
"scripts": {
"babel": "gulp babel",
"clean": "gulp clean",
"csslint": "gulp csslint",
"default": "gulp",
"dev": "gulp dev",
"eslint": "gulp eslint",
"inheritance": "gulp inheritance",
"sasslint": "gulp sasslint",
"setup": "gulp setup",
"styles": "gulp styles",
"svg": "gulp svg",
"watch": "gulp watch",
"test": "./node_modules/eslint/bin/eslint.js *.js helper/*.js task/*.js"
}
}
2 changes: 1 addition & 1 deletion task/watch.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ module.exports = function(resolve) { // eslint-disable-line func-names
}

// Files that require reload after save
if (['.html', '.phtml', '.xml', '.csv', '.js'].some(
if (['.html', '.phtml', '.xml', '.csv', '.js', '.vue'].some(
ext => plugins.path.extname(path) === ext
)) {
plugins.browserSync.reload();
Expand Down
Loading

0 comments on commit af39ea0

Please sign in to comment.