Skip to content

Commit fcd611d

Browse files
morrysmorrys
authored
Merge pull request #125 from morrys/relay-v13
support relay v13
2 parents 89b7a61 + 467a093 commit fcd611d

28 files changed

+2890
-2410
lines changed

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
],
1818
"devDependencies": {
1919
"@babel/runtime": "^7.7.2",
20-
"@types/jest": "24.0.18",
21-
"ts-jest": "24.1.0",
22-
"jest": "24.9.0",
20+
"@types/jest": "^26.0.0",
21+
"ts-jest": "^26.5.6",
22+
"jest": "^26.0.0",
2323
"jest-junit": "8.0.0",
24-
"babel-jest": "24.9.0",
24+
"babel-jest": "^26.0.0",
2525
"@typescript-eslint/eslint-plugin": "2.24.0",
2626
"@typescript-eslint/parser": "2.24.0",
2727
"eslint": "6.8.0",

‎packages/cache-persist/__tests__/Cache-test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ICache } from '../src/CacheTypes';
33
import { createStorage } from '../src/createStorage';
44
import { prefixLayer } from '../src/layers/prefixLayer';
55

6-
jest.mock('../src/createStorage', () => require.requireActual('../__mocks__/createStorage'));
6+
jest.mock('../src/createStorage', () => jest.requireActual('../__mocks__/createStorage'));
77

