Skip to content

Commit 1e5abdf

Browse files
authored
Merge pull request #97 from headwirecom/feature/remove-redux
Upgrade jsonforms and remove redux from spectrum package
2 parents 381aa26 + 62a2f10 commit 1e5abdf

20 files changed

+1766
-2828
lines changed

package-lock.json

Lines changed: 429 additions & 173 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/example/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
"private": true,
55
"dependencies": {
66
"@adobe/react-spectrum": "^3.8.0",
7-
"@jsonforms/core": "2.4.1",
8-
"@jsonforms/examples": "2.4.1",
9-
"@jsonforms/react": "2.4.1",
7+
"@jsonforms/core": "^2.5.0",
8+
"@jsonforms/examples": "^2.5.0",
9+
"@jsonforms/react": "^2.5.0",
1010
"@react-spectrum/table": "^3.0.0-alpha.9",
1111
"@react-spectrum/tabs": "^3.0.0-alpha.3",
1212
"@spectrum-icons/workflow": "^3.2.0",
1313
"@types/react-router-dom": "^5.1.6",
14+
"@types/react-redux": "^7.1.9",
1415
"codemirror": "^5.58.3",
1516
"lodash": "^4.17.15",
1617
"react": "^16.12.0",

packages/example/src/App.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
*/
2828

2929
import React, { useCallback, useEffect, useRef } from 'react';
30-
import { JsonFormsDispatch, JsonFormsReduxContext } from '@jsonforms/react';
30+
import { JsonFormsDispatch } from '@jsonforms/react';
31+
import { JsonFormsReduxContext } from '@jsonforms/react/lib/redux';
3132
import { useParams, useHistory } from 'react-router-dom';
3233
import { Heading, Item, Content, View } from '@adobe/react-spectrum';
3334
import { Tabs } from '@react-spectrum/tabs';

packages/example/src/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import {
4242
Actions,
4343
createAjv,
4444
JsonFormsCellRendererRegistryEntry,
45-
jsonformsReducer,
45+
jsonFormsReducerConfig,
4646
JsonFormsRendererRegistryEntry,
4747
RankedTester,
4848
} from '@jsonforms/core';
@@ -77,7 +77,7 @@ const setupStore = (
7777
renderers: JsonFormsRendererRegistryEntry[]
7878
) => {
7979
const reducer = combineReducers({
80-
jsonforms: jsonformsReducer(),
80+
jsonforms: combineReducers(jsonFormsReducerConfig),
8181
examples: exampleReducer,
8282
});
8383
const store = createStore(reducer, {

packages/spectrum/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@headwire/jsonforms-react-spectrum-renderers",
3-
"version": "0.0.1-beta.3",
3+
"version": "0.0.1-beta.4",
44
"description": "React Spectrum Renderer Set for JSONForms",
55
"repository": "https://github.com/headwirecom/jsonforms-react-spectrum-renderers",
66
"bugs": "https://github.com/headwirecom/jsonforms-react-spectrum-renderers/issues",
@@ -48,8 +48,8 @@
4848
},
4949
"peerDependencies": {
5050
"@adobe/react-spectrum": "^3.7.0",
51-
"@jsonforms/core": "2.4.1",
52-
"@jsonforms/react": "2.4.1",
51+
"@jsonforms/core": "^2.5.0",
52+
"@jsonforms/react": "^2.5.0",
5353
"@react-spectrum/table": "^3.0.0-alpha.9",
5454
"@react-spectrum/tabs": "^3.0.0-alpha.3",
5555
"@spectrum-icons/workflow": "^3.2.0",
@@ -65,7 +65,6 @@
6565
"@types/enzyme": "^3.10.3",
6666
"@types/enzyme-adapter-react-16": "^1.0.5",
6767
"@types/react-dom": "^16.8.0",
68-
"@types/react-redux": "^7.1.9",
6968
"copy-webpack-plugin": "^5.0.5",
7069
"enzyme": "^3.10.0",
7170
"enzyme-adapter-react-16": "^1.15.1",

0 commit comments

Comments
 (0)