diff --git a/eslint.config.js b/eslint.config.js
index 9f6fbf88a..bc7319569 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,13 +1,18 @@
-const globals = require("globals");
+const globals = require('globals');
 
 module.exports = [
   {
     languageOptions: {
-      "globals": {
+      'globals': {
         ...globals.browser,
         ...globals.node,
-        "bson": true
+        'bson': true
       },
+      'parserOptions': {
+        'ecmaFeatures': {
+          'jsx': true
+        }
+      }
     }
   },
   {
@@ -19,7 +24,6 @@ module.exports = [
       eqeqeq: 2,
       'wrap-iife': [2, 'any'],
       'no-use-before-define': 0,
-      'new-cap': 2,
       'no-caller': 2,
       'dot-notation': 0,
       'no-undef': 2,
@@ -30,6 +34,6 @@ module.exports = [
       'no-proto': 2,
       'linebreak-style': 2
     },
-    files: ['Gruntfile.js', 'src/**/*.js']
+    files: ['**/*.{js,jsx,cjs}']
   }
 ];
diff --git a/examples/node_simple.js b/examples/node_simple.js
index 8a9ea80e7..340216dc6 100644
--- a/examples/node_simple.js
+++ b/examples/node_simple.js
@@ -41,5 +41,5 @@ angular : {
 }
 });
 
-console.log("Publishing cmd_vel");
+console.log('Publishing cmd_vel');
 cmdVel.publish(twist);
diff --git a/examples/react-example/src/App.jsx b/examples/react-example/src/App.jsx
index 09e3a5619..add819341 100644
--- a/examples/react-example/src/App.jsx
+++ b/examples/react-example/src/App.jsx
@@ -1,7 +1,7 @@
 import logo from './logo.svg'
 import './App.css'
