Fix Node.js version

Author: Richienb

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         node-version:
-          - 14
+          - 24
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2

lib/load-user.js

@@ -1,8 +1,8 @@
 import {fileURLToPath} from 'node:url'
-import path, {dirname} from 'node:path'
+import path from 'node:path'
 import {loadJsonFile} from 'load-json-file'
 
-const directoryName = dirname(fileURLToPath(import.meta.url))
+const directoryName = path.dirname(fileURLToPath(import.meta.url))
 
 const loadUser = async hostname => {
   const [id] = hostname.split('.')

package-lock.json

@@ -10,7 +10,7 @@
     "url": "git@github.com:remy/mit-license.git"
   },
   "engines": {
-    "node": "14.x"
+    "node": "24.x"
   },
   "author": "Remy Sharp <remy@leftlogic.com> (http://remysharp.com/)",
   "scripts": {
@@ -47,26 +47,15 @@
     "yn": "^5.0.0"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.15.7",
-    "@babel/plugin-syntax-top-level-await": "^7.14.5",
     "css": "^3.0.0",
     "file-ext": "^1.0.0",
     "has-flag": "^5.0.1",
     "nodemon": "^2.0.12",
     "path-extra": "^4.3.0",
-    "xo": "^0.44.0"
+    "xo": "^1.2.1"
   },
   "xo": {
     "space": 2,
-    "semicolon": false,
-    "parser": "@babel/eslint-parser",
-    "parserOptions": {
-      "requireConfigFile": false,
-      "babelOptions": {
-        "plugins": [
-          "@babel/plugin-syntax-top-level-await"
-        ]
-      }
-    }
+    "semicolon": false
   }
 }

package.json

@@ -1,16 +1,15 @@
 import {fileURLToPath} from 'node:url'
-import path, {dirname} from 'node:path'
+import path from 'node:path'
 import {htmlEscape, htmlUnescape} from 'escape-goat'
 import stripHtml from 'html-text'
 import is from '@sindresorhus/is'
 import getGravatarUrl from 'gravatar-url'
 import createHtmlElement from 'create-html-element'
 import {renderFile} from 'ejs'
-
 import loadUser from '../lib/load-user.js'
 import loadOptions from '../lib/load-options.js'
 
