Fix lint-staged not working by upgrading husky

Squashed commit of the following:

commit c79173551c96db363bb6d83475e74856d8d7b61e
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Dec 7 16:38:43 2017 +0000

    Add husky entry to package.json

commit af0f5e6dbc6a223390dac884ea1f51e539691b8f
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Dec 7 16:37:42 2017 +0000

    Remove pre-commit hook from the scripts entry

commit e85794fbc3ab1bf4b10e2fd418417de116e58848
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Dec 7 16:36:51 2017 +0000

    Update npm packages

commit 3d8271767c161b4ebc0c13a9ffd2165160be76eb
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Dec 7 16:27:21 2017 +0000

    Make it correct again, forgot a reset earlier

commit 5d47c75a892c85e2af2b1fc1669e251262b165e6
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Dec 7 16:25:55 2017 +0000

    Try different lint-staged file idewntifiers

commit 4b72da03bc28007b1192bf04c6cbfdcb9e6a550f
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Dec 7 16:06:28 2017 +0000

    Add a lint-staged script

commit 35509858841a6648bbd8659cd75d89210cd0fbe9
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Dec 7 16:03:22 2017 +0000

    Add an error to a sass file

commit a54305b751643c12fc134a4498d96110851943cc
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Dec 7 16:02:58 2017 +0000

    Trying to fix lint-staged
This commit is contained in:
Jonny Barnes 2017-12-07 16:39:06 +00:00
parent a639edf9ae
commit d409098efb
2 changed files with 118 additions and 21 deletions

126
package-lock.json generated
View file

