#33 added support for redux-saga 1.x

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-saga-devtools",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Monitor and UI for redux-saga",
   "main": "lib/index.js",
   "devDependencies": {
@@ -16,10 +16,12 @@
     "cross-env": "^3.1.3",
     "eslint": "^4.11.0",
     "jest": "^24.9.0",
-    "parcel": "^1.12.4",
+    "parcel": "1.12.3",
     "react-redux": "^5.0.0",
     "redux": "^3.6.0",
-    "redux-saga": "^0.16.0",
+    "redux-saga": "^1.0.0",
+    "@redux-saga/is": "^1.0.0",
+    "@redux-saga/symbols": "^1.0.0",
     "regenerator-runtime": "^0.13.3",
     "rimraf": "^2.5.4",
     "tap-spec": "^4.1.1"
@@ -32,7 +34,9 @@
     "styled-components": "^2.2.4"
   },
   "peerDependecies": {
-    "redux-saga": "^0.15.6"
+    "redux-saga": "^1.0.0",
+    "@redux-saga/is": "^1.0.0",
+    "@redux-saga/symbols": "^1.0.0"
   },
   "scripts": {
     "lint": "eslint src",

src/components/Effect/Effect.js

@@ -1,12 +1,12 @@
-import PropTypes from 'prop-types';
+import PropTypes from 'prop-types'
 import React from 'react';
 import styled from 'styled-components'
-import { is, asEffect } from 'redux-saga/utils'
+import * as is from '@redux-saga/is'
+import asEffect from '../../utils/asEffect';
 import { Row, Cell } from '../Layout'
 import SagaValue from '../SagaValue'
 import Result from './Result'
 
-
 const EffectType = styled.span`
   color: ${props => props.theme.effectType};
   margin-right: 5px;

src/components/SagaValue/SagaValue.js

@@ -1,13 +1,14 @@
 import React from 'react'
-import { is, CHANNEL_END } from 'redux-saga/utils'
+import * as is from '@redux-saga/is'
+import { CHANNEL_END_TYPE } from '@redux-saga/symbols'
 import JSValue from '../JSValue'
 import SagaRef from '../../containers/SagaRef'
 
 export default function SagaValue({value, label, isIdentifier}) {
   if(is.channel(value)) {
     return <SagaRef object={value}>{label || 'Channel'}</SagaRef>
   }
-  else if(CHANNEL_END && value === CHANNEL_END) {
+  else if(CHANNEL_END_TYPE && value === CHANNEL_END_TYPE) {
     return <JSValue value={'END'} isIdentifier={true} />
   }
   else {

src/containers/EffectView/helpers.js

@@ -1,5 +1,3 @@
-import { is, asEffect } from 'redux-saga/utils'
-
 export function pathHasChanged(currentPath, newPath) {
   if(
     (!currentPath && newPath)  ||

src/store/__tests__/monitor.test.js

@@ -1,7 +1,8 @@
-import { asEffect, SAGA_ACTION } from "redux-saga/utils";
 import createSagaMonitor from "../createSagaMonitor";
+import { SAGA_ACTION } from "@redux-saga/symbols";
 import { CHILDREN } from "../reducers";
 import * as c from "../constants";
+import asEffect from "../../utils/asEffect";
 
 asEffect.race = eff => {
   return eff.race;

src/store/createSagaMonitor.js

@@ -1,4 +1,5 @@
-import { is, SAGA_ACTION } from 'redux-saga/utils'
+import * as is from '@redux-saga/is'
+import { SAGA_ACTION } from '@redux-saga/symbols'
 import { createStore } from 'redux'
 import rootReducer from './reducers'
 import {
@@ -37,7 +38,7 @@ export default function createSagaMonitor({time = getTime, dispatch: customDispa
 
   function effectResolved(effectId, result) {
     if(is.task(result)) {
-      result.done.then(
+      result.toPromise().then(
         taskResult => {
           if(result.isCancelled())
             effectCancelled(effectId)

src/store/reducers.js

@@ -1,4 +1,4 @@
-import { asEffect } from "redux-saga/utils";
+import asEffect from "../utils/asEffect";
 import { combineReducers } from "redux";
 import {
   EFFECT_TRIGGERED,
@@ -20,7 +20,7 @@ function getPathToEffect(effect, effectsById) {
   const path = [effectId];
 
   while (effectId) {
-    effectId = effect.parentEffectId;
+    effectId = effect && effect.parentEffectId;
     if (effectId) {
       path.push(effectId);
       effect = effectsById[effectId];

src/store/selectors.js

@@ -1,4 +1,5 @@
-import { is, asEffect } from 'redux-saga/utils'
+import * as is from '@redux-saga/is'
+import asEffect from '../utils/asEffect'
 import { STATUS_RESOLVED } from './constants'
 
 /* eslint-disable no-cond-assign */

src/utils/asEffect.js

@@ -0,0 +1,30 @@
+import { effectTypes } from "redux-saga/effects"
+import { IO } from "@redux-saga/symbols"
+/**
+ * A copy of asEffect from redux-saga 0.x
+ * https://github.com/redux-saga/redux-saga/blob/0.x/src/internal/io.js#L183
+ * 
+ * With slight adjustments for new effect structure
+ * https://github.com/redux-saga/redux-saga/blob/v1.0.0/CHANGELOG.md?plain=1#L22
+ */
+const createAsEffectType = type => effect => effect && effect[IO] && effect.type === type && effect.payload
+
+export const asEffect = {
+  take: createAsEffectType(effectTypes.TAKE),
+  put: createAsEffectType(effectTypes.PUT),
+  all: createAsEffectType(effectTypes.ALL),
+  race: createAsEffectType(effectTypes.RACE),
+  call: createAsEffectType(effectTypes.CALL),
+  cps: createAsEffectType(effectTypes.CPS),
+  fork: createAsEffectType(effectTypes.FORK),
+  join: createAsEffectType(effectTypes.JOIN),
+  cancel: createAsEffectType(effectTypes.CANCEL),
+  select: createAsEffectType(effectTypes.SELECT),
+  actionChannel: createAsEffectType(effectTypes.ACTION_CHANNEL),
+  cancelled: createAsEffectType(effectTypes.CANCELLED),
+  flush: createAsEffectType(effectTypes.FLUSH),
+  getContext: createAsEffectType(effectTypes.GET_CONTEXT),
+  setContext: createAsEffectType(effectTypes.SET_CONTEXT)
+}
+
+export default asEffect