diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..6796ca85 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,21 @@ +root=true + +[*] +charset=utf-8 +insert_final_newline=true + +[LICENSE.md] +indent_size=unset +indent_style=space + +[*.{json,yml}] +indent_size=2 +indent_style=space + +[.github/**/*.md] +trim_trailing_whitespace=false # Templates with trailing whitespace are more usable + +[_data/simple-icons.json] +indent_style=space +indent_size=4 +trim_trailing_whitespace=true diff --git a/.gitpod.yml b/.gitpod.yml index ee6ae17d..e2bfa09c 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -3,4 +3,4 @@ ports: onOpen: open-preview tasks: - init: gem install jekyll bundler - command: jekyll serve --host 0.0.0.0 \ No newline at end of file + command: jekyll serve --host 0.0.0.0 diff --git a/.travis.yml b/.travis.yml index ed5774e4..57d1766f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ jobs: script: - npm run jsonlint - npm run svglint + - npm run wslint - name: "Build website" language: ruby rvm: 2.4.1 diff --git a/index.html b/index.html index f0a8bc77..7783d5c5 100644 --- a/index.html +++ b/index.html @@ -256,4 +256,4 @@ - \ No newline at end of file + diff --git a/package-lock.json b/package-lock.json index a133f5d2..db8904ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -705,6 +705,12 @@ "parse5": "^3.0.1" } }, + "chownr": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", + "dev": true + }, "ci-info": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", @@ -1187,6 +1193,16 @@ "safer-buffer": "^2.1.0" } }, + "editorconfig-checker": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/editorconfig-checker/-/editorconfig-checker-2.0.6.tgz", + "integrity": "sha512-/p3egFALNsTSt0YM7gOAGxhIVTX/GHUwwlPKixykpyMbBh5+Hebg0OaxVu3UdPoGttHM2ajPFJfqSIxUL+ytbg==", + "dev": true, + "requires": { + "request": "^2.88.0", + "tar": "^4.4.8" + } + }, "end-of-stream": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", @@ -1603,6 +1619,15 @@ "map-cache": "^0.2.2" } }, + "fs-minipass": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", + "dev": true, + "requires": { + "minipass": "^2.2.1" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -1629,8 +1654,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -1651,14 +1675,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1673,20 +1695,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -1803,8 +1822,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -1816,7 +1834,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1831,7 +1848,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -1839,14 +1855,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -1865,7 +1879,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -1946,8 +1959,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -1959,7 +1971,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -2045,8 +2056,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -2082,7 +2092,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2102,7 +2111,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2146,14 +2154,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -3957,6 +3963,25 @@ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, + "minipass": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", + "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", + "dev": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", + "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", + "dev": true, + "requires": { + "minipass": "^2.2.1" + } + }, "mixin-deep": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", @@ -5329,6 +5354,21 @@ "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=", "dev": true }, + "tar": { + "version": "4.4.8", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", + "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", + "dev": true, + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.3.4", + "minizlib": "^1.1.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.2" + } + }, "test-exclude": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.1.0.tgz", @@ -5851,6 +5891,12 @@ "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", "dev": true }, + "yallist": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "dev": true + }, "yargs": { "version": "12.0.5", "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", diff --git a/package.json b/package.json index 4108fb44..84b0c68a 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "author": "Simple Icons Collaborators", "license": "CC0-1.0", "devDependencies": { + "editorconfig-checker": "^2.0.6", "jest": "^24.1.0", "jsonlint2": "^1.7.1", "svglint": "^1.0.4" @@ -25,6 +26,7 @@ "scripts": { "jsonlint": "jsonlint _data/simple-icons.json -q -V .jsonlintschema", "svglint": "svglint icons/* --ci", + "wslint": "editorconfig-checker", "prepublishOnly": "node scripts/prepublish.js", "postpublish": "rm icons/*.js index.js", "test": "jest", diff --git a/scripts/utils.js b/scripts/utils.js index 80e6a44c..f8c6d775 100644 --- a/scripts/utils.js +++ b/scripts/utils.js @@ -14,4 +14,4 @@ module.exports = { .replace(/&/g, "-and-") .replace(/[ !’]/g, "") ) -} \ No newline at end of file +}