Skip to content

Commit

Permalink
refactor: remove window and app plugins (#671)
Browse files Browse the repository at this point in the history
Co-authored-by: Lucas Nogueira <lucas@tauri.app>
  • Loading branch information
amrbashir and lucasfernog authored Oct 19, 2023
1 parent 0e642e6 commit b7c5407
Show file tree
Hide file tree
Showing 59 changed files with 6 additions and 4,499 deletions.
26 changes: 2 additions & 24 deletions .changes/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
"manager": "rust",
"publish": false,
"dependencies": [
"app",
"barcode-scanner",
"log-plugin",
"cli",
Expand All @@ -51,16 +50,14 @@
"os",
"process",
"shell",
"updater",
"window"
"updater"
]
},
"api-example-js": {
"path": "./examples/api",
"manager": "javascript",
"publish": false,
"dependencies": [
"app-js",
"barcode-scanner-js",
"log-js",
"cli-js",
Expand All @@ -73,8 +70,7 @@
"os-js",
"process-js",
"shell-js",
"updater-js",
"window-js"
"updater-js"
],
"postversion": "pnpm install --no-frozen-lockfile"
},
Expand All @@ -87,15 +83,6 @@
"postversion": "pnpm install --no-frozen-lockfile"
},

"app": {
"path": "./plugins/app",
"manager": "rust"
},
"app-js": {
"path": "./plugins/app",
"manager": "javascript"
},

"authenticator": {
"path": "./plugins/authenticator",
"manager": "rust"
Expand Down Expand Up @@ -333,15 +320,6 @@
"manager": "javascript"
},

"window": {
"path": "./plugins/window",
"manager": "rust"
},
"window-js": {
"path": "./plugins/window",
"manager": "javascript"
},

"window-state": {
"path": "./plugins/window-state",
"manager": "rust"
Expand Down
5 changes: 0 additions & 5 deletions .changes/disable-window-controls-api-options.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/disable-window-controls-api.md

This file was deleted.

2 changes: 0 additions & 2 deletions .changes/fix-docs-build.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
"app": patch
"authenticator": patch
"autostart": patch
"cli": patch
Expand All @@ -23,7 +22,6 @@
"updater": patch
"upload": patch
"websocket": patch
"window": patch
"window-state": patch
---

Expand Down
9 changes: 1 addition & 8 deletions .changes/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
"changes": [
".changes/deep-link-initial-release.md",
".changes/dialog-async-message-dialog.md",
".changes/disable-window-controls-api-options.md",
".changes/disable-window-controls-api.md",
".changes/fix-docs-build.md",
".changes/fs-wiret-binary-file.md",
".changes/http-multipart-refactor.md",
Expand All @@ -30,12 +28,7 @@
".changes/updater-nsis.md",
".changes/updater-plugin-refactor.md",
".changes/v2-alpha.md",
".changes/window-incognito.md",
".changes/window-is-focused.md",
".changes/window-plugin-refactor.md",
".changes/window-set-effects.md",
".changes/window-state-decorated.md",
".changes/window-state-promise.md",
".changes/window-tap-drag-region-detection.md"
".changes/window-state-promise.md"
]
}
4 changes: 0 additions & 4 deletions .changes/tauri-alpha.11.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
---
"app": patch
"app-js": patch
"authenticator": patch
"authenticator-js": patch
"autostart": patch
Expand Down Expand Up @@ -44,8 +42,6 @@
"upload-js": patch
"websocket": patch
"websocket-js": patch
"window": patch
"window-js": patch
"window-state": patch
"window-state-js": patch
---
Expand Down
2 changes: 0 additions & 2 deletions .changes/tauri-alpha.12.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
"app": patch
"authenticator": patch
"autostart": patch
"cli": patch
Expand All @@ -23,7 +22,6 @@
"updater": patch
"upload": patch
"websocket": patch
"window": patch
"window-state": patch
---

Expand Down
4 changes: 0 additions & 4 deletions .changes/v2-alpha.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
---
"app": major
"app-js": major
"authenticator": major
"authenticator-js": major
"autostart": major
Expand Down Expand Up @@ -44,8 +42,6 @@
"upload-js": major
"websocket": major
"websocket-js": major
"window": major
"window-js": major
"window-state": major
"window-state-js": major
---
Expand Down
5 changes: 0 additions & 5 deletions .changes/window-incognito.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/window-is-focused.md

This file was deleted.

10 changes: 0 additions & 10 deletions .changes/window-plugin-refactor.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/window-set-effects.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/window-tap-drag-region-detection.md

This file was deleted.

