Merge pull request #97 from headwirecom/feature/remove-redux

Upgrade jsonforms and remove redux from spectrum package

Author: uudens

package-lock.json

@@ -4,13 +4,14 @@
   "private": true,
   "dependencies": {
     "@adobe/react-spectrum": "^3.8.0",
-    "@jsonforms/core": "2.4.1",
-    "@jsonforms/examples": "2.4.1",
-    "@jsonforms/react": "2.4.1",
+    "@jsonforms/core": "^2.5.0",
+    "@jsonforms/examples": "^2.5.0",
+    "@jsonforms/react": "^2.5.0",
     "@react-spectrum/table": "^3.0.0-alpha.9",
     "@react-spectrum/tabs": "^3.0.0-alpha.3",
     "@spectrum-icons/workflow": "^3.2.0",
     "@types/react-router-dom": "^5.1.6",
+    "@types/react-redux": "^7.1.9",
     "codemirror": "^5.58.3",
     "lodash": "^4.17.15",
     "react": "^16.12.0",

packages/example/package.json

@@ -27,7 +27,8 @@
 */
 
 import React, { useCallback, useEffect, useRef } from 'react';
-import { JsonFormsDispatch, JsonFormsReduxContext } from '@jsonforms/react';
+import { JsonFormsDispatch } from '@jsonforms/react';
+import { JsonFormsReduxContext } from '@jsonforms/react/lib/redux';
 import { useParams, useHistory } from 'react-router-dom';
 import { Heading, Item, Content, View } from '@adobe/react-spectrum';
 import { Tabs } from '@react-spectrum/tabs';

packages/example/src/App.tsx

@@ -42,7 +42,7 @@ import {
   Actions,
   createAjv,
   JsonFormsCellRendererRegistryEntry,
-  jsonformsReducer,
+  jsonFormsReducerConfig,
   JsonFormsRendererRegistryEntry,
   RankedTester,
 } from '@jsonforms/core';
@@ -77,7 +77,7 @@ const setupStore = (
   renderers: JsonFormsRendererRegistryEntry[]
 ) => {
   const reducer = combineReducers({
-    jsonforms: jsonformsReducer(),
+    jsonforms: combineReducers(jsonFormsReducerConfig),
     examples: exampleReducer,
   });
   const store = createStore(reducer, {

packages/example/src/index.tsx

@@ -1,6 +1,6 @@
 {
   "name": "@headwire/jsonforms-react-spectrum-renderers",
-  "version": "0.0.1-beta.3",
+  "version": "0.0.1-beta.4",
   "description": "React Spectrum Renderer Set for JSONForms",
   "repository": "https://github.com/headwirecom/jsonforms-react-spectrum-renderers",
   "bugs": "https://github.com/headwirecom/jsonforms-react-spectrum-renderers/issues",
@@ -48,8 +48,8 @@
   },
   "peerDependencies": {
     "@adobe/react-spectrum": "^3.7.0",
-    "@jsonforms/core": "2.4.1",
-    "@jsonforms/react": "2.4.1",
+    "@jsonforms/core": "^2.5.0",
+    "@jsonforms/react": "^2.5.0",
     "@react-spectrum/table": "^3.0.0-alpha.9",
     "@react-spectrum/tabs": "^3.0.0-alpha.3",
     "@spectrum-icons/workflow": "^3.2.0",
@@ -65,7 +65,6 @@
     "@types/enzyme": "^3.10.3",
     "@types/enzyme-adapter-react-16": "^1.0.5",
     "@types/react-dom": "^16.8.0",
-    "@types/react-redux": "^7.1.9",
     "copy-webpack-plugin": "^5.0.5",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.15.1",