chore: upgrade example deps (#101)

* chore: upgrade example deps * fix: fix test case
web-infra-dev · Dec 23, 2022 · 1432ec1 · 1432ec1
1 parent 29acadb
commit 1432ec1
Show file tree

Hide file tree

Showing 7 changed files with 193 additions and 136 deletions.
diff --git a/examples/todos/package.json b/examples/todos/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@modern-js-reduck/react": "*",
+    "@modern-js-reduck/react": "latest",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.3.0",
     "@testing-library/user-event": "^13.5.0",

diff --git a/examples/vite-counter/package.json b/examples/vite-counter/package.json
@@ -8,7 +8,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@modern-js-reduck/react": "*",
+    "@modern-js-reduck/react": "latest",
     "react": "^18.0.2",
     "react-dom": "^18.0.2"
   },

diff --git a/examples/vite-counter/src/App.tsx b/examples/vite-counter/src/App.tsx
@@ -1,7 +1,7 @@
 import { useModel } from '@modern-js-reduck/react';
 import { modelA, modelB } from './model/count';
 function App() {
-  const [state, actions] = useModel([modelA, modelB]);
+  const [state, actions] = useModel(modelA, modelB);
 
   return (
     <div>

diff --git a/examples/vite-counter/src/model/count.ts b/examples/vite-counter/src/model/count.ts
@@ -4,6 +4,9 @@ export const modelA = model('modelA').define({
   state: {
     a: 1,
   },
+  computed: {
+    // add1: (state) => state.a + 1
+  },
   actions: {
     incA(s) {
       return { a: s.a + 1 };
@@ -14,6 +17,9 @@ export const modelB = model('modelB').define({
   state: {
     b: 1,
   },
+  computed: {
+    add2: (state) => state.b + 1
+  },
   actions: {
     incB(s) {
       return { b: s.b + 1 };

diff --git a/examples/with-middleware/package.json b/examples/with-middleware/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@modern-js-reduck/react": "*",
+    "@modern-js-reduck/react": "latest",
     "react": "^18.0.2",
     "react-dom": "^18.0.2",
     "react-scripts": "5.0.1",

diff --git a/packages/store/src/__tsd__/model.tsd.ts b/packages/store/src/__tsd__/model.tsd.ts
@@ -1,6 +1,7 @@
 import { expectType, expectAssignable } from 'tsd';
 import { useModel } from '@modern-js/runtime/model';
 import { model } from '..';
+import { ReduxAction } from '@/types';
 
 type StateManual = { count: number; name: 'a' | 'b' };
 const counterManual = model<StateManual>('counter').define({
@@ -50,7 +51,7 @@ describe('action and state manually type', () => {
   expectType<(s: StateManual) => void>(counterManual._.actions.empty);
   const [state, actions] = useModel(counterManual);
   expectType<StateManual>(state);
-  expectType<(n: number) => void>(actions.add);
+  expectType<(n: number) => ReduxAction<number>>(actions.add);
 });
 
 describe('action and state auto infer', () => {
@@ -61,7 +62,7 @@ describe('action and state auto infer', () => {
   expectType<(s: StateInfer) => void>(counterInfer._.actions.empty);
   const [state, actions] = useModel(counterInfer);
   expectType<StateInfer>(state);
-  expectType<(n: number) => void>(actions.add);
+  expectType<(n: number) => ReduxAction<number>>(actions.add);
 });
 
 describe('action and state union type', () => {
@@ -92,6 +93,6 @@ describe('action and state function Initial', () => {
     counter._.actions.add,
   );
   expectType<number>(state.c);
-  expectType<() => void>(actions.test.a);
-  expectType<(n: number) => void>(actions.test.b);
+  expectType<() => ReduxAction<undefined>>(actions.test.a);
+  expectType<(n: number) => ReduxAction<number>>(actions.test.b);
 });