Skip to content

Commit 40f3b1b

Browse files
ukrbublikukrbublik
authored
Bump 6.5.2 (#1052)
* 6.5.2 * use mui 5 for demo_switch
1 parent beccd4b commit 40f3b1b

File tree

18 files changed

+188
-850
lines changed

18 files changed

+188
-850
lines changed

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
"./packages/*"
55
],
66
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
7-
"version": "6.5.1"
7+
"version": "6.5.2"
88
}

‎package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,32 +59,32 @@
5959
],
6060
"scripts": {
6161
"build": "pnpm run build-libs && pnpm run build-examples",
62-
"build-libs": "pnpm --filter @react-awesome-query-builder/examples^... run build",
6362
"build-examples": "pnpm --filter !@react-awesome-query-builder/examples^... run build",
64-
"test": "pnpm --filter @react-awesome-query-builder/tests run test",
65-
"test-dev": "pnpm --filter @react-awesome-query-builder/tests run test-dev",
66-
"test-debug": "pnpm --filter @react-awesome-query-builder/tests run test-debug",
63+
"build-libs": "pnpm --filter @react-awesome-query-builder/examples^... run build",
6764
"check-hot": "pnpm -r --parallel --aggregate-output --reporter=append-only check-hot",
6865
"clean": "sh ./scripts/clean.sh",
66+
"examples": "pnpm --filter @react-awesome-query-builder/examples run start",
6967
"lint": "pnpm -r --parallel --aggregate-output --reporter=append-only run lint",
7068
"lint-fix": "pnpm -r --parallel --aggregate-output --reporter=append-only run lint-fix",
71-
"examples": "pnpm --filter @react-awesome-query-builder/examples run start",
69+
"resmoke": "pnpm run clean && pnpm i && pnpm run smoke",
70+
"sandbox": "pnpm run sandbox-ts",
7271
"sandbox-js": "pnpm --filter @react-awesome-query-builder/sandbox-simple run start",
73-
"sandbox-ts": "pnpm --filter @react-awesome-query-builder/sandbox run start",
7472
"sandbox-next": "pnpm --filter @react-awesome-query-builder/sandbox-next run start",
75-
"sandbox": "pnpm run sandbox-ts",
73+
"sandbox-ts": "pnpm --filter @react-awesome-query-builder/sandbox run start",
74+
"smoke": "pnpm run lint && pnpm run test && pnpm run build && pnpm run check-hot",
7675
"start": "pnpm run examples",
77-
"resmoke": "pnpm run clean && pnpm i && pnpm run smoke",
78-
"smoke": "pnpm run lint && pnpm run test && pnpm run build && pnpm run check-hot"
76+
"test": "pnpm --filter @react-awesome-query-builder/tests run test",
77+
"test-debug": "pnpm --filter @react-awesome-query-builder/tests run test-debug",
78+
"test-dev": "pnpm --filter @react-awesome-query-builder/tests run test-dev"
7979
},
8080
"devDependencies": {
8181
"@babel/cli": "^7.24.5",
8282
"@babel/core": "^7.24.5",
8383
"@babel/eslint-parser": "^7.24.5",
8484
"@babel/plugin-transform-class-properties": "^7.24.1",
85+
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
8586
"@babel/plugin-transform-private-methods": "^7.24.1",
8687
"@babel/plugin-transform-private-property-in-object": "^7.24.5",
87-
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
8888
"@babel/plugin-transform-runtime": "^7.24.3",
8989
"@babel/preset-env": "^7.24.5",
9090
"@babel/preset-react": "^7.24.1",
@@ -106,20 +106,20 @@
106106
},
107107
"pnpm": {
108108
"allowedDeprecatedVersions": {
109-
"@material-ui/lab": "4.0.0-alpha.61",
110109
"@material-ui/core": "*",
111-
"@material-ui/pickers": "*",
112110
"@material-ui/icons": "*",
111+
"@material-ui/lab": "4.0.0-alpha.61",
112+
"@material-ui/pickers": "*",
113113
"@material-ui/styles": "*"
114114
},
115115
"overrides": {
116116
"csstype@3.1.1": "^3.1.3",
117117
"ejs@3.1.9": "^3.1.10",
118+
"express@4.18.2": "^4.19.2",
118119
"follow-redirects@1.15.2": "^1.15.6",
119120
"ip@2.0.0": "^2.0.1",
120-
"postcss@8.4.27": "^8.4.31",
121121
"postcss@8.4.14": "^8.4.31",
122-
"express@4.18.2": "^4.19.2"
122+
"postcss@8.4.27": "^8.4.31"
123123
}
124124
}
125125
}