@ -1671,9 +1671,9 @@
} }
}, },
"ci-info": { "ci-info": {
"version": "1.1.1", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.1.tgz", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.2.tgz",
"integrity": "sha512-vHDDF/bP9RYpTWtUhpJRhCFdvvp3iDWvEbuDbWgvjUrNGV1MXJrE0MPcwGtEled04m61iwdBLUIHZtDgzWS4ZQ==", "integrity": "sha512-uTGIPNx/nSpBdsF6xnseRXLLtfr9VLqkz8ZqHXr3Y7b6SftyRxBGjwMtJj1OhNbmlc1wZzLNAlAcvyIiE8a6ZA==",
"dev": true "dev": true
}, },
"cipher-base": { "cipher-base": {
@ -4377,6 +4377,23 @@
"integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=", "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
"dev": true "dev": true
}, },
"gonzales-pe": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.3.tgz",
"integrity": "sha512-Kjhohco0esHQnOiqqdJeNz/5fyPkOMD/d6XVjwTAoPGUFh0mCollPUTUTa2OZy4dYNAqlPIQdTiNzJTWdd9Htw==",
"dev": true,
"requires": {
"minimist": "1.1.3"
},
"dependencies": {
"minimist": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
"integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
"dev": true
}
}
},
"got": { "got": {
"version": "5.7.1", "version": "5.7.1",
"resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz", "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz",
@ -4599,26 +4616,73 @@
"dev": true "dev": true
}, },
"husky": { "husky": {
"version": "0.14.3", "version": "0.15.0-beta.15",
"resolved": "https://registry.npmjs.org/husky/-/husky-0.14.3.tgz", "resolved": "https://registry.npmjs.org/husky/-/husky-0.15.0-beta.15.tgz",
"integrity": "sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==", "integrity": "sha512-7b5ByjqoV6UpYR2c8gerM1P/Txhkqm5Yen9+YBM8BoBMhOyOKkmQaGFRwwVb5+S83UGEDuSa1THxj5abBUz6jA==",
"dev": true, "dev": true,
"requires": { "requires": {
"cosmiconfig": "3.1.0",
"execa": "0.8.0",
"is-ci": "1.0.10", "is-ci": "1.0.10",
"normalize-path": "1.0.0", "pkg-dir": "2.0.0",
"strip-indent": "2.0.0" "pupa": "1.0.0",
"read-pkg": "3.0.0",
"run-node": "0.1.1",
"slash": "1.0.0"
}, },
"dependencies": { "dependencies": {
"normalize-path": { "load-json-file": {
"version": "1.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
"integrity": "sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=", "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
"dev": true,
"requires": {
"graceful-fs": "4.1.11",
"parse-json": "4.0.0",
"pify": "3.0.0",
"strip-bom": "3.0.0"
}
},
"parse-json": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
"integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
"dev": true,
"requires": {
"error-ex": "1.3.1",
"json-parse-better-errors": "1.0.1"
}
},
"path-type": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
"integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
"dev": true,
"requires": {
"pify": "3.0.0"
}
},
"pify": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
"dev": true "dev": true
}, },
"strip-indent": { "read-pkg": {
"version": "2.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
"integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=", "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
"dev": true,
"requires": {
"load-json-file": "4.0.0",
"normalize-package-data": "2.3.8",
"path-type": "3.0.0"
}
},
"strip-bom": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
"dev": true "dev": true
} }
} }
@ -4786,7 +4850,7 @@
"integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=", "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=",
"dev": true, "dev": true,
"requires": { "requires": {
"ci-info": "1.1.1" "ci-info": "1.1.2"
} }
}, },
"is-decimal": { "is-decimal": {
@ -5104,6 +5168,12 @@
"integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==", "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
"dev": true "dev": true
}, },
"json-parse-better-errors": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz",
"integrity": "sha512-xyQpxeWWMKyJps9CuGJYeng6ssI5bpqS9ltQpdVQ90t4ql6NdnxFKh95JcRt2cun/DjMVNrdjniLPuMA69xmCw==",
"dev": true
},
"json-schema": { "json-schema": {
"version": "0.2.3", "version": "0.2.3",
"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@ -7131,6 +7201,16 @@
"postcss": "6.0.13" "postcss": "6.0.13"
} }
}, },
"postcss-sass": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.2.0.tgz",
"integrity": "sha512-cUmYzkP747fPCQE6d+CH2l1L4VSyIlAzZsok3HPjb5Gzsq3jE+VjpAdGlPsnQ310WKWI42sw+ar0UNN59/f3hg==",
"dev": true,
"requires": {
"gonzales-pe": "4.2.3",
"postcss": "6.0.13"
}
},
"postcss-scss": { "postcss-scss": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.2.tgz", "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.2.tgz",
@ -7293,6 +7373,12 @@
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
}, },
"pupa": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/pupa/-/pupa-1.0.0.tgz",
"integrity": "sha1-mpVopa9+ZXuEYqbp1TKHQ1YM7/Y=",
"dev": true
},
"qs": { "qs": {
"version": "6.4.0", "version": "6.4.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
@ -7774,6 +7860,12 @@
"is-promise": "2.1.0" "is-promise": "2.1.0"
} }
}, },
"run-node": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/run-node/-/run-node-0.1.1.tgz",
"integrity": "sha1-GC7prNmjt6xebPdnnVwzoTYMe28=",
"dev": true
},
"rw": { "rw": {
"version": "1.3.3", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",

View file

@ -27,9 +27,10 @@
"eslint-plugin-node": "^5.2.1", "eslint-plugin-node": "^5.2.1",
"eslint-plugin-promise": "^3.6.0", "eslint-plugin-promise": "^3.6.0",
"eslint-plugin-standard": "^3.0.1", "eslint-plugin-standard": "^3.0.1",
"husky": "^0.14.3", "husky": "^0.15.0-beta.15",
"lint-staged": "^6.0.0", "lint-staged": "^6.0.0",
"postcss-cli": "^4.1.1", "postcss-cli": "^4.1.1",
"postcss-sass": "^0.2.0",
"pre-commit": "^1.1.3", "pre-commit": "^1.1.3",
"source-list-map": "^2.0.0", "source-list-map": "^2.0.0",
"stylelint": "^8.3.1", "stylelint": "^8.3.1",
@ -47,17 +48,21 @@
"make:css": "npm run lint:sass && npm run sass && npm run postcss", "make:css": "npm run lint:sass && npm run sass && npm run postcss",
"make:js": "npm run lint:es6 && npm run webpack && npm run uglifyjs", "make:js": "npm run lint:es6 && npm run webpack && npm run uglifyjs",
"postcss": "postcss public/assets/css/app.css --use autoprefixer --autoprefixer.browsers \"> 5%\" --replace --map", "postcss": "postcss public/assets/css/app.css --use autoprefixer --autoprefixer.browsers \"> 5%\" --replace --map",
"precommit": "lint-staged",
"sass": "sassc --style compressed --sourcemap resources/assets/sass/app.scss public/assets/css/app.css", "sass": "sassc --style compressed --sourcemap resources/assets/sass/app.scss public/assets/css/app.css",
"uglifyjs": "scripts/uglifyjs", "uglifyjs": "scripts/uglifyjs",
"webpack": "webpack --progress --colors" "webpack": "webpack --progress --colors"
}, },
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": { "lint-staged": {
"resources/assets/es6/*.js": [ "./resources/assets/es6/*.js": [
"eslint --fix", "eslint --fix",
"git add" "git add"
], ],
"resources/assets/sass/**/*.scss": [ "*.scss": [
"stylelint --syntax=scss --fix", "stylelint --syntax=scss --fix",
"git add" "git add"
] ]