Merge branch 'master' into jc/8wd2

Author: huozhi

immutable/package.json

@@ -1,8 +1,9 @@
 {
   "name": "swr-immutable",
   "version": "0.0.1",
+  "type": "module",
   "main": "./dist/index.js",
-  "module": "./dist/index.esm.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/immutable",
   "peerDependencies": {
     "swr": "*",

infinite/index.ts

@@ -168,22 +168,34 @@ export const infinite = ((<Data, Error, Args extends Arguments>(
 
   const mutate = useCallback(
     (
-      data: Data[] | undefined | Promise<Data[]> | MutatorCallback<Data[]>,
-      shouldRevalidate = true
+      ...args:
+        | []
+        | [undefined | Data[] | Promise<Data[]> | MutatorCallback<Data[]>]
+        | [
+            undefined | Data[] | Promise<Data[]> | MutatorCallback<Data[]>,
+            boolean
+          ]
     ) => {
+      const data = args[0]
+
+      // Default to true.
+      const shouldRevalidate = args[1] !== false
+
       // It is possible that the key is still falsy.
       if (!contextCacheKey) return
 
-      if (shouldRevalidate && !isUndefined(data)) {
-        // We only revalidate the pages that are changed
-        const originalData = dataRef.current
-        cache.set(contextCacheKey, [false, originalData])
-      } else if (shouldRevalidate) {
-        // Calling `mutate()`, we revalidate all pages
-        cache.set(contextCacheKey, [true])
+      if (shouldRevalidate) {
+        if (!isUndefined(data)) {
+          // We only revalidate the pages that are changed
+          const originalData = dataRef.current
+          cache.set(contextCacheKey, [false, originalData])
+        } else {
+          // Calling `mutate()`, we revalidate all pages
+          cache.set(contextCacheKey, [true])
+        }
       }
 
-      return swr.mutate(data, shouldRevalidate)
+      return args.length ? swr.mutate(data, shouldRevalidate) : swr.mutate()
     },
     // swr.mutate is always the same reference
     // eslint-disable-next-line react-hooks/exhaustive-deps

infinite/package.json

@@ -1,8 +1,9 @@
 {
   "name": "swr-infinite",
   "version": "0.0.1",
+  "type": "module",
   "main": "./dist/index.js",
-  "module": "./dist/index.esm.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/infinite",
   "peerDependencies": {
     "swr": "*",

jest.config.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   testEnvironment: 'jsdom',
   testRegex: '/test/.*\\.test\\.tsx?$',
   modulePathIgnorePatterns: ['<rootDir>/examples/'],
@@ -8,10 +8,10 @@ module.exports = {
       '@swc-node/jest',
       {
         jsc: {
-          minify: false,
+          minify: false
         }
-      },
-    ],
+      }
+    ]
   },
   coveragePathIgnorePatterns: ['/node_modules/', '/dist/', '/test/'],
   coverageProvider: 'v8',

package.json

@@ -1,28 +1,29 @@
 {
   "name": "swr",
-  "version": "1.1.0-beta.6",
+  "version": "1.1.0-beta.8",
   "description": "React Hooks library for remote data fetching",
+  "type": "module",
   "main": "./dist/index.js",
-  "module": "./dist/index.esm.js",
+  "module": "./dist/index.mjs",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "import": "./dist/index.esm.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.js",
       "types": "./dist/index.d.ts"
     },
     "./infinite": {
-      "import": "./infinite/dist/index.esm.js",
+      "import": "./infinite/dist/index.mjs",
       "require": "./infinite/dist/index.js",
       "types": "./infinite/dist/infinite/index.d.ts"
     },
     "./immutable": {
-      "import": "./immutable/dist/index.esm.js",
+      "import": "./immutable/dist/index.mjs",
       "require": "./immutable/dist/index.js",
       "types": "./immutable/dist/immutable/index.d.ts"
     }
   },
-  "react-native": "./dist/index.esm.js",
+  "react-native": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
     "dist/**",

src/utils/with-middleware.ts

@@ -15,7 +15,7 @@ export const withMiddleware = (
       | [Key, Fetcher<Data> | null, SWRConfiguration | undefined]
   ) => {
     const [key, fn, config] = normalize(args)
-    config.use = (config.use || []).concat(middleware)
-    return useSWR<Data, Error>(key, fn, config)
+    const middlewares = (config.use || []).concat(middleware)
+    return useSWR<Data, Error>(key, fn, { ...config, use: middlewares })
   }
 }

test/use-swr-infinite.test.tsx

@@ -954,4 +954,34 @@ describe('useSWRInfinite', () => {
     await nextTick()
     screen.getByText('data:fallback-1,fallback-2')
   })
+
+  it('should revalidate the resource with bound mutate when no argument is passed', async () => {
+    let t = 0
+    const key = createKey()
+    const fetcher = jest.fn(async () =>
+      createResponse(`foo-${t++}`, { delay: 10 })
+    )
+    const logger = []
+    function Page() {
+      const { data, mutate } = useSWRInfinite(() => key, fetcher, {
+        dedupingInterval: 0
+      })
+      logger.push(data)
+      return (
+        <>
+          <div>data: {String(data)}</div>
+          <button onClick={() => mutate()}>mutate</button>
+        </>
+      )
+    }
+
+    renderWithConfig(<Page />)
+    await screen.findByText('data: foo-0')
+
+    fireEvent.click(screen.getByText('mutate'))
+    await screen.findByText('data: foo-1')
+    expect(fetcher).toBeCalledTimes(2)
+
+    expect(logger).toEqual([undefined, ['foo-0'], ['foo-1']])
+  })
 })