Skip to content

Commit b669775

Browse files
blacksrcblacksrc
authored
chore(dep): update jest to v30.0.5 (#2880)
* chore(dep): update jest to v30.0.5 * fix: format issues * fix: old unresolved conflict
1 parent 43726c5 commit b669775

File tree

10 files changed

+1016
-692
lines changed

10 files changed

+1016
-692
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"@graphql-tools/merge": "9.1.1",
6363
"@graphql-tools/schema": "10.0.25",
6464
"@theguild/prettier-config": "3.0.1",
65-
"@types/jest": "29.5.14",
65+
"@types/jest": "30.0.0",
6666
"@types/mongodb": "4.0.7",
6767
"@types/node": "22.18.10",
6868
"@typescript-eslint/eslint-plugin": "8.46.0",
@@ -78,7 +78,7 @@
7878
"eslint-plugin-standard": "5.0.0",
7979
"graphql": "16.11.0",
8080
"husky": "9.1.7",
81-
"jest": "29.7.0",
81+
"jest": "30.0.5",
8282
"json-bigint-patch": "0.0.8",
8383
"lint-staged": "16.2.4",
8484
"mockdate": "3.0.5",

‎renovate.json‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": [
4-
"github>the-guild-org/shared-config:renovate"
5-
],
3+
"extends": ["github>the-guild-org/shared-config:renovate"],
64
"automerge": false,
75
"lockFileMaintenance": {
86
"enabled": true,
97
"automerge": true
108
},
119
"packageRules": [
1210
{
13-
"matchUpdateTypes": [
14-
"minor",
15-
"patch"
16-
],
11+
"matchUpdateTypes": ["minor", "patch"],
1712
"groupName": "all non-major dependencies",
1813
"groupSlug": "all-minor-patch",
1914
"matchPackageNames": [

‎tests/PhoneNumber.test.ts‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Kind } from 'graphql/language';
44
import { GraphQLPhoneNumber } from '../src/scalars/PhoneNumber.js';
55

66
function PhoneNumberError(value: string) {
7-
return `Invalid phone number: ${value}. Please ensure it's in a valid format. The country code is optional, and Spaces and dashes are allowed. Examples: +1 (123) 456-7890, +44 (20) 2121 2222, or 123 456-7890.`
7+
return `Invalid phone number: ${value}. Please ensure it's in a valid format. The country code is optional, and Spaces and dashes are allowed. Examples: +1 (123) 456-7890, +44 (20) 2121 2222, or 123 456-7890.`;
88
}
99

1010
describe('PhoneNumber', () => {
@@ -26,11 +26,11 @@ describe('PhoneNumber', () => {
2626
});
2727
describe('without country code', () => {
2828
test('serialize', () => {
29-
expect(() => GraphQLPhoneNumber.serialize('7895551234')).not.toThrow()
29+
expect(() => GraphQLPhoneNumber.serialize('7895551234')).not.toThrow();
3030
});
3131

3232
test('parseValue', () => {
33-
expect(() => GraphQLPhoneNumber.parseValue('123 456-7890')).not.toThrow()
33+
expect(() => GraphQLPhoneNumber.parseValue('123 456-7890')).not.toThrow();
3434
});
3535

3636
test('parseLiteral', () => {
@@ -41,15 +41,15 @@ describe('PhoneNumber', () => {
4141
});
4242
describe('different formatting', () => {
4343
test('serialize', () => {
44-
expect(() => GraphQLPhoneNumber.serialize('62-(21)-9175-5194')).not.toThrow()
44+
expect(() => GraphQLPhoneNumber.serialize('62-(21)-9175-5194')).not.toThrow();
4545
});
4646

4747
test('serialize', () => {
48-
expect(() => GraphQLPhoneNumber.serialize('+622191755194')).not.toThrow()
48+
expect(() => GraphQLPhoneNumber.serialize('+622191755194')).not.toThrow();
4949
});
5050

5151
test('parseValue', () => {
52-
expect(() => GraphQLPhoneNumber.parseValue('+62 (21) 9175 5194')).not.toThrow()
52+
expect(() => GraphQLPhoneNumber.parseValue('+62 (21) 9175 5194')).not.toThrow();
5353
});
5454

5555
test('parseLiteral', () => {
@@ -63,19 +63,20 @@ describe('PhoneNumber', () => {
6363
describe('invalid case', () => {
6464
describe('contains Non-Numeric Characters', () => {
6565
test('serialize', () => {
66-
expect(() => GraphQLPhoneNumber.serialize('98aaa333')).toThrow(PhoneNumberError('98aaa333'));
66+
expect(() => GraphQLPhoneNumber.serialize('98aaa333')).toThrow(
67+
PhoneNumberError('98aaa333'),
68+
);
6769
});
6870

6971
test('parseValue', () => {
70-
expect(() => GraphQLPhoneNumber.parseValue('98aaa333ppp')).toThrow(PhoneNumberError('98aaa333ppp'));
72+
expect(() => GraphQLPhoneNumber.parseValue('98aaa333ppp')).toThrow(
73+
PhoneNumberError('98aaa333ppp'),
74+
);
7175
});
7276

7377
test('parseLiteral', () => {
7478
expect(() =>
75-
GraphQLPhoneNumber.parseLiteral(
76-
{ value: '98aa', kind: Kind.STRING },
77-
{},
78-
),
79+
GraphQLPhoneNumber.parseLiteral({ value: '98aa', kind: Kind.STRING }, {}),
7980
).toThrow(PhoneNumberError('98aa'));
8081
});
8182
});
@@ -98,19 +99,27 @@ describe('PhoneNumber', () => {
9899

99100
describe('wrong formate', () => {
100101
test('serialize', () => {
101-
expect(() => GraphQLPhoneNumber.serialize('+17 89- 5')).toThrow(PhoneNumberError('+17 89- 5'));
102+
expect(() => GraphQLPhoneNumber.serialize('+17 89- 5')).toThrow(
103+
PhoneNumberError('+17 89- 5'),
104+
);
102105
});
103106

104107
test('serialize', () => {
105-
expect(() => GraphQLPhoneNumber.serialize('+1 ( 123 ) 456-7890')).toThrow(PhoneNumberError('+1 ( 123 ) 456-7890'));
108+
expect(() => GraphQLPhoneNumber.serialize('+1 ( 123 ) 456-7890')).toThrow(
109+
PhoneNumberError('+1 ( 123 ) 456-7890'),
110+
);
106111
});
107112

108113
test('serialize', () => {
109-
expect(() => GraphQLPhoneNumber.serialize('+1[123]456 7890')).toThrow(PhoneNumberError('+1[123]456 7890'));
114+
expect(() => GraphQLPhoneNumber.serialize('+1[123]456 7890')).toThrow(
115+
PhoneNumberError('+1[123]456 7890'),
116+
);
110117
});
111118

112119
test('parseValue', () => {
113-
expect(() => GraphQLPhoneNumber.parseValue('+(178)95 55 5678')).toThrow(PhoneNumberError('+(178)95 55 5678'));
120+
expect(() => GraphQLPhoneNumber.parseValue('+(178)95 55 5678')).toThrow(
121+
PhoneNumberError('+(178)95 55 5678'),
122+
);
114123
});
115124

116125
test('parseLiteral', () => {

‎tests/iso-date/Duration.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ describe('GraphQLISO8601Duration', () => {
144144
describe('serialization', () => {
145145
it('throws an error when a non string is passed', () => {
146146
NON_STRING_VALUES.forEach(value => {
147-
expect(() => GraphQLISO8601Duration.serialize(value)).toThrowError(
147+
expect(() => GraphQLISO8601Duration.serialize(value)).toThrow(
148148
`Value is not string: ${value}`,
149149
);
150150
});
151151
});
152152

153153
it('throws an error for all the invalid values', () => {
154154
INVALID_VALUES.forEach(value => {
155-
expect(() => GraphQLISO8601Duration.serialize(value)).toThrowError(
155+
expect(() => GraphQLISO8601Duration.serialize(value)).toThrow(
156156
`Value is not a valid ISO Duration: ${value}`,
157157
);
158158
});
@@ -168,15 +168,15 @@ describe('GraphQLISO8601Duration', () => {
168168
describe('parseValue', () => {
169169
it('throws an error when a non string is passed', () => {
170170
NON_STRING_VALUES.forEach(value => {
171-
expect(() => GraphQLISO8601Duration.parseValue(value)).toThrowError(
171+
expect(() => GraphQLISO8601Duration.parseValue(value)).toThrow(
172172
`Value is not string: ${value}`,
173173
);
174174
});
175175
});
176176

177177
it('throws an error for all the invalid values', () => {
178178
INVALID_VALUES.forEach(value => {
179-
expect(() => GraphQLISO8601Duration.parseValue(value)).toThrowError(
179+
expect(() => GraphQLISO8601Duration.parseValue(value)).toThrow(
180180
`Value is not a valid ISO Duration: ${value}`,
181181
);
182182
});
@@ -198,9 +198,9 @@ describe('GraphQLISO8601Duration', () => {
198198

199199
it('throws an error for all the invalid values', () => {
200200
INVALID_VALUES.forEach(value => {
201-
expect(() =>
202-
GraphQLISO8601Duration.parseLiteral({ value, kind: Kind.STRING }, {}),
203-
).toThrowError(`Value is not a valid ISO Duration: ${value}`);
201+
expect(() => GraphQLISO8601Duration.parseLiteral({ value, kind: Kind.STRING }, {})).toThrow(
202+
`Value is not a valid ISO Duration: ${value}`,
203+
);
204204
});
205205
});
206206

‎tests/iso-date/Time.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ describe('GraphQLTime', () => {
135135
].forEach(literal => {
136136
it(`errors when parsing invalid literal ${stringify(literal)}`, () => {
137137
// @ts-expect-error - intentional invalid input
138-
expect(() => GraphQLTime.parseLiteral(literal, {})).toThrowError();
138+
expect(() => GraphQLTime.parseLiteral(literal, {})).toThrow();
139139
});
140140
});
141141
});

‎website/next-env.d.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,4 @@
22
/// <reference types="next/image-types/global" />
33

44
// NOTE: This file should not be edited
5-
<<<<<<< HEAD
6-
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
7-
=======
85
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
9-
>>>>>>> e3b4678c (aa)

‎website/postcss.config.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@theguild/tailwind-config/postcss.config';
1+
export { default } from '@theguild/tailwind-config/postcss.config';

‎website/src/content/quick-start.mdx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ You can also import ready-to-use type definitions for scalars like below:
2121

2222
```ts
2323
// or import specific typeDefs only with ES6 Import
24-
import { ScalarNameTypeDefinition } from 'graphql-scalars';
24+
import { ScalarNameTypeDefinition } from 'graphql-scalars'
2525
// or import specific typeDefs only with CommonJS
26-
const { ScalarNameTypeDefinition } = require('graphql-scalars');
26+
const { ScalarNameTypeDefinition } = require('graphql-scalars')
2727
// or import all typeDefs once with ES6 Import
28-
import { typeDefs as scalarTypeDefs } from 'graphql-scalars';
28+
import { typeDefs as scalarTypeDefs } from 'graphql-scalars'
2929
// or import all typeDefs once with CommonJS
30-
const { typeDefs: scalarTypeDefs } = require('graphql-scalars');
30+
const { typeDefs: scalarTypeDefs } = require('graphql-scalars')
3131

3232
const typeDefs = [
33-
...scalarTypeDefs,
33+
...scalarTypeDefs
3434
// other typeDefs
35-
];
35+
]
3636
// or
3737
const typeDefs = [
38-
ScalarNameTypeDefinition,
38+
ScalarNameTypeDefinition
3939
// other typeDefs
40-
];
40+
]
4141
```
4242

4343
### Importing it into your Resolver Map

‎website/src/content/scalars/timestamp.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { Callout } from '@theguild/components'
22

33
# Timestamp
44

5-
The JavaScript `Date` as integer. Type represents date and time as number of milliseconds from
6-
start of the UNIX epoch.
5+
The JavaScript `Date` as integer. Type represents date and time as number of milliseconds from start
6+
of the UNIX epoch.
77

88
<Callout>
99
Taken from

0 commit comments

Comments
 (0)