Merge branch 'feature/v1.6-integration' into feature/remove-alpha.3-deprecations

# Conflicts:
#	src/query/createApi.ts
#	src/query/endpointDefinitions.ts

Author: markerikson

.codesandbox/ci.json

@@ -2,7 +2,8 @@
   "sandboxes": [
     "vanilla",
     "vanilla-ts",
-    "github/reduxjs/rtk-github-issues-example"
+    "github/reduxjs/rtk-github-issues-example",
+    "github/reduxjs/toolkit/examples/query/react/optimistic-updates"
   ],
   "node": "14"
-}
+}

.eslintrc.js

@@ -13,13 +13,18 @@ module.exports = {
     '@typescript-eslint/no-redeclare': 'off',
     'no-use-before-define': 'off',
     '@typescript-eslint/no-use-before-define': ['error', { functions: false }],
+    '@typescript-eslint/consistent-type-imports': [
+      'error',
+      { prefer: 'type-imports', disallowTypeAnnotations: false },
+    ],
   },
   overrides: [
     {
       files: ['src/tests/*.ts', 'src/**/tests/*.ts', 'src/**/tests/*.tsx'],
       rules: {
         '@typescript-eslint/no-unused-expressions': 'off',
         'no-lone-blocks': 'off',
+        'no-sequences': 'off',
       },
     },
   ],

.github/workflows/main.yaml

@@ -0,0 +1,13 @@
+name: size
+on: [pull_request]
+jobs:
+  size:
+    runs-on: ubuntu-latest
+    env:
+      CI_JOB_NUMBER: 1
+    steps:
+      - uses: actions/checkout@v1
+      - uses: andresz1/size-limit-action@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          build_script: build-only

.github/workflows/size.yml

@@ -23,10 +23,11 @@ jobs:
       - name: Install deps
         run: npm ci
 
-      - name: Pack (including Prepare)
+      - name: Build
+        run: npm run build-ci
+
+      - name: Pack
         run: npm pack
-        env:
-          NODE_ENV: 'production' # this doesn't actually matter, so just set it to production
 
       - uses: actions/upload-artifact@v2
         with:

.github/workflows/tests.yml

