Skip to content

Commit

Permalink
Merge pull request #125 from morrys/relay-v13
Browse files Browse the repository at this point in the history 
support relay v13
  • Loading branch information
@morrys
morrys committed May 19, 2022
2 parents 89b7a61 + 467a093 commit fcd611d
Show file tree
Hide file tree
Showing 28 changed files with 2,890 additions and 2,410 deletions.
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
],
"devDependencies": {
"@babel/runtime": "^7.7.2",
"@types/jest": "24.0.18",
"ts-jest": "24.1.0",
"jest": "24.9.0",
"@types/jest": "^26.0.0",
"ts-jest": "^26.5.6",
"jest": "^26.0.0",
"jest-junit": "8.0.0",
"babel-jest": "24.9.0",
"babel-jest": "^26.0.0",
"@typescript-eslint/eslint-plugin": "2.24.0",
"@typescript-eslint/parser": "2.24.0",
"eslint": "6.8.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cache-persist/__tests__/Cache-test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ICache } from '../src/CacheTypes';
import { createStorage } from '../src/createStorage';
import { prefixLayer } from '../src/layers/prefixLayer';

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

const INITIAL_STATE = { restore: true, data: 1 };
function sleep(ms) {
Expand Down
32 changes: 16 additions & 16 deletions packages/relay-offline/__tests__/RelayModernEnvironment-ApplyUpdate-test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,35 @@
import { Store as RelayModernStore, RecordSource, Environment as RelayModernEnvironment } from '../src';
import { Network as RelayNetwork, createOperationDescriptor, createReaderSelector } from 'relay-runtime';

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

const UserFragment = graphql`
fragment RelayModernEnvironmentApplyUpdateTestUserFragment on User {
id
name
}
`;
const ParentQuery = graphql`
query RelayModernEnvironmentApplyUpdateTestParentQuery {
me {
id
name
}
}
`;
describe('applyUpdate()', () => {
let environment;
let operation;
let ParentQuery;
let source;
let store;
let UserFragment;

beforeEach(async () => {
jest.resetModules();

({ ParentQuery, UserFragment } = generateAndCompile(`
query ParentQuery {
me {
id
name
}
}
fragment UserFragment on User {
id
name
}
`));

source = RelayRecordSource.create();
store = new RelayModernStore(source);
environment = new RelayModernEnvironment({
Expand Down
27 changes: 14 additions & 13 deletions packages/relay-offline/__tests__/RelayModernEnvironment-Check-test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,32 @@

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

const ParentQuery = graphql`
query RelayModernEnvironmentCheckTestParentQuery($size: [Int]!) {
me {
id
name
profilePicture(size: $size) {
uri
}
}
}
`;

describe('check()', () => {
let environment;
let operationDescriptor;
let ParentQuery;
let source;
let store;

beforeEach(async () => {
jest.resetModules();
({ ParentQuery } = generateAndCompile(`
query ParentQuery($size: [Int]!) {
me {
id
name
profilePicture(size: $size) {
uri
}
}
}
`));

source = RelayRecordSource.create();
store = new RelayModernStore(source);
Expand Down
56 changes: 29 additions & 27 deletions packages/relay-offline/__tests__/RelayModernEnvironment-CheckWithGlobalInvalidation-test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@

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

beforeEach(async () => {
jest.resetModules();
({ ParentQuery } = generateAndCompile(`
query ParentQuery($size: [Int]!) {
me {
id
name
profilePicture(size: $size) {
uri
ParentQuery = graphql`
query RelayModernEnvironmentCheckWithGlobalInvalidationTestParentQuery($size: [Int]!) {
me {
id
name
profilePicture(size: $size) {
uri
}
}
}
}
}
`));
`;
operation = createOperationDescriptor(ParentQuery, { size: 32 });

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

describe('when query has incremental payloads', () => {
beforeEach(() => {
({ ParentQuery } = generateAndCompile(`
query ParentQuery($size: [Int]!) {
me {
id
name
...UserFragment @defer(label: "UserFragment")
}
}
fragment UserFragment on User {
profilePicture(size: $size) {
uri
}
}
`));
const frag = graphql`
fragment RelayModernEnvironmentCheckWithGlobalInvalidationTestFragment on User {
profilePicture(size: $size) {
uri
}
}
`;
ParentQuery = graphql`
query RelayModernEnvironmentCheckWithGlobalInvalidationTestParent2Query($size: [Int]!) {
me {
id
name
...RelayModernEnvironmentCheckWithGlobalInvalidationTestFragment @defer(label: "UserFragment")
}
}
`;
operation = createOperationDescriptor(ParentQuery, { size: 32 });
});

Expand Down Expand Up @@ -337,7 +339,7 @@ describe('check() with global invalidation', () => {
uri: 'https://...',
},
},
label: 'ParentQuery$defer$UserFragment',
label: 'RelayModernEnvironmentCheckWithGlobalInvalidationTestParent2Query$defer$UserFragment',
path: ['me'],
});
dataSource.complete();
Expand Down
56 changes: 29 additions & 27 deletions packages/relay-offline/__tests__/RelayModernEnvironment-CheckWithLocalInvalidation-test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@

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

beforeEach(async () => {
jest.resetModules();
({ ParentQuery } = generateAndCompile(`
query ParentQuery($size: [Int]!) {
me {
id
name
profilePicture(size: $size) {
uri
ParentQuery = graphql`
query RelayModernEnvironmentCheckWithLocalInvalidationTestQuery($size: [Int]!) {
me {
id
name
profilePicture(size: $size) {
uri
}
}
}
}
}
`));
`;
operation = createOperationDescriptor(ParentQuery, { size: 32 });

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

describe('when query has incremental payloads', () => {
beforeEach(() => {
({ ParentQuery } = generateAndCompile(`
query ParentQuery($size: [Int]!) {
me {
id
name
...UserFragment @defer(label: "UserFragment")
}
}
fragment UserFragment on User {
profilePicture(size: $size) {
uri
}
}
`));
const frag = graphql`
fragment RelayModernEnvironmentCheckWithLocalInvalidationTestUserFragment on User {
profilePicture(size: $size) {
uri
}
}
`;
ParentQuery = graphql`
query RelayModernEnvironmentCheckWithLocalInvalidationTestParentQuery($size: [Int]!) {
me {
id
name
...RelayModernEnvironmentCheckWithLocalInvalidationTestUserFragment @defer(label: "UserFragment")
}
}
`;
operation = createOperationDescriptor(ParentQuery, { size: 32 });
});

Expand Down Expand Up @@ -356,7 +358,7 @@ describe('check() with local invalidation', () => {
uri: 'https://...',
},
},
label: 'ParentQuery$defer$UserFragment',
label: 'RelayModernEnvironmentCheckWithLocalInvalidationTestParentQuery$defer$UserFragment',
path: ['me'],
});
dataSource.complete();
Expand Down
Loading

0 comments on commit fcd611d

Please sign in to comment.