Bump 6.5.2 (#1052)

* 6.5.2 * use mui 5 for demo_switch
ukrbublik · May 22, 2024 · 40f3b1b · 40f3b1b
1 parent beccd4b
commit 40f3b1b
Show file tree

Hide file tree

Showing 18 changed files with 188 additions and 850 deletions.
diff --git a/lerna.json b/lerna.json
@@ -4,5 +4,5 @@
     "./packages/*"
   ],
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "6.5.1"
+  "version": "6.5.2"
 }
diff --git a/package.json b/package.json
@@ -59,32 +59,32 @@
   ],
   "scripts": {
     "build": "pnpm run build-libs && pnpm run build-examples",
-    "build-libs": "pnpm --filter @react-awesome-query-builder/examples^... run build",
     "build-examples": "pnpm --filter !@react-awesome-query-builder/examples^... run build",
-    "test": "pnpm --filter @react-awesome-query-builder/tests run test",
-    "test-dev": "pnpm --filter @react-awesome-query-builder/tests run test-dev",
-    "test-debug": "pnpm --filter @react-awesome-query-builder/tests run test-debug",
+    "build-libs": "pnpm --filter @react-awesome-query-builder/examples^... run build",
     "check-hot": "pnpm -r --parallel --aggregate-output --reporter=append-only check-hot",
     "clean": "sh ./scripts/clean.sh",
+    "examples": "pnpm --filter @react-awesome-query-builder/examples run start",
     "lint": "pnpm -r --parallel --aggregate-output --reporter=append-only run lint",
     "lint-fix": "pnpm -r --parallel --aggregate-output --reporter=append-only run lint-fix",
-    "examples": "pnpm --filter @react-awesome-query-builder/examples run start",
+    "resmoke": "pnpm run clean && pnpm i && pnpm run smoke",
+    "sandbox": "pnpm run sandbox-ts",
     "sandbox-js": "pnpm --filter @react-awesome-query-builder/sandbox-simple run start",
-    "sandbox-ts": "pnpm --filter @react-awesome-query-builder/sandbox run start",
     "sandbox-next": "pnpm --filter @react-awesome-query-builder/sandbox-next run start",
-    "sandbox": "pnpm run sandbox-ts",
+    "sandbox-ts": "pnpm --filter @react-awesome-query-builder/sandbox run start",
+    "smoke": "pnpm run lint && pnpm run test && pnpm run build && pnpm run check-hot",
     "start": "pnpm run examples",
-    "resmoke": "pnpm run clean && pnpm i && pnpm run smoke",
-    "smoke": "pnpm run lint && pnpm run test && pnpm run build && pnpm run check-hot"
+    "test": "pnpm --filter @react-awesome-query-builder/tests run test",
+    "test-debug": "pnpm --filter @react-awesome-query-builder/tests run test-debug",
+    "test-dev": "pnpm --filter @react-awesome-query-builder/tests run test-dev"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.5",
     "@babel/core": "^7.24.5",
     "@babel/eslint-parser": "^7.24.5",
     "@babel/plugin-transform-class-properties": "^7.24.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-private-methods": "^7.24.1",
     "@babel/plugin-transform-private-property-in-object": "^7.24.5",
-    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-runtime": "^7.24.3",
     "@babel/preset-env": "^7.24.5",
     "@babel/preset-react": "^7.24.1",
@@ -106,20 +106,20 @@
   },
   "pnpm": {
     "allowedDeprecatedVersions": {
-      "@material-ui/lab": "4.0.0-alpha.61",
       "@material-ui/core": "*",
-      "@material-ui/pickers": "*",
       "@material-ui/icons": "*",
+      "@material-ui/lab": "4.0.0-alpha.61",
+      "@material-ui/pickers": "*",
       "@material-ui/styles": "*"
     },
     "overrides": {
       "[email protected]": "^3.1.3",
       "[email protected]": "^3.1.10",
+      "[email protected]": "^4.19.2",
       "[email protected]": "^1.15.6",
       "[email protected]": "^2.0.1",
-      "[email protected]": "^8.4.31",
       "[email protected]": "^8.4.31",
-      "[email protected]": "^4.19.2"
+      "[email protected]": "^8.4.31"
     }
   }
 }
