update to rfc9702, eslint@9

Author: bourgeoa

.github/workflows/ci.yml

@@ -51,12 +51,14 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - run: npm ci
     # test code
-    - run: npm run standard
+    - run: npm run lint
     - run: npm run validate
     - run: npm run c8
     # Test global install of the package
     - run: npm pack .
     - run: npm install -g solid-server-*.tgz
+    # Run the Solid test-suite
+    - run: bash test/surface/run-solid-test-suite.sh $BRANCH_NAME $REPO_NAME
     - name: Save build
       # if: matrix.node-version == '20.x'
       uses: actions/upload-artifact@v5
@@ -67,16 +69,9 @@ jobs:
           !node_modules
         retention-days: 1
 
-  test-suite:
-    needs: build
-    runs-on: ${{ matrix.os }}
-    steps:
-    # Run the Solid test-suite
-    - run: bash test/surface/run-solid-test-suite.sh $BRANCH_NAME $REPO_NAME
-
   # The pipeline automate publication to npm, so that the docker build gets the correct version
   npm-publish-build:
-    needs: [build, test-suite]
+    needs: [build]
     name: Publish to npm  
     runs-on: ubuntu-latest
     steps:
@@ -85,7 +80,7 @@ jobs:
           name: build
       - uses: actions/setup-node@v6
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: rlespinasse/github-slug-action@v3.x
       - name: Append commit hash to package version
         run: 'sed -i -E "s/(\"version\": *\"[^\"]+)/\1-${GITHUB_SHA_SHORT}/" package.json'
@@ -98,7 +93,7 @@ jobs:
           tag: ${{ env.GITHUB_REF_SLUG }}
 
   npm-publish-latest:
-    needs: [build, test-suite, npm-publish-build]
+    needs: [build, npm-publish-build]
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
     steps:

common/js/auth-buttons.mjs

@@ -17,41 +17,41 @@
     'account-settings',
     'loggedIn',
     'profileLink'
-  ].map(id => document.getElementById(id) || document.createElement('a'));
-  loginButton.addEventListener('click', login);
-  logoutButton.addEventListener('click', logout);
-  registerButton.addEventListener('click', register);
+  ].map(id => document.getElementById(id) || document.createElement('a'))
+  loginButton.addEventListener('click', login)
+  logoutButton.addEventListener('click', logout)
+  registerButton.addEventListener('click', register)
 
   // Track authentication status and update UI
   auth.trackSession(session => {
-    const loggedIn = !!session;
-    const isOwner = loggedIn && new URL(session.webId).origin === location.origin;
-    loginButton.classList.toggle('hidden', loggedIn);
-    logoutButton.classList.toggle('hidden', !loggedIn);
-    registerButton.classList.toggle('hidden', loggedIn);
-    accountSettings.classList.toggle('hidden', !isOwner);
-    loggedInContainer.classList.toggle('hidden', !loggedIn);
+    const loggedIn = !!session
+    const isOwner = loggedIn && new URL(session.webId).origin === location.origin
+    loginButton.classList.toggle('hidden', loggedIn)
+    logoutButton.classList.toggle('hidden', !loggedIn)
+    registerButton.classList.toggle('hidden', loggedIn)
+    accountSettings.classList.toggle('hidden', !isOwner)
+    loggedInContainer.classList.toggle('hidden', !loggedIn)
     if (session) {
-      profileLink.href = session.webId;
-      profileLink.innerText = session.webId;
+      profileLink.href = session.webId
+      profileLink.innerText = session.webId
     }
-  });
+  })
 
   // Log the user in on the client and the server
   async function login () {
-    alert(`login from this page is no more possible.\n\nYou must ask the pod owner to modify this page or remove it.`);
+    alert(`login from this page is no more possible.\n\nYou must ask the pod owner to modify this page or remove it.`)
     // Deprecated code omitted
   }
 
   // Log the user out from the client and the server
   async function logout () {
-    await auth.logout();
-    location.reload();
+    await auth.logout()
+    location.reload()
   }
 
   // Redirect to the registration page
   function register () {
-    const registration = new URL('/register', location);
-    location.href = registration;
+    const registration = new URL('/register', location)
+    location.href = registration
   }
