From df53414c34e23eb4b659795cb673301b35918957 Mon Sep 17 00:00:00 2001 From: "Nicholas C. Zakas" Date: Tue, 19 Apr 2016 08:53:59 -0700 Subject: [PATCH] Chore: Include jQuery Foundation info --- CODE_OF_CONDUCT.md | 64 -------------------------------------------- LICENSE | 2 +- Makefile.js | 3 +++ README.md | 2 +- bin/eslint.js | 4 +-- lib/api.js | 2 ++ lib/ast-utils.js | 4 +-- lib/cli-engine.js | 4 +-- lib/cli.js | 2 ++ lib/config.js | 7 +++-- lib/eslint.js | 5 ++-- lib/file-finder.js | 6 ++--- lib/ignored-paths.js | 3 +++ lib/load-rules.js | 2 ++ lib/logging.js | 4 ++- lib/options.js | 4 ++- lib/rule-context.js | 4 +-- lib/rules.js | 2 ++ lib/timing.js | 3 ++- lib/token-store.js | 4 +-- 20 files changed, 43 insertions(+), 88 deletions(-) delete mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index a0c033650308..000000000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,64 +0,0 @@ -# Code of Conduct - -Like the technical community as a whole, the various ESLint teams and communities are made up of a mixture of professionals and volunteers from all over the world, working on every aspect of the mission - including mentorship, teaching, and connecting people. - -Diversity is one of our huge strengths, but it can also lead to communication issues and unhappiness. To that end, we have a few ground rules that we ask people to adhere to. This code applies equally to founders, mentors and those seeking help and guidance. - -This isn't an exhaustive list of things that you can’t do. Rather, take it in the spirit in which it's intended - a guide to make it easier to enrich all of us and the technical communities in which we participate. - -* **Be friendly and patient.** We understand that we all have different levels of experience or knowledge in many diverse fields, be it technical or nontechnical in nature. We also have areas of knowledge we are eager to expand, and we want to be a community where people can not only contribute, but feel comfortable to ask questions as well and learn along the way. If someone is wrong, or says something accidentally offensive, respond with patience and try to keep it polite and civil. Remember that we all were newbies at one point. - -* **Be welcoming.** We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to, members of any race, ethnicity, culture, national origin, color, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability. - -* **Be considerate.** Your work will be used by other people, and you in turn will depend on the work of others. Any decision you make will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language. - -* **Be respectful.** Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It's important to remember that a community where people feel uncomfortable or threatened is not a productive one. Members of the ESLint community should be respectful when dealing with other members as well as with people outside the ESLint community. - -* **Be careful in the words that you choose.** We are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable. This includes, but is not limited to: - - * Violent threats or language directed against another person. - * Discriminatory jokes and language. - * Posting sexually explicit or violent material. - * Posting (or threatening to post) other people's personally identifying information ("doxing"). - * Personal insults, especially those using racist or sexist terms. - * Unwelcome sexual attention. - * Advocating for, or encouraging, any of the above behavior. - * Repeated harassment of others. In general, if someone asks you to stop, then stop. - -* **When we disagree, try to understand why.** Disagreements, both social and technical, happen all the time and ESLint is no exception. It is important that we resolve disagreements and differing views constructively. Remember that we're different. The strength of the ESLint community comes from inclusion of people from a wide range of backgrounds. Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesn't mean that they're wrong. Don't forget that it is human to err and blaming each other doesn't get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes. - - -## Reporting Guidelines - -**Important:** If you believe anyone is in physical danger, please notify appropriate law enforcement first. Then report to us. - -If you believe someone is violating the code of conduct we ask that you report it to [eslint-conduct@googlegroups.com](mailto:eslint-conduct@googlegroups.com). This is a private mailing list only viewable by project leads and cannot be accessed publicly except to send emails. All reports will be kept confidential. In some cases we may determine that a public statement will need to be made. If that's the case, the identities of all victims and reporters will remain confidential unless those individuals instruct us otherwise. - -In your report please include: - -* Your contact info (so we can get in touch with you if we need to follow up). -* Names (real, nicknames, or pseudonyms) of any individuals involved. If there were other witnesses besides you, please try to include them as well. -* When and where the incident occurred. Please be as specific as possible. -* Your account of what occurred. If there is a publicly available record (e.g. a mailing list archive or a public IRC logger) please include a link. Screenshots can be useful in the case something is edited or deleted before action is taken. -* Any extra context you believe existed for the incident. -* If you believe this incident is ongoing. -* Any other information you believe we should have. - -### What happens after you file a report? - -Reports will receive urgent and immediate attention from the project leads. If the act is ongoing, any team member may act immediately to end the situation without reaching consensus. If the act involves physical danger, then any team member should act immediately to protect safety (this can include contacting law enforcement directly). Any such actions must be reported to the project leads within 24 hours. - -Possible responses to violation reports include: - -* Taking no action (if there was no violation) -* Private reprimand over email -* A public reprimand in the forum in which the violation occurred (mailing list, issue tracker, chatroom, etc.) -* Requesting the violator to voluntarily take time away from the project (this may be enforced if the violator does not agree) -* Requesting a public or private apology -* Permanent or temporary suspension of privileges in the project (including blocking chatroom, mailing list, GitHub, issues, etc.) - -Once a response has been determined, the original reporter will be contacted for feedback about the response. The feedback will be considered when finalizing the response. - -## Credits - -Original text courtesy of the [Speak Up! project](http://speakup.io/coc.html) and [Django Project](https://www.djangoproject.com/conduct/), and [jQuery Code of Conduct](https://jquery.org/conduct/). diff --git a/LICENSE b/LICENSE index 3f7b4baaa164..d41bdf7951f0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ ESLint -Copyright (c) 2013 Nicholas C. Zakas. All rights reserved. +Copyright jQuery Foundation and other contributors, https://jquery.org/ 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/Makefile.js b/Makefile.js index d4ff08217e3b..c01b59f6a95e 100644 --- a/Makefile.js +++ b/Makefile.js @@ -1,7 +1,10 @@ /** * @fileoverview Build file * @author nzakas + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ + /* global cat, cd, cp, echo, exec, exit, find, ls, mkdir, pwd, rm, target, test*/ /* eslint no-use-before-define: 0*/ "use strict"; diff --git a/README.md b/README.md index 0f5f6ec573ec..bdbe7a1a9bf1 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ # ESLint -[Website](http://eslint.org) | [Configuring](http://eslint.org/docs/user-guide/configuring) | [Rules](http://eslint.org/docs/rules/) | [Contributing](http://eslint.org/docs/developer-guide/contributing) | [Reporting Bugs](http://eslint.org/docs/developer-guide/contributing/reporting-bugs) | [Twitter](https://twitter.com/geteslint) | [Mailing List](https://groups.google.com/group/eslint) | [Chat Room](https://gitter.im/eslint/eslint) +[Website](http://eslint.org) | [Configuring](http://eslint.org/docs/user-guide/configuring) | [Rules](http://eslint.org/docs/rules/) | [Contributing](http://eslint.org/docs/developer-guide/contributing) | [Reporting Bugs](http://eslint.org/docs/developer-guide/contributing/reporting-bugs) | [Code of Conduct](https://jquery.org/conduct/) [Twitter](https://twitter.com/geteslint) | [Mailing List](https://groups.google.com/group/eslint) | [Chat Room](https://gitter.im/eslint/eslint) ESLint is a tool for identifying and reporting on patterns found in ECMAScript/JavaScript code. In many ways, it is similar to JSLint and JSHint with a few exceptions: diff --git a/bin/eslint.js b/bin/eslint.js index 19e5720a711f..6176c17078d6 100755 --- a/bin/eslint.js +++ b/bin/eslint.js @@ -3,8 +3,8 @@ /** * @fileoverview Main CLI that is run via the eslint command. * @author Nicholas C. Zakas - * @copyright 2013 Nicholas C. Zakas. All rights reserved. - * See LICENSE file in root directory for full license. + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ "use strict"; diff --git a/lib/api.js b/lib/api.js index 664e9a5b40ee..a5805a67d266 100644 --- a/lib/api.js +++ b/lib/api.js @@ -1,6 +1,8 @@ /** * @fileoverview Expose out ESLint and CLI to require. * @author Ian Christian Myers + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ "use strict"; diff --git a/lib/ast-utils.js b/lib/ast-utils.js index 63b1fb628fd8..7ccdda528c59 100644 --- a/lib/ast-utils.js +++ b/lib/ast-utils.js @@ -1,8 +1,8 @@ /** * @fileoverview Common utils for AST. * @author Gyandeep Singh - * @copyright 2015 Gyandeep Singh. All rights reserved. - * See LICENSE file in root directory for full license. + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ "use strict"; diff --git a/lib/cli-engine.js b/lib/cli-engine.js index e54bf7bf02f1..bb21e2eeadf0 100644 --- a/lib/cli-engine.js +++ b/lib/cli-engine.js @@ -1,8 +1,8 @@ /** * @fileoverview Main CLI object. * @author Nicholas C. Zakas - * @copyright 2014 Nicholas C. Zakas. All rights reserved. - * See LICENSE in root directory for full license. + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ "use strict"; diff --git a/lib/cli.js b/lib/cli.js index adb70d8ce183..fcd1cb911923 100644 --- a/lib/cli.js +++ b/lib/cli.js @@ -1,6 +1,8 @@ /** * @fileoverview Main CLI object. * @author Nicholas C. Zakas + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ "use strict"; diff --git a/lib/config.js b/lib/config.js index cf14717d4f61..cb2f7cfab4f1 100644 --- a/lib/config.js +++ b/lib/config.js @@ -1,11 +1,10 @@ /** * @fileoverview Responsible for loading config files * @author Seth McLaughlin - * @copyright 2014-2016 Nicholas C. Zakas. All rights reserved. - * @copyright 2014 Michael McLaughlin. All rights reserved. - * @copyright 2013 Seth McLaughlin. All rights reserved. - * See LICENSE in root directory for full license. + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ + "use strict"; //------------------------------------------------------------------------------ diff --git a/lib/eslint.js b/lib/eslint.js index 58d4ecfa5bc2..e6b50fb661e8 100755 --- a/lib/eslint.js +++ b/lib/eslint.js @@ -1,9 +1,10 @@ /** * @fileoverview Main ESLint object. * @author Nicholas C. Zakas - * @copyright 2013 Nicholas C. Zakas. All rights reserved. - * See LICENSE file in root directory for full license. + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ + "use strict"; //------------------------------------------------------------------------------ diff --git a/lib/file-finder.js b/lib/file-finder.js index 9e24659df703..0b7fc3fbf66f 100644 --- a/lib/file-finder.js +++ b/lib/file-finder.js @@ -1,10 +1,10 @@ /** * @fileoverview Util class to find config files. * @author Aliaksei Shytkin - * @copyright 2014 Michael McLaughlin. All rights reserved. - * @copyright 2014 Aliaksei Shytkin. All rights reserved. - * See LICENSE in root directory for full license. + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ + "use strict"; //------------------------------------------------------------------------------ diff --git a/lib/ignored-paths.js b/lib/ignored-paths.js index d907b49589d3..deabf8c58663 100644 --- a/lib/ignored-paths.js +++ b/lib/ignored-paths.js @@ -1,7 +1,10 @@ /** * @fileoverview Responsible for loading ignore config files and managing ignore patterns * @author Jonathan Rajavuori + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ + "use strict"; //------------------------------------------------------------------------------ diff --git a/lib/load-rules.js b/lib/load-rules.js index 6691dbba4b35..58b0853fe254 100644 --- a/lib/load-rules.js +++ b/lib/load-rules.js @@ -1,6 +1,8 @@ /** * @fileoverview Module for loading rules from files and directories. * @author Michael Ficarra + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ "use strict"; diff --git a/lib/logging.js b/lib/logging.js index f0ded092955c..097c29a1d5c5 100644 --- a/lib/logging.js +++ b/lib/logging.js @@ -1,8 +1,10 @@ /** * @fileoverview Handle logging for ESLint * @author Gyandeep Singh - * @copyright 2015 Gyandeep Singh. All rights reserved. + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ + "use strict"; /* istanbul ignore next */ diff --git a/lib/options.js b/lib/options.js index 386a25887d2d..42a915d86c30 100644 --- a/lib/options.js +++ b/lib/options.js @@ -1,8 +1,10 @@ /** * @fileoverview Options configuration for optionator. * @author George Zahariev - * See LICENSE in root directory for full license. + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ + "use strict"; //------------------------------------------------------------------------------ diff --git a/lib/rule-context.js b/lib/rule-context.js index 03f5b886fdbd..84b74e886fcb 100644 --- a/lib/rule-context.js +++ b/lib/rule-context.js @@ -1,8 +1,8 @@ /** * @fileoverview RuleContext utility for rules * @author Nicholas C. Zakas - * @copyright 2013 Nicholas C. Zakas. All rights reserved. - * See LICENSE file in root directory for full license. + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ "use strict"; diff --git a/lib/rules.js b/lib/rules.js index 24a8fd8a497b..5fd4ef027eda 100644 --- a/lib/rules.js +++ b/lib/rules.js @@ -1,6 +1,8 @@ /** * @fileoverview Defines a storage for rules. * @author Nicholas C. Zakas + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ "use strict"; diff --git a/lib/timing.js b/lib/timing.js index c1346480fd8a..103fc1164487 100644 --- a/lib/timing.js +++ b/lib/timing.js @@ -1,7 +1,8 @@ /** * @fileoverview Tracks performance of individual rules. * @author Brandon Mills - * @copyright 2014 Brandon Mills. All rights reserved. + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ "use strict"; diff --git a/lib/token-store.js b/lib/token-store.js index 91409b7eedde..787eb7e70931 100644 --- a/lib/token-store.js +++ b/lib/token-store.js @@ -1,8 +1,8 @@ /** * @fileoverview Object to handle access and retrieval of tokens. * @author Brandon Mills - * @copyright 2014 Nicholas C. Zakas. All rights reserved. - * @copyright 2014 Brandon Mills. All rights reserved. + * @copyright jQuery Foundation and other contributors, https://jquery.org/ + * MIT License */ "use strict";