Merge branch 'main' of https://github.com/nodejs/admin into update-mo…

…deration-team

.github/workflows/linters.yml

@@ -0,0 +1,40 @@
+name: Linters
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    paths:
+      - README.md
+      - Moderation-Policy.md
+      - .github/workflows/linters.yml
+  push:
+    branches:
+      - main
+    paths:
+      - README.md
+      - Moderation-Policy.md
+      - .github/workflows/linters.yml
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: false
+
+permissions:
+  contents: read
+
+jobs:
+  lint-md-lists:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        file:
+          - README.md
+          - Moderation-Policy.md
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332  # v4.1.7
+        with:
+          persist-credentials: false
+      - run: tools/lint-readme-lists.mjs "$FILE"
+        env:
+          FILE: ${{ matrix.file }}

Moderation-Policy.md

@@ -195,8 +195,8 @@ Scenario 1:
 
 Scenario 2:
  * A non-Collaborator posts a comment that is against the Code of Conduct.
- * A Collaborator sees the comment and asks the author to self-moderate.
- * The author refuses to self-moderate.
+ * A Collaborator sees the comment and asks the author to edit it.
+ * The author refuses to edit their comment.
  * The Collaborator deletes the comment and posts an issue in the moderation
    repository explaining their actions.
 
@@ -294,6 +294,7 @@ remove resigning team member from respective permissions and private access.
 <!-- referenced from the CoC page -->
 <a id="current-members"></a>
 ### Current Members of Moderation Team
+
 * [aduh95](https://github.com/aduh95) -
 **Antoine du Hamel** <<[email protected]>> (he/him)
 * [atlowChemi](https://github.com/atlowChemi) -
@@ -302,28 +303,29 @@ remove resigning team member from respective permissions and private access.
 **Benjamin Gruenbaum** &lt;[email protected]&gt;
 * [bmuenzenmeyer](https://github.com/bmuenzenmeyer) -
 **Brian Muenzenmeyer** <<[email protected]>> (he/him)
+* [JohnTitor](https://github.com/JohnTitor) -
+**Yuki Okushi** &lt;[email protected]&gt;
 * [othiym23](https://github.com/othiym23) -
 **Forrest L Norvell** &lt;[email protected]&gt;
 * [ovflowd](https://github.com/ovflowd) -
 **Claudio Wunder** &lt;[email protected]&gt; (he/they)
-* [JohnTitor](https://github.com/JohnTitor) -
-**Yuki Okushi** &lt;[email protected]&gt;
 * [Trott](https://github.com/Trott) -
 **Rich Trott** &lt;[email protected]&gt;
 * [UlisesGascon](https://github.com/ulisesgascon) -
 **Ulises Gascón** <<[email protected]>> (he/him)
 
 ### Admins for Node.js Slack community
+
 * [alextes](https://github.com/alextes) -
 **Alexander Tesfamichael** &lt;[email protected]&gt;
 * [aredridel](https://github.com/aredridel) -
 **Aria Stewart** &lt;[email protected]&gt;
-* [ljharb](https://github.com/ljharb) -
-**Jordan Harband** &lt;[email protected]&gt;
-* [jxm262](https://github.com/jxm262) -
-**Justin Maat** &lt;[email protected]&gt;
 * [hackygolucky](https://github.com/hackygolucky) -
 **Tracy Hinds** &lt;[email protected]&gt;
+* [jxm262](https://github.com/jxm262) -
+**Justin Maat** &lt;[email protected]&gt;
+* [ljharb](https://github.com/ljharb) -
+**Jordan Harband** &lt;[email protected]&gt;
 
 ## Escalation of Issues
 

README.md

@@ -29,8 +29,8 @@ action requiring consensus and voting will abide by the TSC process for that.
 
 ### Contacts for assistance
 
-- [@mhdawson](https://github.com/mhdawson) - **Michael Dawson**, TSC Chair
 - [@mcollina](https://github.com/mcollina) - **Matteo Collina**, TSC Vice Chair
+- [@mhdawson](https://github.com/mhdawson) - **Michael Dawson**, TSC Chair
 
 ### Admin members
 
@@ -78,5 +78,4 @@ This list should be reviewed and pruned annually (at minimum). The calendar has
 - [@mhdawson](https://github.com/mhdawson) - **Michael Dawson**
 - [@MylesBorins](https://github.com/MylesBorins) - **Myles Borins**
 - [@ruyadorno](https://github.com/ruyadorno) - **Ruy Adorno**
-- [@ryanmurakami](https://github.com/ryanmurakami) - **Ryan Lewis**
 - [@trott](https://github.com/trott) - **Rich Trott**

tools/lint-readme-lists.mjs

@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+
+// Validates the list in the markdown file passed as CLI argument are in the correct order.
+
+import { open } from 'node:fs/promises';
+
+const [,,markdownFile] = process.argv;
+
+const readme = await open(markdownFile, 'r');
+
+let currentList = null;
+let previousGithubHandle;
+let lineNumber = 0;
+
+for await (const line of readme.readLines()) {
+  lineNumber++;
+  if (line.startsWith('##')) {
+    currentList = line.slice(line.indexOf(' '));
+    previousGithubHandle = null;
+  } else if (currentList && (line.startsWith('- [') || line.startsWith('* ['))) {
+    const currentGithubHandle = line.slice(3, line.indexOf(']')).toLowerCase();
+    if (previousGithubHandle && previousGithubHandle >= currentGithubHandle) {
+      throw new Error(`${currentGithubHandle} should be listed before ${previousGithubHandle} in the ${currentList} list (${markdownFile}:${lineNumber})`);
+    }
+
+    previousGithubHandle = currentGithubHandle;
+  }
+}
+