Skip to content

Commit

Permalink
Merge branch 'main' into ds-limit-setup-chakra-version
Browse files Browse the repository at this point in the history
  • Loading branch information
@jtoar
jtoar authored May 22, 2022
2 parents 11493b1 + 9bea0a3 commit 611fe7b
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 65 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@babel/preset-react": "7.16.7",
"@babel/preset-typescript": "7.16.7",
"@babel/runtime-corejs3": "7.16.7",
"@playwright/test": "1.22.1",
"@playwright/test": "1.22.2",
"@testing-library/jest-dom": "5.16.4",
"@testing-library/react": "12.1.5",
"@testing-library/react-hooks": "8.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@clerk/clerk-js": "3.11.0",
"@clerk/clerk-sdk-node": "3.6.0",
"@clerk/types": "2.13.0",
"@nhost/hasura-auth-js": "1.1.6",
"@nhost/hasura-auth-js": "1.1.9",
"@nhost/nhost-js": "1.1.14",
"@supabase/supabase-js": "1.35.3",
"@types/netlify-identity-widget": "1.9.3",
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffold.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ exports[`in javascript (default) mode creates a stylesheet 1`] = `
background-color: #a1a1aa;
background-clip: content-box;
border: 3px solid transparent;
border-radius: 50%;
border-radius: 10px;
}
.rw-segment-header {
background-color: #e2e8f0;
Expand Down Expand Up @@ -2047,7 +2047,7 @@ exports[`in typescript mode creates a stylesheet 1`] = `
background-color: #a1a1aa;
background-clip: content-box;
border: 3px solid transparent;
border-radius: 50%;
border-radius: 10px;
}
.rw-segment-header {
background-color: #e2e8f0;
Expand Down Expand Up @@ -2792,7 +2792,7 @@ exports[`tailwind flag set to \`false\` generates a scaffold.css with raw CSS 1`
background-color: #a1a1aa;
background-clip: content-box;
border: 3px solid transparent;
border-radius: 50%;
border-radius: 10px;
}
.rw-segment-header {
background-color: #e2e8f0;
Expand Down
4 changes: 2 additions & 2 deletions ...es/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffoldNoNest.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ exports[`in javascript (default) mode creates a stylesheet 1`] = `
background-color: #a1a1aa;
background-clip: content-box;
border: 3px solid transparent;
border-radius: 50%;
border-radius: 10px;
}
.rw-segment-header {
background-color: #e2e8f0;
Expand Down Expand Up @@ -1961,7 +1961,7 @@ exports[`in typescript mode creates a stylesheet 1`] = `
background-color: #a1a1aa;
background-clip: content-box;
border: 3px solid transparent;
border-radius: 50%;
border-radius: 10px;
}
.rw-segment-header {
background-color: #e2e8f0;
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/generate/scaffold/templates/assets/scaffold.css.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
background-color: #a1a1aa;
background-clip: content-box;
border: 3px solid transparent;
border-radius: 50%;
border-radius: 10px;
}
.rw-segment-header {
background-color: #e2e8f0;
Expand Down
6 changes: 3 additions & 3 deletions packages/graphql-server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
"@envelop/filter-operation-type": "3.3.2",
"@envelop/parser-cache": "4.3.2",
"@envelop/validation-cache": "4.3.2",
"@graphql-tools/merge": "8.2.12",
"@graphql-tools/schema": "8.3.12",
"@graphql-tools/utils": "8.6.11",
"@graphql-tools/merge": "8.2.13",
"@graphql-tools/schema": "8.3.13",
"@graphql-tools/utils": "8.6.12",
"@graphql-yoga/common": "2.6.0",
"@prisma/client": "3.14.0",
"@redwoodjs/api": "1.4.2",
Expand Down
87 changes: 33 additions & 54 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3449,15 +3449,15 @@ __metadata:
languageName: node
linkType: hard

"@graphql-tools/merge@npm:8.2.12, @graphql-tools/merge@npm:^8.2.1":
version: 8.2.12
resolution: "@graphql-tools/merge@npm:8.2.12"
"@graphql-tools/merge@npm:8.2.13, @graphql-tools/merge@npm:^8.2.1":
version: 8.2.13
resolution: "@graphql-tools/merge@npm:8.2.13"
dependencies:
"@graphql-tools/utils": 8.6.11
"@graphql-tools/utils": 8.6.12
tslib: ~2.4.0
peerDependencies:
graphql: ^14.0.0 || ^15.0.0 || ^16.0.0
checksum: 98388df471a91262c8f49d3953f0d26210a7a657705793985c1f5f5db382a23b1aa912a89544a2d24fc0e2ecfb9c70c43bfe2f473fd71ba4f15c58301534e9f2
graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
checksum: c366e8e9c90f6958ba2cdbbf06fb2d9effac73da12fa1a44fec6ea06829539fce5f3cf1c2eb09302074fad24557c1224b547a03371abbc7d8d2810fd16e4943a
languageName: node
linkType: hard

Expand Down Expand Up @@ -3529,17 +3529,17 @@ __metadata:
languageName: node
linkType: hard

"@graphql-tools/schema@npm:8.3.12, @graphql-tools/schema@npm:^8.1.2, @graphql-tools/schema@npm:^8.3.1":
version: 8.3.12
resolution: "@graphql-tools/schema@npm:8.3.12"
"@graphql-tools/schema@npm:8.3.13, @graphql-tools/schema@npm:^8.1.2, @graphql-tools/schema@npm:^8.3.1":
version: 8.3.13
resolution: "@graphql-tools/schema@npm:8.3.13"
dependencies:
"@graphql-tools/merge": 8.2.12
"@graphql-tools/utils": 8.6.11
"@graphql-tools/merge": 8.2.13
"@graphql-tools/utils": 8.6.12
tslib: ~2.4.0
value-or-promise: 1.0.11
peerDependencies:
graphql: ^14.0.0 || ^15.0.0 || ^16.0.0
checksum: e9f9bf183d23eaffd40ebee8e11149adf438cc9578f0460d6e519a3a0e5526ed865d00fddcfa3f8b59afbb997f36d42ba408e9f26d37e2b61442597bddd3688d
graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
checksum: f34a45fd76166ff5494e145a0376b23087e1d545d4c30b9b9cf5dc3ae8f096f04f02cafb4b712247c4881420458f4967af23b455a01054bc54f6cba35442231a
languageName: node
linkType: hard

Expand Down Expand Up @@ -3583,14 +3583,14 @@ __metadata:
languageName: node
linkType: hard

"@graphql-tools/utils@npm:8.6.11, @graphql-tools/utils@npm:^8.1.1, @graphql-tools/utils@npm:^8.3.0, @graphql-tools/utils@npm:^8.5.1, @graphql-tools/utils@npm:^8.5.2, @graphql-tools/utils@npm:^8.5.3, @graphql-tools/utils@npm:^8.5.4, @graphql-tools/utils@npm:^8.6.0, @graphql-tools/utils@npm:^8.6.1":
version: 8.6.11
resolution: "@graphql-tools/utils@npm:8.6.11"
"@graphql-tools/utils@npm:8.6.12, @graphql-tools/utils@npm:^8.1.1, @graphql-tools/utils@npm:^8.3.0, @graphql-tools/utils@npm:^8.5.1, @graphql-tools/utils@npm:^8.5.2, @graphql-tools/utils@npm:^8.5.3, @graphql-tools/utils@npm:^8.5.4, @graphql-tools/utils@npm:^8.6.0, @graphql-tools/utils@npm:^8.6.1":
version: 8.6.12
resolution: "@graphql-tools/utils@npm:8.6.12"
dependencies:
tslib: ~2.4.0
peerDependencies:
graphql: ^14.0.0 || ^15.0.0 || ^16.0.0
checksum: b32934c7c06341b5b7bfdd7d50e74043b6cb7ada35476759152e006ebce87a5ba774725465e74a7c22112a4e79d98ce19adaf3443d166ef9176d2d1f2c4f343b
graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
checksum: a3d5662877651601682e33ed557eeac16658c33cdc0c0c053326719d5885cb8cb4cdcfe54a49e17d4628f4f3643cab35d50999b13d673f34b646fa67ea81bd0a
languageName: node
linkType: hard

Expand Down Expand Up @@ -4947,17 +4947,6 @@ __metadata:
languageName: node
linkType: hard

"@nhost/core@npm:0.5.4":
version: 0.5.4
resolution: "@nhost/core@npm:0.5.4"
dependencies:
axios: ^0.27.2
js-cookie: ^3.0.1
xstate: ^4.31.0
checksum: 9500d3b37b61e94607434b269b1994837e9f9a469d16bce5f6f5d306daa51dca200dc722be2988dac132bcfb2fdc39e60b2deaa0633d9ff7c68e194e8be8cdd5
languageName: node
linkType: hard

"@nhost/core@npm:0.6.0":
version: 0.6.0
resolution: "@nhost/core@npm:0.6.0"
Expand All @@ -4969,17 +4958,6 @@ __metadata:
languageName: node
linkType: hard

"@nhost/hasura-auth-js@npm:1.1.6":
version: 1.1.6
resolution: "@nhost/hasura-auth-js@npm:1.1.6"
dependencies:
"@nhost/core": 0.5.4
jwt-decode: ^3.1.2
xstate: ^4.31.0
checksum: fad26c554ef643ff9f99353ef033d095f8c079260e646ec4fe81742b428b9612cc6a7ee03771c3c7daffa14e68b80443cd2f6ff272ead8591337d790ea977151
languageName: node
linkType: hard

"@nhost/hasura-auth-js@npm:1.1.9":
version: 1.1.9
resolution: "@nhost/hasura-auth-js@npm:1.1.9"
Expand Down Expand Up @@ -5494,14 +5472,15 @@ __metadata:
languageName: node
linkType: hard

"@playwright/test@npm:1.22.1":
version: 1.22.1
resolution: "@playwright/test@npm:1.22.1"
"@playwright/test@npm:1.22.2":
version: 1.22.2
resolution: "@playwright/test@npm:1.22.2"
dependencies:
playwright-core: 1.22.1
"@types/node": "*"
playwright-core: 1.22.2
bin:
playwright: cli.js
checksum: 30ca277c53755d3810c08b18d30e1aac8032b6fc8efeef33a1a1bc927af90ce86f1a46bcf62d94213b479d347e5e039a0bb5018a03f9a1e2907c693a158745bb
checksum: a1e97274733535286496137f3e2e23f61294174c01c0fb957d8d626ac01503085e4d4c94073fce9a52e84db2fc9bc8b510a2eb48281421a4ba9867da2a2d51f1
languageName: node
linkType: hard

Expand Down Expand Up @@ -5926,7 +5905,7 @@ __metadata:
"@clerk/clerk-js": 3.11.0
"@clerk/clerk-sdk-node": 3.6.0
"@clerk/types": 2.13.0
"@nhost/hasura-auth-js": 1.1.6
"@nhost/hasura-auth-js": 1.1.9
"@nhost/nhost-js": 1.1.14
"@supabase/supabase-js": 1.35.3
"@types/netlify-identity-widget": 1.9.3
Expand Down Expand Up @@ -6177,9 +6156,9 @@ __metadata:
"@envelop/testing": 4.3.2
"@envelop/types": 2.0.0
"@envelop/validation-cache": 4.3.2
"@graphql-tools/merge": 8.2.12
"@graphql-tools/schema": 8.3.12
"@graphql-tools/utils": 8.6.11
"@graphql-tools/merge": 8.2.13
"@graphql-tools/schema": 8.3.13
"@graphql-tools/utils": 8.6.12
"@graphql-yoga/common": 2.6.0
"@prisma/client": 3.14.0
"@redwoodjs/api": 1.4.2
Expand Down Expand Up @@ -24428,12 +24407,12 @@ __metadata:
languageName: node
linkType: hard

"playwright-core@npm:1.22.1":
version: 1.22.1
resolution: "playwright-core@npm:1.22.1"
"playwright-core@npm:1.22.2":
version: 1.22.2
resolution: "playwright-core@npm:1.22.2"
bin:
playwright: cli.js
checksum: 64588363f6e1ab7da8e7287387abe3388fdb98d203a42650ba1e379578068d890c5ee871e203057a538260c4ddc42af8d77e1ab76d07eb2d0148d182d8353508
checksum: 98935d7906d52093fe260cd2bc74924cad0abb908f96a92867aa71e26eb3ce45d79185280a361e16fab2422a86936dfa1bb7306c5629d5b276f0ce1c99928f04
languageName: node
linkType: hard

Expand Down Expand Up @@ -26899,7 +26878,7 @@ __metadata:
"@babel/preset-react": 7.16.7
"@babel/preset-typescript": 7.16.7
"@babel/runtime-corejs3": 7.16.7
"@playwright/test": 1.22.1
"@playwright/test": 1.22.2
"@testing-library/jest-dom": 5.16.4
"@testing-library/react": 12.1.5
"@testing-library/react-hooks": 8.0.0
Expand Down

0 comments on commit 611fe7b

Please sign in to comment.