Merge branch 'master' of https://github.com/reduxjs/react-redux into format-all-files

Author: aryaemami59

.eslintrc.json

@@ -23,7 +23,9 @@
   },
   "settings": {
     "import/ignore": ["react-native"],
-    "import/resolver": { "node": { "extensions": [".js", ".ts", ".tsx"] } },
+    "import/resolver": {
+      "typescript": { "extensions": [".js", ".ts", ".tsx"] }
+    },
     "react": { "version": "detect" }
   },
   "overrides": [
@@ -33,6 +35,7 @@
         "eslint:recommended",
         "plugin:import/recommended",
         "plugin:react/recommended",
+        "plugin:react/jsx-runtime",
         "plugin:@typescript-eslint/recommended"
       ],
       "rules": {
@@ -56,7 +59,7 @@
     },
     {
       "files": ["**/test/**/*.{ts,tsx}"],
-      "parserOptions": { "project": "./test/tsconfig.test.json" }
+      "parserOptions": { "project": true }
     }
   ]
 }

.github/workflows/test.yml

@@ -1,15 +1,10 @@
 name: Tests
 
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-  workflow_dispatch:
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
-    name: Test Suite
+    name: Build and run test Suite
     runs-on: ubuntu-latest
 
     steps:
@@ -25,6 +20,9 @@ jobs:
       - name: Install dependencies
         run: yarn install
 
+      - name: Lint
+        run: yarn lint
+
       - name: Run test suite
         run: yarn test
 
@@ -63,13 +61,27 @@ jobs:
           node-version: ${{ matrix.node }}
           cache: 'yarn'
 
+      - name: Download build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: package
+          path: .
+
       - name: Install deps
         run: yarn install
 
       - name: Install TypeScript ${{ matrix.ts }}
         run: yarn add typescript@${{ matrix.ts }}
 
+      - name: Install build artifact
+        run: yarn add ./package.tgz
+
+      - name: Erase path aliases
+        run: sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json
+
       - name: Test types
+        env:
+          TEST_DIST: true
         run: |
           yarn tsc --version
           yarn type-tests
@@ -93,10 +105,8 @@ jobs:
           path: .
 
       # Note: We currently expect "FalseCJS" failures for Node16 + `moduleResolution: "node16",
-      # and the `/alternateRenderers" entry point will not resolve under Node10.
-      # Skipping these is dangerous, but we'll leave it for now.
       - name: Run are-the-types-wrong
-        run: npx @arethetypeswrong/cli ./package.tgz --format table --ignore-rules false-cjs no-resolution
+        run: npx @arethetypeswrong/cli ./package.tgz --format table --ignore-rules false-cjs --exclude-entrypoints alternate-renderers
 
   test-published-artifact:
     name: Test Published Artifact ${{ matrix.example }}
@@ -221,3 +231,44 @@ jobs:
 
       - name: Build example
         run: yarn build
