Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Implement SSR. #44

Merged
merged 87 commits into from
Jan 8, 2019
Merged
Show file tree
Hide file tree
Changes from 85 commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
1ef1105
refactor: Rewrite in TypeScript.
avocadowastaken Dec 19, 2018
64b67bb
chore: Deduplicate modules.
avocadowastaken Dec 19, 2018
6428400
fix(useQuery): Use `ApolloCurrentResult` for state.
avocadowastaken Dec 20, 2018
138ef75
chore: Setup .
avocadowastaken Dec 20, 2018
a36e293
fix(useQuery): `QueryHookState.data` can be `undefined`.
avocadowastaken Dec 20, 2018
52eb34b
chore: Setup `eslint-plugin-typescript`.
avocadowastaken Dec 20, 2018
c68a01c
fix(useQuery): Pick `data` prop in `QueryHookState`.
avocadowastaken Dec 20, 2018
d6a112a
style(useQuery-test): Remove unused variables.
avocadowastaken Dec 20, 2018
b80f378
feat(useQuery): Implement `skip`.
avocadowastaken Dec 20, 2018
a362343
chore: Run `build:typings` in `build` script.
avocadowastaken Dec 20, 2018
56dbfe3
Merge branch 'ts' into ts+skip
avocadowastaken Dec 20, 2018
9802ab5
fix(package): Add missed `npm run`.
avocadowastaken Dec 20, 2018
0e03f25
Merge branch 'ts' into ts+skip
avocadowastaken Dec 20, 2018
0c2b7b6
fix(useQuery): Cherry pick props from `currentResult`.
avocadowastaken Dec 20, 2018
5bf2a46
Merge branch 'ts' into ts+skip
avocadowastaken Dec 20, 2018
9fb5c03
fix(useQuery): Cherry pick props from `currentResult`.
avocadowastaken Dec 20, 2018
94e520c
fix(useQuery): Define `observableQuery` for skipped hooks.
avocadowastaken Dec 21, 2018
29be675
feat(useQuery): Use observable query as main source of truth, useMemo.
avocadowastaken Dec 21, 2018
7a5a9dc
test(useQuery): Add `jest-react-profiler` tests.
avocadowastaken Dec 21, 2018
df35507
fix(useQuery): Remove `console.log`s.
avocadowastaken Dec 21, 2018
9b61fbb
[WIP]
avocadowastaken Dec 22, 2018
3d5302e
[WIP]
avocadowastaken Dec 22, 2018
ffc3681
[WIP]
avocadowastaken Dec 22, 2018
ad4b425
feat: Implement SSR.
avocadowastaken Dec 23, 2018
d908182
fix: Expose `getMarkupFromTree`.
avocadowastaken Dec 23, 2018
90a96ec
[WIP]
avocadowastaken Dec 27, 2018
01a6883
[WIP]
avocadowastaken Dec 27, 2018
a28d8bb
[WIP]
avocadowastaken Dec 28, 2018
d2cd233
refactor(react-apollo-hooks): Move main modules to separate files.
avocadowastaken Dec 28, 2018
0211a4e
refactor(tests): Use `toMatchInlineSnapshot` and `jest-react-profiler`.
avocadowastaken Dec 28, 2018
899eed5
refactor: Rename non JSX files to `ts`.
avocadowastaken Dec 28, 2018
3a925da
Merge branch 'refactor-files' into refactor-tests
avocadowastaken Dec 28, 2018
731a3a1
feat(useQuery): Use Apollo client state as main source of truth.
avocadowastaken Dec 28, 2018
769fcd2
[WIP]
avocadowastaken Dec 28, 2018
c771dc6
[WIP]
avocadowastaken Dec 28, 2018
6cda268
Merge branch 'ts' into refactor-files
avocadowastaken Dec 28, 2018
b4c7b48
[WIP]
avocadowastaken Dec 28, 2018
e776802
[WIP]
avocadowastaken Dec 28, 2018
65990cc
[WIP]
avocadowastaken Dec 28, 2018
96f35b9
Merge branch 'ts' into refactor-files
avocadowastaken Dec 28, 2018
9d1a8d4
Merge branch 'master' into refactor-tests
avocadowastaken Dec 28, 2018
31a2205
Merge branch 'master' into refactor-files
avocadowastaken Dec 28, 2018
008ff5d
[WIP]
avocadowastaken Dec 28, 2018
e5aecbb
[WIP]
avocadowastaken Dec 28, 2018
2898291
[WIP]
avocadowastaken Dec 28, 2018
f54c543
Merge branch 'refactor-files' into refactor-tests
avocadowastaken Dec 28, 2018
43e1948
[WIP]
avocadowastaken Dec 28, 2018
28e9d59
[WIP]
avocadowastaken Dec 28, 2018
4dace68
Merge branch 'refactor-files' into refactor-tests
avocadowastaken Dec 28, 2018
8e501b7
Merge branch 'master' into refactor-tests
avocadowastaken Dec 28, 2018
8249233
[WIP]
avocadowastaken Dec 28, 2018
ab3f5f4
[WIP]
avocadowastaken Dec 28, 2018
f4de4c7
[WIP]
avocadowastaken Dec 28, 2018
08ebc15
[WIP]
avocadowastaken Dec 28, 2018
78701e0
Merge branch 'master' into use-query-state
avocadowastaken Dec 28, 2018
ab21ec9
[WIP]
avocadowastaken Dec 28, 2018
e09a262
[WIP]
avocadowastaken Dec 28, 2018
a9cdd54
[WIP]
avocadowastaken Dec 28, 2018
f7ead46
[WIP]
avocadowastaken Dec 28, 2018
d2c6cc4
[WIP]
avocadowastaken Dec 28, 2018
151102a
[WIP]
avocadowastaken Dec 28, 2018
c538f90
Merge branch 'use-query-state' into memo
avocadowastaken Dec 28, 2018
f517f36
[WIP]
avocadowastaken Dec 29, 2018
a037df1
[WIP]
avocadowastaken Dec 29, 2018
451b9ff
[WIP]
avocadowastaken Dec 29, 2018
0b0584d
[WIP]
avocadowastaken Dec 29, 2018
b316b54
[WIP]
avocadowastaken Dec 29, 2018
4a8d8c8
Merge branch 'use-query-state' into memo
avocadowastaken Dec 29, 2018
aa395b6
[WIP]
avocadowastaken Dec 30, 2018
4478236
[WIP]
avocadowastaken Dec 30, 2018
ad13202
Merge branch 'use-query-state' into memo
avocadowastaken Dec 30, 2018
d4a4a6d
Merge branch 'master' into memo
avocadowastaken Dec 31, 2018
00f5af1
Merge branch 'memo' into ssr
avocadowastaken Dec 31, 2018
692d7c2
[WIP]
avocadowastaken Dec 31, 2018
9ab89cd
[WIP]
avocadowastaken Dec 31, 2018
b9a03d5
[WIP]
avocadowastaken Dec 31, 2018
9bbb52b
[WIP]
avocadowastaken Dec 31, 2018
d096636
Merge branch 'master' into ssr
avocadowastaken Jan 3, 2019
adedaa6
[WIP]
avocadowastaken Jan 3, 2019
75b4f9d
[WIP]
avocadowastaken Jan 3, 2019
17df664
[WIP]
avocadowastaken Jan 4, 2019
ad45a6c
[WIP]
avocadowastaken Jan 4, 2019
5c97b53
[WIP]
avocadowastaken Jan 4, 2019
eb314d0
[WIP]
avocadowastaken Jan 4, 2019
2425cfa
[WIP]
avocadowastaken Jan 4, 2019
149595c
[WIP]
avocadowastaken Jan 8, 2019
466d74c
[WIP]
avocadowastaken Jan 8, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
"@types/jest": "^23.3.10",
"@types/lodash": "^4.14.119",
"@types/react": "^16.7.17",
"@types/react-dom": "^16.0.11",
"apollo-cache-inmemory": "^1.3.11",
"apollo-client": "^2.4.7",
"apollo-link": "^1.2.4",
Expand All @@ -99,8 +100,8 @@
"jest-react-profiler": "^0.1.3",
"lint-staged": "^8.1.0",
"prettier": "^1.15.2",
"react": "^16.7.0-alpha.2",
"react-dom": "^16.7.0-alpha.2",
"react": "16.7.0-alpha.2",
"react-dom": "16.7.0-alpha.2",
"react-testing-library": "^5.3.1",
"rimraf": "^2.6.2",
"standard-version": "^4.4.0",
Expand Down
12 changes: 12 additions & 0 deletions src/SuspenseSSR.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React, { Suspense, SuspenseProps, useContext } from 'react';
import { SSRContext } from './internal/SSRContext';

