Merge pull request #12 from jotai-labs/jotai-new-async-api

Migrate to Jotai v2 API
jotaijs · Dec 11, 2022 · 37c1a90 · 37c1a90
2 parents d896b19 + 87487eb
commit 37c1a90
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 21 deletions.
diff --git a/__tests__/01_basic_spec.tsx b/__tests__/01_basic_spec.tsx
@@ -1,6 +1,6 @@
 import { fireEvent, render, waitFor } from '@testing-library/react';
 import React from 'react';
-import { useAtom } from 'jotai';
+import { useAtom } from 'jotai/react';
 import { atomWithValidate } from '../src/index';
 
 describe('atomWithValidate spec', () => {

diff --git a/__tests__/02_form_validation.tsx b/__tests__/02_form_validation.tsx
@@ -2,7 +2,7 @@ import 'regenerator-runtime/runtime';
 
 import { cleanup, fireEvent, render, waitFor } from '@testing-library/react';
 import React from 'react';
-import { useAtom } from 'jotai';
+import { useAtom } from 'jotai/react';
 import * as Yup from 'yup';
 import { atomWithValidate, validateAtoms } from '../src/index';
 

diff --git a/examples/01_minimal/src/index.js b/examples/01_minimal/src/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { createRoot } from 'react-dom/client';
-import { useAtom } from 'jotai';
+import { useAtom } from 'jotai/react';
 import { atomWithValidate } from 'jotai-form';
 
 const fieldAtom = atomWithValidate(0, {

diff --git a/examples/02_typescript/src/App.tsx b/examples/02_typescript/src/App.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { useAtom } from 'jotai';
+import { useAtom } from 'jotai/react';
 import { atomWithValidate } from 'jotai-form';
 import { number } from 'yup';
 

diff --git a/examples/03_joi/src/App.tsx b/examples/03_joi/src/App.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { useAtom } from 'jotai';
+import { useAtom } from 'jotai/react';
 import { atomWithValidate } from 'jotai-form';
 import Joi from 'joi';
 

diff --git a/examples/04_demo/src/index.js b/examples/04_demo/src/index.js
@@ -1,7 +1,7 @@
 import 'normalize.css/normalize.css';
 import React from 'react';
 import { createRoot } from 'react-dom/client';
-import { useAtom } from 'jotai';
+import { useAtom } from 'jotai/react';
 import { atomWithValidate } from 'jotai-form';
 import styled from 'styled-components';
 import * as Yup from 'yup';

diff --git a/examples/04_demo/src/resources/code.js b/examples/04_demo/src/resources/code.js
@@ -1,5 +1,5 @@
 export const defaultCode = `
-import { useAtom } from 'jotai';
+import { useAtom } from 'jotai/react';
 import { atomWithValidate } from 'jotai-form';
 import * as Yup from 'yup';
 

diff --git a/examples/05_zod/src/index.tsx b/examples/05_zod/src/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { createRoot } from 'react-dom/client';
-import { useAtom } from 'jotai';
+import { useAtom } from 'jotai/react';
 import { atomWithValidate } from 'jotai-form';
 import { z } from 'zod';
 

diff --git a/package.json b/package.json
@@ -71,7 +71,7 @@
     "html-webpack-plugin": "^5.5.0",
     "jest": "^27.5.1",
     "joi": "^17.7.0",
-    "jotai": "^1.9.2",
+    "jotai": "^1.11.0",
     "microbundle": "^0.14.2",
     "normalize.css": "^8.0.1",
     "npm-run-all": "^4.1.5",
@@ -93,6 +93,6 @@
     "zod": "^3.19.1"
   },
   "peerDependencies": {
-    "jotai": "*"
+    "jotai": ">=1.11.0"
   }
 }
diff --git a/src/atomWithValidate.ts b/src/atomWithValidate.ts
@@ -1,5 +1,5 @@
-import { atom } from 'jotai';
-import type { WritableAtom, SetStateAction } from 'jotai';
+import { atom } from 'jotai/vanilla';
+import type { WritableAtom, SetStateAction } from 'jotai/vanilla';
 
 export type CommonState<Value> = {
   value: Value;
@@ -31,12 +31,12 @@ type SyncOptions<Value> = CommonOptions<Value> & {
 export function atomWithValidate<Value>(
   initialValue: Value,
   options: AsyncOptions<Value>,
-): WritableAtom<AsyncState<Value>, SetStateAction<Value>>;
+): WritableAtom<AsyncState<Value>, [SetStateAction<Value>], void>;
 
 export function atomWithValidate<Value>(
   initialValue: Value,
   options: SyncOptions<Value>,
-): WritableAtom<SyncState<Value>, SetStateAction<Value>>;
+): WritableAtom<SyncState<Value>, [SetStateAction<Value>], void>;
 
 export function atomWithValidate<Value>(
   initialValue: Value,

diff --git a/src/validateAtoms.ts b/src/validateAtoms.ts
@@ -1,5 +1,6 @@
-import { atom, Getter, SetStateAction, WritableAtom } from 'jotai';
-import { loadable } from 'jotai/utils';
+import { atom } from 'jotai/vanilla';
+import type { Getter, SetStateAction, WritableAtom } from 'jotai/vanilla';
+import { loadable } from 'jotai/vanilla/utils';
 
 import type { CommonState } from './atomWithValidate';
 
@@ -17,7 +18,8 @@ export type ValidatorState = {
 
 type AtomWithValidation<Value> = WritableAtom<
   CommonState<Value>,
-  SetStateAction<Value>
+  [SetStateAction<Value>],
+  void
 >;
 
 type State<Values extends Record<string, unknown>> = {

diff --git a/yarn.lock b/yarn.lock
@@ -5133,10 +5133,10 @@ joi@^17.7.0:
     "@sideway/formula" "^3.0.0"
     "@sideway/pinpoint" "^2.0.0"
 
-jotai@^1.9.2:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/jotai/-/jotai-1.11.1.tgz#a85d2ba34363e831e1e2aa74dead4a0b1ac9e5ae"
-  integrity sha512-pHpaZUdvIpcS12ryMCrwtvmT/IovZAbicfrlll/Rb9394rwhqKoDFsDs0kv4oWtBy/XHHNv7iSZnQFmntiQj+w==
+jotai@^1.11.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/jotai/-/jotai-1.11.0.tgz#d2a666f16935797743eb41a3b75583ea4e17fefb"
+  integrity sha512-8OzJmRxcTZoAOJSz6uTnmofmjAOgNOdAOy26rvyw3OBxt6XIoklNnfUTCm8wgp84SSLJbPZA01VS5O/SUz+QYg==
 
 js-sdsl@^4.1.4:
   version "4.2.0"