+
+  test-dist:
+    name: Run local tests against build artifact
+    needs: [build]
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        node: ['20.x']
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Use node ${{ matrix.node }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'yarn'
+
+      - name: Install deps
+        run: yarn install
+
+      - name: Download build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: package
+          path: .
+
+      - name: Check folder contents
+        run: ls -lah
+
+      - name: Install build artifact
+        run: yarn add ./package.tgz
+
+      - name: Erase path aliases
+        run: sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json
+
+      - name: Run local tests against the build artifact
+        env:
+          TEST_DIST: true
+        run: yarn test

.gitignore

@@ -32,3 +32,6 @@ website/translated_docs
 website/build/
 website/node_modules
 website/i18n/*
+
+tsconfig.vitest-temp.json
+

docs/api/hooks.md

@@ -59,7 +59,7 @@ interface UseSelectorOptions {
 }
 
 const result: Selected = useSelector(
-  selector: SelectorFunction,
+  selector: SelectorFn,
   options?: EqualityFn | UseSelectorOptions
 )
 ```

docs/using-react-redux/accessing-store.md

@@ -17,7 +17,7 @@ store interaction is handled. In typical usage, your own components should never
 won't ever reference the store directly. React Redux also internally handles the details of how the store and state are
 propagated to connected components, so that this works as expected by default.
 
-However, there may be certain use cases where you may need to customize how the store and state are propagated to
+However, there may be certain use cases where you may need to customize how the store is passed to
 connected components, or access the store directly. Here are some examples of how to do this.
 
 ## Understanding Context Usage
@@ -26,8 +26,7 @@ Internally, React Redux uses [React's "context" feature](https://react.dev/learn
 Redux store accessible to deeply nested connected components. As of React Redux version 6, this is normally handled
 by a single default context object instance generated by `React.createContext()`, called `ReactReduxContext`.
 
-React Redux's `<Provider>` component uses `<ReactReduxContext.Provider>` to put the Redux store and the current store
-state into context, and `connect` uses `useContext(ReactReduxContext)` to read those values and handle updates.
+React Redux's `<Provider>` component uses `<ReactReduxContext.Provider>` to put the Redux store and internal subscription wrappers into context. `useSelector`, `useDispatch`, and `connect` call `useContext(ReactReduxContext)` to read those values and handle updates.
 
 ## Using the `useStore` Hook
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-redux",
-  "version": "9.1.0",
+  "version": "9.1.2",
   "description": "Official React bindings for Redux",
   "keywords": [
     "react",
@@ -36,79 +36,76 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsup",
+    "build": "yarn clean && tsup",
     "clean": "rimraf lib dist es coverage",
     "api-types": "api-extractor run --local",
     "format": "prettier --write \"{src,test}/**/*.{js,ts,tsx}\" \"docs/**/*.md\"",
     "lint": "eslint src test",
     "lint:fix": "eslint src test --fix",
     "prepare": "yarn clean && yarn build",
     "pretest": "yarn lint",
-    "test": "vitest --run",
+    "test": "vitest --run --typecheck",
     "test:watch": "vitest --watch",
-    "type-tests": "yarn tsc -p test/typetests/tsconfig.json",
+    "type-tests": "tsc --noEmit -p tsconfig.test.json",
     "coverage": "codecov"
   },
   "peerDependencies": {
     "@types/react": "^18.2.25",
     "react": "^18.0",
-    "react-native": ">=0.69",
     "redux": "^5.0.0"
   },
   "peerDependenciesMeta": {
     "@types/react": {
       "optional": true
     },
-    "react-native": {
-      "optional": true
-    },
     "redux": {
       "optional": true
     }
   },
   "dependencies": {
-    "@types/use-sync-external-store": "^0.0.3",
-    "use-sync-external-store": "^1.0.0"
+    "@types/use-sync-external-store": "^0.0.6",
+    "use-sync-external-store": "^1.2.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.1",
-    "@babel/core": "^7.12.3",
-    "@babel/plugin-proposal-decorators": "^7.12.1",
-    "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
-    "@babel/plugin-transform-flow-strip-types": "^7.22.5",
-    "@babel/plugin-transform-react-display-name": "^7.12.1",
-    "@babel/plugin-transform-react-jsx": "^7.12.1",
-    "@babel/plugin-transform-runtime": "^7.12.1",
-    "@babel/preset-env": "^7.12.1",
-    "@babel/preset-typescript": "^7.14.5",
-    "@microsoft/api-extractor": "^7.18.1",
-    "@reduxjs/toolkit": "^2.0.0-beta.4",
-    "@testing-library/jest-dom": "^6.3.0",
-    "@testing-library/react": "^14.1.2",
-    "@testing-library/react-hooks": "^8.0.1",
-    "@types/node": "^20.11.6",
-    "@types/react": "18.2.25",
-    "@typescript-eslint/eslint-plugin": "^6.17.0",
-    "@typescript-eslint/parser": "^6.17.0",
+    "@babel/cli": "^7.24.7",
+    "@babel/core": "^7.24.7",
+    "@babel/plugin-proposal-decorators": "^7.24.7",
+    "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
+    "@babel/plugin-transform-flow-strip-types": "^7.24.7",
+    "@babel/plugin-transform-react-display-name": "^7.24.7",
+    "@babel/plugin-transform-react-jsx": "^7.24.7",
+    "@babel/plugin-transform-runtime": "^7.24.7",
+    "@babel/preset-env": "^7.24.7",
+    "@babel/preset-typescript": "^7.24.7",
+    "@microsoft/api-extractor": "^7.47.0",
+    "@reduxjs/toolkit": "^2.2.5",
+    "@testing-library/dom": "^10.1.0",
+    "@testing-library/jest-dom": "^6.4.5",
+    "@testing-library/react": "^16.0.0",
+    "@types/node": "^20.14.2",
+    "@types/prop-types": "^15.7.12",
+    "@types/react": "18.3.3",
+    "@types/react-dom": "^18.3.0",
     "babel-eslint": "^10.1.0",
-    "codecov": "^3.8.0",
-    "cross-env": "^7.0.2",
-    "eslint": "^8.56.0",
+    "codecov": "^3.8.3",
+    "cross-env": "^7.0.3",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-prettier": "^5.1.2",
-    "eslint-plugin-react": "^7.33.2",
-    "glob": "^7.1.6",
-    "jsdom": "^24.0.0",
-    "prettier": "^3.2.5",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "react-test-renderer": "18.0.0",
-    "redux": "^5.0.0",
-    "rimraf": "^3.0.2",
-    "tsup": "^7.0.0",
-    "typescript": "^5.4.2",
-    "vitest": "^1.2.1"
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-react": "^7.34.2",
+    "jsdom": "^24.1.0",
+    "prettier": "^3.3.1",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "react-test-renderer": "18.3.1",
+    "redux": "^5.0.1",
+    "rimraf": "^5.0.7",
+    "tsup": "7.0.0",
+    "typescript": "^5.4.5",
+    "typescript-eslint": "^7.12.0",
+    "vitest": "^1.6.0"
   },
   "packageManager": "[email protected]"
 }

