diff --git a/.editorconfig b/.editorconfig index 2bd49bd..85a84c3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,12 +1,13 @@ -# editorconfig.org +# http://editorconfig.org/ root = true [*] indent_style = tab -indent_size = 2 +end_of_line = lf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true -[*.md] -trim_trailing_whitespace = false +[{*.yml}] +indent_style = space +indent_size = 2 diff --git a/.npmignore b/.npmignore index 63744b3..2c8002f 100644 --- a/.npmignore +++ b/.npmignore @@ -1,5 +1,4 @@ .appveyor.yml -.coveralls.yml .editorconfig .eslintrc .github diff --git a/bower.json b/bower.json index d83388d..db40646 100644 --- a/bower.json +++ b/bower.json @@ -29,7 +29,6 @@ ], "ignore": [ ".appveyor.yml", - ".coveralls.yml", ".editorconfig", ".eslintrc", ".github", diff --git a/composer.json b/composer.json index 926cf1c..d06a1d3 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,6 @@ ], "ignore": [ ".appveyor.yml", - ".coveralls.yml", ".editorconfig", ".eslintrc", ".github", diff --git a/package.json b/package.json index ca7e59c..15daa0d 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ ], "ignore": [ ".appveyor.yml", - ".coveralls.yml", ".editorconfig", ".eslintrc", ".github", @@ -55,33 +54,35 @@ "backstopjs": "^2.3.3", "banner-cli": "^0.6.0", "browser-sync": "^2.18.2", - "coveralls": "^2.11.15", + "husky": "^0.11.6", "node-sass": "^3.13.0", "npm-run-all": "^2.3.0", "nyc": "^10.0.0", "onchange": "^2.5.0", "postcss-cli": "^2.6.0", + "rimraf": "^2.5.4", "sass-lint": "^1.10.2" }, "engines": { "node": "^7.0.0" }, "scripts": { - "prestart": "npm install", - "pretest": "npm install", - "banner": "banner-cli dist/*.css", - "clean": "rm -rf dist", - "autoprefixer": "postcss -u autoprefixer --no-map.inline --autoprefixer.browsers \"last 1 versions\" -r dist/*.css", - "sass": "node-sass --output-style expanded src/milligram.sass dist/milligram.css && node-sass --output-style compressed src/milligram.sass dist/milligram.min.css", - "lint": "sass-lint -c .sasslintrc \"src/*.sass\" --verbose --no-exit", - "build": "run-s clean lint sass autoprefixer banner", - "watch": "onchange src -- npm run build", - "serve": "browser-sync start --no-notify -s test --ss dist -f dist", "start": "run-p build watch serve", - "test": "nyc ava", - "coveralls": "nyc report --reporter=text-lcov | coveralls", + "build": "run-s clean sass autoprefixer banner", + "clean": "rimraf dist", + "sass": "node-sass --output-style expanded src/milligram.sass dist/milligram.css && node-sass --output-style compressed src/milligram.sass dist/milligram.min.css", + "autoprefixer": "postcss -u autoprefixer --no-map.inline --autoprefixer.browsers \"last 1 versions\" -r dist/*.css", + "banner": "banner-cli dist/*.css", + "watch": "onchange src -- run-s build", + "serve": "browser-sync start --no-notify -s test --ss dist -f dist", + "test": "run-s lint ava", + "lint": "sass-lint -c .sasslintrc \"src/*.sass\" --verbose --no-exit", + "ava": "nyc ava", + "backstop": "run-s build && run-p serve compare", "reference": "backstop reference --configPath=backstop.conf.js", "compare": "backstop test --configPath=backstop.conf.js", - "backstop": "run-s build && run-p serve compare" + "precommit": "run-s build test && git add dist/*", + "prestart": "npm install", + "pretest": "npm install" } } diff --git a/readme.md b/readme.md index ab392f4..406dda1 100644 --- a/readme.md +++ b/readme.md @@ -3,7 +3,7 @@ > A minimalist CSS framework. [![Travis Status](https://travis-ci.org/milligram/milligram.svg?branch=master)](https://travis-ci.org/milligram/milligram?branch=master) -[![AppVeyor Status](https://ci.appveyor.com/api/projects/status/wabkk000uh6d97xk?svg=true)](https://ci.appveyor.com/project/cjpatoilo/milligram) +[![AppVeyor Status](https://ci.appveyor.com/api/projects/status/xcm8meymwerq0r82?svg=true)](https://ci.appveyor.com/project/cjpatoilo/milligram) [![Codacy Status](https://img.shields.io/codacy/grade/848fb4bd6902434fab0bcfb5461284fe/master.svg)](https://www.codacy.com/app/milligram/milligram/dashboard) [![Dependencies Status](https://david-dm.org/milligram/milligram.svg)](https://travis-ci.org/milligram/milligram?branch=master) [![Download Status](https://img.shields.io/npm/dt/milligram.svg)](https://www.npmjs.com/package/milligram)