Support React 19 (#1229)

ukrbublik · web-flow · commit e913730f1c28 · 2025-03-28T19:29:52.000+02:00
* Support React 19

* upd lock

* upd antd, vite, webpack, next, lerna, css-loader, mocha
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -336,5 +336,26 @@
                 }
             }
 		},
+		{
+			"label": "audit",
+			"type": "npm",
+			"script": "audit",
+			"group": "none",
+            "presentation": {
+                "reveal": "silent",
+                "panel": "dedicated",
+                "clear": true,
+            },
+            "options": {
+                "shell": {
+                    "executable": "${workspaceFolder}/scripts/nvms.sh"
+                },
+                "statusbar": {
+                    "running": {
+                        "backgroundColor": "statusBarItem.errorBackground"
+                    }
+                }
+            }
+		},
 	]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+- 6.6.14
+  - Fixed import from JsonLogic when like op is used inside group with some group op (PR #1225) (issue #1221)
+  - Support React 19 (PR #1229) (issue #1205)
 - 6.6.13
   - Fix selecting func/args at RHS at delta 1 (PR #1211) (issue #1207)
   - Fix fetchSelectedValuesOnInit for func arguments (PR #1210) (issue #1198)
diff --git a/package.json b/package.json
@@ -111,7 +111,7 @@
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-react": "^7.34.1",
-    "lerna": "^8.1.9",
+    "lerna": "^8.2.1",
     "madge": "^8.0.0",
     "typescript": "~5.4.5"
   },
@@ -128,9 +128,10 @@
       "@material-ui/styles": "*"
     },
     "overrides": {
+      "axios@1.7.7": "^1.7.9",
       "csstype@3.1.1": "^3.1.3",
       "ejs@3.1.9": "^3.1.10",
-      "express@4.18.2": "^4.21.1",
+      "express@4.18.2": "^4.21.2",
       "follow-redirects@1.15.2": "^1.15.6",
       "ip@2.0.0": "^2.0.1",
       "postcss@8.4.14": "^8.4.31",
@@ -146,7 +147,8 @@
       "cheerio@1.0.0": "1.0.0-rc.12",
       "http-proxy-middleware@2.0.6": "^2.0.7",
       "nise@5.1.4": "^5.1.9",
-      "cross-spawn@7.0.3": "^7.0.6"
+      "cross-spawn@7.0.3": "^7.0.6",
+      "serialize-javascript@6.0.0": "^6.0.2"
     }
   }
 }
diff --git a/packages/antd/package.json b/packages/antd/package.json
@@ -67,7 +67,7 @@
     "@babel/runtime": "^7.24.5",
     "@types/react": "^17.0.39",
     "@types/react-dom": "^17.0.11",
-    "antd": "^5.23.1",
+    "antd": "^5.24.5",
     "less": "^4.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
@@ -76,7 +76,7 @@
   "peerDependencies": {
     "@ant-design/icons": "^4.0.0 || ^5.0.0",
     "antd": "^4.17.0 || ^5.0.0",
-    "react": "^16.8.4 || ^17.0.1 || ^18.0.0",
-    "react-dom": "^16.8.4 || ^17.0.1 || ^18.0.0"
+    "react": "^16.8.4 || ^17.0.1 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^16.8.4 || ^17.0.1 || ^18.0.0 || ^19.0.0"
   }
 }
diff --git a/packages/antd/styles/fixes.scss b/packages/antd/styles/fixes.scss
@@ -1,3 +1,5 @@
+$custom-select-option-color: lightcoral !default;
+
 /* don't trigger tooltips during drag-n-drop */
 body.qb-dragging {
   /* v4 */
diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json
@@ -77,8 +77,8 @@
     "@fortawesome/free-solid-svg-icons": "^5.15.4 || ^6.0.0",
     "@fortawesome/react-fontawesome": ">=0.1.16 <1.0",
     "bootstrap": "^5.1.3",
-    "react": "^16.8.4 || ^17.0.1 || ^18.0.0",
-    "react-dom": "^16.8.4 || ^17.0.1 || ^18.0.0",
+    "react": "^16.8.4 || ^17.0.1 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^16.8.4 || ^17.0.1 || ^18.0.0 || ^19.0.0",
     "reactstrap": "^9.0.0"
   }
 }
diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -49,7 +49,7 @@
     "@react-awesome-query-builder/mui": "workspace:^",
     "@react-awesome-query-builder/sql": "workspace:^",
     "@react-awesome-query-builder/ui": "workspace:^",
-    "antd": "^5.23.1",
+    "antd": "^5.24.5",
     "bootstrap": "^5.3.3",
     "clone": "^2.1.2",
     "immutable": "^4.3.6",
@@ -83,7 +83,7 @@
     "babel-plugin-import": "^1.13.3",
     "copy-webpack-plugin": "^11.0.0",
     "cross-env": "^7.0.3",