diff --git a/packages/antd/package.json b/packages/antd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/antd",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "User-friendly query builder for React. AntDesign widgets",
   "keywords": [
     "query-builder",
@@ -57,9 +57,9 @@
     "@babel/cli": "^7.24.5",
     "@babel/core": "^7.24.5",
     "@babel/plugin-transform-class-properties": "^7.24.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-private-methods": "^7.24.1",
     "@babel/plugin-transform-private-property-in-object": "^7.24.5",
-    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-runtime": "^7.24.3",
     "@babel/preset-env": "^7.24.5",
     "@babel/preset-react": "^7.24.1",

diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/bootstrap",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "User-friendly query builder for React. Bootstrap widgets",
   "keywords": [
     "query-builder",
@@ -52,9 +52,9 @@
     "@babel/cli": "^7.24.5",
     "@babel/core": "^7.24.5",
     "@babel/plugin-transform-class-properties": "^7.24.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-private-methods": "^7.24.1",
     "@babel/plugin-transform-private-property-in-object": "^7.24.5",
-    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-runtime": "^7.24.3",
     "@babel/preset-env": "^7.24.5",
     "@babel/preset-react": "^7.24.1",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/core",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "User-friendly query builder for React. Core",
   "keywords": [
     "query-builder",
@@ -58,9 +58,9 @@
     "@babel/cli": "^7.24.5",
     "@babel/core": "^7.24.5",
     "@babel/plugin-transform-class-properties": "^7.24.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-private-methods": "^7.24.1",
     "@babel/plugin-transform-private-property-in-object": "^7.24.5",
-    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-runtime": "^7.24.3",
     "@babel/preset-env": "^7.24.5",
     "@babel/preset-react": "^7.24.1",

diff --git a/packages/examples/demo/index.tsx b/packages/examples/demo/index.tsx
@@ -56,7 +56,7 @@ if (nonFixedErrors.length) {
   console.warn("Validation errors on load:", nonFixedErrors);
 }
 
-// Trick to hot-load new config when you edit `config.tsx`
+// Trick for HMR
 const updateEvent = new CustomEvent<CustomEventDetail>("update", { detail: {
   config: loadedConfig,
   _initTree: initTree,
@@ -124,19 +124,19 @@ const DemoQueryBuilder: React.FC = () => {
   });
 
   useEffect(() => {
-    window.addEventListener("update", onConfigChanged);
+    window.addEventListener("update", onHotUpdate);
     return () => {
-      window.removeEventListener("update", onConfigChanged);
+      window.removeEventListener("update", onHotUpdate);
     };
   });
 
-  const onConfigChanged = (e: Event) => {
+  const onHotUpdate = (e: Event) => {
     const {detail: {config, _initTree, _initValue}} = e as CustomEvent<CustomEventDetail>;
-    console.log("Updating config...");
-    setState({
+    console.log("Updating...");
+    setState(state => ({
       ...state,
       config,
-    });
+    }));
     initTree = _initTree;
     initValue = _initValue;
   };

diff --git a/packages/examples/demo_switch/config.tsx b/packages/examples/demo_switch/config.tsx
@@ -3,11 +3,11 @@ import {
   Utils as QbUtils, 
   Widgets, Fields, Config, Settings, SpelConcatPart, WidgetProps
 } from "@react-awesome-query-builder/ui";
-import { MaterialConfig } from "@react-awesome-query-builder/material";
+import { MuiConfig } from "@react-awesome-query-builder/mui";
 import ReactSelect from "./select";
 
 export default (): Config => {
-  const InitialConfig = MaterialConfig;
+  const InitialConfig = MuiConfig;
 
   const widgets: Widgets = {
     ...InitialConfig.widgets,

diff --git a/packages/examples/demo_switch/index.tsx b/packages/examples/demo_switch/index.tsx
@@ -8,7 +8,7 @@ import {
 } from "@react-awesome-query-builder/ui";
 import { LazyStyleModule } from "../utils";
 // @ts-ignore
-import styles from "@react-awesome-query-builder/material/css/styles.scss";
+import styles from "@react-awesome-query-builder/mui/css/styles.scss";
 import getConfig from "./config";
 
 (styles as LazyStyleModule).use();

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/examples",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "Local hot-reloadable demo for @react-awesome-query-builder",
   "repository": {
     "type": "git",
@@ -15,11 +15,11 @@
     "build": "cross-env NODE_ENV=production CSS=0 webpack",
     "check-hot": "node ./scripts/check-hot.js",
     "eslint": "eslint --ext .jsx --ext .js --ext .tsx --ext .ts .",
+    "preinstall": "node ./scripts/patch-versions.js",
     "lint": "npm run eslint && npm run tsc",
     "lint-fix": "eslint --ext .jsx --ext .js --ext .tsx --ext .ts --fix .",
     "start": "webpack serve",
-    "tsc": "tsc -p . --noEmit",
-    "preinstall": "node ./scripts/patch-versions.js"
+    "tsc": "tsc -p . --noEmit"
   },
   "dependencies": {
     "@ant-design/icons": "^5.3.7",
@@ -65,9 +65,9 @@
     "@babel/cli": "^7.24.5",
     "@babel/core": "^7.24.5",
     "@babel/plugin-transform-class-properties": "^7.24.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-private-methods": "^7.24.1",
     "@babel/plugin-transform-private-property-in-object": "^7.24.5",
-    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-runtime": "^7.24.3",
     "@babel/preset-env": "^7.24.5",
     "@babel/preset-react": "^7.24.1",

diff --git a/packages/fluent/package.json b/packages/fluent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/fluent",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "User-friendly query builder for React. Fluent 8 widgets",
   "keywords": [
     "query-builder",
@@ -52,9 +52,9 @@
     "@babel/cli": "^7.24.5",
     "@babel/core": "^7.24.5",
     "@babel/plugin-transform-class-properties": "^7.24.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-private-methods": "^7.24.1",
     "@babel/plugin-transform-private-property-in-object": "^7.24.5",
-    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-runtime": "^7.24.3",
     "@babel/preset-env": "^7.24.5",
     "@babel/preset-react": "^7.24.1",

diff --git a/packages/material/package.json b/packages/material/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/material",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "User-friendly query builder for React. Material-UI 4 widgets",
   "keywords": [
     "query-builder",
@@ -57,9 +57,9 @@
     "@babel/cli": "^7.24.5",
     "@babel/core": "^7.24.5",
     "@babel/plugin-transform-class-properties": "^7.24.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-private-methods": "^7.24.1",
     "@babel/plugin-transform-private-property-in-object": "^7.24.5",
-    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-runtime": "^7.24.3",
     "@babel/preset-env": "^7.24.5",
     "@babel/preset-react": "^7.24.1",

diff --git a/packages/mui/package.json b/packages/mui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/mui",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "User-friendly query builder for React. MUI 5 widgets",
   "keywords": [
     "query-builder",
@@ -56,9 +56,9 @@
     "@babel/cli": "^7.24.5",
     "@babel/core": "^7.24.5",
     "@babel/plugin-transform-class-properties": "^7.24.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-private-methods": "^7.24.1",
     "@babel/plugin-transform-private-property-in-object": "^7.24.5",
-    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-runtime": "^7.24.3",
     "@babel/preset-env": "^7.24.5",
     "@babel/preset-react": "^7.24.1",

diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/sandbox",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "Demo for @react-awesome-query-builder",
   "repository": {
     "type": "git",
@@ -13,12 +13,12 @@
   "scripts": {
     "build": "tsc && vite build --mode dev --debug",
     "eslint": "eslint --ext .jsx --ext .js --ext .tsx --ext .ts ./src/",
+    "preinstall": "node ./scripts/patch-versions.js",
     "lint": "npm run eslint && npm run tsc",
     "lint-fix": "eslint --ext .jsx --ext .js --ext .tsx --ext .ts --fix ./src/",
     "preview": "vite preview",
     "start": "vite",
-    "tsc": "tsc -p . --noEmit",
-    "preinstall": "node ./scripts/patch-versions.js"
+    "tsc": "tsc -p . --noEmit"
   },
   "browserslist": {
     "production": [

diff --git a/packages/sandbox_next/package.json b/packages/sandbox_next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/sandbox-next",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "Demo for @react-awesome-query-builder",
   "repository": {
     "type": "git",
@@ -13,12 +13,12 @@
   "scripts": {
     "build": "tsc && next build",
     "eslint": "eslint --ext .jsx --ext .js --ext .tsx --ext .ts ./pages/ ./components/ ./lib/",
+    "preinstall": "node ./scripts/patch-versions.js",
     "lint": "npm run eslint && npm run tsc && next lint",
     "lint-fix": "eslint --ext .jsx --ext .js --ext .tsx --ext .ts --fix ./pages/ ./components/ ./lib/",
-    "tsc": "tsc -p . --noEmit",
-    "preinstall": "node ./scripts/patch-versions.js",
+    "preview": "PORT=3002 next start",
     "start": "PORT=3002 next dev",
-    "preview": "PORT=3002 next start"
+    "tsc": "tsc -p . --noEmit"
   },
   "browserslist": {
     "production": [
@@ -45,8 +45,8 @@
     "@upstash/redis": "^1.31.1",
     "iron-session": "^6.3.1",
     "jsonfile": "^6.1.0",
-    "nanoid": "^5.0.7",
     "lodash": "^4.17.21",
+    "nanoid": "^5.0.7",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "serialize-javascript": "^6.0.2"

diff --git a/packages/sandbox_simple/package.json b/packages/sandbox_simple/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/sandbox-simple",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "Simple demo for @react-awesome-query-builder",
   "repository": {
     "type": "git",
@@ -13,11 +13,11 @@
   "scripts": {
     "build": "vite build --mode dev --debug",
     "eslint": "eslint --ext .jsx --ext .js ./src/",
+    "preinstall": "node ./scripts/patch-versions.js",
     "lint": "npm run eslint",
     "lint-fix": "eslint --ext .jsx --ext .js --fix ./src/",
     "preview": "vite preview",
-    "start": "vite",
-    "preinstall": "node ./scripts/patch-versions.js"
+    "start": "vite"
   },
   "browserslist": {
     "production": [

diff --git a/packages/tests/package.json b/packages/tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/tests",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "private": true,
   "description": "Tests for @react-awesome-query-builder",
   "repository": {
@@ -17,8 +17,8 @@
     "lint": "npm run eslint && npm run tsc",
     "lint-fix": "eslint --ext .jsx --ext .js --ext .tsx --ext .ts --fix  ./specs/ ./support/",
     "test": "karma start ./karma.conf.js",
-    "test-dev": "TEST_WATCH=1 karma start ./karma.conf.js",
     "test-debug": "TEST_WATCH=1 TEST_DEBUG=1 karma start ./karma.conf.js --debug",
+    "test-dev": "TEST_WATCH=1 karma start ./karma.conf.js",
     "tsc": "tsc -p . --noEmit"
   },
   "dependencies": {

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/ui",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "User-friendly query builder for React. Core React UI",
   "keywords": [
     "query-builder",
@@ -67,9 +67,9 @@
     "@babel/cli": "^7.24.5",
     "@babel/core": "^7.24.5",
     "@babel/plugin-transform-class-properties": "^7.24.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-private-methods": "^7.24.1",
     "@babel/plugin-transform-private-property-in-object": "^7.24.5",
-    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-runtime": "^7.24.3",
     "@babel/preset-env": "^7.24.5",
     "@babel/preset-react": "^7.24.1",