From 534cc151d1cc72733f129a49db0fbebd7831b804 Mon Sep 17 00:00:00 2001
From: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
Date: Mon, 2 May 2022 20:39:38 +0200
Subject: [PATCH] fix: resolve conflict between clients (#45837)

npm was confusing the two due to the name clash
---
 package-lock.json                          | 41 +++++++++++-----------
 tools/challenge-editor/client/package.json |  2 +-
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4210d01b9a2..b5045de1f9c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3760,6 +3760,10 @@
       "resolved": "tools/challenge-editor/api",
       "link": true
     },
+    "node_modules/@freecodecamp/challenge-editor-client": {
+      "resolved": "tools/challenge-editor/client",
+      "link": true
+    },
     "node_modules/@freecodecamp/challenge-parser": {
       "resolved": "tools/challenge-parser",
       "link": true
@@ -20269,10 +20273,6 @@
         "node": ">= 10"
       }
     },
-    "node_modules/client": {
-      "resolved": "tools/challenge-editor/client",
-      "link": true
-    },
     "node_modules/clipboardy": {
       "version": "2.3.0",
       "license": "MIT",
@@ -53611,6 +53611,7 @@
       }
     },
     "tools/challenge-editor/client": {
+      "name": "@freecodecamp/challenge-editor-client",
       "version": "0.1.0",
       "dependencies": {
         "@testing-library/jest-dom": "5.16.4",
@@ -56432,6 +56433,22 @@
         "typescript": "4.6.4"
       }
     },
+    "@freecodecamp/challenge-editor-client": {
+      "version": "file:tools/challenge-editor/client",
+      "requires": {
+        "@testing-library/jest-dom": "5.16.4",
+        "@testing-library/react": "12.1.5",
+        "@testing-library/user-event": "13.5.0",
+        "@types/codemirror": "5.60.5",
+        "eslint-plugin-react-hooks": "4.5.0",
+        "react": "16.14.0",
+        "react-codemirror2": "7.2.1",
+        "react-dom": "16.14.0",
+        "react-router-dom": "6.2.1",
+        "react-scripts": "5.0.1",
+        "typescript": "4.6.4"
+      }
+    },
     "@freecodecamp/challenge-parser": {
       "version": "file:tools/challenge-parser",
       "requires": {
@@ -68246,22 +68263,6 @@
     "cli-width": {
       "version": "3.0.0"
     },
-    "client": {
-      "version": "file:tools/challenge-editor/client",
-      "requires": {
-        "@testing-library/jest-dom": "5.16.4",
-        "@testing-library/react": "12.1.5",
-        "@testing-library/user-event": "13.5.0",
-        "@types/codemirror": "5.60.5",
-        "eslint-plugin-react-hooks": "4.5.0",
-        "react": "16.14.0",
-        "react-codemirror2": "7.2.1",
-        "react-dom": "16.14.0",
-        "react-router-dom": "6.2.1",
-        "react-scripts": "5.0.1",
-        "typescript": "4.6.4"
-      }
-    },
     "clipboardy": {
       "version": "2.3.0",
       "requires": {
diff --git a/tools/challenge-editor/client/package.json b/tools/challenge-editor/client/package.json
index 649bdbf92d9..5c4f727b68f 100644
--- a/tools/challenge-editor/client/package.json
+++ b/tools/challenge-editor/client/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "client",
+  "name": "@freecodecamp/challenge-editor-client",
   "version": "0.1.0",
   "private": true,
   "dependencies": {