Skip to content

Commit 05e26ae

Browse files
committed
Merge branch 'beta' of https://github.com/tannerlinsley/react-query into fix/query-function-data-dont-accept-promise-undefined
2 parents b9168c2 + fdbc002 commit 05e26ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+723
-1464
lines changed

.babelrc.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const { NODE_ENV, BABEL_ENV } = process.env
22
const cjs = NODE_ENV === 'test' || BABEL_ENV === 'commonjs'
3+
const es = BABEL_ENV === 'es'
34
const loose = true
45

56
module.exports = {
@@ -20,10 +21,11 @@ module.exports = {
2021
],
2122
plugins: [
2223
cjs && ['@babel/transform-modules-commonjs', { loose }],
23-
[
24+
es && ['babel-plugin-add-import-extension', { extension: 'mjs' }],
25+
// no runtime for umd builds
26+
BABEL_ENV && [
2427
'@babel/transform-runtime',
2528
{
26-
useESModules: !cjs,
2729
version: require('./package.json').dependencies[
2830
'@babel/runtime'
2931
].replace(/^[^0-9]*/, ''),

.github/workflows/test-and-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
strategy:
1919
matrix:
20-
node: [12, 14, 16]
20+
node: [14, 16]
2121
react: [17, 18]
2222
steps:
2323
- uses: actions/checkout@v2

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Tabl
3030

3131
## Visit [react-query.tanstack.com](https://react-query.tanstack.com) for docs, guides, API and more!
3232

33-
Still on **React Query v2**? No problem! Check out the v2 docs here: https://react-query-v2.tanstack.com/.
33+
Still on **React Query v2**? No problem! Check out the v2 docs here: https://react-query-v2.tanstack.com/. <br />
34+
Would you like to try **React Query v4beta**? Check out the v4 beta docs here: https://react-query-beta.tanstack.com/.
3435
## Quick Features
3536

3637
- Transport/protocol/backend agnostic data fetching (REST, GraphQL, promises, whatever!)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from '../lib/broadcastQueryClient-experimental'
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('../lib/broadcastQueryClient-experimental/index')

core/index.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from '../lib/core'

core/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('../lib/core/index')

core/package.json

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from '../lib/createAsyncStoragePersister'
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('../lib/createAsyncStoragePersister/index')

0 commit comments

Comments
 (0)