Skip to content

Commit

Permalink
Merge branch 'spacedriveapp:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Raghav-45 committed Aug 29, 2023
2 parents df4f627 + 795bb18 commit 619a4c8
Show file tree
Hide file tree
Showing 333 changed files with 11,991 additions and 7,430 deletions.
5 changes: 4 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,8 @@ apps/desktop/src/index.tsx
/packages/client/src/core.ts
apps/desktop/src/commands.ts

# Import only file, which order is relevant
interface/components/TextViewer/prism.ts

.next/
.contentlayer/
.contentlayer/
1 change: 0 additions & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ module.exports = {
],
importOrderSortSpecifiers: true,
importOrderParserPlugins: ['importAssertions', 'typescript', 'jsx'],
pluginSearchDirs: false,
plugins: ['@trivago/prettier-plugin-sort-imports', 'prettier-plugin-tailwindcss'],
tailwindConfig: './packages/ui/tailwind.config.js'
};
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"tauri-apps.tauri-vscode",
"rust-lang.rust-analyzer",
"oscartbeaumont.rspc-vscode",
"EditorConfig.EditorConfig"
"EditorConfig.EditorConfig",
"bradlc.vscode-tailwindcss"
]
}
Loading

0 comments on commit 619a4c8

Please sign in to comment.