Merge pull request #18177 from GordonSmith/HPCC-31059-VERSION_BUMP

HPCC-31059 ECL Watch Security and Version bump
hpcc-systems · Jan 4, 2024 · cc28f70 · cc28f70
2 parents 85f2efc + 20acbf7
commit cc28f70
Show file tree

Hide file tree

Showing 12 changed files with 1,097 additions and 998 deletions.
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
@@ -35,12 +35,12 @@
   },
   "main": "src/stub.js",
   "dependencies": {
-    "@fluentui/react": "8.110.7",
-    "@fluentui/react-components": "9.41.0",
-    "@fluentui/react-experiments": "8.14.95",
-    "@fluentui/react-hooks": "8.6.29",
-    "@fluentui/react-icons-mdl2": "1.3.47",
-    "@fluentui/react-migration-v8-v9": "9.4.41",
+    "@fluentui/react": "8.114.0",
+    "@fluentui/react-components": "9.44.0",
+    "@fluentui/react-experiments": "8.14.122",
+    "@fluentui/react-hooks": "8.6.34",
+    "@fluentui/react-icons-mdl2": "1.3.53",
+    "@fluentui/react-migration-v8-v9": "9.4.42",
     "@hpcc-js/chart": "2.81.8",
     "@hpcc-js/codemirror": "2.61.0",
     "@hpcc-js/common": "2.71.13",
@@ -56,7 +56,7 @@
     "@hpcc-js/react": "2.53.10",
     "@hpcc-js/tree": "2.40.13",
     "@hpcc-js/util": "2.50.6",
-    "@kubernetes/client-node": "0.18.1",
+    "@kubernetes/client-node": "0.20.0",
     "clipboard": "2.0.11",
     "d3-dsv": "3.0.1",
     "dijit": "1.17.3",
@@ -66,41 +66,41 @@
     "dojox": "1.17.3",
     "es6-promise": "4.2.8",
     "font-awesome": "4.7.0",
-    "formik": "2.2.9",
+    "formik": "2.4.5",
     "put-selector": "0.3.6",
     "query-string": "7.1.3",
-    "octokit": "3.1.1",
+    "octokit": "3.1.2",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "react-hook-form": "7.43.5",
-    "react-hot-toast": "2.4.0",
-    "react-reflex": "4.0.9",
+    "react-hook-form": "7.49.2",
+    "react-hot-toast": "2.4.1",
+    "react-reflex": "4.2.1",
     "react-sizeme": "3.0.2",
-    "universal-router": "9.1.0",
-    "xstyle": "0.3.2"
+    "universal-router": "9.2.0",
+    "xstyle": "0.3.3"
   },
   "devDependencies": {
     "@simbathesailor/use-what-changed": "^2.0.0",
-    "@types/dojo": "1.9.44",
-    "@types/react": "17.0.62",
-    "@types/react-dom": "17.0.20",
-    "@typescript-eslint/eslint-plugin": "5.54.0",
-    "@typescript-eslint/parser": "5.54.0",
+    "@types/dojo": "1.9.48",
+    "@types/react": "17.0.74",
+    "@types/react-dom": "17.0.25",
+    "@typescript-eslint/eslint-plugin": "6.17.0",
+    "@typescript-eslint/parser": "6.17.0",
     "copyfiles": "2.4.1",
     "css-loader": "6.8.1",
-    "dojo-webpack-plugin": "3.0.5",
-    "eslint": "8.35.0",
+    "dojo-webpack-plugin": "3.0.6",
+    "eslint": "8.56.0",
     "eslint-plugin-eclwatch": "file:./eslint",
     "eslint-plugin-react-hooks": "4.6.0",
     "file-loader": "6.2.0",
     "local-web-server": "5.3.0",
     "npm-run-all": "4.1.5",
-    "rimraf": "3.0.2",
-    "source-map-loader": "3.0.2",
+    "rimraf": "5.0.5",
+    "source-map-loader": "4.0.2",
     "string-replace-loader": "3.1.0",
     "style-loader": "3.3.3",
-    "tslib": "2.5.3",
-    "typescript": "4.9.5",
+    "tslib": "2.6.2",
+    "typescript": "5.3.3",
     "url-loader": "4.1.1",
     "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
@@ -112,4 +112,4 @@
     "type": "git",
     "url": "https://github.com/hpcc-systems/HPCC-Platform"
   }
-}
+}
diff --git a/esp/src/src-react/components/PackageMaps.tsx b/esp/src/src-react/components/PackageMaps.tsx
@@ -47,7 +47,7 @@ const validateMapStyles = mergeStyleSets({
     displayNone: { display: "none" }
 });
 
