Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.6.4 #979

Merged
merged 22 commits into from
Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
32173c7
build(deps): bump tokio from 1.23.0 to 1.24.2 in /src-tauri
dependabot[bot] Feb 4, 2023
22f8e61
build(deps): bump openssl from 0.10.44 to 0.10.48 in /src-tauri
dependabot[bot] Mar 25, 2023
912ceb1
build(deps): bump tauri from 1.2.2 to 1.2.5 in /src-tauri
dependabot[bot] May 3, 2023
cf82b93
Add open project folder in linux native app
me-mariosteve Aug 18, 2023
ec75dd9
fix strange module resolution suggestions by monaco quick fix
outercloudstudio Oct 4, 2023
963f3bc
more responsive context menu
outercloudstudio Oct 8, 2023
8ebfac3
Improve folder and file context menu
outercloudstudio Oct 8, 2023
eac01e8
bump version to 2.6.4
outercloudstudio Oct 8, 2023
9a63325
Merge pull request #913 from bridge-core/dependabot/cargo/src-tauri/t…
outercloudstudio Oct 9, 2023
a7adf29
Merge pull request #895 from bridge-core/dependabot/cargo/src-tauri/o…
outercloudstudio Oct 9, 2023
fe0280c
Merge pull request #871 from bridge-core/dependabot/cargo/src-tauri/t…
outercloudstudio Oct 9, 2023
2eff18e
chore(deps-dev): bump postcss from 8.4.20 to 8.4.31
dependabot[bot] Oct 9, 2023
9bb2850
Merge pull request #952 from me-mariosteve/dev
outercloudstudio Oct 9, 2023
f20671d
chore(deps-dev): bump vite from 4.0.0 to 4.0.5
dependabot[bot] Oct 9, 2023
f29ca07
Merge pull request #974 from bridge-core/dependabot/npm_and_yarn/post…
outercloudstudio Oct 9, 2023
afd5595
Merge pull request #975 from bridge-core/dependabot/npm_and_yarn/vite…
outercloudstudio Oct 9, 2023
b3fa2c0
chore(deps-dev): bump postcss from 8.4.20 to 8.4.31
dependabot[bot] Oct 9, 2023
c600246
Merge pull request #976 from bridge-core/dependabot/npm_and_yarn/post…
outercloudstudio Oct 9, 2023
ce291fc
chore(deps): bump tauri from 1.2.2 to 1.2.5 in /src-tauri
dependabot[bot] Oct 9, 2023
6b97037
Merge pull request #977 from bridge-core/dependabot/cargo/src-tauri/t…
outercloudstudio Oct 9, 2023
144653c
Merge pull request #56 from bridge-core/upd
outercloudstudio Oct 16, 2023
7851a1a
Merge pull request #57 from bridge-core/upd
outercloudstudio Oct 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 34 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bridge",
"version": "2.6.3",
"version": "2.6.4",
"private": true,
"scripts": {
"dev": "vite",
Expand Down Expand Up @@ -63,12 +63,12 @@
"autoprefixer": "^10.4.13",
"markdown-it": "^12.3.2",
"node-fetch": "^2.6.7",
"postcss": "^8.4.20",
"postcss": "^8.4.31",
"prettier": "^2.2.1",
"sass": "^1.19.0",
"tailwindcss": "^3.2.4",
"typescript": "^4.4.3",
"vite": "^4.0.0",
"vite": "^4.0.5",
"vite-plugin-ejs": "^1.4.3",
"vite-plugin-pwa": "^0.14.0",
"vite-plugin-solid": "^2.5.0"
Expand Down
Binary file modified public/packages.zip
Binary file not shown.
26 changes: 14 additions & 12 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ tauri-build = { version = "1.1", features = [] }
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
tauri = { version = "1.2.2", features = ["api-all", "updater"] }
tauri = { version = "1.2.5", features = ["api-all", "updater"] }
discord-rich-presence = "0.2.3"
chrono = "0.4.23"
window-shadows = "0.2.0"
tokio = { version = "1.23", features = ["process", "io-util", "sync"] }
tokio = { version = "1.24", features = ["process", "io-util", "sync"] }
mime_guess = "2.0.4"

[features]
Expand Down
5 changes: 4 additions & 1 deletion src-tauri/src/fs_extra.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ pub async fn reveal_in_file_explorer(path: &str) -> Result<(), String> {
.spawn()
.expect("Failed to open finder");
} else {
// TODO: Linux
Command::new("xdg-open")
.args([path])
.spawn()
.expect("Failed to open file explorer");
}

Ok(())
Expand Down
1 change: 0 additions & 1 deletion src/components/ContextMenu/ContextMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ export default {
<style>
.context-menu-transition-enter-active,
.context-menu-transition-leave-active {
transition: opacity 0.08s;
}
.context-menu-transition-enter,
.context-menu-transition-leave-to {
Expand Down
3 changes: 1 addition & 2 deletions src/components/ContextMenu/showContextMenu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,5 @@ export async function showContextMenu(
}
})

// This is necessary so an old click outside event doesn't close the new menu
setTimeout(() => app.contextMenu.show(event, actionManager, options), 60)
app.contextMenu.show(event, actionManager, options)
}
5 changes: 4 additions & 1 deletion src/components/Data/TypeLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,10 @@ export class TypeLoader {
this.userTypeDisposables = []

for (const typeScriptFile of typeScriptFiles) {
const fileUri = Uri.file(typeScriptFile)
const fileUri = Uri.file(
// This for some reason fixes monaco suggesting the wrong path for quickfixes #932
typeScriptFile.replace('/BP/', '/bp/')
)
const file = await app.fileSystem
.readFile(typeScriptFile)
.catch(() => null)
Expand Down
3 changes: 2 additions & 1 deletion src/components/Editors/Text/TextTab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ export class TextTab extends FileTab {
if (!this.editorModel || this.editorModel.isDisposed()) {
const file = await this.fileHandle.getFile()
const fileContent = await file.text()
const uri = Uri.file(this.getPath())
// This for some reason fixes monaco suggesting the wrong path for quickfixes #932
const uri = Uri.file(this.getPath().replace('/BP/', '/bp/'))

this.editorModel = markRaw(
editor.getModel(uri) ??
Expand Down
4 changes: 2 additions & 2 deletions src/components/Solid/DirectoryViewer/Common/Name.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export function Name(props: NameProps) {
props.baseWrapper.unselectAll()
props.baseWrapper.isSelected.value = true
}
const onClick = (event: MouseEvent) => {
const onMouseDown = (event: MouseEvent) => {
// Left click
if (event.button === 0) {
props.baseWrapper.onClick(event)
Expand All @@ -41,7 +41,7 @@ export function Name(props: NameProps) {
classList={{
selected: isSelected(),
}}
onClick={onClick}
onMouseDown={onMouseDown}
onFocus={(event: FocusEvent) => onFocus(event)}
onBlur={() => setIsFocused(false)}
>
Expand Down
3 changes: 2 additions & 1 deletion src/components/UIElements/DirectoryViewer/Common/Name.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
@click.prevent="onClick($event)"
@keydown.space.prevent="isFocused ? onClick($event) : null"
@keydown.stop="onKeyDown"
@click.right.prevent.stop="baseWrapper.onRightClick($event)"
@mousedown.right.prevent.stop="baseWrapper.onRightClick($event)"
@click.right.prevent.stop
@focus.exact="onFocus"
@blur="isFocused = false"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,19 @@ export const EditAction = async (
baseWrapper: BaseWrapper<any>,
options: IEditOptions = {}
) => {
// Construct and return submenu
return <ISubmenuConfig>{
type: 'submenu',
icon:
baseWrapper instanceof DirectoryWrapper
? 'mdi-folder-edit-outline'
: 'mdi-file-edit-outline',
name: 'actions.edit.name',
return [
options.hideRename ? null : RenameAction(baseWrapper),
options.hideDelete ? null : DeleteAction(baseWrapper),
options.hideDuplicate ? null : DuplicateAction(baseWrapper),
// options.hideRename && options.hideDelete && options.hideDuplicate
// ? null
// : { type: 'divider' },

actions: [
CopyAction(baseWrapper),
PasteAction(
baseWrapper instanceof DirectoryWrapper
? baseWrapper
: baseWrapper.getParent()!
),
options.hideDuplicate ? null : DuplicateAction(baseWrapper),
options.hideRename ? null : RenameAction(baseWrapper),
options.hideDelete ? null : DeleteAction(baseWrapper),
],
}
CopyAction(baseWrapper),
PasteAction(
baseWrapper instanceof DirectoryWrapper
? baseWrapper
: baseWrapper.getParent()!
),
]
}
Loading
Loading