Skip to content

Commit

Permalink
feat: upgrade react-i18next HP-2410
Browse files Browse the repository at this point in the history
  • Loading branch information
mikkojamG committed May 3, 2024
1 parent a732953 commit f6a1fde
Show file tree
Hide file tree
Showing 13 changed files with 1,562 additions and 2,517 deletions.
5 changes: 0 additions & 5 deletions codegen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ config:
dedupeOperationSuffix: true
preResolveTypes: true
skipTypeNameForRoot: true

#typescript-react-apollo
withHooks: true
withComponent: false
generates:
./src/graphql/generatedTypes.ts:
plugins:
Expand All @@ -30,4 +26,3 @@ generates:
- '// This file was automatically generated and should not be edited.'
- 'typescript'
- 'typescript-operations'
- 'typescript-react-apollo'
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"dompurify": "^2.2.9",
"dotenv": "^16.4.5",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"enzyme-adapter-react-16": "^1.15.8",
"enzyme-to-json": "^3.5.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^8.5.0",
Expand All @@ -49,6 +49,7 @@
"file-saver": "^2.0.2",
"formik": "^2.0.4",
"graphql": "^15.8.0",
"graphql-tag": "2.12.6",
"hds-core": "^3.6.0",
"hds-design-tokens": "^3.6.0",
"hds-react": "^3.6.0",
Expand All @@ -65,7 +66,7 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-helmet": "^6.0.0",
"react-i18next": "^11.18.6",
"react-i18next": "^14.1.1",
"react-router": "^5.1.2",
"react-router-dom": "^5.1.2",
"ts-node": "^10.9.2",
Expand Down Expand Up @@ -112,7 +113,6 @@
"@graphql-codegen/cli": "^5.0.2",
"@graphql-codegen/typescript": "^4.0.6",
"@graphql-codegen/typescript-operations": "^4.2.0",
"@graphql-codegen/typescript-react-apollo": "^4.3.0",
"@vitest/coverage-istanbul": "^1.3.1",
"cross-env": "^7.0.3",
"helsinki-utils": "City-of-Helsinki/helsinki-utils-js#0.1.0",
Expand Down
1 change: 0 additions & 1 deletion src/BrowserApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { disableTrackingCookiesUntilConsentGiven } from './common/helpers/tracki

function BrowserApp(): React.ReactElement {
disableTrackingCookiesUntilConsentGiven();

return (
<I18nextProvider i18n={i18n}>
<BrowserRouter>
Expand Down
2 changes: 1 addition & 1 deletion src/common/test/commonTestRuns.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FetchMock } from 'vitest-fetch-mock';
import { TFunction } from 'react-i18next';
import { TFunction } from 'i18next';

import { UpdateMyProfileMutationVariables } from '../../graphql/generatedTypes';
import { ProfileData } from '../../graphql/typings';
Expand Down
2 changes: 1 addition & 1 deletion src/cookieConsents/cookieContentSource.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ContentSource } from 'hds-react';
import { TFunction } from 'react-i18next';
import { TFunction } from 'i18next';

export const trackingCookieId = 'matomo';

Expand Down

0 comments on commit f6a1fde

Please sign in to comment.