Update Node.js + dependencies (#36)

* Update to Node.js 22

* Replace import assert w/ import with

* Remove node-fetch usage

* Fix missing confirm import

* Update chalk to latest

* Update diff to latest

* Update @octokit/rest to latest

Author: MattIPv4

.nvmrc

@@ -1 +1 @@
-v16.20.2
+v22.16.0

package-lock.json

@@ -16,10 +16,9 @@
   },
   "homepage": "https://github.com/js-org/js.org-cleanup#readme",
   "dependencies": {
-    "@octokit/rest": "^16.28.2",
-    "chalk": "^2.4.2",
-    "diff": "^5.0.0",
-    "node-fetch": "^2.6.7",
-    "octokit-create-pull-request": "^1.2.0"
+    "@octokit/rest": "^22.0.0",
+    "chalk": "^5.4.1",
+    "diff": "^8.0.2",
+    "octokit-plugin-create-pull-request": "^6.0.1"
   }
 }

package.json

@@ -1,12 +1,11 @@
 import { URL } from 'node:url';
 
 import chalk from 'chalk';
-import fetch from 'node-fetch';
-import Octokit from '@octokit/rest';
+import { Octokit } from '@octokit/rest';
 
 import { log } from '../util/log.js';
 import { getCache, setCache } from './cache.js';
-import config from '../../config.json' assert { type: 'json' };
+import config from '../../config.json' with { type: 'json' };
 
 const octokit = new Octokit();
 
@@ -19,7 +18,7 @@ export const getCNAMEsFile = async () => {
     log('\nStarting getCNAMEsFile process', chalk.cyanBright.bold);
 
     // Get the raw GitHub API data
-    const req = await octokit.repos.getContents({
+    const req = await octokit.rest.repos.getContent({
         owner: config.repository_owner,
         repo: config.repository_name,
         path: 'cnames_active.js'
@@ -45,7 +44,7 @@ const testUrl = async url => {
 
     try {
         resp = await fetch(url, {
-            headers: { 'User-Agent': 'js.org-cleanup/1.0 node-fetch' },
+            headers: { 'User-Agent': 'js.org-cleanup/1.0' },
             signal: controller.signal,
         });
     } catch (err) {

src/robot/cnames.js

@@ -1,14 +1,15 @@
 import fs from 'node:fs';
 
 import chalk from 'chalk';
-import Octokit from '@octokit/rest';
+import { Octokit } from '@octokit/rest';
 
 import { logDown, logUp, log } from '../util/log.js';
 import { getCache, setCache, removeCache } from './cache.js';
 import { getCNAMEsFile, validateCNAMEs } from './cnames.js';
 import { parseCNAMEsFile } from '../util/cnames.js';
 import { repoContactIssue } from './templates.js';
-import config from '../../config.json' assert { type: 'json' };
+import confirm from './confirm.js';
+import config from '../../config.json' with { type: 'json' };
 
 const octokit = new Octokit({ auth: config.github_token });
 
@@ -76,7 +77,7 @@ const attemptTargetIssues = async (failed, issueUrl) => {
             // Attempt to create issue
             let issue;
             try {
-                issue = await octokit.issues.create({
+                issue = await octokit.rest.issues.create({
                     owner,
                     repo,
                     title: 'JS.ORG CLEANUP',
@@ -210,7 +211,7 @@ export const createMainIssue = async () => {
     // Create new empty issue (change this for DEV)
     let issue = getCache('createMainIssueProgress');
     if (!issue) {
-        issue = await octokit.issues.create({
+        issue = await octokit.rest.issues.create({
             owner: config.repository_owner,
             repo: config.repository_name,
             title: 'JS.ORG CLEANUP',
@@ -252,7 +253,7 @@ export const createMainIssue = async () => {
         .replace(/{{CONTACT_ISSUE}}/g, contactIssue);
 
     // Edit the issue
-    await octokit.issues.update({
+    await octokit.rest.issues.update({
         owner: config.repository_owner,
         repo: config.repository_name,
         issue_number: issue.data.number,
@@ -291,7 +292,7 @@ export const parseIssueEntries = async issueNumber => {
     }
 
     // Get the issue body
-    const issue = await octokit.issues.get({
+    const issue = await octokit.rest.issues.get({
         owner: config.repository_owner,
         repo: config.repository_name,
         issue_number: issueNumber

src/robot/issues.js

@@ -1,16 +1,16 @@
 import chalk from 'chalk';
-import Octokit from '@octokit/rest';
-import createPullRequestPlugin from 'octokit-create-pull-request';
+import { Octokit } from '@octokit/rest';
+import { createPullRequest } from 'octokit-plugin-create-pull-request';
 
 import { logDown, logUp, log } from '../util/log.js';
 import { getCache, setCache, removeCache } from './cache.js';
 import { getCNAMEsFile, validateCNAMEs } from './cnames.js';
 import { parseCNAMEsFile, generateCNAMEsFile } from '../util/cnames.js';
 import { robotDisclaimer, mainPullRequest } from './templates.js';
 import { parseIssueEntries } from './issues.js';
-import config from '../../config.json' assert { type: 'json' };
+import config from '../../config.json' with { type: 'json' };
 
-const octokit = new Octokit.plugin(createPullRequestPlugin)({ auth: config.github_token });
+const octokit = new (Octokit.plugin(createPullRequest))({ auth: config.github_token });
 
 /**
  * Generates a perfect cnames_active.js file w/ pull request
@@ -62,7 +62,8 @@ export const perfectCNAMEsFile = async () => {
                 'cnames_active.js': newFile
             },
             commit: 'Cleanup: Perfect Format & Sorting'
-        }
+        },
+        update: true
     });
 
     // Done
@@ -90,7 +91,7 @@ export const mainCleanupPull = async issueNumber => {
     // Lock issue
     log('  Locking cleanup issue...', chalk.blue);
     try {
-        await octokit.issues.lock({
+        await octokit.rest.issues.lock({
             owner: config.repository_owner,
             repo: config.repository_name,
             issue_number: issueNumber

src/robot/prs.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 
-import config from '../../config.json' assert { type: 'json' };
+import config from '../../config.json' with { type: 'json' };
 
 /**
  * Generates the robot disclaimer

src/robot/templates.js

@@ -23,7 +23,7 @@ export const logUp = () => {
  * This logs a message at the current depth using the given color
  * Empty lines will be logged without indentation
  * @param {string} message - The message to be logged
- * @param {(line: string) => string} [chalkColor=chalk.default] - The chalk color that will be used
+ * @param {(...text: unknown[]) => string} [chalkColor=chalk.default] - The chalk color that will be used
  */
 export const log = (message, chalkColor) => {
     if (typeof message !== 'string') return;