From 403fe2d7bd3047b7a1f7b3215aebc59b30c37094 Mon Sep 17 00:00:00 2001
From: Ezra Brooks <ezra@brooks.cx>
Date: Mon, 18 Mar 2024 14:57:30 -0600
Subject: [PATCH] Remove old object-assign polyfill, move `globals` to dev deps

---
 package-lock.json        | 12 ++----------
 package.json             |  3 +--
 src/core/Message.js      |  4 +---
 src/core/Ros.js          |  5 ++---
 src/urdf/UrdfMaterial.js |  4 +---
 5 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dfa8e03eb..e1c2cbaac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,8 +12,6 @@
         "@xmldom/xmldom": "^0.8.0",
         "cbor-js": "^0.1.0",
         "eventemitter3": "^5.0.1",
-        "globals": "^14.0.0",
-        "object-assign": "^4.0.0",
         "pngparse": "^2.0.0",
         "ws": "^8.0.0"
       },
@@ -21,6 +19,7 @@
         "@testing-library/react": "^14.2.1",
         "@types/node": "^20.11.19",
         "eslint": "^8.56.0",
+        "globals": "^14.0.0",
         "jsdoc": "^4.0.2",
         "jsdom": "^24.0.0",
         "typescript": "^5.2.2",
@@ -2771,6 +2770,7 @@
       "version": "14.0.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
       "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+      "dev": true,
       "engines": {
         "node": ">=18"
       },
@@ -3830,14 +3830,6 @@
       "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
       "dev": true
     },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object-inspect": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
diff --git a/package.json b/package.json
index 852a90609..8fae2bd9f 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "@testing-library/react": "^14.2.1",
     "@types/node": "^20.11.19",
     "eslint": "^8.56.0",
+    "globals": "^14.0.0",
     "jsdoc": "^4.0.2",
     "jsdom": "^24.0.0",
     "typescript": "^5.2.2",
@@ -32,8 +33,6 @@
     "@xmldom/xmldom": "^0.8.0",
     "cbor-js": "^0.1.0",
     "eventemitter3": "^5.0.1",
-    "globals": "^14.0.0",
-    "object-assign": "^4.0.0",
     "pngparse": "^2.0.0",
     "ws": "^8.0.0"
   },
diff --git a/src/core/Message.js b/src/core/Message.js
index 08e824ae2..10b14429b 100644
--- a/src/core/Message.js
+++ b/src/core/Message.js
@@ -3,8 +3,6 @@
  * @author Brandon Alexander - baalexander@gmail.com
  */
 
-import assign from 'object-assign';
-
 /**
  * Message objects are used for publishing and subscribing to and from topics.
  *
@@ -16,6 +14,6 @@ export default class Message {
    * @param {T} [values={}] - An object matching the fields defined in the .msg definition file.
    */
   constructor(values) {
-    assign(this, values || {});
+    Object.assign(this, values || {});
   }
 }
diff --git a/src/core/Ros.js b/src/core/Ros.js
index b834a9b81..155d32add 100644
--- a/src/core/Ros.js
+++ b/src/core/Ros.js
@@ -5,7 +5,6 @@
 
 import socketAdapter from './SocketAdapter.js';
 
-import assign from 'object-assign';
 import Topic from './Topic.js';
 import Service from './Service.js';
 import Param from './Param.js';
@@ -64,7 +63,7 @@ export default class Ros extends EventEmitter {
    */
   connect(url) {
     if (this.transportLibrary.constructor.name === 'RTCPeerConnection') {
-      this.socket = assign(
+      this.socket = Object.assign(
         // @ts-expect-error -- this is kinda wild. `this.transportLibrary` can either be a string or an RTCDataChannel. This needs fixing.
         this.transportLibrary.createDataChannel(url, this.transportOptions),
         socketAdapter(this)
@@ -74,7 +73,7 @@ export default class Ros extends EventEmitter {
         // Detect if in browser vs in NodeJS
         var sock = typeof window !== 'undefined' ? new window.WebSocket(url) : new WebSocket(url);
         sock.binaryType = 'arraybuffer';
-        this.socket = assign(sock, socketAdapter(this));
+        this.socket = Object.assign(sock, socketAdapter(this));
       }
     } else {
       throw 'Unknown transportLibrary: ' + this.transportLibrary.toString();
diff --git a/src/urdf/UrdfMaterial.js b/src/urdf/UrdfMaterial.js
index bb1b0e64c..6279e4487 100644
--- a/src/urdf/UrdfMaterial.js
+++ b/src/urdf/UrdfMaterial.js
@@ -39,8 +39,6 @@ export default class UrdfMaterial {
     return this.color === null && this.textureFilename === null;
   }
   assign(obj) {
-    return assign(this, obj);
+    return Object.assign(this, obj);
   }
 }
-
-import assign from 'object-assign';