Skip to content

Commit c7ef05e

Browse files
author
Marco Solazzi
committed
Merge branch 'hotfix/4.0.2'
2 parents 9c781ec + 0a5dbdf commit c7ef05e

File tree

3 files changed

+30
-29
lines changed

3 files changed

+30
-29
lines changed

.stylelintrc.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@
88
"rules": {
99
"indentation": 4,
1010
"max-empty-lines": 3,
11-
"rule-nested-empty-line-before": ["always", { "ignore": ["after-comment"]}],
12-
"no-missing-end-of-source-newline": null,
13-
"at-rule-empty-line-before": ["always", {
14-
"except": [
15-
"blockless-group", "first-nested"
16-
],
17-
"ignoreAtRules": ["import", "if", "each", "for", "else", "content", "return", "warn"],
11+
"rule-nested-empty-line-before": ["always", {
1812
"ignore": ["after-comment"]
1913
}],
14+
"at-rule-empty-line-before": [ "always", {
15+
"ignore": ["after-comment", "blockless-group", "all-nested"],
16+
"ignoreAtRules": ["else", "content", "return", "warn"]
17+
}],
2018
"block-closing-brace-newline-after": ["always", {
21-
"ignoreAtRules": ["if", "else"]
19+
"ignoreAtRules": ["if", "else", "content", "return", "warn"]
2220
}],
21+
"declaration-colon-newline-after": null,
22+
"function-comma-newline-after": null,
23+
"no-missing-end-of-source-newline": null,
2324
"declaration-empty-line-before": "never",
2425
"declaration-block-properties-order": [
2526

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wok",
3-
"version": "4.0.1",
3+
"version": "4.0.2",
44
"authors": [
55
"Marco Solazzi <[email protected]>",
66
"Matteo Guidotto <[email protected]>",

package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "wok",
33
"description": "A Static Website Boilerplate",
4-
"version": "4.0.1",
4+
"version": "4.0.2",
55
"license": "MIT",
66
"repository": {
77
"type": "git",
@@ -32,25 +32,25 @@
3232
"html5shiv": "3.7.3"
3333
},
3434
"devDependencies": {
35-
"autoprefixer": "6.5.1",
36-
"browser-sync": "2.17.5",
35+
"autoprefixer": "6.5.3",
36+
"browser-sync": "2.18.2",
3737
"customizr": "https://github.com/doctyper/customizr/tarball/develop",
3838
"datauri": "1.0.4",
3939
"del": "2.2.2",
40-
"eslint": "3.9.1",
41-
"eslint-config-airbnb-base": "9.0.0",
42-
"eslint-plugin-import": "2.1.0",
40+
"eslint": "3.11.0",
41+
"eslint-config-airbnb-base": "10.0.1",
42+
"eslint-plugin-import": "2.2.0",
4343
"ftps": "0.4.8",
4444
"glob": "7.1.1",
4545
"gulp": "3.9.1",
46-
"gulp-bump": "2.5.0",
46+
"gulp-bump": "2.5.1",
4747
"gulp-changed": "1.3.2",
4848
"gulp-clean-css": "2.0.13",
49-
"gulp-concat": "2.6.0",
49+
"gulp-concat": "2.6.1",
5050
"gulp-eslint": "3.0.1",
5151
"gulp-filter": "4.0.0",
5252
"gulp-header": "1.8.8",
53-
"gulp-if": "2.0.1",
53+
"gulp-if": "2.0.2",
5454
"gulp-imagemin": "3.1.1",
5555
"gulp-load-plugins": "1.4.0",
5656
"gulp-notify": "2.2.0",
@@ -62,30 +62,30 @@
6262
"gulp-sass": "2.3.2",
6363
"gulp-size": "2.1.0",
6464
"gulp-sourcemaps": "2.2.0",
65-
"gulp-stylelint": "3.4.0",
65+
"gulp-stylelint": "3.5.0",
6666
"gulp-uglify": "2.0.0",
6767
"gulp-useref": "3.1.2",
6868
"gulp-util": "3.0.7",
6969
"hasbin": "1.2.3",
7070
"image-size": "0.5.0",
71-
"inquirer": "1.2.2",
71+
"inquirer": "1.2.3",
7272
"lazypipe": "1.0.1",
73-
"lodash": "4.16.6",
73+
"lodash": "4.17.2",
7474
"lorem-ipsum": "1.0.3",
7575
"marked": "0.3.6",
7676
"mkdirp": "0.5.1",
7777
"modernizr": "3.3.1",
78-
"node-sass": "3.11.1",
79-
"nunjucks": "2.5.2",
80-
"nunjucks-markdown": "2.0.0",
78+
"node-sass": "3.13.0",
79+
"nunjucks": "3.0.0",
80+
"nunjucks-markdown": "2.0.1",
8181
"rsyncwrapper": "2.0.1",
8282
"run-sequence": "1.2.2",
8383
"semver": "5.3.0",
84-
"ssh2": "0.5.2",
85-
"stylelint": "7.5.0",
86-
"stylelint-config-standard": "14.0.0",
84+
"ssh2": "0.5.4",
85+
"stylelint": "7.6.0",
86+
"stylelint-config-standard": "15.0.0",
8787
"stylelint-scss": "1.3.4",
88-
"through2": "2.0.1",
89-
"yargs": "6.3.0"
88+
"through2": "2.0.2",
89+
"yargs": "6.4.0"
9090
}
9191
}

0 commit comments

Comments
 (0)