Merge branch 'master' into docs-update

Author: PrinceRajRoy

.codesandbox/ci.json

@@ -3,7 +3,17 @@
     "vanilla",
     "vanilla-ts",
     "github/reduxjs/rtk-github-issues-example",
-    "github/reduxjs/toolkit/examples/query/react/optimistic-updates"
+    "/examples/query/react/basic",
+    "/examples/query/react/advanced"
   ],
-  "node": "14"
-}
+  "node": "14",
+  "buildCommand": "build:packages",
+  "packages": [
+    "packages/toolkit",
+    "packages/rtk-query-graphql-request-base-query"
+  ],
+  "publishDirectory": {
+    "@reduxjs/toolkit": "packages/toolkit",
+    "@rtk-query/graphql-request-base-query": "packages/rtk-query-graphql-request-base-query"
+  }
+}

.eslintrc.js

@@ -3,6 +3,7 @@ module.exports = {
   parser: '@typescript-eslint/parser',
   rules: {
     'jsx-a11y/href-no-hash': 'off',
+    'react/react-in-jsx-scope': 'off',
     // Taken care of by TypeScript's `noUnusedLocals` / `noUnusedParameters`
     'no-unused-vars': 'off',
     '@typescript-eslint/no-unused-vars': 'off',
@@ -39,7 +40,11 @@ module.exports = {
     //   },
     // },
     {
-      files: ['src/tests/*.ts', 'src/**/tests/*.ts', 'src/**/tests/*.tsx'],
+      files: [
+        'packages/toolkit/src/tests/*.ts',
+        'packages/toolkit/src/**/tests/*.ts',
+        'packages/toolkit/src/**/tests/*.tsx',
+      ],
       rules: {
         '@typescript-eslint/no-unused-expressions': 'off',
         'no-lone-blocks': 'off',

.github/README.md

@@ -0,0 +1 @@
+../packages/toolkit/README.md

.github/workflows/size.yml

@@ -9,5 +9,6 @@ jobs:
       - uses: actions/checkout@v1
       - uses: andresz1/size-limit-action@v1
         with:
+          directory: packages/toolkit
           github_token: ${{ secrets.GITHUB_TOKEN }}
           build_script: build-only

.github/workflows/tests.yml

@@ -1,5 +1,9 @@
 name: CI
 on: [push, pull_request]
+defaults:
+  run:
+    working-directory: ./packages/toolkit
+
 jobs:
   build:
     name: Lint, Test, Build & Pack on Node ${{ matrix.node }}
@@ -18,21 +22,22 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
 
-      - uses: c-hive/gha-npm-cache@v1
+      - uses: actions/cache@v2
+        with:
+          path: .yarn/cache
+          key: yarn-${{ hashFiles('yarn.lock') }}
+          restore-keys: yarn-
 
       - name: Install deps
-        run: npm ci
-
-      - name: Build
-        run: npm run build-ci
+        run: yarn install
 
       - name: Pack
-        run: npm pack
+        run: yarn pack
 
       - uses: actions/upload-artifact@v2
         with:
           name: package
-          path: reduxjs-toolkit*.tgz
+          path: packages/toolkit/package.tgz
 
   test-dist:
     name: Test against dist
@@ -51,23 +56,29 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
 
-      - uses: c-hive/gha-npm-cache@v1
+      - uses: actions/cache@v2
+        with:
+          path: .yarn/cache
+          key: yarn-${{ hashFiles('yarn.lock') }}
+          restore-keys: yarn-
 
       - name: Install deps
-        run: npm ci --ignore-scripts
+        run: yarn install
 
       - uses: actions/download-artifact@v2
         with:
           name: package
+          path: packages/toolkit
+
+      - run: ls -lah
 
       - name: Install build artifact
-        run: |
-          sed -i -e '/"name": "@reduxjs\/toolkit",/d' package.json
-          npm i reduxjs-toolkit-*.tgz --ignore-scripts
-          sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json ./jest.config.js ./src/tests/*.* ./src/query/tests/*.*
+        run: yarn workspace @reduxjs/toolkit add $(pwd)/package.tgz
+
+      - run: sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json ./jest.config.js ./src/tests/*.* ./src/query/tests/*.*
 
       - name: Run tests, against dist
-        run: npm test
+        run: yarn test
 
   test-types:
     name: Test Types with TypeScript ${{ matrix.ts }}
@@ -88,33 +99,33 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
 
-      - uses: c-hive/gha-npm-cache@v1
+      - uses: actions/cache@v2
+        with:
+          path: .yarn/cache
+          key: yarn-${{ hashFiles('yarn.lock') }}
+          restore-keys: yarn-
 
       - name: Install deps
-        run: npm ci --ignore-scripts
+        run: yarn install
 
       - name: Install TypeScript ${{ matrix.ts }}
-        run: npm install typescript@${{ matrix.ts }} --ignore-scripts
+        run: yarn add typescript@${{ matrix.ts }}
 
       - uses: actions/download-artifact@v2
         with:
           name: package
+          path: packages/toolkit
 
       - name: Install build artifact
-        run: |
-          sed -i -e '/"name": "@reduxjs\/toolkit",/d' package.json
-          npm i reduxjs-toolkit-*.tgz --ignore-scripts
-          sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json ./jest.config.js ./src/tests/*.* ./src/query/tests/*.*
+        run: yarn add ./package.tgz
+
+      - run: sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json ./jest.config.js ./src/tests/*.* ./src/query/tests/*.*
 
       - name: "@ts-ignore stuff that didn't exist pre-4.1 in the tests"
         if: ${{ matrix.ts < 4.1 }}
         run: sed -i -e 's/@pre41-ts-ignore/@ts-ignore/' -e  '/pre41-remove-start/,/pre41-remove-end/d' ./src/tests/*.* ./src/query/tests/*.ts*
 
-      - name: 'disable strictOptionalProperties'
-        if: ${{ matrix.ts == 'next' }}
-        run: sed -i -e 's|//\(.*strictOptionalProperties.*\)$|\1|' tsconfig.base.json
-
       - name: Test types
         run: |
-          ./node_modules/.bin/tsc --version
-          npm run type-tests
+          yarn tsc --version
+          yarn type-tests

.gitignore

@@ -3,12 +3,9 @@
 node_modules
 # Dist and query are both build output folders
 dist*/
-!query/
 # But don't ignore the RTK Query source
-!src/query/
 lib
 es
-yarn.lock
 
 
 .idea/
@@ -20,5 +17,16 @@ build/
 
 typesversions
 .cache
-.yarn
 .yarnrc
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*
+*.tgz
+
+.yalc
+yalc.lock
+yalc.sig

.yarn/patches/react-scripts__npm_4.0.2.patch

@@ -0,0 +1,28 @@
+diff --git a/config/webpack.config.js b/config/webpack.config.js
+index ba8fd0b9b56a073c6f6173feb9e3154290ceeda2..bf316c8df3b5dd9e862b3b4f02019d449ee06516 100644
+--- a/config/webpack.config.js
++++ b/config/webpack.config.js
+@@ -24,7 +24,6 @@ const ManifestPlugin = require('webpack-manifest-plugin');
+ const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
+ const WorkboxWebpackPlugin = require('workbox-webpack-plugin');
+ const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
+-const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
+ const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
+ const ESLintPlugin = require('eslint-webpack-plugin');
+ const paths = require('./paths');
+@@ -349,15 +348,6 @@ module.exports = function (webpackEnv) {
+         // Adds support for installing with Plug'n'Play, leading to faster installs and adding
+         // guards against forgotten dependencies and such.
+         PnpWebpackPlugin,
+-        // Prevents users from importing files from outside of src/ (or node_modules/).
+-        // This often causes confusion because we only process files within src/ with babel.
+-        // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
+-        // please link the files into your node_modules/ and let module-resolution kick in.
+-        // Make sure your source files are compiled, as they will not be processed in any way.
+-        new ModuleScopePlugin(paths.appSrc, [
+-          paths.appPackageJson,
+-          reactRefreshOverlayEntry,
+-        ]),
+       ],
+     },
+     resolveLoader: {

.yarn/plugins/@yarnpkg/plugin-compat.cjs

@@ -0,0 +1,9 @@
+module.exports = {
+  name: `@yarnpkg/plugin-compat`,
+  factory: (require) => {
+    // we are not using PNP and want to use `typescript@next` in CI without hassle
+    // dummy implementation to override the built-in version of this plugin
+    // can be dropped once we switch to yarn 3
+    return {}
+  },
+}