1
0
mirror of synced 2026-02-04 12:08:33 -05:00

Compare commits

...

3 Commits

Author SHA1 Message Date
beerose
b336ad05f4 Update pnpm-lock.yaml 2022-06-10 11:32:17 -07:00
github-actions[bot]
39ca0ef8bf Version Packages (alpha) (#3429)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-06-10 11:31:27 -07:00
Aleksandra
4cad9cca25 Add queryClient to RPC plugin exports (#3424) 2022-06-10 10:18:50 -07:00
28 changed files with 117 additions and 51 deletions

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/rpc": patch
---
Add queryClient to RPC Plugin exports

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/codemod": patch
---
Update queryClient import in codemod

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/generator": patch
---
Update codemod and template with a new queryClient import location

View File

@@ -22,6 +22,7 @@
"changesets": [
"big-phones-bow",
"breezy-cameras-double",
"bright-mangos-run",
"cool-doors-invent",
"dirty-monkeys-greet",
"eleven-humans-sort",
@@ -31,7 +32,9 @@
"fast-trainers-kneel",
"flat-bees-approve",
"four-meals-fry",
"gentle-dogs-reply",
"great-months-train",
"green-papayas-do",
"healthy-rice-shout",
"hot-drinks-approve",
"lovely-colts-share",

View File

@@ -2,7 +2,7 @@ import { AuthClientPlugin } from "@blitzjs/auth"
import { setupBlitzClient } from "@blitzjs/next"
import { BlitzRpcPlugin } from "@blitzjs/rpc"
export const { withBlitz } = setupBlitzClient({
export const { withBlitz, queryClient } = setupBlitzClient({
plugins: [
AuthClientPlugin({
cookiePrefix: "web-cookie-prefix",

View File

@@ -29,7 +29,7 @@
"@blitzjs/rpc": "workspace:*",
"@hookform/resolvers": "2.8.8",
"@prisma/client": "3.9.0",
"blitz": "workspace:2.0.0-alpha.35",
"blitz": "workspace:2.0.0-alpha.36",
"next": "12.1.6-canary.17",
"prisma": "3.9.0",
"react": "18.0.0",

View File

@@ -2,7 +2,7 @@ import {AuthClientPlugin} from "@blitzjs/auth"
import {setupBlitzClient} from "@blitzjs/next"
import {BlitzRpcPlugin} from "@blitzjs/rpc"
const {withBlitz} = setupBlitzClient({
const {withBlitz, queryClient} = setupBlitzClient({
plugins: [
AuthClientPlugin({
cookiePrefix: "webapp-cookie-prefix",
@@ -17,4 +17,4 @@ const {withBlitz} = setupBlitzClient({
],
})
export {withBlitz}
export {withBlitz, queryClient}

View File

@@ -1,5 +1,11 @@
# @blitzjs/auth
## 2.0.0-alpha.36
### Patch Changes
- blitz@2.0.0-alpha.36
## 2.0.0-alpha.35
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/auth",
"version": "2.0.0-alpha.35",
"version": "2.0.0-alpha.36",
"scripts": {
"build": "unbuild",
"predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
@@ -26,7 +26,7 @@
"@types/secure-password": "3.1.1",
"b64-lite": "1.4.0",
"bad-behavior": "1.0.1",
"blitz": "2.0.0-alpha.35",
"blitz": "2.0.0-alpha.36",
"cookie": "0.4.1",
"cookie-session": "2.0.0",
"debug": "4.3.3",
@@ -39,7 +39,7 @@
"url": "0.11.0"
},
"devDependencies": {
"@blitzjs/config": "workspace:2.0.0-alpha.35",
"@blitzjs/config": "workspace:2.0.0-alpha.36",
"@testing-library/react": "13.0.0",
"@testing-library/react-hooks": "7.0.2",
"@types/cookie": "0.4.1",

View File

@@ -1,5 +1,12 @@
# @blitzjs/next
## 2.0.0-alpha.36
### Patch Changes
- Updated dependencies [4cad9cca]
- @blitzjs/rpc@2.0.0-alpha.36
## 2.0.0-alpha.35
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/next",
"version": "2.0.0-alpha.35",
"version": "2.0.0-alpha.36",
"scripts": {
"build": "unbuild",
"dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
"eslint.js"
],
"dependencies": {
"@blitzjs/rpc": "2.0.0-alpha.35",
"@blitzjs/rpc": "2.0.0-alpha.36",
"@types/hoist-non-react-statics": "3.3.1",
"debug": "4.3.3",
"fs-extra": "10.0.1",
@@ -32,7 +32,7 @@
"superjson": "1.8.0"
},
"devDependencies": {
"@blitzjs/config": "workspace:2.0.0-alpha.35",
"@blitzjs/config": "workspace:2.0.0-alpha.36",
"@testing-library/dom": "8.13.0",
"@testing-library/jest-dom": "5.16.3",
"@testing-library/react": "13.0.0",
@@ -43,7 +43,7 @@
"@types/react": "18.0.1",
"@types/react-dom": "17.0.14",
"@types/testing-library__react-hooks": "4.0.0",
"blitz": "2.0.0-alpha.35",
"blitz": "2.0.0-alpha.36",
"cross-spawn": "7.0.3",
"find-up": "4.1.0",
"lodash.frompairs": "4.0.1",

View File

@@ -1,5 +1,13 @@
# @blitzjs/rpc
## 2.0.0-alpha.36
### Patch Changes
- 4cad9cca: Add queryClient to RPC Plugin exports
- blitz@2.0.0-alpha.36
- @blitzjs/auth@2.0.0-alpha.36
## 2.0.0-alpha.35
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/rpc",
"version": "2.0.0-alpha.35",
"version": "2.0.0-alpha.36",
"scripts": {
"build": "unbuild",
"predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts && wait-on -d 250 ../blitz-auth/dist/index-browser.d.ts",
@@ -20,7 +20,7 @@
"dist/**"
],
"dependencies": {
"@blitzjs/auth": "2.0.0-alpha.35",
"@blitzjs/auth": "2.0.0-alpha.36",
"b64-lite": "1.4.0",
"bad-behavior": "1.0.1",
"chalk": "^4.1.0",
@@ -30,11 +30,11 @@
"zod": "3.10.1"
},
"devDependencies": {
"@blitzjs/config": "workspace:2.0.0-alpha.35",
"@blitzjs/config": "workspace:2.0.0-alpha.36",
"@types/debug": "4.1.7",
"@types/react": "18.0.1",
"@types/react-dom": "17.0.14",
"blitz": "2.0.0-alpha.35",
"blitz": "2.0.0-alpha.36",
"next": "12.1.6-canary.17",
"react": "18.0.0",
"react-dom": "18.0.0",
@@ -43,7 +43,7 @@
"watch": "1.0.2"
},
"peerDependencies": {
"blitz": "2.0.0-alpha.35",
"blitz": "2.0.0-alpha.36",
"next": "*"
},
"publishConfig": {

View File

@@ -2,11 +2,11 @@ export * from "./rpc"
export {useQuery, usePaginatedQuery, useInfiniteQuery, useMutation} from "./react-query"
export type {MutateFunction} from "./react-query"
export {
queryClient,
getQueryKey,
getInfiniteQueryKey,
invalidateQuery,
setQueryData,
queryClient,
} from "./react-query-utils"
export {useQueryErrorResetBoundary, QueryClient} from "react-query"
export {dehydrate} from "react-query/hydration"

View File

@@ -4,12 +4,10 @@ import {DefaultOptions, QueryClient} from "react-query"
export * from "./data-client/index"
export const queryClient = globalThis.queryClient
interface BlitzRpcOptions {
reactQueryOptions?: DefaultOptions
}
export const BlitzRpcPlugin = createClientPlugin<BlitzRpcOptions, any>(
export const BlitzRpcPlugin = createClientPlugin<BlitzRpcOptions, {queryClient: QueryClient}>(
(options?: BlitzRpcOptions) => {
const initializeQueryClient = () => {
const {reactQueryOptions} = options || {}
@@ -37,12 +35,14 @@ export const BlitzRpcPlugin = createClientPlugin<BlitzRpcOptions, any>(
},
})
}
globalThis.queryClient = initializeQueryClient()
const queryClient = initializeQueryClient()
globalThis.queryClient = queryClient
return {
events: {},
middleware: {},
exports: () => {},
exports: () => ({
queryClient,
}),
}
},
)

View File

@@ -5,7 +5,10 @@ import {assert, expect, test, beforeEach, describe, spyOn, it} from "vitest"
import {queryClient, invalidateQuery, setQueryData} from "../../src/data-client"
import {getQueryCacheFunctions} from "../../src/data-client/react-query-utils"
import {
getQueryCacheFunctions,
initializeQueryClient,
} from "../../src/data-client/react-query-utils"
import {buildQueryRpc} from "../blitz-test-utils"
// eslint-disable-next-line require-await

View File

@@ -1,5 +1,12 @@
# blitz
## 2.0.0-alpha.36
### Patch Changes
- Updated dependencies [4cad9cca]
- @blitzjs/generator@2.0.0-alpha.36
## 2.0.0-alpha.35
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "blitz",
"version": "2.0.0-alpha.35",
"version": "2.0.0-alpha.36",
"scripts": {
"build": "unbuild",
"dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
"blitz": "bin/blitz"
},
"dependencies": {
"@blitzjs/generator": "2.0.0-alpha.35",
"@blitzjs/generator": "2.0.0-alpha.36",
"arg": "5.0.1",
"chalk": "^4.1.0",
"console-table-printer": "2.10.0",
@@ -52,7 +52,7 @@
"watchpack": "2.1.1"
},
"devDependencies": {
"@blitzjs/config": "workspace:2.0.0-alpha.35",
"@blitzjs/config": "workspace:2.0.0-alpha.36",
"@types/cookie": "0.4.1",
"@types/cross-spawn": "6.0.2",
"@types/debug": "4.1.7",

View File

@@ -1,5 +1,14 @@
# @blitzjs/codemod
## 2.0.0-alpha.36
### Patch Changes
- 4cad9cca: Update queryClient import in codemod
- Updated dependencies [4cad9cca]
- @blitzjs/generator@2.0.0-alpha.36
- blitz@2.0.0-alpha.36
## 2.0.0-alpha.35
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/codemod",
"version": "2.0.0-alpha.35",
"version": "2.0.0-alpha.36",
"scripts": {
"build": "unbuild",
"dev": "watch unbuild src --wait=0.2",
@@ -25,9 +25,9 @@
"@babel/plugin-proposal-class-properties": "7.17.12",
"@babel/plugin-syntax-jsx": "7.17.12",
"@babel/plugin-syntax-typescript": "7.17.12",
"@blitzjs/generator": "2.0.0-alpha.35",
"@blitzjs/generator": "2.0.0-alpha.36",
"arg": "5.0.1",
"blitz": "2.0.0-alpha.35",
"blitz": "2.0.0-alpha.36",
"chalk": "^4.1.0",
"cross-spawn": "7.0.3",
"debug": "4.3.3",

View File

@@ -145,7 +145,7 @@ const upgradeLegacy = async () => {
usePaginatedQuery: "@blitzjs/rpc",
useInfiniteQuery: "@blitzjs/rpc",
useMutation: "@blitzjs/rpc",
queryClient: "@blitzjs/rpc",
queryClient: "app/blitz-client",
getQueryKey: "@blitzjs/rpc",
getInfiniteQueryKey: "@blitzjs/rpc",
invalidateQuery: "@blitzjs/rpc",

View File

@@ -1,5 +1,7 @@
# @blitzjs/config
## 2.0.0-alpha.36
## 2.0.0-alpha.35
## 2.0.0-alpha.34

View File

@@ -1,7 +1,7 @@
{
"name": "@blitzjs/config",
"private": true,
"version": "2.0.0-alpha.35",
"version": "2.0.0-alpha.36",
"license": "MIT",
"dependencies": {
"@typescript-eslint/eslint-plugin": "5.9.1",

View File

@@ -1,5 +1,11 @@
# @blitzjs/generator
## 2.0.0-alpha.36
### Patch Changes
- 4cad9cca: Update codemod and template with a new queryClient import location
## 2.0.0-alpha.35
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/generator",
"version": "2.0.0-alpha.35",
"version": "2.0.0-alpha.36",
"scripts": {
"dev": "watch unbuild src --wait=0.2",
"build": "unbuild && pnpm build:templates",
@@ -45,7 +45,7 @@
"vinyl": "2.2.1"
},
"devDependencies": {
"@blitzjs/config": "2.0.0-alpha.35",
"@blitzjs/config": "2.0.0-alpha.36",
"@juanm04/cpx": "2.0.1",
"@types/babel__core": "7.1.19",
"@types/diff": "5.0.2",

View File

@@ -2,7 +2,7 @@ import { AuthClientPlugin } from "@blitzjs/auth"
import { setupBlitzClient } from "@blitzjs/next"
import { BlitzRpcPlugin } from "@blitzjs/rpc"
export const { withBlitz } = setupBlitzClient({
export const { withBlitz, queryClient } = setupBlitzClient({
plugins: [
AuthClientPlugin({
cookiePrefix: "__safeNameSlug__-cookie-prefix",

View File

@@ -25,7 +25,7 @@
"@typescript-eslint/parser": "5.9.1"
},
"devDependencies": {
"@blitzjs/config": "2.0.0-alpha.35",
"@blitzjs/config": "2.0.0-alpha.36",
"@types/react": "18.0.1",
"@types/react-dom": "17.0.14",
"react": "18.0.0",

30
pnpm-lock.yaml generated
View File

@@ -50,7 +50,7 @@ importers:
"@types/node": 17.0.16
"@types/preview-email": 2.0.1
"@types/react": 18.0.1
blitz: workspace:2.0.0-alpha.35
blitz: workspace:2.0.0-alpha.36
eslint: 7.32.0
husky: 7.0.4
jest: 27.5.1
@@ -432,8 +432,8 @@ importers:
packages/blitz:
specifiers:
"@blitzjs/config": workspace:2.0.0-alpha.35
"@blitzjs/generator": 2.0.0-alpha.35
"@blitzjs/config": workspace:2.0.0-alpha.36
"@blitzjs/generator": 2.0.0-alpha.36
"@types/cookie": 0.4.1
"@types/cross-spawn": 6.0.2
"@types/debug": 4.1.7
@@ -539,7 +539,7 @@ importers:
packages/blitz-auth:
specifiers:
"@blitzjs/config": workspace:2.0.0-alpha.35
"@blitzjs/config": workspace:2.0.0-alpha.36
"@testing-library/react": 13.0.0
"@testing-library/react-hooks": 7.0.2
"@types/b64-lite": 1.3.0
@@ -553,7 +553,7 @@ importers:
"@types/secure-password": 3.1.1
b64-lite: 1.4.0
bad-behavior: 1.0.1
blitz: 2.0.0-alpha.35
blitz: 2.0.0-alpha.36
cookie: 0.4.1
cookie-session: 2.0.0
debug: 4.3.3
@@ -604,8 +604,8 @@ importers:
packages/blitz-next:
specifiers:
"@blitzjs/config": workspace:2.0.0-alpha.35
"@blitzjs/rpc": 2.0.0-alpha.35
"@blitzjs/config": workspace:2.0.0-alpha.36
"@blitzjs/rpc": 2.0.0-alpha.36
"@testing-library/dom": 8.13.0
"@testing-library/jest-dom": 5.16.3
"@testing-library/react": 13.0.0
@@ -617,7 +617,7 @@ importers:
"@types/react": 18.0.1
"@types/react-dom": 17.0.14
"@types/testing-library__react-hooks": 4.0.0
blitz: 2.0.0-alpha.35
blitz: 2.0.0-alpha.36
cross-spawn: 7.0.3
debug: 4.3.3
find-up: 4.1.0
@@ -669,14 +669,14 @@ importers:
packages/blitz-rpc:
specifiers:
"@blitzjs/auth": 2.0.0-alpha.35
"@blitzjs/config": workspace:2.0.0-alpha.35
"@blitzjs/auth": 2.0.0-alpha.36
"@blitzjs/config": workspace:2.0.0-alpha.36
"@types/debug": 4.1.7
"@types/react": 18.0.1
"@types/react-dom": 17.0.14
b64-lite: 1.4.0
bad-behavior: 1.0.1
blitz: 2.0.0-alpha.35
blitz: 2.0.0-alpha.36
chalk: ^4.1.0
debug: 4.3.3
next: 12.1.6-canary.17
@@ -718,12 +718,12 @@ importers:
"@babel/plugin-syntax-typescript": 7.17.12
"@babel/preset-env": 7.12.10
"@blitzjs/config": workspace:*
"@blitzjs/generator": 2.0.0-alpha.35
"@blitzjs/generator": 2.0.0-alpha.36
"@types/jscodeshift": 0.11.2
"@types/node": 17.0.16
arg: 5.0.1
ast-types: 0.14.2
blitz: 2.0.0-alpha.35
blitz: 2.0.0-alpha.36
chalk: ^4.1.0
cross-spawn: 7.0.3
debug: 4.3.3
@@ -778,7 +778,7 @@ importers:
"@babel/plugin-transform-typescript": 7.12.1
"@babel/preset-env": 7.12.10
"@babel/types": 7.12.10
"@blitzjs/config": 2.0.0-alpha.35
"@blitzjs/config": 2.0.0-alpha.36
"@juanm04/cpx": 2.0.1
"@mrleebo/prisma-ast": 0.2.6
"@types/babel__core": 7.1.19
@@ -869,7 +869,7 @@ importers:
packages/pkg-template:
specifiers:
"@blitzjs/config": 2.0.0-alpha.35
"@blitzjs/config": 2.0.0-alpha.36
"@types/react": 18.0.1
"@types/react-dom": 17.0.14
"@typescript-eslint/eslint-plugin": 5.9.1