-    "css-loader": "^6.11.0",
+    "css-loader": "^7.1.2",
     "file-loader": "^6.2.0",
     "less": "^4.2.0",
     "less-loader": "^12.2.0",
@@ -95,7 +95,7 @@
     "style-loader": "^3.2.1",
     "typescript": "~5.4.5",
     "url-loader": "^4.1.1",
-    "webpack": "^5.95.0",
+    "webpack": "^5.98.0",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.15.2"
diff --git a/packages/fluent/package.json b/packages/fluent/package.json
@@ -73,7 +73,7 @@
     "@fluentui/font-icons-mdl2": "^8.4.2",
     "@fluentui/react": "^8.1.0",
     "@fluentui/react-icons": "^2.0.175",
-    "react": "^16.8.4 || ^17.0.1 || ^18.0.0",
-    "react-dom": "^16.8.4 || ^17.0.1 || ^18.0.0"
+    "react": "^16.8.4 || ^17.0.1 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^16.8.4 || ^17.0.1 || ^18.0.0 || ^19.0.0"
   }
 }
diff --git a/packages/material/package.json b/packages/material/package.json
@@ -82,7 +82,7 @@
     "@material-ui/icons": "^4.0.0",
     "@material-ui/lab": "^4.0.0-alpha.57",
     "@material-ui/pickers": "^3.2.10",
-    "react": "^16.8.4 || ^17.0.1 || ^18.0.0",
-    "react-dom": "^16.8.4 || ^17.0.1 || ^18.0.0"
+    "react": "^16.8.4 || ^17.0.1 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^16.8.4 || ^17.0.1 || ^18.0.0 || ^19.0.0"
   }
 }
diff --git a/packages/mui/package.json b/packages/mui/package.json
@@ -84,7 +84,7 @@
     "@mui/icons-material": "^5.2.4 || ^6.0.0",
     "@mui/material": "^5.2.4 || ^6.0.0",
     "@mui/x-date-pickers": "^5.0.0-beta.2 || ^6.0.0 || ^7.0.0",
-    "react": "^16.8.4 || ^17.0.1 || ^18.0.0",
-    "react-dom": "^16.8.4 || ^17.0.1 || ^18.0.0"
+    "react": "^16.8.4 || ^17.0.1 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^16.8.4 || ^17.0.1 || ^18.0.0 || ^19.0.0"
   }
 }
diff --git a/packages/mui/styles/fixes.scss b/packages/mui/styles/fixes.scss
@@ -1,3 +1,5 @@
+$custom-select-option-color: lightcoral !default;
+
 .query-builder {
   .MuiIconButton-sizeSmall {
     padding: 3px; // smaller button
diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json
@@ -45,20 +45,20 @@
     "@mui/x-date-pickers": "^7.23.6",
     "@react-awesome-query-builder/antd": "workspace:^",
     "@react-awesome-query-builder/mui": "workspace:^",
-    "antd": "^5.23.1",
+    "antd": "^5.24.5",
     "lodash": "^4.17.21",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.24.5",
     "@types/lodash": "^4.14.170",
-    "@types/react": "^18.3.2",
-    "@types/react-dom": "^18.3.0",
-    "@vitejs/plugin-react": "^4.2.1",
+    "@types/react": "^19.0.12",
+    "@types/react-dom": "^19.0.4",
+    "@vitejs/plugin-react": "^4.3.4",
     "sass": "^1.77.2",
     "typescript": "~5.4.5",
-    "vite": "^5.2.14"
+    "vite": "^5.4.15"
   },
   "readme": "README.md"
 }
diff --git a/packages/sandbox/src/demo/config.tsx b/packages/sandbox/src/demo/config.tsx
@@ -89,8 +89,8 @@ export function createConfig(InitialConfig: BasicConfig): Config {
         max: 100,
         step: 1,
         marks: {
-          0: <strong>0%</strong>,
-          100: <strong>100%</strong>
+          0: "0%", //<strong>0%</strong>,
+          100: "100%" //<strong>100%</strong>
         },
       },
       //overrides
diff --git a/packages/sandbox_next/package.json b/packages/sandbox_next/package.json
@@ -65,10 +65,10 @@
     "@types/react-dom": "^18.3.0",
     "babel-loader": "^8.2.2",
     "babel-plugin-import": "^1.13.3",
-    "next": "^14.2.23",
+    "next": "^14.2.26",
     "sass": "^1.77.2",
     "typescript": "~5.4.5",
-    "webpack": "^5.95.0"
+    "webpack": "^5.98.0"
   },
   "readme": "README.md"
 }
