fix(deps): use core-package as peer-dep

examples/example-next-gip/eggs/active-post/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { ACTIVE_POST_REDUCER_KEY, activePostReducer } from '@/eggs/active-post/reducer'
 import { loadActivePostWatcher } from '@/eggs/active-post/saga'

examples/example-next-gip/eggs/aviasales/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { AVIASALES_REDUCER_KEY, aviasalesReducer } from '@/eggs/aviasales/reducer'
 import { aviasalesSaga } from '@/eggs/aviasales/saga'

examples/example-next-gip/eggs/chuck-norris/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { ChuckNorrisPublicAction } from '@/eggs/chuck-norris/action-creators'
 import { CHUCK_NORRIS_REDUCER_KEY, chuckNorrisReducer } from '@/eggs/chuck-norris/reducer'

examples/example-next-gip/eggs/clock/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { CLOCK_REDUCER_KEY, clockReducer } from '@/eggs/clock/reducer'
 import { startClockWatcher } from '@/eggs/clock/saga'

examples/example-next-gip/eggs/common/index.ts

@@ -1,4 +1,4 @@
-import type { EggTuple } from '@redux-eggs/redux'
+import type { EggTuple } from '@redux-eggs/core'
 
 import { getXkcdEgg } from '@/eggs/xkcd'
 

examples/example-next-gip/eggs/count/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { COUNT_REDUCER_KEY, countReducer } from '@/eggs/count/reducer'
 import { countWatcher } from '@/eggs/count/saga'

examples/example-next-gip/eggs/dog/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { DOG_REDUCER_KEY, dogReducer } from '@/eggs/dog/reducer'
 import { loadDogWatcher } from '@/eggs/dog/saga'

examples/example-next-gip/eggs/fox/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { FOX_REDUCER_KEY, foxReducer } from '@/eggs/fox/reducer'
 import { loadFoxWatcher } from '@/eggs/fox/saga'

examples/example-next-gip/eggs/picsum/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { PICSUM_REDUCER_KEY, picsumReducer } from '@/eggs/picsum/reducer'
 import { loadPicsumWatcher } from '@/eggs/picsum/saga'

examples/example-next-gip/eggs/posts/index.ts

@@ -1,4 +1,4 @@
-import type { Egg, EggEventHandler } from '@redux-eggs/redux'
+import type { Egg, EggEventHandler } from '@redux-eggs/core'
 
 import { POSTS_REDUCER_KEY, postsReducer } from '@/eggs/posts/reducer'
 import { loadPostsWatcher } from '@/eggs/posts/saga'

examples/example-next-gip/eggs/users/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { USERS_REDUCER_KEY, usersReducer } from '@/eggs/users/reducer'
 import { loadUsersWatcher } from '@/eggs/users/saga'

examples/example-next-gip/eggs/xkcd/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { XkcdPublicAction } from '@/eggs/xkcd/action-creators'
 import { XKCD_REDUCER_KEY, xkcdReducer } from '@/eggs/xkcd/reducer'

examples/example-next-gip/package.json