@@ -0,0 +1,144 @@
+const webpack = require('webpack')
+let { join } = require('path')
+
+const suffixes = ['cjs.production.min.js', 'esm.js']
+
+function withRtkPath(suffix) {
+  return (config) => {
+    config.plugins.push(
+      new webpack.NormalModuleReplacementPlugin(
+        /@reduxjs\/toolkit\/query\/react/,
+        join(__dirname, `query/react`)
+      ),
+      new webpack.NormalModuleReplacementPlugin(
+        /@reduxjs\/toolkit\/query/,
+        join(__dirname, `query`)
+      ),
+      new webpack.NormalModuleReplacementPlugin(
+        /@reduxjs\/toolkit/,
+        join(__dirname)
+      ),
+      new webpack.NormalModuleReplacementPlugin(
+        /rtk-query-react.esm.js/,
+        (r) => {
+          const old = r.request
+          r.request = r.request.replace(
+            /rtk-query-react.esm.js$/,
+            `rtk-query-react.${suffix}`
+          )
+          // console.log(old, '=>', r.request)
+        }
+      ),
+      new webpack.NormalModuleReplacementPlugin(/rtk-query.esm.js/, (r) => {
+        const old = r.request
+        r.request = r.request.replace(
+          /rtk-query.esm.js$/,
+          `rtk-query.${suffix}`
+        )
+        // console.log(old, '=>', r.request)
+      }),
+      new webpack.NormalModuleReplacementPlugin(
+        /redux-toolkit.esm.js$/,
+        (r) => {
+          const old = r.request
+          r.request = r.request.replace(
+            /redux-toolkit.esm.js$/,
+            `redux-toolkit.${suffix}`
+          )
+          // console.log(old, '=>', r.request)
+        }
+      )
+    )
+    if (suffix === 'cjs.production.min.js') {
+      config.resolve.mainFields = ['main', 'module']
+    }
+    config.optimization.nodeEnv = 'production'
+    return config
+  }
+}
+
+const ignoreAll = [
+  '@reduxjs/toolkit',
+  '@reduxjs/toolkit/query',
+  'immer',
+  'redux',
+  'reselect',
+  'redux-thunk',
+]
+
+module.exports = [
+  {
+    name: `1. entry point: @reduxjs/toolkit`,
+    path: 'dist/redux-toolkit.esm.js',
+  },
+  {
+    name: `1. entry point: @reduxjs/toolkit/query`,
+    path: 'dist/query/rtk-query.esm.js',
+  },
+  {
+    name: `1. entry point: @reduxjs/toolkit/query/react`,
+    path: 'dist/query/react/rtk-query-react.esm.js',
+  },
+  {
+    name: `2. entry point: @reduxjs/toolkit (without dependencies)`,
+    path: 'dist/redux-toolkit.esm.js',
+    ignore: ignoreAll,
+  },
+  {
+    name: `2. entry point: @reduxjs/toolkit/query (without dependencies)`,
+    path: 'dist/query/rtk-query.esm.js',
+    ignore: ignoreAll,
+  },
+  {
+    name: `2. entry point: @reduxjs/toolkit/query/react (without dependencies)`,
+    path: 'dist/query/react/rtk-query-react.esm.js',
+    ignore: ignoreAll,
+  },
+]
+  .flatMap((e) =>
+    suffixes.map((suffix) => ({
+      ...e,
+      name: e.name + ` (${suffix})`,
+      modifyWebpackConfig: withRtkPath(suffix),
+    }))
+  )
+  .concat(
+    ...[
+      {
+        name: `3. createSlice`,
+        import: { '@reduxjs/toolkit': '{ createSlice }' },
+      },
+      {
+        name: `3. createEntityAdapter`,
+        import: { '@reduxjs/toolkit': '{ createEntityAdapter }' },
+      },
+      {
+        name: `3. configureStore`,
+        import: { '@reduxjs/toolkit': '{ configureStore }' },
+      },
+      {
+        name: `3. createApi`,
+        import: { '@reduxjs/toolkit/query': '{ createApi }' },
+      },
+      {
+        name: `3. createApi (react)`,
+        import: { '@reduxjs/toolkit/query/react': '{ createApi }' },
+      },
+      {
+        name: `3. fetchBaseQuery`,
+        import: { '@reduxjs/toolkit/query': '{ fetchBaseQuery }' },
+      },
+      {
+        name: `3. setupListeners`,
+        import: { '@reduxjs/toolkit/query': '{ setupListeners }' },
+      },
+      {
+        name: `3. ApiProvider`,
+        import: { '@reduxjs/toolkit/query/react': '{ ApiProvider }' },
+      },
+    ].map((e) => ({
+      ...e,
+      name: e.name + ` (esm.js)`,
+      modifyWebpackConfig: withRtkPath('esm.js'),
+    }))
+  )

.size-limit.js

@@ -5,6 +5,8 @@ sidebar_label: configureStore
 hide_title: true
 ---
 
+ 
+
 # `configureStore`
 
 A friendly abstraction over the standard Redux `createStore` function that adds good defaults

docs/api/configureStore.mdx

@@ -5,6 +5,8 @@ sidebar_label: createAction
 hide_title: true
 ---
 
+ 
+
 # `createAction`
 
 A helper function for defining a Redux [action](https://redux.js.org/basics/actions) type and creator.
@@ -21,7 +23,7 @@ const INCREMENT = 'counter/increment'
 function increment(amount: number) {
   return {
     type: INCREMENT,
-    payload: amount
+    payload: amount,
   }
 }
 
@@ -63,8 +65,8 @@ const addTodo = createAction('todos/add', function prepare(text: string) {
     payload: {
       text,
       id: nanoid(),
-      createdAt: new Date().toISOString()
-    }
+      createdAt: new Date().toISOString(),
+    },
   }
 })
 
@@ -95,7 +97,7 @@ import { createAction, createReducer } from '@reduxjs/toolkit'
 const increment = createAction<number>('counter/increment')
 const decrement = createAction<number>('counter/decrement')
 
-const counterReducer = createReducer(0, builder => {
+const counterReducer = createReducer(0, (builder) => {
   builder.addCase(increment, (state, action) => state + action.payload)
   builder.addCase(decrement, (state, action) => state - action.payload)
 })
@@ -133,7 +135,7 @@ const counterReducer = createReducer(0, {
   [increment]: (state, action) => state + action.payload,
 
   // You would need to use the action type explicitly instead.
-  [INCREMENT]: (state, action) => state + action.payload
+  [INCREMENT]: (state, action) => state + action.payload,
 })
 ```
 
@@ -178,7 +180,7 @@ const increment = createAction<number>('INCREMENT')
 export const epic = (actions$: Observable<Action>) =>
   actions$.pipe(
     filter(increment.match),
-    map(action => {
+    map((action) => {
       // action.payload can be safely used as number here (and will also be correctly inferred by TypeScript)
       // ...
     })