Merge branch 'main' into main

Author: dai-shi

docs/guides/tutorial-tic-tac-toe.md

@@ -1313,7 +1313,7 @@ export default function Game() {
 
   function jumpTo(nextMove) {
     setCurrentMove(nextMove)
-    setXIsNext(currentMove % 2 === 0)
+    setXIsNext(nextMove % 2 === 0)
   }
 
   return (

docs/hooks/use-store-with-equality-fn.md

@@ -709,7 +709,7 @@ given tab.
 
 ```tsx
 const useCounterStore = <U,>(
-  currentTabIndex: number,
+  key: string,
   selector: (state: CounterStore) => U,
 ) => {
   const stores = useContext(CounterStoresContext)
@@ -719,15 +719,11 @@ const useCounterStore = <U,>(
   }
 
   const getOrCreateCounterStoreByKey = useCallback(
-    () => createCounterStoreFactory(stores),
+    (key: string) => createCounterStoreFactory(stores!)(key),
     [stores],
   )
 
-  return useStoreWithEqualityFn(
-    getOrCreateCounterStoreByKey(`tab-${currentTabIndex}`),
-    selector,
-    shallow,
-  )
+  return useStore(getOrCreateCounterStoreByKey(key), selector)
 }
 ```
 

eslint.config.mjs

@@ -3,7 +3,6 @@ import vitest from '@vitest/eslint-plugin'
 import importPlugin from 'eslint-plugin-import'
 import jestDom from 'eslint-plugin-jest-dom'
 import react from 'eslint-plugin-react'
-import reactCompiler from 'eslint-plugin-react-compiler'
 import reactHooks from 'eslint-plugin-react-hooks'
 import testingLibrary from 'eslint-plugin-testing-library'
 import tseslint from 'typescript-eslint'
@@ -17,8 +16,7 @@ export default tseslint.config(
   tseslint.configs.recommended,
   react.configs.flat.recommended,
   react.configs.flat['jsx-runtime'],
-  reactHooks.configs['recommended-latest'],
-  reactCompiler.configs.recommended,
+  reactHooks.configs.recommended,
   {
     settings: {
       react: {
@@ -42,7 +40,7 @@ export default tseslint.config(
       'import/namespace': 'off',
       'import/no-named-as-default-member': 'off',
       'import/no-duplicates': 'error',
-      'import/extensions': ['error', 'always'],
+      'import/extensions': ['error', 'always', { ignorePackages: true }],
       'import/order': [
         'error',
         {
@@ -72,6 +70,7 @@ export default tseslint.config(
         'warn',
         { argsIgnorePattern: '^_', varsIgnorePattern: '^_' },
       ],
+      'react-hooks/react-compiler': 'error',
     },
   },
   {
@@ -90,10 +89,4 @@ export default tseslint.config(
       ],
     },
   },
-  {
-    files: ['*.js'],
-    rules: {
-      '@typescript-eslint/no-require-imports': 'off',
-    },
-  },
 )

package.json

@@ -137,8 +137,7 @@
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest-dom": "^5.5.0",
     "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-react-compiler": "19.1.0-rc.1",
-    "eslint-plugin-react-hooks": "^5.2.0",
+    "eslint-plugin-react-hooks": "6.0.0-rc.1",
     "eslint-plugin-testing-library": "^7.1.1",
     "immer": "^10.1.1",
     "jsdom": "^26.1.0",

pnpm-lock.yaml

@@ -1,5 +1,4 @@
 import React from 'react'
-// eslint-disable-next-line import/extensions
 import useSyncExternalStoreExports from 'use-sync-external-store/shim/with-selector'
 import { createStore } from './vanilla.ts'
 import type {

src/traditional.ts

@@ -1,5 +1,5 @@
 /* eslint @typescript-eslint/no-unused-expressions: off */ // FIXME
-/* eslint react-compiler/react-compiler: off */
+/* eslint react-hooks/react-compiler: off */
 
 import { describe, expect, expectTypeOf, it } from 'vitest'
 import { create } from 'zustand'

tests/middlewareTypes.test.tsx

@@ -1,5 +1,4 @@
 import { resolve } from 'path'
-// eslint-disable-next-line import/extensions
 import { defineConfig } from 'vitest/config'
 
 export default defineConfig({