Merge branch 'reduxjs:master' into docs/correction-of-refetch-typing-for-use-query

Author: domvo

.codesandbox/ci.json

@@ -8,7 +8,7 @@
     "/examples/action-listener/counter",
     "/examples/publish-ci/cra5"
   ],
-  "node": "16",
+  "node": "18",
   "buildCommand": "build:packages",
   "packages": [
     "packages/toolkit",

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/workflows/publish.yml

@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '18.x'
+          node-version: '20.x'
           registry-url: 'https://registry.npmjs.org'
           cache: 'yarn'
       - run: yarn install --frozen-lockfile

.github/workflows/size.yml.bak renamed to .github/workflows/size.yml

@@ -1,14 +1,21 @@
 name: size
-on: [pull_request]
+on:
+  pull_request:
+    branches:
+      - master
+permissions:
+  pull-requests: write
 jobs:
   size:
     runs-on: ubuntu-latest
     env:
       CI_JOB_NUMBER: 1
     steps:
       - uses: actions/checkout@v2
-      - uses: andresz1/size-limit-action@v1
+      - uses: EskiMojo14/size-limit-action@v2
         with:
           directory: packages/toolkit
           github_token: ${{ secrets.GITHUB_TOKEN }}
           build_script: build-only
+          package_manager: yarn
+          size_margin: non-zero

.github/workflows/test-codegen.yml

@@ -31,7 +31,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: ['16.x']
+        node-version: ['20.x']
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/tests.yml

@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['18.x']
+        node: ['20.x']
 
     steps:
       - name: Checkout repo
@@ -67,7 +67,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['18.x']
+        node: ['20.x']
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -91,7 +91,7 @@ jobs:
       - name: Install build artifact
         run: yarn workspace @reduxjs/toolkit add $(pwd)/package.tgz
 
-      - run: sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json ./vitest.config.ts ./src/tests/*.* ./src/query/tests/*.*
+      - run: sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json ./vitest.config.mts ./src/tests/*.* ./src/query/tests/*.*
 
       - name: Run tests, against dist
         run: yarn test
@@ -104,7 +104,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['18.x']
+        node: ['20.x']
         ts: ['4.7', '4.8', '4.9', '5.0', '5.1', '5.2', '5.3']
     steps:
       - name: Checkout repo
@@ -133,7 +133,7 @@ jobs:
       - name: Show installed RTK versions
         run: yarn info @reduxjs/toolkit
 
-      - run: sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json ./vitest.config.ts ./src/tests/*.* ./src/query/tests/*.*
+      - run: sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json ./vitest.config.mts ./src/tests/*.* ./src/query/tests/*.*
 
       - name: Test types
         run: |
@@ -148,11 +148,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['18.x']
-        example: ['cra4', 'cra5', 'next', 'vite', 'node-standard', 'node-esm', 'expo']
+        node: ['20.x']
+        example:
+          [
+            'cra4',
+            'cra5',
+            'next',
+            'vite',
+            'node-standard',
+            'node-esm',
+            'react-native',
+            'expo',
+          ]
     defaults:
       run:
         working-directory: ./examples/publish-ci/${{ matrix.example }}
+    env:
+      YARN_ENABLE_IMMUTABLE_INSTALLS: "false"
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -204,7 +216,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['18.x']
+        node: ['20.x']
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2

.gitignore

@@ -30,3 +30,5 @@ typesversions
 !.yarn/versions
 .pnp.*
 *.tgz
+
+tsconfig.vitest-temp.json

.prettierrc.json

@@ -1,6 +1,4 @@
 {
   "semi": false,
-  "singleQuote": true,
-  "endOfLine": "auto"
+  "singleQuote": true
 }
- 

.yarn/patches/msw-npm-0.40.2-2107d48752

@@ -0,0 +1,22 @@
+diff --git a/get-config.js b/get-config.js
+index 76ebaee5455b2a4bacb986784bd1b53ad89adeb7..1b092e645b258f4a6533ca88b7d36dbcde4eb6de 100644
+--- a/get-config.js
++++ b/get-config.js
+@@ -132,7 +132,7 @@ export default async function getConfig(plugins, process, args, pkg) {
+         } else if (!check.entry) {
+           if (pkg.packageJson.main) {
+             processed.files = [
+-              require.resolve(join(dirname(pkg.path), pkg.packageJson.main))
++              import.meta.resolve(join(dirname(pkg.path), pkg.packageJson.main))
+             ]
+           } else {
+             processed.files = [join(dirname(pkg.path), 'index.js')]
+@@ -177,7 +177,7 @@ export default async function getConfig(plugins, process, args, pkg) {
+       for (let i in check.import) {
+         if (peer.includes(i)) {
+           check.ignore = check.ignore.filter(j => j !== i)
+-          imports[require.resolve(i, config.cwd)] = check.import[i]
++          imports[import.meta.resolve(i, config.cwd)] = check.import[i]
+         } else {
+           imports[toAbsolute(i, config.cwd)] = check.import[i]
+         }