Merge branch 'opensearch-project:main' into datasource-cypress-fix

opensearch-project · Jan 10, 2024 · c7aab98 · c7aab98
2 parents dc8b19a + 9a0fb3d
commit c7aab98
Show file tree

Hide file tree

Showing 17 changed files with 1,521 additions and 277 deletions.
diff --git a/.cypress/.eslintrc.js b/.cypress/.eslintrc.js
@@ -0,0 +1,16 @@
+module.exports = {
+  root: true,
+  extends: ['plugin:cypress/recommended'],
+  env: {
+    'cypress/globals': true,
+  },
+  plugins: ['cypress'],
+  rules: {
+    // Add cypress specific rules here
+    'cypress/no-assigning-return-values': 'error',
+    'cypress/no-unnecessary-waiting': 'error',
+    'cypress/assertion-before-screenshot': 'warn',
+    'cypress/no-force': 'warn',
+    'cypress/no-async-tests': 'error',
+  },
+};
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -14,16 +14,10 @@ module.exports = {
     '@elastic/eslint-config-kibana',
     'plugin:@elastic/eui/recommended',
     'plugin:react-hooks/recommended',
-    "plugin:cypress/recommended",
     'plugin:jest/recommended',
     'plugin:prettier/recommended',
   ],
-  env: {
-    'cypress/globals': true,
-  },
-  plugins: [
-    'cypress',
-  ],
+
   rules: {
     '@typescript-eslint/no-unused-vars': [
       'error',
@@ -45,12 +39,6 @@ module.exports = {
         ],
       },
     ],
-    // Add cypress specific rules here
-    'cypress/no-assigning-return-values': 'error',
-    'cypress/no-unnecessary-waiting': 'error',
-    'cypress/assertion-before-screenshot': 'warn',
-    'cypress/no-force': 'warn',
-    'cypress/no-async-tests': 'error',
   },
   overrides: [
     {

diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "performance-now": "^2.1.0",
     "plotly.js-dist": "^2.2.0",
     "postinstall": "^0.7.4",
-    "react-graph-vis": "^1.0.5",
+    "react-graph-vis": "^1.0.7",
     "react-paginate": "^8.1.3",
     "react-plotly.js": "^2.5.1",
     "redux-persist": "^6.0.0",
@@ -50,10 +50,10 @@
     "@types/enzyme-adapter-react-16": "^1.0.6",
     "@types/mime": "^3.0.1",
     "@types/react-plotly.js": "^2.5.0",
-    "@types/react-test-renderer": "^16.9.1",
+    "@types/react-test-renderer": "^18.0.0",
     "@types/sanitize-filename": "^1.6.3",
     "antlr4ts-cli": "^0.5.0-alpha.4",
-    "cypress": "^12.8.1",
+    "cypress": "^13.6.0",
     "cypress-watch-and-reload": "^1.10.6",
     "eslint": "^6.8.0",
     "husky": "^8.0.3",