fix tests

jotaijs · Jun 19, 2024 · 2fc3603 · 2fc3603
1 parent d9805b1
commit 2fc3603
Show file tree

Hide file tree

Showing 18 changed files with 99 additions and 78 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -22,7 +22,7 @@ module.exports = {
     react: { version: 'detect' },
   },
   rules: {
-    'import/no-unresolved': ['error', { ignore: ['jotai-zustand'] }],
+    'import/no-unresolved': ['error', { ignore: ['jotai-relay'] }],
     '@typescript-eslint/no-unused-vars': [
       'error',
       {

diff --git a/examples/01_minimal/package.json b/examples/01_minimal/package.json
@@ -14,6 +14,7 @@
   "devDependencies": {
     "@types/react": "latest",
     "@types/react-dom": "latest",
+    "@types/relay-runtime": "latest",
     "typescript": "latest",
     "vite": "latest"
   },

diff --git a/examples/01_minimal/src/App.js → examples/01_minimal/src/app.tsx b/examples/01_minimal/src/App.js → examples/01_minimal/src/app.tsx
@@ -10,6 +10,8 @@ import {
   graphql,
 } from 'relay-runtime';
 
+import type { AppCountriesQuery } from './__generated__/AppCountriesQuery.graphql';
+
 const myEnvironment = new Environment({
   network: Network.create(async (params, variables) => {
     const response = await fetch('https://countries.trevorblades.com/', {
@@ -27,7 +29,7 @@ const myEnvironment = new Environment({
   store: new Store(new RecordSource()),
 });
 
-const countriesAtom = atomWithQuery(
+const countriesAtom = atomWithQuery<AppCountriesQuery>(
   graphql`
     query AppCountriesQuery {
       countries {

diff --git a/examples/01_minimal/src/index.js b/examples/01_minimal/src/index.js
diff --git a/examples/01_minimal/src/main.tsx b/examples/01_minimal/src/main.tsx
@@ -0,0 +1,10 @@
+import { StrictMode } from 'react';
+import { createRoot } from 'react-dom/client';
+
+import App from './app';
+
+createRoot(document.getElementById('root')!).render(
+  <StrictMode>
+    <App />
+  </StrictMode>,
+);
diff --git a/examples/02_typescript/package.json b/examples/02_typescript/package.json
@@ -4,7 +4,6 @@
   "type": "module",
   "private": true,
   "dependencies": {
-    "@types/relay-runtime": "latest",
     "babel-plugin-relay": "latest",
     "jotai": "latest",
     "jotai-relay": "latest",
@@ -15,6 +14,7 @@
   "devDependencies": {
     "@types/react": "latest",
     "@types/react-dom": "latest",
+    "@types/relay-runtime": "latest",
     "typescript": "latest",
     "vite": "latest"
   },

diff --git a/examples/02_typescript/relay.config.js b/examples/02_typescript/relay.config.js
@@ -1,6 +1,9 @@
+// eslint-disable-next-line no-undef
 module.exports = {
   language: 'typescript',
+  // eslint-disable-next-line no-undef
   src: `${__dirname}/src`,
+  // eslint-disable-next-line no-undef
   schema: `${__dirname}/data/schema.graphql`,
   exclude: ['**/node_modules/**', '**/__mocks__/**', '**/__generated__/**'],
 };
diff --git a/examples/02_typescript/src/App.tsx → examples/02_typescript/src/app.tsx b/examples/02_typescript/src/App.tsx → examples/02_typescript/src/app.tsx
diff --git a/examples/02_typescript/src/index.tsx b/examples/02_typescript/src/index.tsx
diff --git a/examples/02_typescript/src/main.tsx b/examples/02_typescript/src/main.tsx
@@ -0,0 +1,10 @@
+import { StrictMode } from 'react';
+import { createRoot } from 'react-dom/client';
+
+import App from './app';
+
+createRoot(document.getElementById('root')!).render(
+  <StrictMode>
+    <App />
+  </StrictMode>,
+);
diff --git a/examples/03_errorhandling/package.json b/examples/03_errorhandling/package.json
@@ -4,7 +4,6 @@
   "type": "module",
   "private": true,
   "dependencies": {
-    "@types/relay-runtime": "latest",
     "babel-plugin-relay": "latest",
     "jotai": "latest",
     "jotai-relay": "latest",
@@ -16,6 +15,7 @@
   "devDependencies": {
     "@types/react": "latest",
     "@types/react-dom": "latest",
+    "@types/relay-runtime": "latest",
     "typescript": "latest",
     "vite": "latest"
   },

diff --git a/examples/03_errorhandling/relay.config.js b/examples/03_errorhandling/relay.config.js
@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-undef
 module.exports = {
   language: 'typescript',
   // eslint-disable-next-line no-undef

diff --git a/examples/03_errorhandling/src/App.tsx → examples/03_errorhandling/src/app.tsx b/examples/03_errorhandling/src/App.tsx → examples/03_errorhandling/src/app.tsx
diff --git a/examples/03_errorhandling/src/index.tsx b/examples/03_errorhandling/src/index.tsx
diff --git a/examples/03_errorhandling/src/main.tsx b/examples/03_errorhandling/src/main.tsx
@@ -0,0 +1,10 @@
+import { StrictMode } from 'react';
+import { createRoot } from 'react-dom/client';
+
+import App from './app';
+
+createRoot(document.getElementById('root')!).render(
+  <StrictMode>
+    <App />
+  </StrictMode>,
+);
diff --git a/package.json b/package.json
@@ -65,9 +65,10 @@
     "@testing-library/react": "^15.0.7",
     "@testing-library/user-event": "^14.5.2",
     "@types/jest": "^29.5.12",
+    "@types/node": "^20.14.5",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "@types/react-relay": "^16.0.6",
+    "@types/relay-runtime": "^17.0.0",
     "@typescript-eslint/eslint-plugin": "^7.12.0",
     "@typescript-eslint/parser": "^7.12.0",
     "babel-loader": "^9.1.3",