@@ -26,6 +26,7 @@
     ]
   },
   "dependencies": {
+    "@redux-eggs/core": "workspace:*",
     "@redux-eggs/next": "workspace:*",
     "@redux-eggs/react": "workspace:*",
     "@redux-eggs/redux": "workspace:*",

examples/example-next-gip/store/index.tsx

@@ -1,5 +1,5 @@
+import type { EggExt } from '@redux-eggs/core'
 import { createWrapperInitializer } from '@redux-eggs/next'
-import type { EggExt } from '@redux-eggs/redux'
 import { createStore } from '@redux-eggs/redux'
 import type { SagaExt } from '@redux-eggs/saga-extension'
 import { getSagaExtension } from '@redux-eggs/saga-extension'

examples/example-next-gip/store/logger-extension/index.ts

@@ -1,4 +1,4 @@
-import type { Extension } from '@redux-eggs/redux'
+import type { Extension } from '@redux-eggs/core'
 import type { Middleware } from 'redux'
 
 export const getLoggerExtension = (): Extension => {

examples/example-next-rtk/eggs/active-post/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux-toolkit'
+import type { Egg } from '@redux-eggs/core'
 
 import { loadActivePostWatcher } from '@/eggs/active-post/saga'
 import { ACTIVE_POST_SLICE, activePostReducer } from '@/eggs/active-post/slice'

examples/example-next-rtk/eggs/aviasales/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux-toolkit'
+import type { Egg } from '@redux-eggs/core'
 
 import { aviasalesSaga } from '@/eggs/aviasales/saga'
 import { AVIASALES_SLICE, aviasalesReducer } from '@/eggs/aviasales/slice'

examples/example-next-rtk/eggs/chuck-norris/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux-toolkit'
+import type { Egg } from '@redux-eggs/core'
 
 import { loadChuckNorrisJokeWatcher } from '@/eggs/chuck-norris/saga'
 import { CHUCK_NORRIS_SLICE, ChuckNorrisPublicAction, chuckNorrisReducer } from '@/eggs/chuck-norris/slice'

examples/example-next-rtk/eggs/clock/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux-toolkit'
+import type { Egg } from '@redux-eggs/core'
 
 import { startClockWatcher } from '@/eggs/clock/saga'
 import { CLOCK_SLICE, clockReducer } from '@/eggs/clock/slice'

examples/example-next-rtk/eggs/common/index.ts

@@ -1,4 +1,4 @@
-import type { EggTuple } from '@redux-eggs/redux-toolkit'
+import type { EggTuple } from '@redux-eggs/core'
 
 import { getXkcdEgg } from '@/eggs/xkcd'
 

examples/example-next-rtk/eggs/count/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux-toolkit'
+import type { Egg } from '@redux-eggs/core'
 
 import { countWatcher } from '@/eggs/count/saga'
 import { COUNT_SLICE, countReducer } from '@/eggs/count/slice'

examples/example-next-rtk/eggs/dog/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux-toolkit'
+import type { Egg } from '@redux-eggs/core'
 
 import { loadDogWatcher } from '@/eggs/dog/saga'
 import { DOG_SLICE, dogReducer } from '@/eggs/dog/slice'

examples/example-next-rtk/eggs/fox/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux-toolkit'
+import type { Egg } from '@redux-eggs/core'
 
 import { loadFoxWatcher } from '@/eggs/fox/saga'
 import { FOX_SLICE, foxReducer } from '@/eggs/fox/slice'

examples/example-next-rtk/eggs/picsum/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux-toolkit'
+import type { Egg } from '@redux-eggs/core'
 
 import { loadPicsumWatcher } from '@/eggs/picsum/saga'
 import { PICSUM_SLICE, picsumReducer } from '@/eggs/picsum/slice'

examples/example-next-rtk/eggs/posts/index.ts

@@ -1,4 +1,4 @@
-import type { Egg, EggEventHandler } from '@redux-eggs/redux-toolkit'
+import type { Egg, EggEventHandler } from '@redux-eggs/core'
 
 import { loadPostsWatcher } from '@/eggs/posts/saga'
 import { POSTS_SLICE, postsReducer } from '@/eggs/posts/slice'

examples/example-next-rtk/eggs/users/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux-toolkit'
+import type { Egg } from '@redux-eggs/core'
 
 import { loadUsersWatcher } from '@/eggs/users/saga'
 import { USERS_SLICE, usersReducer } from '@/eggs/users/slice'

examples/example-next-rtk/eggs/xkcd/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux-toolkit'
+import type { Egg } from '@redux-eggs/core'
 
 import { loadXkcdInfoWatcher } from '@/eggs/xkcd/saga'
 import { XKCD_SLICE, XkcdPublicAction, xkcdReducer } from '@/eggs/xkcd/slice'

examples/example-next-rtk/package.json

@@ -26,6 +26,7 @@
     ]
   },
   "dependencies": {
+    "@redux-eggs/core": "workspace:*",
     "@redux-eggs/next": "workspace:*",
     "@redux-eggs/react": "workspace:*",
     "@redux-eggs/redux-toolkit": "workspace:*",

examples/example-next-rtk/store/index.tsx

@@ -1,5 +1,5 @@
+import type { EggExt } from '@redux-eggs/core'
 import { createWrapperInitializer } from '@redux-eggs/next'
-import type { EggExt } from '@redux-eggs/redux-toolkit'
 import { createStore } from '@redux-eggs/redux-toolkit'
 import type { SagaExt } from '@redux-eggs/saga-extension'
 import { getSagaExtension } from '@redux-eggs/saga-extension'

examples/example-next-rtk/store/logger-extension/index.ts

@@ -1,4 +1,4 @@
-import type { Extension } from '@redux-eggs/redux-toolkit'
+import type { Extension } from '@redux-eggs/core'
 import type { Middleware } from '@reduxjs/toolkit'
 
 export const getLoggerExtension = (): Extension => {

examples/example-next/eggs/active-post/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { ACTIVE_POST_REDUCER_KEY, activePostReducer } from '@/eggs/active-post/reducer'
 import { loadActivePostWatcher } from '@/eggs/active-post/saga'

examples/example-next/eggs/aviasales/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { AVIASALES_REDUCER_KEY, aviasalesReducer } from '@/eggs/aviasales/reducer'
 import { aviasalesSaga } from '@/eggs/aviasales/saga'

examples/example-next/eggs/chuck-norris/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { ChuckNorrisPublicAction } from '@/eggs/chuck-norris/action-creators'
 import { CHUCK_NORRIS_REDUCER_KEY, chuckNorrisReducer } from '@/eggs/chuck-norris/reducer'

examples/example-next/eggs/clock/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { CLOCK_REDUCER_KEY, clockReducer } from '@/eggs/clock/reducer'
 import { startClockWatcher } from '@/eggs/clock/saga'

examples/example-next/eggs/common/index.ts

@@ -1,4 +1,4 @@
-import type { EggTuple } from '@redux-eggs/redux'
+import type { EggTuple } from '@redux-eggs/core'
 
 import { getXkcdEgg } from '@/eggs/xkcd'
 

examples/example-next/eggs/count/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { COUNT_REDUCER_KEY, countReducer } from '@/eggs/count/reducer'
 import { countWatcher } from '@/eggs/count/saga'

examples/example-next/eggs/dog/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { DOG_REDUCER_KEY, dogReducer } from '@/eggs/dog/reducer'
 import { loadDogWatcher } from '@/eggs/dog/saga'

examples/example-next/eggs/fox/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { FOX_REDUCER_KEY, foxReducer } from '@/eggs/fox/reducer'
 import { loadFoxWatcher } from '@/eggs/fox/saga'

examples/example-next/eggs/picsum/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { PICSUM_REDUCER_KEY, picsumReducer } from '@/eggs/picsum/reducer'
 import { loadPicsumWatcher } from '@/eggs/picsum/saga'

examples/example-next/eggs/posts/index.ts

@@ -1,4 +1,4 @@
-import type { Egg, EggEventHandler } from '@redux-eggs/redux'
+import type { Egg, EggEventHandler } from '@redux-eggs/core'
 
 import { POSTS_REDUCER_KEY, postsReducer } from '@/eggs/posts/reducer'
 import { loadPostsWatcher } from '@/eggs/posts/saga'

examples/example-next/eggs/users/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { USERS_REDUCER_KEY, usersReducer } from '@/eggs/users/reducer'
 import { loadUsersWatcher } from '@/eggs/users/saga'

examples/example-next/eggs/xkcd/index.ts

@@ -1,4 +1,4 @@
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 
 import { XkcdPublicAction } from '@/eggs/xkcd/action-creators'
 import { XKCD_REDUCER_KEY, xkcdReducer } from '@/eggs/xkcd/reducer'

examples/example-next/package.json

@@ -26,6 +26,7 @@
     ]
   },
   "dependencies": {
+    "@redux-eggs/core": "workspace:*",
     "@redux-eggs/next": "workspace:*",
     "@redux-eggs/react": "workspace:*",
     "@redux-eggs/redux": "workspace:*",

examples/example-next/store/index.tsx

@@ -1,5 +1,5 @@
+import type { EggExt } from '@redux-eggs/core'
 import { createWrapperInitializer } from '@redux-eggs/next'
-import type { EggExt } from '@redux-eggs/redux'
 import { createStore } from '@redux-eggs/redux'
 import type { SagaExt } from '@redux-eggs/saga-extension'
 import { getSagaExtension } from '@redux-eggs/saga-extension'

examples/example-next/store/logger-extension/index.ts

@@ -1,4 +1,4 @@
-import type { Extension } from '@redux-eggs/redux'
+import type { Extension } from '@redux-eggs/core'
 import type { Middleware } from 'redux'
 
 export const getLoggerExtension = (): Extension => {

packages/next/README.md

@@ -13,13 +13,13 @@ Redux Eggs wrapper for [Next.js](https://nextjs.org/) applications.
 If you are using **Yarn**, run
 
 ```shell
-yarn add @redux-eggs/next
+yarn add @redux-eggs/core @redux-eggs/next
 ```
 
 If you are using **NPM**, run
 
 ```shell
-npm install --save @redux-eggs/next
+npm install --save @redux-eggs/core @redux-eggs/next
 ```
 
 `// TODO`

packages/next/package.json

@@ -26,8 +26,6 @@
     "@redux-eggs-internal/rollup-plugin-filesize": "1.0.0",
     "@redux-eggs/core": "1.0.5",
     "@redux-eggs/redux": "1.0.5",
-    "@redux-eggs/redux-toolkit": "1.0.5",
-    "@reduxjs/toolkit": "1.6.2",
     "@rollup/plugin-eslint": "8.0.1",
     "@testing-library/react": "12.1.2",
     "@types/jest": "27.0.2",
@@ -57,6 +55,7 @@
     "typescript": "4.4.4"
   },
   "peerDependencies": {
+    "@redux-eggs/core": "^1.0.5",
     "next": ">=11.1.0",
     "react": "^16.8.3 || ^17.0.0",
     "react-redux": "^7.0.0"

packages/next/src/client/index.test.tsx

@@ -2,8 +2,10 @@
  * @jest-environment jsdom
  */
 
-import type { Egg, StoreCreatorOptions } from '@redux-eggs/redux'
-import { createStore, REDUCE_ACTION_TYPE } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
+import { REDUCE_ACTION_TYPE } from '@redux-eggs/core'
+import type { StoreCreatorOptions } from '@redux-eggs/redux'
+import { createStore } from '@redux-eggs/redux'
 import type { RenderResult } from '@testing-library/react'
 import { act, render } from '@testing-library/react'
 import type { NextPage } from 'next'

packages/next/src/server/index.test.tsx

@@ -2,7 +2,7 @@
  * @jest-environment node
  */
 
-import type { Egg } from '@redux-eggs/redux'
+import type { Egg } from '@redux-eggs/core'
 import { createStore as createReduxStore, createStore } from '@redux-eggs/redux'
 import type {
   GetServerSideProps,
@@ -1566,31 +1566,33 @@ describe('Next Eggs Wrapper tests (Server-side)', () => {
           }
         })
 
-        const getStaticProps: GetStaticProps<Props, InferGetStaticPathsQueryType<typeof getStaticPaths>> =
-          wrapper.wrapGetStaticProps(() => context => {
-            if (context.params?.q === '404') {
-              return {
-                notFound: true,
-              }
-            }
-
-            if (context.params?.q === '308') {
-              return {
-                redirect: {
-                  permanent: true,
-                  destination: '/',
-                },
-                revalidate: 1,
-              }
+        const getStaticProps: GetStaticProps<
+          Props,
+          InferGetStaticPathsQueryType<typeof getStaticPaths>
+        > = wrapper.wrapGetStaticProps(() => context => {
+          if (context.params?.q === '404') {
+            return {
+              notFound: true,
             }
+          }
 
+          if (context.params?.q === '308') {
             return {
-              props: {
-                num: 123,
+              redirect: {
+                permanent: true,
+                destination: '/',
               },
               revalidate: 1,
             }
-          })
+          }
+
+          return {
+            props: {
+              num: 123,
+            },
+            revalidate: 1,
+          }
+        })
 
         expect((wrapper.wrapPage(PageComponent) as EggsConfig).__eggs).toEqual([])
         expect(await getStaticPaths({} as any)).toEqual({ paths: [{ params: { q: 'query' } }], fallback: false })