-})(solid);
+})(solid)

common/js/index-buttons.mjs

@@ -1,43 +1,43 @@
 // ESM version of index-buttons.js
-'use strict';
-const keyname = 'SolidServerRootRedirectLink';
-function register() {
-  alert(2);
-  window.location.href = "/register";
-}
-document.addEventListener('DOMContentLoaded', async function() {
-  const authn = UI.authn;
-  const authSession = UI.authn.authSession;
+'use strict'
+const keyname = 'SolidServerRootRedirectLink'
+/* function register () {
+  alert(2)
+  window.location.href = '/register'
+} */
+document.addEventListener('DOMContentLoaded', async function () {
+  const authn = UI.authn
+  const authSession = UI.authn.authSession
 
-  if (!authn.currentUser()) await authn.checkUser();
-  let user = authn.currentUser();
+  if (!authn.currentUser()) await authn.checkUser()
+  const user = authn.currentUser()
 
   // IF LOGGED IN: SET SolidServerRootRedirectLink. LOGOUT
   if (user) {
-    window.localStorage.setItem(keyname, user.uri);
-    await authSession.logout();
+    window.localStorage.setItem(keyname, user.uri)
+    await authSession.logout()
   } else {
-    let webId = window.localStorage.getItem(keyname);
+    const webId = window.localStorage.getItem(keyname)
     // IF NOT LOGGED IN AND COOKIE EXISTS: REMOVE COOKIE, HIDE WELCOME, SHOW LINK TO PROFILE
     if (webId) {
-      window.localStorage.removeItem(keyname);
-      document.getElementById('loggedIn').style.display = "block";
-      document.getElementById('loggedIn').innerHTML = `<p>Your WebID is : <a href="${webId}">${webId}</a>.</p> <p>Visit your profile to log into your Pod.</p>`;
-    }
+      window.localStorage.removeItem(keyname)
+      document.getElementById('loggedIn').style.display = 'block'
+      document.getElementById('loggedIn').innerHTML = `<p>Your WebID is : <a href="${webId}">${webId}</a>.</p> <p>Visit your profile to log into your Pod.</p>`
+
     // IF NOT LOGGED IN AND COOKIE DOES NOT EXIST
     //     SHOW WELCOME, SHOW LOGIN BUTTON
     //     HIDE LOGIN BUTTON, ADD REGISTER BUTTON
-    else {
-      let loginArea = document.getElementById('loginStatusArea');
-      let html = `<input type="button" onclick="window.location.href='/register'" value="Register to get a Pod" class="register-button" style="padding: 1em; border-radius:0.2em; font-size: 100%;margin: 0.75em 0 0.75em 0.5em !important; padding: 0.5em !important;background-color: #efe;">`;
-      let span = document.createElement("span");
-      span.innerHTML = html;
-      loginArea.appendChild(span);
-      loginArea.appendChild(UI.login.loginStatusBox(document, null, {}));
-      const logInButton = loginArea.querySelectorAll('input')[1];
-      logInButton.value = "Log in to see your WebID";
-      const signUpButton = loginArea.querySelectorAll('input')[2];
-      signUpButton.style.display = "none";
+    } else {
+      const loginArea = document.getElementById('loginStatusArea')
+      const html = `<input type="button" onclick="window.location.href='/register'" value="Register to get a Pod" class="register-button" style="padding: 1em; border-radius:0.2em; font-size: 100%;margin: 0.75em 0 0.75em 0.5em !important; padding: 0.5em !important;background-color: #efe;">`
+      const span = document.createElement('span')
+      span.innerHTML = html
+      loginArea.appendChild(span)
+      loginArea.appendChild(UI.login.loginStatusBox(document, null, {}))
+      const logInButton = loginArea.querySelectorAll('input')[1]
+      logInButton.value = 'Log in to see your WebID'
+      const signUpButton = loginArea.querySelectorAll('input')[2]
+      signUpButton.style.display = 'none'
     }
   }
-});
+})

