mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 09:01:17 -08:00
fix(tauri): pass CSP nonce to runtime styles (#1730)
<!-- Please read https://github.com/SableClient/Sable/blob/dev/CONTRIBUTING.md before submitting your pull request --> ### Description <!-- Please include a summary of the change. Please also include relevant motivation and context. List any dependencies that are required for this change. --> Fixes # #### Type of change - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] This change requires a documentation update ### Checklist: - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings ### AI disclosure: - [ ] Partially AI assisted (clarify which code was AI assisted and briefly explain what it does). - [ ] Fully AI generated (explain what all the generated code does in moderate detail). <!-- Write any explanation required here, but do not generate the explanation using AI!! You must prove you understand what the code in this PR does. -->
This commit is contained in:
3 files changed
+11
-2
No files matched your search
@@ -21,6 +21,7 @@ import { ScreenSizeProvider } from '$hooks/useScreenSize';
|
||||
import { isReactQueryDevtoolsEnabled } from '$pages/reactQueryDevtoolsGate';
|
||||
import { useDesktopSetting } from '$state/hooks/desktopSettings';
|
||||
import { getCustomTitlebarKind } from '$utils/tauriTitlebar';
|
||||
import { getCspNonce } from '$utils/cspNonce';
|
||||
import { SystemBarShell } from './SystemBarShell';
|
||||
|
||||
const ReactQueryDevtools = lazy(async () => {
|
||||
@@ -57,7 +58,10 @@ export function AppShell({ children, queryClient, screenSize, jotaiStore }: AppS
|
||||
</JotaiProvider>
|
||||
{reactQueryDevtoolsEnabled && (
|
||||
<Suspense fallback={null}>
|
||||
<ReactQueryDevtools initialIsOpen={false} />
|
||||
<ReactQueryDevtools
|
||||
initialIsOpen={false}
|
||||
styleNonce={getCspNonce() || undefined}
|
||||
/>
|
||||
</Suspense>
|
||||
)}
|
||||
</QueryClientProvider>
|
||||
|
||||
@@ -19,6 +19,7 @@ import { isReactQueryDevtoolsEnabled } from './reactQueryDevtoolsGate';
|
||||
import { bootstrapSettingsStore } from '$state/settings';
|
||||
import { AppShell } from '$components/app-shell';
|
||||
import { normalizeOAuthCallbackUrl } from '$utils/oauthCallback';
|
||||
import { getCspNonce } from '$utils/cspNonce';
|
||||
|
||||
const queryClient = new QueryClient({
|
||||
defaultOptions: {
|
||||
@@ -53,7 +54,7 @@ function BootstrappedAppShell({ clientConfig, screenSize, jotaiStore }: Bootstra
|
||||
</JotaiProvider>
|
||||
{reactQueryDevtoolsEnabled && (
|
||||
<Suspense fallback={null}>
|
||||
<ReactQueryDevtools initialIsOpen={false} />
|
||||
<ReactQueryDevtools initialIsOpen={false} styleNonce={getCspNonce() || undefined} />
|
||||
</Suspense>
|
||||
)}
|
||||
</QueryClientProvider>
|
||||
|
||||
@@ -10,8 +10,10 @@ import '@fontsource/space-mono/700-italic.css';
|
||||
import 'katex/dist/katex.min.css';
|
||||
import 'folds/dist/style.css';
|
||||
import { configClass, varsClass } from 'folds';
|
||||
import { setNonce as setReactColorfulNonce } from 'react-colorful';
|
||||
import App from './app/pages/App';
|
||||
import './app/i18n';
|
||||
import { getCspNonce } from './app/utils/cspNonce';
|
||||
|
||||
import './index.css';
|
||||
import './app/styles/themes.css';
|
||||
@@ -30,6 +32,8 @@ import { installTauriNativeBehaviors } from './app/utils/tauriNative';
|
||||
import { installAndroidBackBridge } from './app/utils/androidBack';
|
||||
|
||||
enableMapSet();
|
||||
const tauriStyleNonce = getCspNonce();
|
||||
if (tauriStyleNonce) setReactColorfulNonce(tauriStyleNonce);
|
||||
installConsolePasteScamWarning();
|
||||
registerMatrixUriProtocol();
|
||||
const log = createLogger('index');
|
||||
|
||||
Reference in new issue
Block a user