8 changes: 0 additions & 8 deletions .github/workflows/check-generated-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ jobs:
id: filter
with:
filters: |
app:
- .github/workflows/check-generated-files.yml
- plugins/app/guest-js/**
- plugins/app/src/api-iife.js
authenticator:
- .github/workflows/check-generated-files.yml
- plugins/authenticator/guest-js/**
Expand Down Expand Up @@ -109,10 +105,6 @@ jobs:
- .github/workflows/check-generated-files.yml
- plugins/websocket/guest-js/**
- plugins/websocket/src/api-iife.js
window:
- .github/workflows/check-generated-files.yml
- plugins/window/guest-js/**
- plugins/window/src/api-iife.js
window-state:
- .github/workflows/check-generated-files.yml
- plugins/window-state/guest-js/**
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/lint-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ jobs:
id: filter
with:
filters: |
tauri-plugin-app:
- .github/workflows/lint-rust.yml
- plugins/app/**
tauri-plugin-authenticator:
- .github/workflows/lint-rust.yml
- plugins/authenticator/**
Expand Down Expand Up @@ -116,9 +113,6 @@ jobs:
tauri-plugin-websocket:
- .github/workflows/lint-rust.yml
- plugins/websocket/**
tauri-plugin-window:
- .github/workflows/lint-rust.yml
- plugins/window/**
tauri-plugin-window-state:
- .github/workflows/lint-rust.yml
- plugins/window-state/**
Expand Down Expand Up @@ -165,8 +159,6 @@ jobs:

fmt:
runs-on: ubuntu-latest
strategy:
fail-fast: false

steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/test-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ jobs:
id: filter
with:
filters: |
tauri-plugin-app:
- .github/workflows/test-rust.yml
- plugins/app/**
tauri-plugin-authenticator:
- .github/workflows/test-rust.yml
- plugins/authenticator/**
Expand Down Expand Up @@ -118,9 +115,6 @@ jobs:
tauri-plugin-websocket:
- .github/workflows/test-rust.yml
- plugins/websocket/**
tauri-plugin-window:
- .github/workflows/test-rust.yml
- plugins/window/**
tauri-plugin-window-state:
- .github/workflows/test-rust.yml
- plugins/window-state/**
Expand Down
18 changes: 0 additions & 18 deletions Cargo.lock

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

2 changes: 0 additions & 2 deletions examples/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
},
"dependencies": {
"@tauri-apps/api": "2.0.0-alpha.8",
"@tauri-apps/plugin-app": "2.0.0-alpha.1",
"@tauri-apps/plugin-barcode-scanner": "2.0.0-alpha.0",
"@tauri-apps/plugin-cli": "2.0.0-alpha.1",
"@tauri-apps/plugin-clipboard-manager": "2.0.0-alpha.1",
Expand All @@ -23,7 +22,6 @@
"@tauri-apps/plugin-process": "2.0.0-alpha.1",
"@tauri-apps/plugin-shell": "2.0.0-alpha.1",
"@tauri-apps/plugin-updater": "2.0.0-alpha.1",
"@tauri-apps/plugin-window": "2.0.0-alpha.1",
"@zerodevx/svelte-json-view": "1.0.5"
},
"devDependencies": {
Expand Down
2 changes: 0 additions & 2 deletions examples/api/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ serde_json = { workspace = true }
serde = { workspace = true }
tiny_http = "0.11"
log = { workspace = true }
tauri-plugin-app = { path = "../../../plugins/app", version = "2.0.0-alpha.2" }
tauri-plugin-log = { path = "../../../plugins/log", version = "2.0.0-alpha.2" }
tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.0.0-alpha.2" }
tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.0.0-alpha.2" }
Expand All @@ -28,7 +27,6 @@ tauri-plugin-notification = { path = "../../../plugins/notification", version =
tauri-plugin-os = { path = "../../../plugins/os", version = "2.0.0-alpha.2" }
tauri-plugin-process = { path = "../../../plugins/process", version = "2.0.0-alpha.2" }
tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.0.0-alpha.2" }
tauri-plugin-window = { path = "../../../plugins/window", version = "2.0.0-alpha.2", features = [ "devtools", "icon-ico", "icon-png" ] }

[dependencies.tauri]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions examples/api/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ pub fn run() {
.level(log::LevelFilter::Info)
.build(),
)
.plugin(tauri_plugin_app::init())
.plugin(tauri_plugin_fs::init())
.plugin(tauri_plugin_clipboard_manager::init())
.plugin(tauri_plugin_dialog::init())
Expand All @@ -40,7 +39,6 @@ pub fn run() {
.plugin(tauri_plugin_os::init())
.plugin(tauri_plugin_process::init())
.plugin(tauri_plugin_shell::init())
.plugin(tauri_plugin_window::init())
.setup(move |app| {
#[cfg(desktop)]
{
Expand Down
Loading

0 comments on commit b7c5407

Please sign in to comment.