Merge pull request #1020 from reduxjs/bugfix/invalidation-loop

Author: markerikson

.github/workflows/main.yaml

@@ -8,6 +8,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: preactjs/compressed-size-action@v1
+      - uses: preactjs/compressed-size-action@v2
         with:
           repo-token: '${{ secrets.GITHUB_TOKEN }}'

.gitignore

@@ -2,7 +2,7 @@
 *.log
 node_modules
 # Dist and query are both build output folders
-dist
+dist*/
 !query/
 # But don't ignore the RTK Query source
 !src/query/

scripts/build.ts

@@ -116,6 +116,8 @@ const entryPoints: EntryPointOptions[] = [
 ]
 
 const esVersionMappings = {
+  // Don't output ES2015 - have TS convert to ES5 instead
+  es2015: ts.ScriptTarget.ES5,
   es2017: ts.ScriptTarget.ES2017,
   es2018: ts.ScriptTarget.ES2018,
   es2019: ts.ScriptTarget.ES2019,
@@ -130,7 +132,7 @@ async function bundle(options: BuildOptions & EntryPointOptions) {
     folder = '',
     prefix = 'redux-toolkit',
     name,
-    target,
+    target = 'es2015',
     entryPoint,
   } = options
 
@@ -142,7 +144,7 @@ async function bundle(options: BuildOptions & EntryPointOptions) {
     entryPoints: [entryPoint],
     outfile: outputFilePath,
     write: false,
-    target: 'esnext',
+    target: target,
     sourcemap: 'inline',
     bundle: true,
     format: format === 'umd' ? 'esm' : format,
@@ -232,7 +234,11 @@ async function bundle(options: BuildOptions & EntryPointOptions) {
       mapping = transformResult.map as RawSourceMap
     }
 
-    console.log('Build artifact:', chunk.path)
+    const relativePath = path.relative(process.cwd(), chunk.path)
+    console.log(`Build artifact: ${relativePath}, settings: `, {
+      target,
+      output: ts.ScriptTarget[esVersion],
+    })
     await fs.writeFile(chunk.path, code)
     await fs.writeJSON(chunk.path + '.map', mapping)
   }

src/query/core/buildMiddleware.ts

@@ -242,7 +242,8 @@ export function buildMiddleware<
     }
 
     context.batch(() => {
-      for (const queryCacheKey of toInvalidate.values()) {
+      const valuesArray = Array.from(toInvalidate.values())
+      for (const queryCacheKey of valuesArray) {
         const querySubState = state.queries[queryCacheKey]
         const subscriptionSubState = state.subscriptions[queryCacheKey]
         if (querySubState && subscriptionSubState) {