src/components/Provider.tsx

@@ -91,7 +91,6 @@ function Provider<A extends Action<string> = UnknownAction, S = unknown>({
 
   const Context = context || ReactReduxContext
 
-  // @ts-ignore 'AnyAction' is assignable to the constraint of type 'A', but 'A' could be instantiated with a different subtype
   return <Context.Provider value={contextValue}>{children}</Context.Provider>
 }
 

src/components/connect.tsx

@@ -519,7 +519,6 @@ function connect<
       WrappedComponent,
       // @ts-ignore
       initMapStateToProps,
-      // @ts-ignore
       initMapDispatchToProps,
       initMergeProps,
       areStatesEqual,
@@ -641,13 +640,19 @@ function connect<
       }, [didStoreComeFromProps, contextValue, subscription])
 
       // Set up refs to coordinate values between the subscription effect and the render logic
-      const lastChildProps = React.useRef<unknown>()
+      const lastChildProps = React.useRef<unknown>(undefined)
       const lastWrapperProps = React.useRef(wrapperProps)
-      const childPropsFromStoreUpdate = React.useRef<unknown>()
+      const childPropsFromStoreUpdate = React.useRef<unknown>(undefined)
       const renderIsScheduled = React.useRef(false)
       const isMounted = React.useRef(false)
 
-      const latestSubscriptionCallbackError = React.useRef<Error>()
+      // TODO: Change this to `React.useRef<Error>(undefined)` after upgrading to React 19.
+      /**
+       * @todo Change this to `React.useRef<Error>(undefined)` after upgrading to React 19.
+       */
+      const latestSubscriptionCallbackError = React.useRef<Error | undefined>(
+        undefined,
+      )
 
       useIsomorphicLayoutEffect(() => {
         isMounted.current = true

src/hooks/useSelector.ts

@@ -142,7 +142,7 @@ export function createSelectorHook(
       ? useDefaultReduxContext
       : createReduxContextHook(context)
 
-  const useSelector = <TState, Selected extends unknown>(
+  const useSelector = <TState, Selected>(
     selector: (state: TState) => Selected,
     equalityFnOrOptions:
       | EqualityFn<NoInfer<Selected>>

src/index-rsc.ts

@@ -10,25 +10,25 @@ const _check2: typeof rsc = {} as typeof normal
 
 // -------------------------------------------------------------------------------------
 
-function throwNotSupportedError(
+const throwNotSupportedError = ((
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   ...args: any[]
-): any {
+): any => {
   throw new Error(
     'This function is not supported in React Server Components. Please only use this export in a Client Component.',
   )
-}
+}) as any
 
 export {
-  throwNotSupportedError as batch,
   throwNotSupportedError as Provider,
+  throwNotSupportedError as batch,
   throwNotSupportedError as connect,
-  throwNotSupportedError as useSelector,
-  throwNotSupportedError as useDispatch,
-  throwNotSupportedError as useStore,
   throwNotSupportedError as createDispatchHook,
   throwNotSupportedError as createSelectorHook,
   throwNotSupportedError as createStoreHook,
+  throwNotSupportedError as useDispatch,
+  throwNotSupportedError as useSelector,
+  throwNotSupportedError as useStore,
 }
 export const ReactReduxContext = {} as any
 export { default as shallowEqual } from './utils/shallowEqual'

src/utils/react.ts

@@ -1,7 +1,6 @@
-import * as ReactOriginal from 'react'
 import type * as ReactNamespace from 'react'
+import * as ReactOriginal from 'react'
 
 export const React: typeof ReactNamespace =
   // prettier-ignore
-  // @ts-ignore
   'default' in ReactOriginal ? ReactOriginal['default'] : ReactOriginal as any