common/js/solid.mjs

@@ -2,25 +2,25 @@
 // global: owaspPasswordStrengthTest, TextEncoder, crypto, fetch
 
 (function () {
-  'use strict';
+  'use strict'
 
   const PasswordValidator = function (passwordField, repeatedPasswordField) {
     if (
       passwordField === null || passwordField === undefined ||
       repeatedPasswordField === null || repeatedPasswordField === undefined
     ) {
-      return;
+      return
     }
 
-    this.passwordField = passwordField;
-    this.repeatedPasswordField = repeatedPasswordField;
+    this.passwordField = passwordField
+    this.repeatedPasswordField = repeatedPasswordField
 
-    this.fetchDomNodes();
-    this.bindEvents();
+    this.fetchDomNodes()
+    this.bindEvents()
 
-    this.currentStrengthLevel = 0;
-    this.errors = [];
-  };
+    this.currentStrengthLevel = 0
+    this.errors = []
+  }
 
   const FEEDBACK_SUCCESS = 'success'
   const FEEDBACK_WARNING = 'warning'
@@ -452,5 +452,5 @@
   new PasswordValidator(
     document.getElementById('password'),
     document.getElementById('repeat_password')
-  );
-})();
+  )
+})()

config/defaults.mjs

@@ -19,4 +19,4 @@ export default {
   //   "host": "proxy.example.com",
   //   "port": 12345
   // }
-};
+}

index.mjs

@@ -8,15 +8,15 @@ import startCli from './bin/lib/cli.mjs'
 let exported
 const canAttach = (ldnode && (typeof ldnode === 'object' || typeof ldnode === 'function'))
 if (canAttach) {
-	try {
-		if (!ldnode.createServer) ldnode.createServer = createServer
-		if (!ldnode.startCli) ldnode.startCli = startCli
-		exported = ldnode
-	} catch (e) {
-		exported = { default: ldnode, createServer, startCli }
-	}
+  try {
+    if (!ldnode.createServer) ldnode.createServer = createServer
+    if (!ldnode.startCli) ldnode.startCli = startCli
+    exported = ldnode
+  } catch (e) {
+    exported = { default: ldnode, createServer, startCli }
+  }
 } else {
-	exported = { default: ldnode, createServer, startCli }
+  exported = { default: ldnode, createServer, startCli }
 }
 
 export default exported

lib/acl-checker.mjs

@@ -1,5 +1,4 @@
 'use strict'
-/* eslint-disable node/no-deprecated-api */
 
 import { dirname } from 'path'
 import rdf from 'rdflib'

lib/handlers/copy.mjs

@@ -1,5 +1,3 @@
-/* eslint-disable node/no-deprecated-api */
-
 import debug from '../debug.mjs'
 import HTTPError from '../http-error.mjs'
 import ldpCopy from '../ldp-copy.mjs'

lib/handlers/cors-proxy.mjs

@@ -1,5 +1,3 @@
-/* eslint-disable node/no-deprecated-api */
-
 import { createProxyMiddleware } from 'http-proxy-middleware'
 import cors from 'cors'
 import debug from '../debug.mjs'

lib/handlers/get.mjs

@@ -240,7 +240,7 @@ function hasReadPermissions (file, req, res, callback) {
   if (!ldp.webid) {
     // FIXME: what is the rule that causes
     // "Unexpected literal in error position of callback" in `npm run standard`?
-    // eslint-disable-next-line
+
     return callback(true)
   }
 
@@ -249,6 +249,6 @@ function hasReadPermissions (file, req, res, callback) {
   res.locals.path = relativePath
   // FIXME: what is the rule that causes
   // "Unexpected literal in error position of callback" in `npm run standard`?
-  // eslint-disable-next-line
+
   allow('Read')(req, res, err => callback(!err))
 }