‎packages/antd/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-awesome-query-builder/antd",
3-
"version": "6.5.1",
3+
"version": "6.5.2",
44
"description": "User-friendly query builder for React. AntDesign widgets",
55
"keywords": [
66
"query-builder",
@@ -57,9 +57,9 @@
5757
"@babel/cli": "^7.24.5",
5858
"@babel/core": "^7.24.5",
5959
"@babel/plugin-transform-class-properties": "^7.24.1",
60+
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
6061
"@babel/plugin-transform-private-methods": "^7.24.1",
6162
"@babel/plugin-transform-private-property-in-object": "^7.24.5",
62-
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
6363
"@babel/plugin-transform-runtime": "^7.24.3",
6464
"@babel/preset-env": "^7.24.5",
6565
"@babel/preset-react": "^7.24.1",

‎packages/bootstrap/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-awesome-query-builder/bootstrap",
3-
"version": "6.5.1",
3+
"version": "6.5.2",
44
"description": "User-friendly query builder for React. Bootstrap widgets",
55
"keywords": [
66
"query-builder",
@@ -52,9 +52,9 @@
5252
"@babel/cli": "^7.24.5",
5353
"@babel/core": "^7.24.5",
5454
"@babel/plugin-transform-class-properties": "^7.24.1",
55+
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
5556
"@babel/plugin-transform-private-methods": "^7.24.1",
5657
"@babel/plugin-transform-private-property-in-object": "^7.24.5",
57-
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
5858
"@babel/plugin-transform-runtime": "^7.24.3",
5959
"@babel/preset-env": "^7.24.5",
6060
"@babel/preset-react": "^7.24.1",

‎packages/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-awesome-query-builder/core",
3-
"version": "6.5.1",
3+
"version": "6.5.2",
44
"description": "User-friendly query builder for React. Core",
55
"keywords": [
66
"query-builder",
@@ -58,9 +58,9 @@
5858
"@babel/cli": "^7.24.5",
5959
"@babel/core": "^7.24.5",
6060
"@babel/plugin-transform-class-properties": "^7.24.1",
61+
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
6162
"@babel/plugin-transform-private-methods": "^7.24.1",
6263
"@babel/plugin-transform-private-property-in-object": "^7.24.5",
63-
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
6464
"@babel/plugin-transform-runtime": "^7.24.3",
6565
"@babel/preset-env": "^7.24.5",
6666
"@babel/preset-react": "^7.24.1",

‎packages/examples/demo/index.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ if (nonFixedErrors.length) {
5656
console.warn("Validation errors on load:", nonFixedErrors);
5757
}
5858

59-
// Trick to hot-load new config when you edit `config.tsx`
59+
// Trick for HMR
6060
const updateEvent = new CustomEvent<CustomEventDetail>("update", { detail: {
6161
config: loadedConfig,
6262
_initTree: initTree,
@@ -124,19 +124,19 @@ const DemoQueryBuilder: React.FC = () => {
124124
});
125125

126126
useEffect(() => {
127-
window.addEventListener("update", onConfigChanged);
127+
window.addEventListener("update", onHotUpdate);
128128
return () => {
129-
window.removeEventListener("update", onConfigChanged);
129+
window.removeEventListener("update", onHotUpdate);
130130
};
131131
});
132132

133-
const onConfigChanged = (e: Event) => {
133+
const onHotUpdate = (e: Event) => {
134134
const {detail: {config, _initTree, _initValue}} = e as CustomEvent<CustomEventDetail>;
135-
console.log("Updating config...");
136-
setState({
135+
console.log("Updating...");
136+
setState(state => ({
137137
...state,
138138
config,
139-
});
139+
}));
140140
initTree = _initTree;
141141
initValue = _initValue;
142142
};

‎packages/examples/demo_switch/config.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import {
33
Utils as QbUtils,
44
Widgets, Fields, Config, Settings, SpelConcatPart, WidgetProps
55
} from "@react-awesome-query-builder/ui";
6-
import { MaterialConfig } from "@react-awesome-query-builder/material";
6+
import { MuiConfig } from "@react-awesome-query-builder/mui";
77
import ReactSelect from "./select";
88

99
export default (): Config => {
10-
const InitialConfig = MaterialConfig;
10+
const InitialConfig = MuiConfig;
1111

1212
const widgets: Widgets = {
1313
...InitialConfig.widgets,

‎packages/examples/demo_switch/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
} from "@react-awesome-query-builder/ui";
99
import { LazyStyleModule } from "../utils";
1010
// @ts-ignore
11-
import styles from "@react-awesome-query-builder/material/css/styles.scss";
11+
import styles from "@react-awesome-query-builder/mui/css/styles.scss";
1212
import getConfig from "./config";
1313

1414
(styles as LazyStyleModule).use();

‎packages/examples/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-awesome-query-builder/examples",
3-
"version": "6.5.1",
3+
"version": "6.5.2",
44
"description": "Local hot-reloadable demo for @react-awesome-query-builder",
55
"repository": {
66
"type": "git",
@@ -15,11 +15,11 @@
1515
"build": "cross-env NODE_ENV=production CSS=0 webpack",
1616
"check-hot": "node ./scripts/check-hot.js",
1717
"eslint": "eslint --ext .jsx --ext .js --ext .tsx --ext .ts .",
18+
"preinstall": "node ./scripts/patch-versions.js",
1819
"lint": "npm run eslint && npm run tsc",
1920
"lint-fix": "eslint --ext .jsx --ext .js --ext .tsx --ext .ts --fix .",
2021
"start": "webpack serve",
21-
"tsc": "tsc -p . --noEmit",
22-
"preinstall": "node ./scripts/patch-versions.js"
22+
"tsc": "tsc -p . --noEmit"
2323
},
2424
"dependencies": {
2525
"@ant-design/icons": "^5.3.7",
@@ -65,9 +65,9 @@
6565
"@babel/cli": "^7.24.5",
6666
"@babel/core": "^7.24.5",
6767
"@babel/plugin-transform-class-properties": "^7.24.1",
68+
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
6869
"@babel/plugin-transform-private-methods": "^7.24.1",
6970
"@babel/plugin-transform-private-property-in-object": "^7.24.5",
70-
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
7171
"@babel/plugin-transform-runtime": "^7.24.3",
7272
"@babel/preset-env": "^7.24.5",
7373
"@babel/preset-react": "^7.24.1",

‎packages/fluent/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-awesome-query-builder/fluent",
3-
"version": "6.5.1",
3+
"version": "6.5.2",
44
"description": "User-friendly query builder for React. Fluent 8 widgets",
55
"keywords": [
66
"query-builder",
@@ -52,9 +52,9 @@
5252
"@babel/cli": "^7.24.5",
5353
"@babel/core": "^7.24.5",
5454
"@babel/plugin-transform-class-properties": "^7.24.1",
55+
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
5556
"@babel/plugin-transform-private-methods": "^7.24.1",
5657
"@babel/plugin-transform-private-property-in-object": "^7.24.5",
57-
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
5858
"@babel/plugin-transform-runtime": "^7.24.3",
5959
"@babel/preset-env": "^7.24.5",
6060
"@babel/preset-react": "^7.24.1",

‎packages/material/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-awesome-query-builder/material",
3-
"version": "6.5.1",
3+
"version": "6.5.2",
44
"description": "User-friendly query builder for React. Material-UI 4 widgets",
55
"keywords": [
66
"query-builder",
@@ -57,9 +57,9 @@
5757
"@babel/cli": "^7.24.5",
5858
"@babel/core": "^7.24.5",
5959
"@babel/plugin-transform-class-properties": "^7.24.1",
60+
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
6061
"@babel/plugin-transform-private-methods": "^7.24.1",
6162
"@babel/plugin-transform-private-property-in-object": "^7.24.5",
62-
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
6363
"@babel/plugin-transform-runtime": "^7.24.3",
6464
"@babel/preset-env": "^7.24.5",
6565
"@babel/preset-react": "^7.24.1",

‎packages/mui/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-awesome-query-builder/mui",
3-
"version": "6.5.1",
3+
"version": "6.5.2",
44
"description": "User-friendly query builder for React. MUI 5 widgets",
55
"keywords": [
66
"query-builder",
@@ -56,9 +56,9 @@
5656
"@babel/cli": "^7.24.5",
5757
"@babel/core": "^7.24.5",
5858
"@babel/plugin-transform-class-properties": "^7.24.1",
59+
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
5960
"@babel/plugin-transform-private-methods": "^7.24.1",
6061
"@babel/plugin-transform-private-property-in-object": "^7.24.5",
61-
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
6262
"@babel/plugin-transform-runtime": "^7.24.3",
6363
"@babel/preset-env": "^7.24.5",
6464
"@babel/preset-react": "^7.24.1",

‎packages/sandbox/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-awesome-query-builder/sandbox",
3-
"version": "6.5.1",
3+
"version": "6.5.2",
44
"description": "Demo for @react-awesome-query-builder",
55
"repository": {
66
"type": "git",
@@ -13,12 +13,12 @@
1313
"scripts": {
1414
"build": "tsc && vite build --mode dev --debug",
1515
"eslint": "eslint --ext .jsx --ext .js --ext .tsx --ext .ts ./src/",
16+
"preinstall": "node ./scripts/patch-versions.js",
1617
"lint": "npm run eslint && npm run tsc",
1718
"lint-fix": "eslint --ext .jsx --ext .js --ext .tsx --ext .ts --fix ./src/",
1819
"preview": "vite preview",
1920
"start": "vite",
20-
"tsc": "tsc -p . --noEmit",
21-
"preinstall": "node ./scripts/patch-versions.js"
21+
"tsc": "tsc -p . --noEmit"
2222
},
2323
"browserslist": {
2424
"production": [

‎packages/sandbox_next/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-awesome-query-builder/sandbox-next",
3-
"version": "6.5.1",
3+
"version": "6.5.2",
44
"description": "Demo for @react-awesome-query-builder",
55
"repository": {
66
"type": "git",
@@ -13,12 +13,12 @@
1313
"scripts": {
1414
"build": "tsc && next build",
1515
"eslint": "eslint --ext .jsx --ext .js --ext .tsx --ext .ts ./pages/ ./components/ ./lib/",
16+
"preinstall": "node ./scripts/patch-versions.js",
1617
"lint": "npm run eslint && npm run tsc && next lint",
1718
"lint-fix": "eslint --ext .jsx --ext .js --ext .tsx --ext .ts --fix ./pages/ ./components/ ./lib/",
18-
"tsc": "tsc -p . --noEmit",
19-
"preinstall": "node ./scripts/patch-versions.js",
19+
"preview": "PORT=3002 next start",
2020
"start": "PORT=3002 next dev",
21-
"preview": "PORT=3002 next start"
21+
"tsc": "tsc -p . --noEmit"
2222
},
2323
"browserslist": {
2424
"production": [
@@ -45,8 +45,8 @@
4545
"@upstash/redis": "^1.31.1",
4646
"iron-session": "^6.3.1",
4747
"jsonfile": "^6.1.0",
48-
"nanoid": "^5.0.7",
4948
"lodash": "^4.17.21",
49+
"nanoid": "^5.0.7",
5050
"react": "^18.3.1",
5151
"react-dom": "^18.3.1",
5252
"serialize-javascript": "^6.0.2"

‎packages/sandbox_simple/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-awesome-query-builder/sandbox-simple",
3-
"version": "6.5.1",
3+
"version": "6.5.2",
44
"description": "Simple demo for @react-awesome-query-builder",
55
"repository": {
66
"type": "git",
@@ -13,11 +13,11 @@
1313
"scripts": {
1414
"build": "vite build --mode dev --debug",
1515
"eslint": "eslint --ext .jsx --ext .js ./src/",
16+
"preinstall": "node ./scripts/patch-versions.js",
1617
"lint": "npm run eslint",
1718
"lint-fix": "eslint --ext .jsx --ext .js --fix ./src/",
1819
"preview": "vite preview",
19-
"start": "vite",
20-
"preinstall": "node ./scripts/patch-versions.js"
20+
"start": "vite"
2121
},
2222
"browserslist": {
2323
"production": [

‎packages/tests/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-awesome-query-builder/tests",
3-
"version": "6.5.1",
3+
"version": "6.5.2",
44
"private": true,
55
"description": "Tests for @react-awesome-query-builder",
66
"repository": {
@@ -17,8 +17,8 @@
1717
"lint": "npm run eslint && npm run tsc",
1818
"lint-fix": "eslint --ext .jsx --ext .js --ext .tsx --ext .ts --fix ./specs/ ./support/",
1919
"test": "karma start ./karma.conf.js",
20-
"test-dev": "TEST_WATCH=1 karma start ./karma.conf.js",
2120
"test-debug": "TEST_WATCH=1 TEST_DEBUG=1 karma start ./karma.conf.js --debug",
21+
"test-dev": "TEST_WATCH=1 karma start ./karma.conf.js",
2222
"tsc": "tsc -p . --noEmit"
2323
},
2424
"dependencies": {

‎packages/ui/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-awesome-query-builder/ui",
3-
"version": "6.5.1",
3+
"version": "6.5.2",
44
"description": "User-friendly query builder for React. Core React UI",
55
"keywords": [
66
"query-builder",
@@ -67,9 +67,9 @@
6767
"@babel/cli": "^7.24.5",
6868
"@babel/core": "^7.24.5",
6969
"@babel/plugin-transform-class-properties": "^7.24.1",
70+
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
7071
"@babel/plugin-transform-private-methods": "^7.24.1",
7172
"@babel/plugin-transform-private-property-in-object": "^7.24.5",
72-
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
7373
"@babel/plugin-transform-runtime": "^7.24.3",
7474
"@babel/preset-env": "^7.24.5",
7575
"@babel/preset-react": "^7.24.1",

0 commit comments

Comments
 (0)