HPCC-30971 Remove JS Submodules

put-selector xstyle Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
hpcc-systems · Dec 6, 2023 · b42effb · b42effb
1 parent 82ba015
commit b42effb
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "esp/src/xstyle"]
-	path = esp/src/xstyle
-	url = https://github.com/hpcc-systems/xstyle.git
-[submodule "esp/src/put-selector"]
-	path = esp/src/put-selector
-	url = https://github.com/hpcc-systems/put-selector.git
 [submodule "esp/src/dgrid"]
 	path = esp/src/dgrid
 	url = https://github.com/hpcc-systems/dgrid.git

diff --git a/esp/src/CMakeLists.txt b/esp/src/CMakeLists.txt
@@ -28,10 +28,8 @@ file(COPY
     ${CMAKE_CURRENT_SOURCE_DIR}/eslint
     ${CMAKE_CURRENT_SOURCE_DIR}/ganglia
     ${CMAKE_CURRENT_SOURCE_DIR}/loader
-    ${CMAKE_CURRENT_SOURCE_DIR}/put-selector
     ${CMAKE_CURRENT_SOURCE_DIR}/src
     ${CMAKE_CURRENT_SOURCE_DIR}/src-react
-    ${CMAKE_CURRENT_SOURCE_DIR}/xstyle
     ${CMAKE_CURRENT_SOURCE_DIR}/.eslintrc.js
     ${CMAKE_CURRENT_SOURCE_DIR}/GetUserName.html
     ${CMAKE_CURRENT_SOURCE_DIR}/index.html

diff --git a/esp/src/package-lock.json b/esp/src/package-lock.json
diff --git a/esp/src/package.json b/esp/src/package.json
@@ -66,6 +66,7 @@
     "es6-promise": "4.2.8",
     "font-awesome": "4.7.0",
     "formik": "2.2.9",
+    "put-selector": "0.3.6",
     "query-string": "7.1.3",
     "octokit": "3.1.1",
     "react": "17.0.2",
@@ -74,7 +75,8 @@
     "react-hot-toast": "2.4.0",
     "react-reflex": "4.0.9",
     "react-sizeme": "3.0.2",
-    "universal-router": "9.1.0"
+    "universal-router": "9.1.0",
+    "xstyle": "0.3.2"
   },
   "devDependencies": {
     "@simbathesailor/use-what-changed": "^2.0.0",

diff --git a/esp/src/put-selector b/esp/src/put-selector
diff --git a/esp/src/xstyle b/esp/src/xstyle