From f8e8217b3c52bddf88c2dc1241211ae4476987f6 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Tue, 5 Dec 2023 20:55:54 +0000 Subject: [PATCH] HPCC-30971 Remove JS Submodules put-selector xstyle Signed-off-by: Gordon Smith --- .gitmodules | 6 ------ esp/src/package-lock.json | 17 ++++++++++++++++- esp/src/package.json | 4 +++- esp/src/put-selector | 1 - esp/src/xstyle | 1 - 5 files changed, 19 insertions(+), 10 deletions(-) delete mode 160000 esp/src/put-selector delete mode 160000 esp/src/xstyle diff --git a/.gitmodules b/.gitmodules index d88eb124579..5ec896ff711 100644 --- 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/package-lock.json b/esp/src/package-lock.json index 0e6ad30ef66..fbb376b3051 100644 --- a/esp/src/package-lock.json +++ b/esp/src/package-lock.json @@ -41,6 +41,7 @@ "font-awesome": "4.7.0", "formik": "2.2.9", "octokit": "3.1.1", + "put-selector": "0.3.6", "query-string": "7.1.3", "react": "17.0.2", "react-dom": "17.0.2", @@ -48,7 +49,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", @@ -8252,6 +8254,11 @@ "node": ">=6" } }, + "node_modules/put-selector": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/put-selector/-/put-selector-0.3.6.tgz", + "integrity": "sha512-usnm25gsnYkxRnSK5n0tXAgnQQ5DZV4zOqW8VwcDKSo0YebzOGMRx1Xl+LahwtnH+vqg97hlAi6qPUpqgIhX8g==" + }, "node_modules/qrcode-terminal": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz", @@ -10223,6 +10230,14 @@ } } }, + "node_modules/xstyle": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/xstyle/-/xstyle-0.3.2.tgz", + "integrity": "sha512-NgElqDZ5ACAN8S3X+DhZlDLdSyKRW7dCml6VqDrh5iR5b5+x3APHGQd7F+AQAcGxmUx1yoMlt1V3kyyksxhjtA==", + "dependencies": { + "put-selector": "0.3.6" + } + }, "node_modules/xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", diff --git a/esp/src/package.json b/esp/src/package.json index 3c7cbd68e1a..cfec5c297a6 100644 --- 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 deleted file mode 160000 index 06358997b45..00000000000 --- a/esp/src/put-selector +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 06358997b4523e03e150b40bdf666a590b72cb40 diff --git a/esp/src/xstyle b/esp/src/xstyle deleted file mode 160000 index 87c414981d6..00000000000 --- a/esp/src/xstyle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 87c414981d6810aac82204291c25a138720cd3d2