-const emptyFilter = {};
+const emptyFilter: { [key: string]: any } = {};
 
 const addArrayToText = (title, items, text): string => {
     if ((items.Item !== undefined) && (items.Item.length > 0)) {

diff --git a/esp/src/src/DataPatterns/StatChart.ts b/esp/src/src/DataPatterns/StatChart.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import { QuartileCandlestick, Scatter } from "@hpcc-js/chart";
 import { format as d3Format, HTMLWidget, Palette } from "@hpcc-js/common";
 import { StyledTable } from "@hpcc-js/html";

diff --git a/esp/src/src/DataPatternsWidget.ts b/esp/src/src/DataPatternsWidget.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import * as dom from "dojo/dom";
 import * as domClass from "dojo/dom-class";
 import * as domForm from "dojo/dom-form";

diff --git a/esp/src/src/ECLArchiveWidget.ts b/esp/src/src/ECLArchiveWidget.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import { ECLEditor } from "@hpcc-js/codemirror";
 import { extent, Palette } from "@hpcc-js/common";
 import { Workunit } from "@hpcc-js/comms";

diff --git a/esp/src/src/Graph7Widget.ts b/esp/src/src/Graph7Widget.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import * as lang from "dojo/_base/lang";
 import * as aspect from "dojo/aspect";
 import * as dom from "dojo/dom";

diff --git a/esp/src/src/GraphTree7Widget.ts b/esp/src/src/GraphTree7Widget.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import * as arrayUtil from "dojo/_base/array";
 import * as declare from "dojo/_base/declare";
 import * as lang from "dojo/_base/lang";

diff --git a/esp/src/src/GraphTreeWidget.ts b/esp/src/src/GraphTreeWidget.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import * as arrayUtil from "dojo/_base/array";
 import * as declare from "dojo/_base/declare";
 import * as Deferred from "dojo/_base/Deferred";

diff --git a/esp/src/src/WUStatus.ts b/esp/src/src/WUStatus.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import { Workunit, WUStateID } from "@hpcc-js/comms";
 import { Edge, Graph, Vertex } from "@hpcc-js/graph";
 import { hashSum, IObserverHandle } from "@hpcc-js/util";

diff --git a/esp/src/tsconfig.json b/esp/src/tsconfig.json
@@ -30,7 +30,8 @@
         "paths": {
             "@hpcc-js/*": [
                 "./node_modules/@hpcc-js/*",
-                "../../../hpcc-js/packages/*"
+                "../../../hpcc-js/packages/*",
+                "../../../Visualization/packages/*"
             ]
         }
     },

diff --git a/esp/src/webpack.config.js b/esp/src/webpack.config.js
@@ -1,4 +1,5 @@
-/* eslint-disable */
+/* eslint-disable no-undef */
+/* eslint-disable @typescript-eslint/no-var-requires */
 var DojoWebpackPlugin = require("dojo-webpack-plugin");
 
 var fs = require("fs");
@@ -55,12 +56,12 @@ module.exports = function (env) {
     ];
 
     return {
-        context: __dirname,
+        context: path.resolve(__dirname),
         entry: entry,
         output: {
             filename: "[name].eclwatch.js",
             chunkFilename: "[name].eclwatch.js",
-            path: path.join(__dirname, "build/dist"),
+            path: path.resolve(__dirname, "build/dist"),
             publicPath: "/esp/files/dist/",
             pathinfo: true
         },
@@ -75,25 +76,25 @@ module.exports = function (env) {
                     enforce: "pre"
                 }, {
                     test: /\.js$/,
-                    loader: 'string-replace-loader',
+                    loader: "string-replace-loader",
                     options: {
                         search: isProduction ? "RELEASE_ONLY" : "DEBUG_ONLY",
                         replace(match, p1, offset, string) {
-                            return "DEBUG_ONLY */"
+                            return "DEBUG_ONLY */";
                         },
                         flags: "g"
                     }
                 }]
         },
         resolve: {
             alias: {
-                "clipboard": path.resolve(__dirname, "node_modules/clipboard/dist/clipboard"),
-                "@fluentui/react-experiments/lib/Pagination": path.resolve(__dirname, "node_modules/@fluentui/react-experiments/lib/Pagination")
             },
-            // WebPack >= v5
-            // fallback: {
-            //     "@hpcc-js": path.resolve(__dirname, "../../../hpcc-js/packages")
-            // },
+            fallback: {
+                "@hpcc-js": [
+                    path.resolve(__dirname, "../../../hpcc-js/packages"),
+                    path.resolve(__dirname, "../../../Visualization/packages")
+                ]
+            }
         },
         plugins: plugins,
         resolveLoader: {
@@ -110,12 +111,12 @@ module.exports = function (env) {
         devServer: isProduction ? undefined : {
             hot: "only",
             static: {
-                directory: path.join(__dirname, './build'),
+                directory: path.resolve(__dirname, "build"),
                 publicPath: "/esp/files"
             },
             liveReload: false,
             proxy,
             port: 8080
         }
-    }
+    };
 };