Skip to content

Commit 8b56ab7

Browse files
authored
Merge pull request #1171 from rvsia/updateBuilder
Update form builder to MUI5
2 parents 6366f6b + c0f49c5 commit 8b56ab7

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

packages/react-renderer-demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
},
2929
"dependencies": {
3030
"@actions/github": "^5.0.0",
31-
"@data-driven-forms/form-builder": "0.0.12-rc1",
31+
"@data-driven-forms/form-builder": "0.0.13-rc1",
3232
"@data-driven-forms/mui-component-mapper": "*",
3333
"@data-driven-forms/react-form-renderer": "*",
3434
"@emotion/react": "^11.4.1",

packages/react-renderer-demo/src/pages/live-editor.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* eslint no-console: "off" */
2-
/*
32
import React, { useState } from 'react';
43
import componentTypes from '@data-driven-forms/react-form-renderer/component-types';
54
import FormBuilder from '@data-driven-forms/form-builder/form-builder';
@@ -220,8 +219,4 @@ const LiveEditor = () => {
220219
);
221220
};
222221

223-
*/
224-
225-
const LiveEditor = () => 'TODO: update editor to mui v5';
226-
227222
export default LiveEditor;

yarn.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,17 +1255,17 @@
12551255
enabled "2.0.x"
12561256
kuler "^2.0.0"
12571257

1258-
"@data-driven-forms/form-builder@0.0.12-rc1":
1259-
version "0.0.12-rc1"
1260-
resolved "https://registry.yarnpkg.com/@data-driven-forms/form-builder/-/form-builder-0.0.12-rc1.tgz#ce9af72f9c148dec42e88b9de2e80721a77b64b4"
1261-
integrity sha512-PSeZZZR/VZGK12to0gYp1Ozoge0+FZJywPVlA92SiuECpwEYKdU3fx3PsSUpc/5Yia/ZyWfTzAuAygyUeRy5kQ==
1258+
"@data-driven-forms/form-builder@0.0.13-rc1":
1259+
version "0.0.13-rc1"
1260+
resolved "https://registry.yarnpkg.com/@data-driven-forms/form-builder/-/form-builder-0.0.13-rc1.tgz#e4a391b0efc2ac8277acac7f8d5e5e7deba60c90"
1261+
integrity sha512-+jkk+NWAfdZ9ZKLlge7W96jxUDxgXNrgRA492yDZ/dJADQ9kf07C1bcZG0CXJHzOHVymGRAEhou0IPs8IdnTIg==
12621262
dependencies:
12631263
clsx "^1.1.1"
1264-
lodash "^4.17.20"
1264+
lodash "^4.17.21"
12651265
prop-types "^15.7.2"
1266-
react-beautiful-dnd "^13.0.0"
1267-
react-redux "^7.2.1"
1268-
redux "^4.0.5"
1266+
react-beautiful-dnd "^13.1.0"
1267+
react-redux "^7.2.6"
1268+
redux "^4.1.2"
12691269

12701270
"@date-io/core@^2.11.0":
12711271
version "2.11.0"
@@ -16930,7 +16930,7 @@ re2@^1.15.8:
1693016930
nan "^2.14.2"
1693116931
node-gyp "^8.0.0"
1693216932

16933-
react-beautiful-dnd@^13.0.0:
16933+
react-beautiful-dnd@^13.1.0:
1693416934
version "13.1.0"
1693516935
resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.0.tgz#ec97c81093593526454b0de69852ae433783844d"
1693616936
integrity sha512-aGvblPZTJowOWUNiwd6tNfEpgkX5OxmpqxHKNW/4VmvZTNTbeiq7bA3bn5T+QSF2uibXB0D1DmJsb1aC/+3cUA==
@@ -17066,7 +17066,7 @@ react-popper@^2.2.4:
1706617066
react-fast-compare "^3.0.1"
1706717067
warning "^4.0.2"
1706817068

17069-
react-redux@^7.2.0, react-redux@^7.2.1:
17069+
react-redux@^7.2.0, react-redux@^7.2.6:
1707017070
version "7.2.6"
1707117071
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.6.tgz#49633a24fe552b5f9caf58feb8a138936ddfe9aa"
1707217072
integrity sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==
@@ -17404,7 +17404,7 @@ reduce@^1.0.1:
1740417404
dependencies:
1740517405
object-keys "^1.1.0"
1740617406

17407-
redux@^4.0.0, redux@^4.0.4, redux@^4.0.5:
17407+
redux@^4.0.0, redux@^4.0.4, redux@^4.1.2:
1740817408
version "4.1.2"
1740917409
resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.2.tgz#140f35426d99bb4729af760afcf79eaaac407104"
1741017410
integrity sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==

0 commit comments

Comments
 (0)