export function unstable_SuspenseSSR({ children, fallback }: SuspenseProps) {
const ssrManager = useContext(SSRContext);

return ssrManager ? (
<>{children}</>
Copy link

@sandiiarov sandiiarov Feb 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious. Was there a specific reason to wrap children into fragment?

) : (
<Suspense fallback={fallback}>{children}</Suspense>
);
}
131 changes: 131 additions & 0 deletions src/__tests__/SuspenseSSR-test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
import ApolloClient from 'apollo-client';
import { ApolloLink } from 'apollo-link';
import { MockedResponse } from 'apollo-link-mock';
import gql from 'graphql-tag';
import * as React from 'react';
import { renderToString } from 'react-dom/server';
import { render } from 'react-testing-library';

import { ApolloProvider } from '../ApolloContext';
import { unstable_SuspenseSSR as SuspenseSSR } from '../SuspenseSSR';
import createClient from '../__testutils__/createClient';
import flushEffectsAndWait from '../__testutils__/flushEffectsAndWait';
import { getMarkupFromTree } from '../getMarkupFromTree';
import { QueryHookOptions, useQuery } from '../useQuery';

const USER_QUERY = gql`
{
currentUser {
firstName
}
}
`;

interface UserQueryResult {
currentUser: { firstName: string };
}

