Update import paths

Author: markerikson

docs/api/rtk-query/ApiProvider.md

@@ -12,7 +12,7 @@ hide_title: true
 [examples](docblock://query/react/ApiProvider.tsx?token=ApiProvider)
 
 :::danger
-Using this together with an existing redux store will cause them to conflict with each other. If you are already using Redux, please use follow the instructions as shown in the [Getting Started guide](../introduction/getting-started).
+Using this together with an existing Redux store will cause them to conflict with each other. If you are already using Redux, please use follow the instructions as shown in the [Getting Started guide](../../introduction/getting-started).
 :::
 
 ### Example

docs/api/rtk-query/created-api/endpoints.md

@@ -112,12 +112,6 @@ A function that accepts a cache key argument, and generates a new memoized selec
 
 RTKQ defines a `Symbol` named `skipSelector` internally. If `skipSelector` is passed as the query argument to these selectors, the selector will return `undefined`. This can be used to avoid returning a value if a given query is supposed to be disabled.
 
-:::caution
-
-RTKQ does not currently export `skipSelector`, although the React hooks use it internally. We plan to export it before final release so that end users can use that as well - see https://github.com/rtk-incubator/rtk-query/issues/211 .
-
-:::
-
 React Hooks users will most likely never need to use these directly, as the hooks automatically use these selectors as needed.
 
 :::caution

docs/api/rtk-query/created-api/hooks.md

@@ -14,7 +14,7 @@ The core RTK Query `createApi` method is UI-agnostic, in the same way that the R
 However, RTK Query also provides the ability to auto-generate React hooks for each of your endpoints. Since this specifically depends on React itself, RTK Query provides an alternate entry point that exposes a customized version of `createApi` that includes that functionality:
 
 ```js
-import { createApi } from '@rtk-incubator/rtk-query/react';
+import { createApi } from 'reduxjs/toolkit/query/react'
 ```
 
 If you have used the React-specific version of `createApi`, the generated `Api` slice structure will also contain a set of React hooks. These endpoint hooks are available as `api.endpoints[endpointName].useQuery` or `api.endpoints[endpointName].useMutation`, matching how you defined that endpoint.

docs/api/rtk-query/fetchBaseQuery.md

@@ -43,8 +43,8 @@ Promise<{
 To use it, import it when you are [creating an API service definition](../introduction/getting-started#create-an-api-service).
 
 ```ts title="src/services/pokemon.ts"
-// Or from '@rtk-incubator/rtk-query/react'
-import { createApi, fetchBaseQuery } from '@rtk-incubator/rtk-query';
+// Or from '@reduxjs/toolkit/query/react'
+import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query'
 
 export const pokemonApi = createApi({
   baseQuery: fetchBaseQuery({ baseUrl: 'https://pokeapi.co/api/v2/' }), // Set the baseUrl for every endpoint below

docs/tutorials/rtk-query.md

@@ -71,7 +71,7 @@ An RTK service generates a "slice reducer" that should be included in the Redux
 
 ```ts title="src/store.ts"
 import { configureStore } from '@reduxjs/toolkit'
-// Or from '@rtk-incubator/rtk-query/react'
+// Or from '@reduxjs/toolkit/query/react'
 import { setupListeners } from '@reduxjs/toolkit/query'
 import { pokemonApi } from './services/pokemon'
 

docs/usage/rtk-query/customizing-create-api.md

@@ -19,28 +19,42 @@ You can create your own versions of `createApi` by either specifying non-default
 If you want the hooks to use different versions of `useSelector` or `useDispatch`, for example if you are using a custom context, you can pass these in at module creation:
 
 ```ts
-import * as React from 'react';
-import { createDispatchHook, ReactReduxContextValue } from 'react-redux';
-import { buildCreateApi, coreModule, reactHooksModule } from '@rtk-incubator/rtk-query';
-
-const MyContext = React.createContext<ReactReduxContextValue>(null as any);
-const customCreateApi = buildCreateApi(coreModule(), reactHooksModule({ useDispatch: createDispatchHook(MyContext) }));
+import * as React from 'react'
+import { createDispatchHook, ReactReduxContextValue } from 'react-redux'
+import {
+  buildCreateApi,
+  coreModule,
+  reactHooksModule,
+} from '@reduxjs/toolkit/query'
+
+const MyContext = React.createContext<ReactReduxContextValue>(null as any)
+const customCreateApi = buildCreateApi(
+  coreModule(),
+  reactHooksModule({ useDispatch: createDispatchHook(MyContext) })
+)
 ```
 
 ## Creating your own module
 
-If you want to create your own module, you should review [the react-hooks module](https://github.com/rtk-incubator/rtk-query/blob/main/src/react-hooks/module.ts) to see what an implementation would look like.
+If you want to create your own module, you should review [the react-hooks module](https://github.com/reduxjs/redux-toolkit/blob/b74a52935a5840bebca5acdc8e2265e3b6497afa/src/query/react/module.ts) to see what an implementation would look like.
 
 Here is a very stripped down version:
 
 ```ts
-import { CoreModule } from '@internal/core/module';
-import { BaseQueryFn, EndpointDefinitions, Api, Module, buildCreateApi, coreModule } from '@rtk-incubator/rtk-query';
-
-export const customModuleName = Symbol();
-export type CustomModule = typeof customModuleName;
-
-declare module '@rtk-incubator/rtk-query' {
+import { CoreModule } from '@internal/core/module'
+import {
+  BaseQueryFn,
+  EndpointDefinitions,
+  Api,
+  Module,
+  buildCreateApi,
+  coreModule,
+} from '@reduxjs/toolkit/query'
+
+export const customModuleName = Symbol()
+export type CustomModule = typeof customModuleName
+
+declare module '../apiTypes' {
   export interface ApiModules<
     BaseQuery extends BaseQueryFn,
     Definitions extends EndpointDefinitions,

docs/usage/rtk-query/pagination.md

@@ -12,8 +12,8 @@ RTK Query makes it straightforward to integrate with a standard index-based pagi
 ## Setup an endpoint to accept a page `arg`
 
 ```ts title="src/app/services/posts.ts"
-// Or from '@rtk-incubator/rtk-query/react'
-import { createApi, fetchBaseQuery } from "@rtk-incubator/rtk-query";
+// Or from '@reduxjs/toolkit/query/react'
+import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query";
 
 interface ListResponse<T> {
   page: number;

src/query/createApi.ts

@@ -61,7 +61,7 @@ export interface CreateApiOptions<
    *
    * ```js
    * // codeblock-meta title="apis.js"
-   * import { createApi, fetchBaseQuery } from '@rtk-incubator/rtk-query';
+   * import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query';
    *
    * const apiOne = createApi({
    *   reducerPath: 'apiOne',

src/query/react/ApiProvider.tsx

@@ -11,7 +11,7 @@ import { Api } from '../apiTypes'
  * ```ts
  * // codeblock-meta title="Basic usage - wrap your App with ApiProvider"
  * import * as React from 'react';
- * import { ApiProvider } from '@rtk-incubator/rtk-query';
+ * import { ApiProvider } from '@reduxjs/toolkit/query/react';
  *
  * function App() {
  *   return (