From 2f83d7f1c0a8778d3113e4ea89a6ec9b719e9b22 Mon Sep 17 00:00:00 2001 From: Lubos Kmetko Date: Tue, 20 Mar 2018 14:45:27 +0100 Subject: [PATCH 1/4] Updating project packages --- generators/app/templates/package.json | 58 ++++++++++++++------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json index 803ec880..7c447f5e 100644 --- a/generators/app/templates/package.json +++ b/generators/app/templates/package.json @@ -42,54 +42,56 @@ } }, "devDependencies": { - "autoprefixer": "^7.1.2", + "autoprefixer": "^8.1", "babel-core": "^6.26.0", - "babel-loader": "^7.1.2", + "babel-loader": "^7.1.4", "babel-plugin-syntax-dynamic-import": "^6.18.0", "babel-preset-es2015": "^6.24.1", - "browser-sync": "^2.18.12", - "chalk": "^2.3.0", + "browser-sync": "^2.23.6", + "chalk": "^2.3.2", "chunk-manifest-webpack-plugin": "^1.1.2", "del": "^3.0.0", + "eslint": "^4.19.0", "eslint-config-chisel": "^1.0.0", "glob": "^7.1.2", "gulp": "^3.9.1", - "gulp-clean-css": "^3.7.0", + "gulp-clean-css": "^3.9.3", "gulp-cli": "^1.3.0", "gulp-concat": "^2.6.1", - "gulp-data": "^1.2.1", - "gulp-debug": "^3.1.0", - "gulp-eslint": "^4.0.0", - "gulp-filter": "^5.0.0", - "gulp-htmlhint": "^0.3.1", + "gulp-data": "^1.3.1", + "gulp-debug": "^3.2.0", + "gulp-eslint": "^4.0.2", + "gulp-filter": "^5.1.0", + "gulp-htmlhint": "^2.1.0", "gulp-load-plugins": "^1.5.0", "gulp-mirror": "^1.0.0", - "gulp-newer": "^1.3.0", - "gulp-plumber": "^1.1.0", - "gulp-postcss": "^7.0.0", + "gulp-newer": "^1.4.0", + "gulp-plumber": "^1.2.0", + "gulp-postcss": "^7.0.1", "gulp-prettify": "^0.5.0", "gulp-rename": "^1.2.2", - "gulp-rev": "^7.1.2", - "gulp-rev-replace": "^0.4.3", - "gulp-sass": "^3.1.0", + "gulp-rev": "^8.1.1", + "gulp-rev-replace": "^0.4.4", + "gulp-sass": "^3.2.0", "gulp-sass-glob": "^1.0.8", - "gulp-sequence": "^0.4.6", - "gulp-sourcemaps": "^2.6.0", - "gulp-stylelint": "^3.9.0",<% if (projectType == 'fe') { %> - "gulp-twig": "^v1.1.1",<% } %> - "gulp-uglify": "^2.0.0", - "lodash": "^4.17.4", - "multipipe": "^1.0.2", + "gulp-sequence": "^1.0.0", + "gulp-sourcemaps": "^2.6.4", + "gulp-stylelint": "^7.0.0",<% if (projectType == 'fe') { %> + "gulp-twig": "^v1.2.0",<% } %> + "gulp-uglify": "^3.0.0", + "lodash": "^4.17.5", + "multipipe": "^2.0.3", "pre-commit": "^1.2.2", - "prettier": "1.8.2", + "prettier": "1.11.1", + "stylelint": "^9.1.3", "through2": "^2.0.3", "vinyl-named": "^1.1.0", - "webpack": "^3.8.1", - "webpack-stream": "^4.0.0" + "webpack": "^3.11.0", + "webpack-stream": "^4.0.2" }, "dependencies": {<% if (has_jquery) { %> - "jquery": "^3.2.1",<% } %> - "normalize-scss": "^7.0.0" + "jquery": "^3.3.1",<% } %> + "normalize-scss": "^7.0.1" }, "engines": { "node": ">=6" From e12bf402c72f63f1f4ff71869b31a7b8afc8e162 Mon Sep 17 00:00:00 2001 From: Lubos Kmetko Date: Tue, 20 Mar 2018 14:54:09 +0100 Subject: [PATCH 2/4] Preventing package name collisions --- generators/app/templates/gulpfile.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/generators/app/templates/gulpfile.js b/generators/app/templates/gulpfile.js index 0492d15a..1c3e243d 100644 --- a/generators/app/templates/gulpfile.js +++ b/generators/app/templates/gulpfile.js @@ -2,7 +2,10 @@ const gulp = require('gulp'); const _ = require('lodash'); -const plugins = require('gulp-load-plugins')({ pattern: '*' }); +const plugins = require('gulp-load-plugins')({ + pattern: '*', + rename: { 'stylelint': 'stylelintLib', 'eslint': 'eslintLib' }, +}); let config = require('./package.json').chisel; const generatorConfig = require('./.yo-rc.json')['generator-chisel'].config; const helpers = require('./gulp/helpers')(gulp, plugins, config); From ede11c2e099067a55d0d19e1acf215c3464320d7 Mon Sep 17 00:00:00 2001 From: Lubos Kmetko Date: Thu, 22 Mar 2018 13:42:04 +0100 Subject: [PATCH 3/4] Downgrading gulp-stylelint to version which respects .stylelintignore --- generators/app/templates/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json index 7c447f5e..864bd11a 100644 --- a/generators/app/templates/package.json +++ b/generators/app/templates/package.json @@ -76,7 +76,7 @@ "gulp-sass-glob": "^1.0.8", "gulp-sequence": "^1.0.0", "gulp-sourcemaps": "^2.6.4", - "gulp-stylelint": "^7.0.0",<% if (projectType == 'fe') { %> + "gulp-stylelint": "^3.9.0",<% if (projectType == 'fe') { %> "gulp-twig": "^v1.2.0",<% } %> "gulp-uglify": "^3.0.0", "lodash": "^4.17.5", From 7160e2ce17c76c05c1900b29d85cc873b7a18748 Mon Sep 17 00:00:00 2001 From: Lubos Kmetko Date: Tue, 3 Apr 2018 13:54:24 +0200 Subject: [PATCH 4/4] Removing stylelint from dependencies --- generators/app/templates/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json index 864bd11a..86d6d3fd 100644 --- a/generators/app/templates/package.json +++ b/generators/app/templates/package.json @@ -83,7 +83,6 @@ "multipipe": "^2.0.3", "pre-commit": "^1.2.2", "prettier": "1.11.1", - "stylelint": "^9.1.3", "through2": "^2.0.3", "vinyl-named": "^1.1.0", "webpack": "^3.11.0",