const MOCKS: MockedResponse[] = [
{
request: { query: USER_QUERY },
result: { data: { currentUser: { firstName: 'James' } } },
},
];

function createMockClient(link?: ApolloLink) {
return createClient({ link, mocks: MOCKS, addTypename: false });
}

function UserDetails(props: QueryHookOptions<{}>) {
const { data, loading } = useQuery<UserQueryResult>(USER_QUERY, props);

return (
<>
{loading
? 'Loading'
: !data
? 'No Data'
: !data.currentUser
? 'No Current User'
: data.currentUser.firstName}
</>
);
}

interface UserWrapperProps extends QueryHookOptions<{}> {
readonly client: ApolloClient<object>;
}

function UserDetailsWrapper({ client, ...props }: UserWrapperProps) {
return (
<ApolloProvider client={client}>
<SuspenseSSR fallback={<>Loading with suspense</>}>
<UserDetails {...props} />
</SuspenseSSR>
</ApolloProvider>
);
}

it('not throws in react-dom with suspense', async () => {
const client = createMockClient();

const { container } = render(<UserDetailsWrapper client={client} suspend />);

expect(container).toMatchInlineSnapshot(`
<div>
Loading with suspense
</div>
`);

await flushEffectsAndWait();

expect(container).toMatchInlineSnapshot(`
<div>
James
</div>
`);
});

it('not throws in react-dom without suspense', async () => {
const client = createMockClient();

const { container } = render(
<UserDetailsWrapper client={client} suspend={false} />
);

expect(container).toMatchInlineSnapshot(`
<div>
Loading
</div>
`);

await flushEffectsAndWait();

expect(container).toMatchInlineSnapshot(`
<div>
James
</div>
`);
});

it('not throws in react-dom/server with suspense', async () => {
avocadowastaken marked this conversation as resolved.
Show resolved Hide resolved
const client = createMockClient();

await expect(
getMarkupFromTree({
renderFunction: renderToString,
tree: <UserDetailsWrapper client={client} suspend />,
})
).resolves.toMatchInlineSnapshot(`"James"`);
});

it('not throws in react-dom/server without suspense', async () => {
const client = createMockClient();

await expect(
getMarkupFromTree({
renderFunction: renderToString,
tree: <UserDetailsWrapper client={client} suspend={false} />,
})
).resolves.toMatchInlineSnapshot(`"James"`);
});
Loading