From fa8efa858bf3bc13e4cec338d31d24635bdcc069 Mon Sep 17 00:00:00 2001
From: John Hill <john.c.hill@nasa.gov>
Date: Fri, 13 Sep 2024 07:52:58 -0700
Subject: [PATCH 1/2] [Build] Update package lock to reference correct version
 of package and also update the browserlist (#7843)

chore: update package lock to 4.1.0-next and update browserlist
---
 package-lock.json | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b15818b907..9a29ebe433 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "openmct",
-  "version": "4.0.0-next",
+  "version": "4.1.0-next",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "openmct",
-      "version": "4.0.0-next",
+      "version": "4.1.0-next",
       "license": "Apache-2.0",
       "workspaces": [
         "e2e"
@@ -98,7 +98,7 @@
     },
     "e2e": {
       "name": "openmct-e2e",
-      "version": "4.0.0-next",
+      "version": "4.1.0-next",
       "license": "Apache-2.0",
       "devDependencies": {
         "@axe-core/playwright": "4.8.5",
@@ -2797,9 +2797,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001597",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001597.tgz",
-      "integrity": "sha512-7LjJvmQU6Sj7bL0j5b5WY/3n7utXUJvAe1lxhsHDbLmwX9mdL86Yjtr+5SRCyf8qME4M7pU2hswj0FpyBVCv9w==",
+      "version": "1.0.30001660",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz",
+      "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==",
       "dev": true,
       "funding": [
         {
@@ -2814,7 +2814,8 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/chalk": {
       "version": "2.4.2",

From de122b91c26900dacb4ffa51b2d264c97be9987a Mon Sep 17 00:00:00 2001
From: John Hill <john.c.hill@nasa.gov>
Date: Mon, 16 Sep 2024 16:23:56 -0700
Subject: [PATCH 2/2] [Build] Update tsconfig to explicitly set `target` and
 `module` options (#7845)

* bugfix: update tsconfig to set module to NodeNext and exclude openmct/e2e

* chore: remove unnecessary paths from exclude

- the `exclude` option only excludes files in the context of the `include` paths, if there are any. We can remove some of these because they don't match anything in the include paths.

* chore: fix capitalization for consistency

---------

Co-authored-by: Jesse Mazzella <jesse.d.mazzella@nasa.gov>
---
 tsconfig.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index 4ebb82543c..7b392cc64f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,6 +4,7 @@
  */
 {
   "compilerOptions": {
+    "target": "ES6",
     "baseUrl": "./",
     "allowJs": true,
     "checkJs": false,
@@ -14,14 +15,14 @@
     "esModuleInterop": true,
     "noImplicitOverride": true,
     "noImplicitAny": false,
-    "outFile": "dist/types/index.d.ts"
+    "outFile": "dist/types/index.d.ts",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext"
   },
   "include": [
     "src/api/**/*.js"
   ],
   "exclude": [
-    "node_modules",
-    "dist",
     "**/*Spec.js"
   ]
 }
\ No newline at end of file