From eab0b40e2cb3483f99572ee3c8213617178c9952 Mon Sep 17 00:00:00 2001 From: Kim Gardner Date: Wed, 20 Jun 2018 18:37:34 -0400 Subject: [PATCH 1/7] Update COC --- CODE_OF_CONDUCT.md | 80 +++------------------------------------------- package.json | 1 + yarn.lock | 4 +++ 3 files changed, 9 insertions(+), 76 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 449ef585b5..d066d76579 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,78 +1,6 @@ -# Contributor Covenant Code of Conduct +# Mozilla Community Participation Guidelines -## Our Pledge +## Version 2.3 - Updated May 16, 2017 -We expect everyone contributing to The Coral Project to follow this code of conduct. That means the team, contractors we employ, contributors, as well as anyone posting to our public or internal-facing channels. -We created it not because we anticipate any unacceptable behavior, but because we believe that articulating our values and obligations to one another reinforces the already exceptional level of respect among the team, and because having a code provides us with clear avenues to correct our culture should it ever stray from that course. - -We commit to enforce and evolve this code over the duration of the project. - -## Expected behavior - -* Be supportive of each other. -* Be collaborative. Involve others in brainstorms, sketching sessions, code reviews, planning documents, and the like. It’s not only okay to ask for help or feedback often, it’s unacceptable not to do so. -* Be generous and kind in both giving and accepting critique. Critique is a natural and important part of our culture. Good critiques are kind, respectful, clear, and constructive, focused on goals and requirements rather than personal preferences. You are expected to give and receive criticism with grace. -* Be humane. Be polite and friendly in all forms of communication, especially remote communication, where opportunities for misunderstanding are greater. Use sarcasm carefully. Tone is hard to decipher online; make judicious use of emoji to aid in communication. -* Be considerate. -* Be tolerant. -* Respect people’s boundaries. -* Do not make it personal. -* Use welcoming and inclusive language. -* Offer to help if you see someone struggling or otherwise in need of assistance (taking care not to be patronizing or disrespectful). -* If someone approaches you looking for help, be generous with your time; if you’re under a deadline, direct them to someone else who may be of assistance. -* Go out of your way to include people in jokes or memes, recognizing that we want to build an environment free of cliques. -* Show empathy towards other community members - - -## Unacceptable behavior - -We are committed to providing a welcoming and safe environment for people of all races, gender identities, gender expressions, sexual orientations, physical abilities, physical appearances, socioeconomic backgrounds, nationalities, ages, religions, and beliefs. -We expect that you will refrain from demeaning, discriminatory, or harassing behavior and speech. - -Harassment includes, but is not limited to: deliberate intimidation; stalking; unwanted photography or recording; sustained or willful disruption of talks or other events; inappropriate physical contact; use of sexual or discriminatory imagery, comments, or jokes; and unwelcome sexual attention. -Furthermore, any behavior or language which is unwelcoming—whether or not it rises to the level of harassment—is also strongly discouraged. Much exclusionary behavior takes the form of microaggressions—subtle put-downs which may be unconsciously delivered. Regardless of intent, microaggressions can have a significant negative impact on victims and have no place on our team. - -Other inappropriate behavior: - -* Threats -* Slurs -* Pornography -* Spam -* Bullying -* Copyright infringement -* Impersonation of someone else -* Violating someone’s privacy - -If you feel that someone has harassed you or otherwise treated you or someone else inappropriately, please alert the project lead at [andrewl@mozillafoundation.org](mailto:andrewl@mozillafoundation.org). - - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. - -## Enforcement - -These guidelines are ambitious, and we’re not always going to succeed in meeting them. When something goes wrong—whether it’s a microaggression or an instance of harassment — there are a number of things you can do to address the situation. Depending on your comfort level and the severity of the situation, here are some suggestions: - -* Address it directly. If you’re comfortable bringing up the incident with the person who instigated it, pull them aside to discuss how it affected you. Be sure to approach these conversations in a forgiving spirit: an angry or tense conversation will not do either of you any good. If you’re unsure how to go about that, try discussing with your manager or with the people and culture team first—they might have some advice about how to make this conversation happen. - -If you’re too frustrated to have a direct conversation, there are a number of alternate routes you can take. - -* Talk to a peer or mentor. Your colleagues are likely to have personal and professional experience on which to draw that could be of use to you. If you have someone you’re comfortable approaching, reach out and discuss the situation with them. They may be able to advise on how they would handle it, or direct you to someone who can. The flip side of this, of course, is that you should also be available when your colleagues reach out to you. - -* Contact the project lead, Andrew Losowsky, [andrewl@mozillafoundation.org](mailto:andrewl@mozillafoundation.org), or the technical lead. We will work with you to help you figure out how to ensure that any conflict doesn’t interfere with your work, in confidence if you would prefer. - -* Talk to Chris Lawrence. Chris oversees the project. He can be contacted at [clawrence@mozillafoundation.org](mailto:clawrence@mozillafoundation.org). - -If you feel you have been unfairly accused of violating this code of conduct, you should contact Chris with a concise description of your grievance. - -## Conclusion - -We welcome your feedback on this and every other aspect of what we do as The Coral Project, and we thank you for working with us to make it a safe, enjoyable, and friendly experience for everyone involved in the project and what we do. -Above text is licensed CC BY-SA 4.0, adapted from the SRCCON code of conduct, FreeBSD’s code of conduct, Vox Media’s product team code of conduct, Medium’s code of conduct, as well as adapted from the Contributor Covenant. \ No newline at end of file +The heart of Mozilla is people. We put people first and do our best to recognize, appreciate and respect the diversity of our global contributors. The Mozilla Project welcomes contributions from everyone who shares our goals and wants to contribute in a healthy and constructive manner within our community. As such, we have adopted this code of conduct and require all those who participate to agree and adhere to these Community Participation Guidelines in order to help us create a safe and positive community experience for all. +https://www.mozilla.org/en-US/about/governance/policies/participation/ diff --git a/package.json b/package.json index 4af3837385..c2cdb46b2e 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "dependencies": { "@coralproject/gql-merge": "^0.1.0", "@coralproject/graphql-anywhere-optimized": "^0.1.0", + "@coralproject/talk-plugin-auth-checkbox": "^1.0.0", "apollo-client": "^1.9.1", "apollo-engine": "^0.8.1", "apollo-server-express": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index dfd1b01294..05c039f0b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -123,6 +123,10 @@ dependencies: graphql-ast-tools "^0.2.2" +"@coralproject/talk-plugin-auth-checkbox@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@coralproject/talk-plugin-auth-checkbox/-/talk-plugin-auth-checkbox-1.0.0.tgz#b9ae26ab5e327212f8ae7d04d1d8148cca50bfe0" + "@easyops/git-exec-and-restage@^1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@easyops/git-exec-and-restage/-/git-exec-and-restage-1.0.4.tgz#51ee761def34502665dcfa1deb2bbd0e8a3f1ade" From ae9f5d4e8e6b72e9e20995494b43d756c5b95d9a Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 20 Jun 2018 21:03:23 -0600 Subject: [PATCH 2/7] fixes #1691 --- bin/cli-plugins | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/bin/cli-plugins b/bin/cli-plugins index 85132c39d3..4a778cd488 100755 --- a/bin/cli-plugins +++ b/bin/cli-plugins @@ -143,9 +143,9 @@ async function reconcileRemotePlugins({ dryRun, upgradeRemote }) { if (fetchable.length > 0) { console.log( - `$ yarn add --ignore-scripts --ignore-workspace-root-check ${fetchable.map( - ({ name, version }) => `${name}@${version}`.cyan - )}` + `$ yarn add --ignore-scripts --ignore-workspace-root-check ${fetchable + .map(({ name, version }) => `${name}@${version}`.cyan) + .join(' ')}` ); if (!dryRun) { @@ -162,7 +162,7 @@ async function reconcileRemotePlugins({ dryRun, upgradeRemote }) { if (output.status) { throw new Error( - 'Could not install external plugins, errors occured during install' + 'Could not install external plugins, errors occurred during install' ); } @@ -329,27 +329,28 @@ async function createSeedPlugin() { if (answers.addPluginsJson) { const pluginsJson = path.resolve(__dirname, '..', 'plugins.json'); - fs.readJson(pluginsJson) - .then(j => { - // This is a client-side plugin, let's push this. - if (answers.client) { - j.client.push(answers.pluginName); + let j; + try { + j = await fs.readJson(pluginsJson); + } catch (err) { + j = { client: [], server: [] }; + } - const output = JSON.stringify(j, null, 2); - fs.writeFileSync(pluginsJson, output); - } + // This is a client-side plugin, let's push this. + if (answers.client) { + j.client.push(answers.pluginName); - // This is a server-side plugin, let's push this. - if (answers.server) { - j.server.push(answers.pluginName); + const output = JSON.stringify(j, null, 2); + fs.writeFileSync(pluginsJson, output); + } - const output = JSON.stringify(j, null, 2); - fs.writeFileSync(pluginsJson, output); - } - }) - .catch(err => { - console.error(err); - }); + // This is a server-side plugin, let's push this. + if (answers.server) { + j.server.push(answers.pluginName); + + const output = JSON.stringify(j, null, 2); + fs.writeFileSync(pluginsJson, output); + } } console.log( From b6d20920481fa0542825ea37b16d5eac69f79a6c Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 20 Jun 2018 21:06:55 -0600 Subject: [PATCH 3/7] added more fallbacks --- bin/cli-plugins | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/bin/cli-plugins b/bin/cli-plugins index 4a778cd488..dba17c5069 100755 --- a/bin/cli-plugins +++ b/bin/cli-plugins @@ -333,7 +333,20 @@ async function createSeedPlugin() { try { j = await fs.readJson(pluginsJson); } catch (err) { - j = { client: [], server: [] }; + // Fallback to plugins.default.json if the plugins.json file does not + // exist. + const defaultPluginsJson = path.resolve( + __dirname, + '..', + 'plugins.default.json' + ); + + try { + j = await fs.readJson(defaultPluginsJson); + } catch (err) { + // Fallback to an empty one if that also, doesn't exist. + j = { client: [], server: [] }; + } } // This is a client-side plugin, let's push this. From c287b842f359da38a2342d2573bcb293a1c34a8b Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 20 Jun 2018 21:08:32 -0600 Subject: [PATCH 4/7] review: spelling --- bin/cli-plugins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cli-plugins b/bin/cli-plugins index dba17c5069..f2ca03350a 100755 --- a/bin/cli-plugins +++ b/bin/cli-plugins @@ -189,7 +189,7 @@ async function reconcileRemotePlugins({ dryRun, upgradeRemote }) { if (output.status) { throw new Error( - 'Could not install external plugins, errors occured during install' + 'Could not install external plugins, errors occurred during install' ); } From 0ad2da9baa805d82bbda59085ff43fe605a8e8a4 Mon Sep 17 00:00:00 2001 From: Kim Gardner Date: Wed, 20 Jun 2018 23:57:26 -0400 Subject: [PATCH 5/7] Remove auth-checkbox --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index c2cdb46b2e..4af3837385 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,6 @@ "dependencies": { "@coralproject/gql-merge": "^0.1.0", "@coralproject/graphql-anywhere-optimized": "^0.1.0", - "@coralproject/talk-plugin-auth-checkbox": "^1.0.0", "apollo-client": "^1.9.1", "apollo-engine": "^0.8.1", "apollo-server-express": "^1.2.0", From 7699e440e4e3aa46d8ceaedd8684979df140fd7a Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Thu, 21 Jun 2018 08:37:48 -0600 Subject: [PATCH 6/7] fix: updated yarn.lock --- yarn.lock | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index 05c039f0b0..dfd1b01294 100644 --- a/yarn.lock +++ b/yarn.lock @@ -123,10 +123,6 @@ dependencies: graphql-ast-tools "^0.2.2" -"@coralproject/talk-plugin-auth-checkbox@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@coralproject/talk-plugin-auth-checkbox/-/talk-plugin-auth-checkbox-1.0.0.tgz#b9ae26ab5e327212f8ae7d04d1d8148cca50bfe0" - "@easyops/git-exec-and-restage@^1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@easyops/git-exec-and-restage/-/git-exec-and-restage-1.0.4.tgz#51ee761def34502665dcfa1deb2bbd0e8a3f1ade" From f40328197812c950b01e73d5a156798aa617a6f6 Mon Sep 17 00:00:00 2001 From: Andrew Losowsky Date: Fri, 22 Jun 2018 18:44:59 -0400 Subject: [PATCH 7/7] added strategy tutorial link (#1704) --- docs/source/01-05-pre-launch-checklist.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/source/01-05-pre-launch-checklist.md b/docs/source/01-05-pre-launch-checklist.md index 324f788a4c..37099f23b1 100644 --- a/docs/source/01-05-pre-launch-checklist.md +++ b/docs/source/01-05-pre-launch-checklist.md @@ -62,5 +62,10 @@ permalink: /pre-launch-checklist/ - [ ] Do you want to send all new comments or all reported comments to a Slack channel? - - See [our blog for more information]( https://coralproject.net/blog/slacking-on/) + - See [our blog for more information](https://coralproject.net/blog/slacking-on/) + + +- [ ] Has your community team configured Talk to match your community strategy? + - See [our tutorial for more information](https://docs.coralproject.net/talk/when-youve-installed-talk/) +