-import SendMessage from "./component_examples/example_functions"
-import React from "react";
+import SendMessage from './component_examples/example_functions'
+import React from 'react';
 
 function App() {
   return (
diff --git a/examples/react-example/src/App.test.jsx b/examples/react-example/src/App.test.jsx
index ee495b31e..0bf2466a8 100644
--- a/examples/react-example/src/App.test.jsx
+++ b/examples/react-example/src/App.test.jsx
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react'
 import App from './App'
-import React from "react";
-import { expect, test } from "vitest";
+import React from 'react';
+import { expect, test } from 'vitest';
 
 test('renders learn react link', () => {
   render(<App />)
diff --git a/examples/react-example/src/component_examples/example_functions.jsx b/examples/react-example/src/component_examples/example_functions.jsx
index 5c52edac8..99576b5cc 100644
--- a/examples/react-example/src/component_examples/example_functions.jsx
+++ b/examples/react-example/src/component_examples/example_functions.jsx
@@ -2,13 +2,13 @@ import React, { useState } from 'react'
 import ROSLIB from '../../../..'
 
 function SendMessage() {
-  const [status, setStatus] = useState("Not connected")
+  const [status, setStatus] = useState('Not connected')
   const [linear, setLinear] = useState({ x: 0, y: 0, z: 0 })
   const [angular, setAngular] = useState({ x: 0, y: 0, z: 0 })
   const ros = new ROSLIB.Ros({encoding: 'ascii'})
 
   function convert(input){
-        if (input.charAt(0) === "-") {
+        if (input.charAt(0) === '-') {
             let x = input.slice(0)
             return parseInt(x)
           } else {
@@ -17,7 +17,7 @@ function SendMessage() {
         }
 
     function connect() {
-      ros.connect("ws://localhost:9090")
+      ros.connect('ws://localhost:9090')
       // won't let the user connect more than once
       ros.on('error', function (error) {
         console.log(error)
@@ -27,12 +27,12 @@ function SendMessage() {
       // Find out exactly when we made a connection.
       ros.on('connection', function () {
         console.log('Connected!')
-        setStatus("Connected!")
+        setStatus('Connected!')
       })
 
       ros.on('close', function () {
         console.log('Connection closed')
-        setStatus("Connection closed")
+        setStatus('Connection closed')
       })
   }
 
@@ -42,8 +42,8 @@ function SendMessage() {
     }
     const cmdVel = new ROSLIB.Topic({
       ros: ros,
-      name: "pose_topic",
-      messageType: "geometry_msgs/Pose2D"
+      name: 'pose_topic',
+      messageType: 'geometry_msgs/Pose2D'
     })
 
     const data = new ROSLIB.Message({
@@ -65,18 +65,18 @@ function SendMessage() {
     <p>Send a message to turtle</p>
     <p>Linear:</p>
     <label>X</label>
-    <input name={"linear"} type={"number"} value={linear.x} onChange={(ev) => setLinear({...linear, x: convert(ev.target.value)})}/>
+    <input name={'linear'} type={'number'} value={linear.x} onChange={(ev) => setLinear({...linear, x: convert(ev.target.value)})}/>
     <label>Y</label>
-    <input name={"linear"} type={"number"} value={linear.y} onChange={(ev) => setLinear({...linear, y: convert(ev.target.value)})}/>
+    <input name={'linear'} type={'number'} value={linear.y} onChange={(ev) => setLinear({...linear, y: convert(ev.target.value)})}/>
     <label>Z</label>
-    <input name={"linear"} type={"number"} value={linear.z} onChange={(ev) => setLinear({...linear, z: convert(ev.target.value)})}/>
+    <input name={'linear'} type={'number'} value={linear.z} onChange={(ev) => setLinear({...linear, z: convert(ev.target.value)})}/>
     <p>Angular:</p>
     <label>X</label>
-    <input name={"angular"} type={"number"} value={angular.x} onChange={(ev) => setAngular({...angular, x: convert(ev.target.value)})}/>
+    <input name={'angular'} type={'number'} value={angular.x} onChange={(ev) => setAngular({...angular, x: convert(ev.target.value)})}/>
     <label>Y</label>
-    <input name={"angular"} type={"number"} value={angular.y} onChange={(ev) => setAngular({...angular, y: convert(ev.target.value)})}/>
+    <input name={'angular'} type={'number'} value={angular.y} onChange={(ev) => setAngular({...angular, y: convert(ev.target.value)})}/>
     <label>Z</label>
-    <input name={"angular"} type={"number"} value={angular.z} onChange={(ev) => setAngular({...angular, z: convert(ev.target.value)})}/>
+    <input name={'angular'} type={'number'} value={angular.z} onChange={(ev) => setAngular({...angular, z: convert(ev.target.value)})}/>
     <br />
     <button onClick={() => publish()}>Publish</button>
         <br/>
diff --git a/test/examples/check-topics.example.js b/test/examples/check-topics.example.js
index a84ccb8de..2164d9cd1 100644
--- a/test/examples/check-topics.example.js
+++ b/test/examples/check-topics.example.js
@@ -1,4 +1,4 @@
-import { describe, it, expect } from "vitest";
+import { describe, it, expect } from 'vitest';
 var ROSLIB = require('../..');
 
 var expectedTopics = [
@@ -45,7 +45,7 @@ describe('Example topics are live', function() {
     }));
 
     it('unadvertise will end the topic (if it\s the last around)', () => new Promise((done) =>  {
-        console.log("Unadvertisement test. Wait for 15 seconds..");
+        console.log('Unadvertisement test. Wait for 15 seconds..');
         setTimeout(function() {
           ros.getTopics(function(result) {
               expect(result.topics).not.to.contain('/some_test_topic');
diff --git a/test/examples/fibonacci.example.js b/test/examples/fibonacci.example.js
index 2d2109d56..a247813bd 100644
--- a/test/examples/fibonacci.example.js
+++ b/test/examples/fibonacci.example.js
@@ -1,4 +1,4 @@
-import { describe, it, expect } from "vitest";
+import { describe, it, expect } from 'vitest';
 var ROSLIB = require('../..');
 
 describe('Fibonacci Example', function() {
diff --git a/test/examples/params.examples.js b/test/examples/params.examples.js
index a150429af..561dea889 100644
--- a/test/examples/params.examples.js
+++ b/test/examples/params.examples.js
@@ -1,4 +1,4 @@
-import { describe, it, expect } from "vitest";
+import { describe, it, expect } from 'vitest';
 var ROSLIB = require('../..');
 
 describe('Param setting', function() {
diff --git a/test/examples/pubsub.example.js b/test/examples/pubsub.example.js
index 35b806e68..58960a029 100644
--- a/test/examples/pubsub.example.js
+++ b/test/examples/pubsub.example.js
@@ -28,18 +28,18 @@ describe('Topics Example', function() {
         var topic1msg = messages1[0],
             topic2msg = {};
         example.subscribe(function(message) {
-            if (message.data === topic1msg.data) return;
+            if (message.data === topic1msg.data) {return;}
             topic1msg = messages1[0];
             expect(message).to.be.eql(messages2.shift());
-            if (messages1.length) example.publish(topic1msg);
-            else done();
+            if (messages1.length) {example.publish(topic1msg);}
+            else {done();}
         });
         example2.subscribe(function(message) {
-            if (message.data === topic2msg.data) return;
+            if (message.data === topic2msg.data) {return;}
             topic2msg = messages2[0];
             expect(message).to.be.eql(messages1.shift());
-            if (messages2.length) example2.publish(topic2msg);
-            else done();
+            if (messages2.length) {example2.publish(topic2msg);}
+            else {done();}
         });
         example.publish(topic1msg);
     }));
diff --git a/test/examples/tf.example.js b/test/examples/tf.example.js
index 9c6f0a88f..8353f3013 100644
--- a/test/examples/tf.example.js
+++ b/test/examples/tf.example.js
@@ -1,4 +1,4 @@
-import { describe, it, expect } from "vitest";
+import { describe, it, expect } from 'vitest';
 var ROSLIB = require('../..');
 
 describe('TF2 Republisher Example', function() {
diff --git a/test/examples/tf_service.example.js b/test/examples/tf_service.example.js
index e5555fbd0..98cd04410 100644
--- a/test/examples/tf_service.example.js
+++ b/test/examples/tf_service.example.js
@@ -1,4 +1,4 @@
-import { describe, it, expect } from "vitest";
+import { describe, it, expect } from 'vitest';
 var ROSLIB = require('../..');
 
 describe('TF2 Republisher Service Example', function() {
diff --git a/test/math-examples.test.js b/test/math-examples.test.js
index 639729648..6c3ed8326 100644
--- a/test/math-examples.test.js
+++ b/test/math-examples.test.js
@@ -5,7 +5,7 @@ function clone(x) {
     var y = {};
     for (var prop in x) {
         if (x.hasOwnProperty(prop)) {
-            y[prop] = typeof x[prop] === "object" ? clone(x[prop]) : x[prop];
+            y[prop] = typeof x[prop] === 'object' ? clone(x[prop]) : x[prop];
         }
     }
     return y;
diff --git a/test/quaternion.test.js b/test/quaternion.test.js
index 90f38e8f7..d06aa06be 100644
--- a/test/quaternion.test.js
+++ b/test/quaternion.test.js
@@ -1,4 +1,4 @@
-import { describe, it, expect } from "vitest";
+import { describe, it, expect } from 'vitest';
 var ROSLIB = require('..');
 
 
diff --git a/test/tfclient.test.js b/test/tfclient.test.js
index 6456feff2..322fccba1 100644
--- a/test/tfclient.test.js
+++ b/test/tfclient.test.js
@@ -1,4 +1,4 @@
-import { describe, it, expect } from "vitest";
+import { describe, it, expect } from 'vitest';
 var ROSLIB = require('..');
 
 describe('TFClient', function() {
diff --git a/test/transform.test.js b/test/transform.test.js
index ccb8b71d3..975d8f799 100644
--- a/test/transform.test.js
+++ b/test/transform.test.js
@@ -1,4 +1,4 @@
-import { describe, it, expect } from "vitest";
+import { describe, it, expect } from 'vitest';
 var ROSLIB = require('..');
 
 describe('Transform', function() {
diff --git a/vitest.config.js b/vitest.config.js
index 64e146e07..7e6dad78d 100644
--- a/vitest.config.js
+++ b/vitest.config.js
@@ -1,4 +1,4 @@
-import {defineConfig} from "vitest/config";
+import {defineConfig} from 'vitest/config';
 
 export default defineConfig({
   test: {