From ae8a931c622167116599d2e09a8003d07f67b42a Mon Sep 17 00:00:00 2001 From: jonschlinkert Date: Tue, 23 Jan 2018 01:33:56 -0500 Subject: [PATCH] run update --- .editorconfig | 9 +++++---- .eslintrc.json | 5 ----- .gitignore | 10 ++++++++++ LICENSE | 2 +- index.js | 4 ++-- package.json | 6 +++--- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.editorconfig b/.editorconfig index 818e072..449f0da 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,13 +1,14 @@ +# http://editorconfig.org/ root = true [*] -indent_style = space -end_of_line = lf charset = utf-8 +end_of_line = lf indent_size = 2 -trim_trailing_whitespace = true +indent_style = space insert_final_newline = true +trim_trailing_whitespace = true [{**/{actual,fixtures,expected,templates}/**,*.md}] trim_trailing_whitespace = false -insert_final_newline = false \ No newline at end of file +insert_final_newline = false diff --git a/.eslintrc.json b/.eslintrc.json index 948dbdb..61e8895 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,9 +1,4 @@ { - "ecmaFeatures": { - "modules": true, - "experimentalObjectRestSpread": true - }, - "env": { "browser": false, "es6": true, diff --git a/.gitignore b/.gitignore index 13bb9ba..f969a2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,30 @@ # always ignore files *.DS_Store +.idea +.vscode *.sublime-* # test related, or directories generated by tests test/actual actual coverage +.nyc* # npm node_modules npm-debug.log +# yarn +yarn.lock +yarn-error.log + # misc _gh_pages +_draft +_drafts bower_components vendor temp tmp TODO.md +package-lock.json \ No newline at end of file diff --git a/LICENSE b/LICENSE index 1e49edf..f8de063 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2016, Jon Schlinkert. +Copyright (c) 2015-2018, Jon Schlinkert. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/index.js b/index.js index 85e9f87..43cdfbf 100644 --- a/index.js +++ b/index.js @@ -1,8 +1,8 @@ /*! * parse-git-config * - * Copyright (c) 2015 Jon Schlinkert. - * Licensed under the MIT license. + * Copyright (c) 2015-2018, Jon Schlinkert. + * Released under the MIT License. */ 'use strict'; diff --git a/package.json b/package.json index d855a40..b90f9f1 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,9 @@ "homepage": "https://github.com/jonschlinkert/parse-git-config", "author": "Jon Schlinkert (https://github.com/jonschlinkert)", "contributors": [ - "Jason Denizac (https://jden.us)", - "Jon Schlinkert (http://twitter.com/jonschlinkert)", - "Sam Holmes (https://samholmes.net)" + "Jon Schlinkert (http://twitter.com/jonschlinkert)", + "Sam Holmes (https://samholmes.net)", + "(https://github.com/js-n)" ], "repository": "jonschlinkert/parse-git-config", "bugs": {