88
const INITIAL_STATE = { restore: true, data: 1 };
99
function sleep(ms) {

‎packages/relay-offline/__tests__/RelayModernEnvironment-ApplyUpdate-test.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,35 @@
1616
import { Store as RelayModernStore, RecordSource, Environment as RelayModernEnvironment } from '../src';
1717
import { Network as RelayNetwork, createOperationDescriptor, createReaderSelector } from 'relay-runtime';
1818

19-
import { generateAndCompile, createPersistedStorage } from '../src-test';
19+
import { createPersistedStorage } from '../src-test';
20+
import { graphql } from 'relay-runtime';
2021
const RelayRecordSource = {
2122
create: (data?: any) => new RecordSource({ storage: createPersistedStorage(), initialState: { ...data } }),
2223
};
2324

25+
const UserFragment = graphql`
26+
fragment RelayModernEnvironmentApplyUpdateTestUserFragment on User {
27+
id
28+
name
29+
}
30+
`;
31+
const ParentQuery = graphql`
32+
query RelayModernEnvironmentApplyUpdateTestParentQuery {
33+
me {
34+
id
35+
name
36+
}
37+
}
38+
`;
2439
describe('applyUpdate()', () => {
2540
let environment;
2641
let operation;
27-
let ParentQuery;
2842
let source;
2943
let store;
30-
let UserFragment;
3144

3245
beforeEach(async () => {
3346
jest.resetModules();
3447

35-
({ ParentQuery, UserFragment } = generateAndCompile(`
36-
query ParentQuery {
37-
me {
38-
id
39-
name
40-
}
41-
}
42-
fragment UserFragment on User {
43-
id
44-
name
45-
}
46-
`));
47-
4848
source = RelayRecordSource.create();
4949
store = new RelayModernStore(source);
5050
environment = new RelayModernEnvironment({

‎packages/relay-offline/__tests__/RelayModernEnvironment-Check-test.ts‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,32 @@
1515

1616
import { Store as RelayModernStore, RecordSource, Environment as RelayModernEnvironment } from '../src';
1717
import { Network as RelayNetwork, createOperationDescriptor } from 'relay-runtime';
18-
import { generateAndCompile, createPersistedStorage } from '../src-test';
18+
import { createPersistedStorage } from '../src-test';
19+
import { graphql } from 'relay-runtime';
1920
const RelayRecordSource = {
2021
create: (data?: any): RecordSource => new RecordSource({ storage: createPersistedStorage(), initialState: { ...data } }),
2122
};
2223

24+
const ParentQuery = graphql`
25+
query RelayModernEnvironmentCheckTestParentQuery($size: [Int]!) {
26+
me {
27+
id
28+
name
29+
profilePicture(size: $size) {
30+
uri
31+
}
32+
}
33+
}
34+
`;
35+
2336
describe('check()', () => {
2437
let environment;
2538
let operationDescriptor;
26-
let ParentQuery;
2739
let source;
2840
let store;
2941

3042
beforeEach(async () => {
3143
jest.resetModules();
32-
({ ParentQuery } = generateAndCompile(`
33-
query ParentQuery($size: [Int]!) {
34-
me {
35-
id
36-
name
37-
profilePicture(size: $size) {
38-
uri
39-
}
40-
}
41-
}
42-
`));
4344

4445
source = RelayRecordSource.create();
4546
store = new RelayModernStore(source);

‎packages/relay-offline/__tests__/RelayModernEnvironment-CheckWithGlobalInvalidation-test.ts‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515

1616
import { Store as RelayModernStore, RecordSource, Environment as RelayModernEnvironment } from '../src';
1717
import { Network as RelayNetwork, Observable as RelayObservable, createOperationDescriptor } from 'relay-runtime';
18-
import { generateAndCompile, createPersistedStorage } from '../src-test';
18+
import { createPersistedStorage } from '../src-test';
19+
import { graphql } from 'relay-runtime';
1920
const RelayRecordSource = {
2021
create: (data?: any) => new RecordSource({ storage: createPersistedStorage(), initialState: { ...data } }),
2122
};
@@ -36,17 +37,17 @@ describe('check() with global invalidation', () => {
3637

3738
beforeEach(async () => {
3839
jest.resetModules();
39-
({ ParentQuery } = generateAndCompile(`
40-
query ParentQuery($size: [Int]!) {
41-
me {
42-
id
43-
name
44-
profilePicture(size: $size) {
45-
uri
40+
ParentQuery = graphql`
41+
query RelayModernEnvironmentCheckWithGlobalInvalidationTestParentQuery($size: [Int]!) {
42+
me {
43+
id
44+
name
45+
profilePicture(size: $size) {
46+
uri
47+
}
48+
}
4649
}
47-
}
48-
}
49-
`));
50+
`;
5051
operation = createOperationDescriptor(ParentQuery, { size: 32 });
5152

5253
complete = jest.fn();
@@ -285,21 +286,22 @@ describe('check() with global invalidation', () => {
285286

286287
describe('when query has incremental payloads', () => {
287288
beforeEach(() => {
288-
({ ParentQuery } = generateAndCompile(`
289-
query ParentQuery($size: [Int]!) {
290-
me {
291-
id
292-
name
293-
...UserFragment @defer(label: "UserFragment")
294-
}
295-
}
296-
297-
fragment UserFragment on User {
298-
profilePicture(size: $size) {
299-
uri
300-
}
301-
}
302-
`));
289+
const frag = graphql`
290+
fragment RelayModernEnvironmentCheckWithGlobalInvalidationTestFragment on User {
291+
profilePicture(size: $size) {
292+
uri
293+
}
294+
}
295+
`;
296+
ParentQuery = graphql`
297+
query RelayModernEnvironmentCheckWithGlobalInvalidationTestParent2Query($size: [Int]!) {
298+
me {
299+
id
300+
name
301+
...RelayModernEnvironmentCheckWithGlobalInvalidationTestFragment @defer(label: "UserFragment")
302+
}
303+
}
304+
`;
303305
operation = createOperationDescriptor(ParentQuery, { size: 32 });
304306
});
305307

@@ -337,7 +339,7 @@ describe('check() with global invalidation', () => {
337339
uri: 'https://...',
338340
},
339341
},
340-
label: 'ParentQuery$defer$UserFragment',
342+
label: 'RelayModernEnvironmentCheckWithGlobalInvalidationTestParent2Query$defer$UserFragment',
341343
path: ['me'],
342344
});
343345
dataSource.complete();

‎packages/relay-offline/__tests__/RelayModernEnvironment-CheckWithLocalInvalidation-test.ts‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515

1616
import { Store as RelayModernStore, RecordSource, Environment as RelayModernEnvironment } from '../src';
1717
import { Network as RelayNetwork, Observable as RelayObservable, createOperationDescriptor } from 'relay-runtime';
18-
import { generateAndCompile, createPersistedStorage } from '../src-test';
18+
import { createPersistedStorage } from '../src-test';
19+
import { graphql } from 'relay-runtime';
1920
const RelayRecordSource = {
2021
create: (data?: any) => new RecordSource({ storage: createPersistedStorage(), initialState: { ...data } }),
2122
};
@@ -36,17 +37,17 @@ describe('check() with local invalidation', () => {
3637

3738
beforeEach(async () => {
3839
jest.resetModules();
39-
({ ParentQuery } = generateAndCompile(`
40-
query ParentQuery($size: [Int]!) {
41-
me {
42-
id
43-
name
44-
profilePicture(size: $size) {
45-
uri
40+
ParentQuery = graphql`
41+
query RelayModernEnvironmentCheckWithLocalInvalidationTestQuery($size: [Int]!) {
42+
me {
43+
id
44+
name
45+
profilePicture(size: $size) {
46+
uri
47+
}
48+
}
4649
}
47-
}
48-
}
49-
`));
50+
`;
5051
operation = createOperationDescriptor(ParentQuery, { size: 32 });
5152

5253
complete = jest.fn();
@@ -303,21 +304,22 @@ describe('check() with local invalidation', () => {
303304

304305
describe('when query has incremental payloads', () => {
305306
beforeEach(() => {
306-
({ ParentQuery } = generateAndCompile(`
307-
query ParentQuery($size: [Int]!) {
308-
me {
309-
id
310-
name
311-
...UserFragment @defer(label: "UserFragment")
312-
}
313-
}
314-
315-
fragment UserFragment on User {
316-
profilePicture(size: $size) {
317-
uri
318-
}
319-
}
320-
`));
307+
const frag = graphql`
308+
fragment RelayModernEnvironmentCheckWithLocalInvalidationTestUserFragment on User {
309+
profilePicture(size: $size) {
310+
uri
311+
}
312+
}
313+
`;
314+
ParentQuery = graphql`
315+
query RelayModernEnvironmentCheckWithLocalInvalidationTestParentQuery($size: [Int]!) {
316+
me {
317+
id
318+
name
319+
...RelayModernEnvironmentCheckWithLocalInvalidationTestUserFragment @defer(label: "UserFragment")
320+
}
321+
}
322+
`;
321323
operation = createOperationDescriptor(ParentQuery, { size: 32 });
322324
});
323325

@@ -356,7 +358,7 @@ describe('check() with local invalidation', () => {
356358
uri: 'https://...',
357359
},
358360
},
359-
label: 'ParentQuery$defer$UserFragment',
361+
label: 'RelayModernEnvironmentCheckWithLocalInvalidationTestParentQuery$defer$UserFragment',
360362
path: ['me'],
361363
});
362364
dataSource.complete();

0 commit comments

Comments
 (0)