diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ac6334a..fad0e7c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ # **Version 3** +- Set explicit peer dependencies: `@rescript/react >= 0.12.1`, `react-relay@16.0.0`, `relay-runtime@16.0.0`. +- Clean up connection handler generators now that v3 let us use a better representation. +- Fix issue with default args in connection id makers. https://github.com/zth/rescript-relay/pull/488 + # 3.0.0-rc.4 - Fix an error in postinstall.js when reinstalling rescript-relay dependency (https://github.com/zth/rescript-relay/pull/487) diff --git a/packages/relay b/packages/relay index 7f64aefe..75130d6e 160000 --- a/packages/relay +++ b/packages/relay @@ -1 +1 @@ -Subproject commit 7f64aefe6be1d0a98a8aa6d046270a4e6bf1a020 +Subproject commit 75130d6e6c46bff49b0eed35f7dd7fc215ad2def diff --git a/packages/rescript-relay/__tests__/Test_connections.res b/packages/rescript-relay/__tests__/Test_connections.res index 8b7d4d83..82584c42 100644 --- a/packages/rescript-relay/__tests__/Test_connections.res +++ b/packages/rescript-relay/__tests__/Test_connections.res @@ -8,7 +8,7 @@ module Fragment = %relay(` test: { type: "Boolean", defaultValue: true } orderBy: { type: "[UserOrder!]" - defaultValue: { direction: ASC, field: FIRST_NAME } + defaultValue: [{ direction: ASC, field: FIRST_NAME }] } ) { __id diff --git a/packages/rescript-relay/__tests__/__generated__/TestConnectionsQuery_graphql.res b/packages/rescript-relay/__tests__/__generated__/TestConnectionsQuery_graphql.res index 17b08a39..9929c3c0 100644 --- a/packages/rescript-relay/__tests__/__generated__/TestConnectionsQuery_graphql.res +++ b/packages/rescript-relay/__tests__/__generated__/TestConnectionsQuery_graphql.res @@ -120,10 +120,12 @@ v2 = [ { "kind": "Literal", "name": "orderBy", - "value": { - "direction": "ASC", - "field": "FIRST_NAME" - } + "value": [ + { + "direction": "ASC", + "field": "FIRST_NAME" + } + ] }, { "kind": "Literal", @@ -289,12 +291,12 @@ return { ] }, "params": { - "cacheID": "50f3883f29e0f3212a4936331f80d098", + "cacheID": "289b5b258a2d73bef596bee127410b5e", "id": null, "metadata": {}, "name": "TestConnectionsQuery", "operationKind": "query", - "text": "query TestConnectionsQuery(\n $beforeDate: Datetime!\n) {\n loggedInUser {\n ...TestConnections_user_3xCS8w\n id\n }\n}\n\nfragment TestConnections_user_3xCS8w on User {\n friendsConnection(statuses: [Idle, offline], first: 2, after: \"\", beforeDate: $beforeDate, orderBy: {direction: ASC, field: FIRST_NAME}) {\n edges {\n node {\n id\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n }\n }\n}\n" + "text": "query TestConnectionsQuery(\n $beforeDate: Datetime!\n) {\n loggedInUser {\n ...TestConnections_user_3xCS8w\n id\n }\n}\n\nfragment TestConnections_user_3xCS8w on User {\n friendsConnection(statuses: [Idle, offline], first: 2, after: \"\", beforeDate: $beforeDate, orderBy: [{direction: ASC, field: FIRST_NAME}]) {\n edges {\n node {\n id\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n }\n }\n}\n" } }; })() `) diff --git a/packages/rescript-relay/__tests__/__generated__/TestConnections_user_graphql.res b/packages/rescript-relay/__tests__/__generated__/TestConnections_user_graphql.res index aca90c63..1cbf6ffa 100644 --- a/packages/rescript-relay/__tests__/__generated__/TestConnections_user_graphql.res +++ b/packages/rescript-relay/__tests__/__generated__/TestConnections_user_graphql.res @@ -51,7 +51,7 @@ let connectionKey = "TestConnections_user_friendsConnection" ) @live -let makeConnectionId = (connectionParentDataId: RescriptRelay.dataId, ~onlineStatuses: array=[Idle, Offline], ~beforeDate: TestsUtils.Datetime.t, ~orderBy: array=Obj.magic({"direction": ASC, "field": FIRST_NAME})) => { +let makeConnectionId = (connectionParentDataId: RescriptRelay.dataId, ~onlineStatuses: array=[Idle, Offline], ~beforeDate: TestsUtils.Datetime.t, ~orderBy: array=[{direction: ASC, field: FIRST_NAME}]) => { let onlineStatuses = Some(onlineStatuses) let beforeDate = Some(TestsUtils.Datetime.serialize(beforeDate)) let orderBy = Some(orderBy) @@ -110,10 +110,12 @@ let node: operationType = %raw(json` { "name": "onlineStatuses" }, { - "defaultValue": { - "direction": "ASC", - "field": "FIRST_NAME" - }, + "defaultValue": [ + { + "direction": "ASC", + "field": "FIRST_NAME" + } + ], "kind": "LocalArgument", "name": "orderBy" }, diff --git a/packages/rescript-relay/package.json b/packages/rescript-relay/package.json index cef86c42..ec49bf5d 100644 --- a/packages/rescript-relay/package.json +++ b/packages/rescript-relay/package.json @@ -40,7 +40,7 @@ }, "devDependencies": { "@glennsl/rescript-fetch": "^0.2.0", - "@rescript/react": "0.12.0", + "@rescript/react": "0.12.1", "@testing-library/jest-dom": "^5.16.3", "@testing-library/react": "^13.0.0-alpha.6", "graphql-query-test-mock": "^0.12.1", @@ -54,8 +54,8 @@ "rescript": "^11.0.0" }, "peerDependencies": { - "@rescript/react": "^0.12.0", - "react-relay": ">=16.0.0", + "@rescript/react": "^0.12.1", + "react-relay": "16.0.0", "relay-runtime": "*", "rescript": "^11.0.0" }, diff --git a/packages/rescript-relay/yarn.lock b/packages/rescript-relay/yarn.lock index 07c3e8bc..e5bede3c 100644 --- a/packages/rescript-relay/yarn.lock +++ b/packages/rescript-relay/yarn.lock @@ -521,10 +521,10 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@rescript/react@0.12.0": - version "0.12.0" - resolved "https://registry.yarnpkg.com/@rescript/react/-/react-0.12.0.tgz#d72f0561ec9c4ae04c5db0a752087190ba7d3f40" - integrity sha512-EBLsf5rD7sJOjgfLLGwuLw/hONszc3UtYnIVgv7OdTyUNR41/m4deVm62PI0agvr3kWakXz4KchKRSd+19/bRA== +"@rescript/react@0.12.1": + version "0.12.1" + resolved "https://registry.yarnpkg.com/@rescript/react/-/react-0.12.1.tgz#7bddb957a1bc08b944c6597f28549ac410982d64" + integrity sha512-ZD7nhDr5FZgLYqRH9s4CNM+LRz/3IMuTb+LH12fd2Akk0xYkYUP+DZveB2VQUC2UohJnTf/c8yPSNsiFihVCCg== "@sinonjs/commons@^1.7.0": version "1.8.3"