diff --git a/packages/sandbox_simple/package.json b/packages/sandbox_simple/package.json
@@ -40,9 +40,9 @@
     "react-dom": "^16.14.0"
   },
   "devDependencies": {
-    "@vitejs/plugin-react": "^4.2.1",
+    "@vitejs/plugin-react": "^4.3.4",
     "sass": "^1.77.2",
-    "vite": "^5.2.14"
+    "vite": "^5.4.15"
   },
   "readme": "README.md"
 }
diff --git a/packages/tests/package.json b/packages/tests/package.json
@@ -49,7 +49,7 @@
     "@react-awesome-query-builder/mui": "workspace:^",
     "@react-awesome-query-builder/sql": "workspace:^",
     "@react-awesome-query-builder/ui": "workspace:^",
-    "antd": "^5.23.1",
+    "antd": "^5.24.5",
     "bootstrap": "^5.3.3",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
@@ -94,12 +94,12 @@
     "karma-webpack": "^5.0.1",
     "less": "^4.2.0",
     "less-loader": "^12.2.0",
-    "mocha": "^10.4.0",
+    "mocha": "^10.8.2",
     "puppeteer": "^22.9.0",
     "sass": "^1.77.2",
     "sass-loader": "^12.1.0",
     "sinon": "^15.2.0",
     "style-loader": "^3.2.1",
-    "webpack": "^5.95.0"
+    "webpack": "^5.98.0"
   }
 }
diff --git a/packages/tests/specs/QueryWithOperators.test.js b/packages/tests/specs/QueryWithOperators.test.js
@@ -2,7 +2,6 @@ import * as configs from "../support/configs";
 import * as inits from "../support/inits";
 import { export_checks } from "../support/utils";
 import { Utils } from "@react-awesome-query-builder/core";
-import { SqlUtils } from "@react-awesome-query-builder/sql";
 import { BasicConfig } from "@react-awesome-query-builder/ui";
 import { expect } from "chai";
 
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -89,7 +89,7 @@
     "sass": "^1.77.2"
   },
   "peerDependencies": {
-    "react": "^16.8.4 || ^17.0.1 || ^18.0.0",
-    "react-dom": "^16.8.4 || ^17.0.1 || ^18.0.0"
+    "react": "^16.8.4 || ^17.0.1 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^16.8.4 || ^17.0.1 || ^18.0.0 || ^19.0.0"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+$custom-select-option-color: lightcoral !default;`
	`2`	`+`
`1`	`3`	`/* don't trigger tooltips during drag-n-drop */`
`2`	`4`	`body.qb-dragging {`
`3`	`5`	`/* v4 */`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,8 @@`
`77`	`77`	`"@fortawesome/free-solid-svg-icons": "^5.15.4 \|\| ^6.0.0",`
`78`	`78`	`"@fortawesome/react-fontawesome": ">=0.1.16 <1.0",`
`79`	`79`	`"bootstrap": "^5.1.3",`
`80`		`- "react": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0",`
`81`		`- "react-dom": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0",`
	`80`	`+ "react": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0 \|\| ^19.0.0",`
	`81`	`+ "react-dom": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0 \|\| ^19.0.0",`
`82`	`82`	`"reactstrap": "^9.0.0"`
`83`	`83`	`}`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@`
`73`	`73`	`"@fluentui/font-icons-mdl2": "^8.4.2",`
`74`	`74`	`"@fluentui/react": "^8.1.0",`
`75`	`75`	`"@fluentui/react-icons": "^2.0.175",`
`76`		`- "react": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0",`
`77`		`- "react-dom": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0"`
	`76`	`+ "react": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0 \|\| ^19.0.0",`
	`77`	`+ "react-dom": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0 \|\| ^19.0.0"`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@`
`82`	`82`	`"@material-ui/icons": "^4.0.0",`
`83`	`83`	`"@material-ui/lab": "^4.0.0-alpha.57",`
`84`	`84`	`"@material-ui/pickers": "^3.2.10",`
`85`		`- "react": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0",`
`86`		`- "react-dom": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0"`
	`85`	`+ "react": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0 \|\| ^19.0.0",`
	`86`	`+ "react-dom": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0 \|\| ^19.0.0"`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@`
`84`	`84`	`"@mui/icons-material": "^5.2.4 \|\| ^6.0.0",`
`85`	`85`	`"@mui/material": "^5.2.4 \|\| ^6.0.0",`
`86`	`86`	`"@mui/x-date-pickers": "^5.0.0-beta.2 \|\| ^6.0.0 \|\| ^7.0.0",`
`87`		`- "react": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0",`
`88`		`- "react-dom": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0"`
	`87`	`+ "react": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0 \|\| ^19.0.0",`
	`88`	`+ "react-dom": "^16.8.4 \|\| ^17.0.1 \|\| ^18.0.0 \|\| ^19.0.0"`
`89`	`89`	`}`
`90`	`90`	`}`