chore: fix missing items after merges #1771
Conversation
📝 WalkthroughWalkthroughThis pull request updates several configuration and code files. In knip.ts, the ignored dependency list is reduced and its comment updated. The version is bumped from 0.9.837 to 0.9.838 in package.json, Cargo.toml, and tauri.conf.json along with dependency and CSP configuration changes. The tor_adapter.rs file removes an unused import, while the useSetUp.ts hook drops an unnecessary function call. Additionally, a new GitHub Actions step is added in release.yml to automate the Windows installer upload during releases. Changes
Sequence Diagram(s)sequenceDiagram
participant Runner as GitHub Runner
participant Workflow as GitHub Workflow
participant Asset as Upload Action
Runner->>Workflow: Trigger release job (Windows & release branch)
Workflow->>Asset: Execute "Add installer to release" step
Asset-->>Workflow: Confirm installer uploaded
sequenceDiagram
participant Setup as useSetUp Function
participant Status as Setup Completion Handler
participant Versions as Version Fetcher
Setup->>Status: Check progress condition (>= 1)
Note right of Setup: airdropSetup call removed
Setup->>Status: Mark setup as complete
Setup->>Versions: Invoke fetchApplicationsVersionsWithRetry
Poem
✨ Finishing Touches
🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
Documentation and Community
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Nitpick comments (1)
src-tauri/tauri.conf.json (1)
43-53: Refactored 'connect-src' as an Array
Converting theconnect-srcdirective from a single string to an array format enhances clarity by explicitly listing each allowed source. Double-check that all necessary endpoints (like"wss://ut.tari.com","tauri:","ipc:", etc.) are correctly included and ordered as required.
📜 Review details
Configuration used: .coderabbit.yml
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (2)
diff(1 hunks)src-tauri/tauri.conf.json(1 hunks)
✅ Files skipped from review due to trivial changes (1)
- diff
⏰ Context from checks skipped due to timeout of 90000ms (3)
- GitHub Check: tauri-build
- GitHub Check: cargo checks (fmt, clippy, check)
- GitHub Check: Check i18n
🔇 Additional comments (7)
src-tauri/tauri.conf.json (7)
34-34: Updated 'createUpdaterArtifacts' Type
Changing"createUpdaterArtifacts": "v1Compatible"to"createUpdaterArtifacts": truealigns the configuration with a boolean flag rather than a string. Please confirm that the Tauri updater API now expects a boolean value.
38-39: Streamlined Security Array Configurations
The consolidation of thecapabilitiesanddangerousDisableAssetCspModificationproperties into single-line arrays improves readability and maintainability. Verify that no required capabilities were unintentionally dropped in the process.
41-41: Refined 'default-src' Directive in CSP
The simplified value for"default-src": "'self' tauri: https:"clarifies the allowed sources. Please ensure that this change still meets your application's security requirements.
56-56: Added 'worker-src' Directive
The inclusion of"worker-src": "'self' blob: https://cdn.npmjs.com/@tari-project/tari-tower"strengthens the security for web workers by explicitly defining allowed sources. Please verify that this URL and the use ofblob:fit the intended security model.
57-57: Enhanced 'img-src' Directive
The updated"img-src"now includes explicit trusted origins (e.g., wildcards likehttps://*.twimg.comand a CDN reference). Confirm that these entries cover all legitimate image sources and that the inclusion ofdata:,blob:, andbase64protocols does not inadvertently broaden the allowed sources.
58-58: Refined 'object-src' Directive
Restricting"object-src"to"'self' data: blob:"helps mitigate risks associated with embedding untrusted objects. Ensure that this limitation does not disrupt any necessary functionality.
59-59: Introduced 'script-src-elem' Directive
The new"script-src-elem": "'self' 'unsafe-inline' 'unsafe-eval'"directive adds an extra layer of control over script elements loaded on the page. Validate that this approach aligns with your overall security policy and that both inline scripts and eval usage are accounted for as planned.
…nf/cargo files changes being overwritten again
shanimal08
changed the title
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Nitpick comments (1)
.github/workflows/release.yml (1)
329-339: New Installer Upload Step AddedThe new "Add installer to release" step correctly leverages
actions/upload-release-asset@v1to upload the Windows installer when running on a Windows runner and on a release branch. The conditional expression checks that the OS starts with "Windows" and that the Git reference begins with "refs/heads/release", ensuring the step only runs in the intended context.Key points:
- Conditional Expression: The check
appears correct for targeting Windows release builds.if: ${{ startsWith(runner.os,'Windows') && startsWith(github.ref, 'refs/heads/release') }}- Asset Parameters: The parameters for
upload_url,asset_path,asset_name, andasset_content_typeare defined appropriately. Verify that the${{ env.TARI_UNIVERSE_BUNDLER_NAME }}variable is consistently set in the previous steps and that the file exists at./tari-win-bundler/${{ env.TARI_UNIVERSE_BUNDLER_NAME }}.exeat this point in the workflow.- Action Version: While using
actions/upload-release-asset@v1is acceptable, consider checking if an updated version might offer improvements or additional features.Overall, the implementation is solid. A good-to-have enhancement could be adding a pre-upload file existence check or more detailed logging to help diagnose issues if the asset is absent.
📜 Review details
Configuration used: .coderabbit.yml
Review profile: CHILL
Plan: Pro
⛔ Files ignored due to path filters (2)
package-lock.jsonis excluded by!**/package-lock.jsonsrc-tauri/Cargo.lockis excluded by!**/*.lock
📒 Files selected for processing (5)
.github/workflows/release.yml(1 hunks)package.json(4 hunks)src-tauri/Cargo.toml(1 hunks)src-tauri/tauri.conf.json(2 hunks)src/hooks/app/useSetUp.ts(0 hunks)
💤 Files with no reviewable changes (1)
- src/hooks/app/useSetUp.ts
✅ Files skipped from review due to trivial changes (1)
- src-tauri/Cargo.toml
🚧 Files skipped from review as they are similar to previous changes (2)
- src-tauri/tauri.conf.json
- package.json
⏰ Context from checks skipped due to timeout of 90000ms (2)
- GitHub Check: tauri-build
- GitHub Check: cargo checks (fmt, clippy, check)
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Nitpick comments (1)
src/theme/types.ts (1)
24-24: Fix typo in type nameThere's a typo in the type name
GraidentKey- it should beGradientKey.-type GraidentKey = 'setupBg' | 'radialBg' | 'miningButtonStarted' | 'miningButtonHover' | ColourKey; +type GradientKey = 'setupBg' | 'radialBg' | 'miningButtonStarted' | 'miningButtonHover' | ColourKey;
📜 Review details
Configuration used: .coderabbit.yml
Review profile: CHILL
Plan: Pro
⛔ Files ignored due to path filters (1)
src-tauri/Cargo.lockis excluded by!**/*.lock
📒 Files selected for processing (5)
src/containers/main/SideBar/components/MiningButton/MiningButton.styles.ts(2 hunks)src/styled.d.ts(1 hunks)src/theme/gradients.ts(1 hunks)src/theme/themes.ts(1 hunks)src/theme/types.ts(1 hunks)
✅ Files skipped from review due to trivial changes (1)
- src/containers/main/SideBar/components/MiningButton/MiningButton.styles.ts
🧰 Additional context used
🧬 Code Definitions (2)
src/theme/themes.ts (1)
src/styled.d.ts (1)
DefaultTheme(6-12)
src/styled.d.ts (1)
src/theme/types.ts (1)
ThemePalette(29-35)
⏰ Context from checks skipped due to timeout of 90000ms (1)
- GitHub Check: tauri-build
🔇 Additional comments (5)
src/theme/themes.ts (1)
11-11: Type annotation added for consistencyAdding the
DefaultThemetype annotation todarkThemeimproves type safety and ensures consistency withlightTheme. This is a good practice that helps with IDE autocompletion and type checking.src/styled.d.ts (1)
10-11: Added theme properties to match ThemePalette interfaceThe addition of
colorsAlphaandgradientsproperties to theDefaultThemeinterface ensures that the theme has access to these properties from theThemePaletteinterface. This change complements the flattened gradient structure ingradients.ts.src/theme/types.ts (1)
27-27: Updated Gradients type to use the new gradient key typeThe
Gradientstype now uses the newly created key type, which includes specific gradient names. Don't forget to update this reference if you renameGraidentKeytoGradientKey.Make sure this change doesn't break any existing code that might be accessing gradient properties not included in the new
GraidentKeytype.src/theme/gradients.ts (2)
6-7: Flattened gradient structure for dark themeThe previously nested
miningButton.startedandminingButton.hoverproperties have been flattened tominingButtonStartedandminingButtonHover. This change makes the API more direct and aligns with the new type definitions.Ensure that all references to the old nested properties (
theme.gradients.miningButton.startedandtheme.gradients.miningButton.hover) have been updated throughout the codebase to use the new flattened structure.
14-15: Flattened gradient structure for light themeSimilar to the dark theme, the light theme's gradient structure has been flattened for consistency. The gradient values remain unchanged.
Description
reinstate changes meant to be in release
v0.9.838that may have been overwritten in weird auto mergesNOTE: main affected files were ones where the hotfix release versions were bumped, i.e. package/-lock.json, tauri.conf.json, and Cargo.toml/lock, but there were a few small mismatches in other files from varying PRs too
How Has This Been Tested?
Full Changelog: https://github.com/tari-project/universe/compare/v0.9.837...v0.9.838sectionif one of your PRs is included in the release, PLEASE check the table below and make sure the reinstatement here isn't messed up/wrong if there was a change from the release 😬 cc @Misieq01 @leet4tari
fix: add correct tag name for adding new installer to release by @Misieq01 in #1702overwritten by #1704 - NEEDS CHECKINGreverted to matchmainNEEDS CHECKING - in relation to #1711reverted to matchmainSummary by CodeRabbit
Summary by CodeRabbit