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.

Sign up for GitHub

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

Import node-int64 from thrift #9916

Merged
merged 1 commit into from
Dec 15, 2023
Merged

Import node-int64 from thrift #9916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions apps-rendering/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@
"@types/jest": "28.1.8",
"@types/jsdom": "16.2.15",
"@types/node": "18.18.14",
"@types/node-int64": "0.4.32",
"@types/react": "18.2.45",
"@types/react-dom": "18.2.17",
"@types/react-test-renderer": "18.0.0",
"@types/thrift": "0.10.17",
"@types/uuid": "9.0.7",
"@types/webpack": "5.28.5",
"aws-cdk": "2.90.0",
Expand All @@ -97,7 +97,6 @@
"jsdom": "16.7.0",
"lodash.debounce": "4.0.6",
"mockdate": "3.0.5",
"node-int64": "0.4.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-test-renderer": "18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion apps-rendering/src/atoms.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { TimelineItem } from '@guardian/content-atom-model/timeline/timelineItem
import { fromNullable, some } from '../vendor/@guardian/types/index';
import { ElementKind } from 'bodyElement';
import { atomScript } from 'components/InteractiveAtom';
import Int64 from 'node-int64';
import { Int64 } from 'thrift';
import { DocParser } from 'parserContext';
import { Result } from 'result';
import { formatOptionalDate, parseAtom } from './atoms';
Expand Down
2 changes: 1 addition & 1 deletion apps-rendering/src/atoms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { BodyElement } from 'bodyElement';
import { ElementKind } from 'bodyElement';
import { atomScript } from 'components/InteractiveAtom';
import { isValidDate } from 'date';
import type Int64 from 'node-int64';
import type { Int64 } from 'thrift';
import type { DocParser } from 'parserContext';
import { Result } from 'result';

Expand Down
2 changes: 1 addition & 1 deletion apps-rendering/src/campaign.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Campaign } from '@guardian/apps-rendering-api-models/campaign';
import { CampaignFields } from '@guardian/apps-rendering-api-models/campaignFields';
import { ParticipationFields } from '@guardian/apps-rendering-api-models/participationFields';
import { ArticleSpecial } from '@guardian/libs';
import Int64 from 'node-int64';
import { Int64 } from 'thrift';
import { getCallout, getReport } from 'campaign';

// ----- Mocks ----- //
Expand Down
2 changes: 1 addition & 1 deletion apps-rendering/src/item.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Int64 from 'node-int64';
import { Int64 } from 'thrift';
import { ContentType } from '@guardian/content-api-models/v1/contentType';
import { Tag } from '@guardian/content-api-models/v1/tag';
import { TagType } from '@guardian/content-api-models/v1/tagType';
Expand Down
9 changes: 4 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9230,7 +9230,7 @@ __metadata:
languageName: node
linkType: hard

"@types/node-int64@npm:*, @types/node-int64@npm:0.4.32, @types/node-int64@npm:^0.4.29":
"@types/node-int64@npm:*, @types/node-int64@npm:^0.4.29":
version: 0.4.32
resolution: "@types/node-int64@npm:0.4.32"
dependencies:
Expand Down Expand Up @@ -9553,7 +9553,7 @@ __metadata:
languageName: node
linkType: hard

"@types/thrift@npm:^0.10.11":
"@types/thrift@npm:0.10.17, @types/thrift@npm:^0.10.11":
version: 0.10.17
resolution: "@types/thrift@npm:0.10.17"
dependencies:
Expand Down Expand Up @@ -10914,10 +10914,10 @@ __metadata:
"@types/jest": "npm:28.1.8"
"@types/jsdom": "npm:16.2.15"
"@types/node": "npm:18.18.14"
"@types/node-int64": "npm:0.4.32"
"@types/react": "npm:18.2.45"
"@types/react-dom": "npm:18.2.17"
"@types/react-test-renderer": "npm:18.0.0"
"@types/thrift": "npm:0.10.17"
"@types/uuid": "npm:9.0.7"
"@types/webpack": "npm:5.28.5"
aws-cdk: "npm:2.90.0"
Expand All @@ -10940,7 +10940,6 @@ __metadata:
jsdom: "npm:16.7.0"
lodash.debounce: "npm:4.0.6"
mockdate: "npm:3.0.5"
node-int64: "npm:0.4.0"
react: "npm:18.2.0"
react-dom: "npm:18.2.0"
react-test-renderer: "npm:18.2.0"
Expand Down Expand Up @@ -21294,7 +21293,7 @@ __metadata:
languageName: node
linkType: hard

"node-int64@npm:0.4.0, node-int64@npm:^0.4.0":
"node-int64@npm:^0.4.0":
version: 0.4.0
resolution: "node-int64@npm:0.4.0"
checksum: a6a4d8369e2f2720e9c645255ffde909c0fbd41c92ea92a5607fc17055955daac99c1ff589d421eee12a0d24e99f7bfc2aabfeb1a4c14742f6c099a51863f31a
Expand Down
Loading