-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update peer dependencies and dependencies with breaking changes. BREAKING CHANGE: bump tinymce to v6 BREAKING CHANGE: major bump of i18next and related deps (external dependency) BREAKING CHANGE: bump react-redux to v8 (external dependency) refs: SHELL-55 (#209)
- Loading branch information
Showing
27 changed files
with
991 additions
and
2,215 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -123,3 +123,6 @@ export const SCALING_LIMIT = { | |
|
|
||
| export const LOGIN_V3_CONFIG_PATH = '/zx/login/v3/config'; | ||
| export const DARK_READER_PROP_KEY = 'zappDarkreaderMode'; | ||
| export const SENTRY_SHELL_DSN = 'https://[email protected]/6'; | ||
| export const SENTRY_FEEDBACK_DNS = | ||
| 'https://[email protected]/8'; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: 2023 Zextras <https://www.zextras.com> | ||
| * | ||
| * SPDX-License-Identifier: AGPL-3.0-only | ||
| */ | ||
| // import the original type declarations | ||
| import * as i18next from 'i18next'; | ||
| // import all namespaces (for the default language, only) | ||
| import en from '../translations/en.json'; | ||
|
|
||
| declare module 'i18next' { | ||
| // Extend CustomTypeOptions | ||
| interface CustomTypeOptions { | ||
| // custom resources type | ||
| resources: { | ||
| [defaultNs: i18next.TypeOptions['defaultNS']]: typeof en; | ||
| }; | ||
| returnNull: false; | ||
| jsonFormat: 'v3'; | ||
| allowObjectInHTMLChildren: true; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ | |
| * SPDX-License-Identifier: AGPL-3.0-only | ||
| */ | ||
|
|
||
| import create, { StoreApi, UseBoundStore } from 'zustand'; | ||
| import { create } from 'zustand'; | ||
| import { | ||
| BrowserClient, | ||
| defaultIntegrations, | ||
|
|
@@ -14,21 +14,21 @@ import { | |
| } from '@sentry/browser'; | ||
| import { reduce } from 'lodash'; | ||
| import type { CarbonioModule } from '../../types'; | ||
| import { SHELL_APP_ID } from '../constants'; | ||
| import { SENTRY_FEEDBACK_DNS, SENTRY_SHELL_DSN, SHELL_APP_ID } from '../constants'; | ||
|
|
||
| type ReporterState = { | ||
| clients: Record<string, Hub>; | ||
| setClients: (apps: Array<CarbonioModule>) => void; | ||
| }; | ||
|
|
||
| export const useReporter = create<ReporterState>((set) => ({ | ||
| export const useReporter = create<ReporterState>()((set) => ({ | ||
| clients: { | ||
| [SHELL_APP_ID]: new Hub( | ||
| new BrowserClient({ | ||
| transport: makeFetchTransport, | ||
| stackParser: defaultStackParser, | ||
| integrations: defaultIntegrations, | ||
| dsn: 'https://[email protected]/6', | ||
| dsn: SENTRY_SHELL_DSN, | ||
| release: '0', | ||
| maxValueLength: 500 | ||
| }) | ||
|
|
@@ -38,7 +38,7 @@ export const useReporter = create<ReporterState>((set) => ({ | |
| transport: makeFetchTransport, | ||
| stackParser: defaultStackParser, | ||
| integrations: defaultIntegrations, | ||
| dsn: 'https://[email protected]/8', | ||
| dsn: SENTRY_FEEDBACK_DNS, | ||
| release: '0', | ||
| maxValueLength: 500 | ||
| }) | ||
|
|
@@ -68,4 +68,4 @@ export const useReporter = create<ReporterState>((set) => ({ | |
| ) | ||
| })); | ||
| } | ||
| })) as UseBoundStore<ReporterState, StoreApi<ReporterState>>; | ||
| })); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.