-const directoryName = dirname(fileURLToPath(import.meta.url))
+const directoryName = path.dirname(fileURLToPath(import.meta.url))
 
 function getCopyrightName(user, isPlainText) {
   if (is.string(user)) {
@@ -24,13 +23,15 @@ function getCopyrightName(user, isPlainText) {
 
 function getCopyrightHtml(user, isPlainText) {
   const name = getCopyrightName(user, isPlainText)
-  let html = user.url ? createHtmlElement({
-    name: 'a',
-    attributes: {
-      href: user.url,
-    },
-    text: name,
-  }) : name
+  let html = user.url
+    ? createHtmlElement({
+      name: 'a',
+      attributes: {
+        href: user.url,
+      },
+      text: name,
+    })
+    : name
 
   if (user.email) {
     html += ` <${createHtmlElement({
@@ -71,6 +72,7 @@ export default async function getRoute(request, response) {
   }
 
   const options = loadOptions(request.url)
+  // eslint-disable-next-line unicorn/prefer-logical-operator-over-ternary
   const year = options.pinnedYear
     ? options.pinnedYear
     : removeFalsy([options.startYear, options.endYear]).join('-')

routes/get.js

@@ -1,4 +1,4 @@
-import path, {dirname} from 'node:path'
+import path from 'node:path'
 import {fileURLToPath} from 'node:url'
 import process from 'node:process'
 import toBase64 from 'btoa'
@@ -11,7 +11,7 @@ import yn from 'yn'
 import is from '@sindresorhus/is'
 import isDomainId from '../utils/is-domain-id.js'
 
-const directoryName = dirname(fileURLToPath(import.meta.url))
+const directoryName = path.dirname(fileURLToPath(import.meta.url))
 
 const {version} = await readPackage()
 
@@ -59,9 +59,7 @@ export default async function postRoute(request, response) {
     // Return a vague error intentionally
     response
       .status(400)
-      .send(
-        'User already exists - to update values, please send a pull request on https://github.com/remy/mit-license',
-      )
+      .send('User already exists - to update values, please send a pull request on https://github.com/remy/mit-license')
 
     return
   }
@@ -70,9 +68,7 @@ export default async function postRoute(request, response) {
   if (await pathExists(path.join(directoryName, '..', 'users', `${id}.json`))) {
     response
       .status(409)
-      .send(
-        'User already exists - to update values, please send a pull request on https://github.com/remy/mit-license',
-      )
+      .send('User already exists - to update values, please send a pull request on https://github.com/remy/mit-license')
     return
   }
 
@@ -82,9 +78,7 @@ export default async function postRoute(request, response) {
     if (is.undefined(userData.gravatar)) {
       response
         .status(400)
-        .send(
-          'The "gravatar" JSON property must be a boolean.',
-        )
+        .send('The "gravatar" JSON property must be a boolean.')
       return
     }
   }
@@ -116,8 +110,6 @@ export default async function postRoute(request, response) {
   } catch {
     response
       .status(500)
-      .send(
-        'Unable to create new user - please send a pull request on https://github.com/remy/mit-license',
-      )
+      .send('Unable to create new user - please send a pull request on https://github.com/remy/mit-license')
   }
 }

routes/post.js

@@ -1,6 +1,6 @@
 // IMPORTANT: Set the `github_token` environment variable to a personal access token with at least the `public_repo` scope for the API.
 // The `PORT` environment variable can also be set to control the port the server should be hosted on.
-import path, {dirname} from 'node:path'
+import path from 'node:path'
 import {fileURLToPath} from 'node:url'
 import process from 'node:process'
 import express from 'express'
@@ -10,22 +10,19 @@ import postcssMiddleware from 'postcss-middleware'
 import tempDirectory from 'temp-dir'
 import postcssPresetEnv from 'postcss-preset-env'
 import cors from 'cors'
-
 import postRoute from './routes/post.js'
 import getRoute from './routes/get.js'
 
 // Server
 const PORT = process.env.PORT || 8080
 
-const directoryName = dirname(fileURLToPath(import.meta.url))
+const directoryName = path.dirname(fileURLToPath(import.meta.url))
 
 // Prepare application
 const app = express()
-app.use(
-  minify({
-    cache: tempDirectory,
-  }),
-)
+app.use(minify({
+  cache: tempDirectory,
+}))
 app.use(favicon(path.join(directoryName, 'favicon.ico')))
 app.set('views', path.join(directoryName, '/licenses'))
 
@@ -52,11 +49,9 @@ app.use(
 // CORS
 app.use(cors())
 // Parse URL-encoded bodies (as sent by HTML forms)
-app.use(
-  express.urlencoded({
-    extended: true,
-  }),
-)
+app.use(express.urlencoded({
+  extended: true,
+}))
 // Parse JSON bodies (as sent by API clients)
 app.use(express.json())
 

server.js

@@ -37,7 +37,7 @@ for await (const user of users) {
       const parsedData = JSON.parse(data)
 
       if (!parsedData.locked && !parsedData.copyright) {
-        report(`Copyright not specified in ${user}`)
+        await report(`Copyright not specified in ${user}`)
       }
 
       if (parsedData.version) {
@@ -55,10 +55,10 @@ for await (const user of users) {
         })
       }
     } catch ({message}) {
-      report(`Invalid JSON in ${user} (${message})`)
+      await report(`Invalid JSON in ${user} (${message})`)
     }
   } catch ({message}) {
-    report(`Unable to read ${user} (${message})`)
+    await report(`Unable to read ${user} (${message})`)
   }
 }
 
@@ -71,10 +71,10 @@ for await (const theme of themes) {
       try {
         parseCSS(cssData)
       } catch ({message}) {
-        report(`Invalid CSS in ${theme} (${message})`)
+        await report(`Invalid CSS in ${theme} (${message})`)
       }
     } catch ({message}) {
-      report(`Unable to read ${theme} (${message})`)
+      await report(`Unable to read ${theme} (${message})`)
     }
   }
 }