Skip to content

Commit

Permalink
Merge branch 'tauri-apps:dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
hixio-mh authored Dec 17, 2023
2 parents 4b4bb6e + ef21b68 commit b488447
Show file tree
Hide file tree
Showing 163 changed files with 6,175 additions and 1,887 deletions.
5 changes: 5 additions & 0 deletions .changes/api-moduleresolution-node.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tauri-apps/api": "patch:bug"
---

Fix a regression where typescript could not find types when using `"moduleResolution": "node"`
5 changes: 5 additions & 0 deletions .changes/api-primitives-core.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@tauri-apps/api': 'patch:breaking'
---

Changed former `tauri` module from `primitives` to `core`.
5 changes: 5 additions & 0 deletions .changes/api-top-level-main-module.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@tauri-apps/api': 'patch:bug'
---

Add top-level `main`, `module` and `types` fields in `package.json` to be compliant with typescripts's `"moduleResolution": "node"`
5 changes: 5 additions & 0 deletions .changes/api-tray-menu.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@tauri-apps/api': 'minor:feat'
---

Add `tray` and `menu` modules to create and manage tray icons and menus from Javascript.
9 changes: 9 additions & 0 deletions .changes/cli-signer-env-vars.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'tauri-cli': 'patch:enhance'
---

Read the following env vars when using the `tauri signer sign` command to make it easier to use in CI.

- `TAURI_PRIVATE_KEY`
- `TAURI_PRIVATE_KEY_PASSWORD`
- `TAURI_PRIVATE_KEY_PATH`
5 changes: 5 additions & 0 deletions .changes/fix-file-drop-event-payload.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tauri-apps/api": 'patch:enhance'
---

Added `position` field to the `FileDropEvent` payload.
6 changes: 6 additions & 0 deletions .changes/fix-ide-build-run.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"tauri-cli": patch:bug
"@tauri-apps/cli": patch:bug
---

Fixes `android build --open` and `ios build --open` IDE failing to read CLI options.
5 changes: 5 additions & 0 deletions .changes/fix-ios-channel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri": 'patch:enhance'
---

Fixed the deserialisation of a `Channel` in iOS.
5 changes: 5 additions & 0 deletions .changes/get-ipc-response-test.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri": patch:enhance
---

Added `test::get_ipc_response`.
6 changes: 6 additions & 0 deletions .changes/merge-ios-plist.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"tauri-cli": patch:feat
"@tauri-apps/cli": patch:feat
---

Merge `src-tauri/Info.plist` and `src-tauri/Info.ios.plist` with the iOS project plist file.
16 changes: 15 additions & 1 deletion .changes/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
".changes/api-min-node-18.md",
".changes/api-primitives.md",
".changes/api-tabbed.md",
".changes/api-tray-menu.md",
".changes/api-window.md",
".changes/app-builder-send.md",
".changes/app-plugin-core.md",
Expand Down Expand Up @@ -53,6 +54,7 @@
".changes/cli-nodejs-detection.md",
".changes/cli-npx-mobile.md",
".changes/cli-plugin-init.md",
".changes/cli-plugin-name-snake-case.md",
".changes/cli-pnpm.md",
".changes/cli-refactor-ipc-mobile.md",
".changes/cli-removed-new-version-check.md",
Expand Down Expand Up @@ -94,7 +96,10 @@
".changes/fix-clearmocks.md",
".changes/fix-dev-server-proxy-path.md",
".changes/fix-empty-identifier.md",
".changes/fix-file-drop-event-payload.md",
".changes/fix-global-event.md",
".changes/fix-icons-android.md",
".changes/fix-ide-build-run.md",
".changes/fix-ios-cli-panic.md",
".changes/fix-ios-logs.md",
".changes/fix-ios-plugin-throws-command.md",
Expand All @@ -108,20 +113,23 @@
".changes/fix-plugin-ios-bool.md",
".changes/fix-plugin-removal.md",
".changes/fix-plugin-template-cargotoml.md",
".changes/fix-plugin-template.md",
".changes/fix-proguard-injection.md",
".changes/fix-proguard-rules.md",
".changes/fix-shell-build.md",
".changes/fix-tauri-binary-windows.md",
".changes/fix-tray-icon-validation.md",
".changes/fix-windows-custom-protocol-url.md",
".changes/fix-windows-custom-protocol.md",
".changes/fix-wix-output-filename-version.md",
".changes/fix-xcodescript-lib-path.md",
".changes/force-colored-logs.md",
".changes/generate-tauri-activity.md",
".changes/gradle-8.md",
".changes/gtk018.md",
".changes/gtk16.md",
".changes/http-types-refactor.md",
".changes/icon-svg.md",
".changes/improve-local-ip-detection.md",
".changes/improve-mobile-plugin-error-handling.md",
".changes/inject-config.md",
Expand All @@ -148,6 +156,7 @@
".changes/local-dev-path-mobile.md",
".changes/log-file-fix-for-linux-and-windows.md",
".changes/logcat-all-tags.md",
".changes/merge-ios-plist.md",
".changes/migrate-cmd.md",
".changes/migrate-csp.md",
".changes/migrate-plugins.md",
Expand Down Expand Up @@ -211,6 +220,7 @@
".changes/refactor-setup.md",
".changes/refactor-tauri-android-dependency.md",
".changes/register_asynchronous_uri_scheme_protocol.md",
".changes/relative-mobile-args.md",
".changes/remove-allowlist.md",
".changes/remove-attohttpc.md",
".changes/remove-clipboard.md",
Expand Down Expand Up @@ -249,12 +259,14 @@
".changes/skip-target-install-arg.md",
".changes/state-0.6.md",
".changes/submenu-and-menu-builders-item-and-id.md",
".changes/syn-2.0.md",
".changes/system-tray-feat.md",
".changes/target-dir-detection.md",
".changes/tauri-api-removal.md",
".changes/tauri-app-handle-ref.md",
".changes/tauri-asset-protocol.md",
".changes/tauri-build-mobile.md",
".changes/tauri-build-resource-compiler.md",
".changes/tauri-cleanup-before-exit.md",
".changes/tauri-defaultvbox.md",
".changes/tauri-env-args.md",
Expand All @@ -277,6 +289,7 @@
".changes/tauri-tray-on-tray-event.md",
".changes/tauri-utils-tabbed.md",
".changes/tauri-utils-tray-icon-id copy.md",
".changes/tauri-utils-windows-version.md",
".changes/tauri-uuid-rand.md",
".changes/tempdir-api.md",
".changes/tempdir-core.md",
Expand All @@ -298,6 +311,7 @@
".changes/wry-0.32.md",
".changes/wry-0.34.md",
".changes/wry-navigate-method.md",
".changes/wry26.md"
".changes/wry26.md",
".changes/xcode-archive.md"
]
}
5 changes: 5 additions & 0 deletions .changes/syn-2.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri-macros": patch:deps
---

Update to syn v2.
5 changes: 5 additions & 0 deletions .changes/tauri-menu-predefined-close-wiwndow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri": "patch:bug"
---

Fix incorrect menu item for `PredefinedMenuItem::close_window`
5 changes: 5 additions & 0 deletions .changes/tauri-resources-table.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'tauri': 'patch:feat'
---

Exposed `Manager::resources_table` to access the resources table used by tauri, which could be used by plugins or app authors to store their resources and retrieve it later using an id.
5 changes: 5 additions & 0 deletions .changes/tauri-utils-windows-version.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'tauri-utils': 'minor:breaking'
---

Removed `platform::windows_version` and `platform::is_windows_7`, use `windows-version` crate instead.
6 changes: 6 additions & 0 deletions .changes/xcode-archive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"tauri-cli": patch:bug
"@tauri-apps/cli": patch:bug
---

Added support to Xcode's archive. This requires regenerating the Xcode project.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Hi! We, the maintainers, are really excited that you are interested in contribut

- Issues with no clear repro steps will not be triaged. If an issue labeled "need repro" receives no further input from the issue author for more than 5 days, it will be closed.

- If your issue is resolved but still open, dont hesitate to close it. In case you found a solution by yourself, it could be helpful to explain how you fixed it.
- If your issue is resolved but still open, don't hesitate to close it. In case you found a solution by yourself, it could be helpful to explain how you fixed it.

- Most importantly, we beg your patience: the team must balance your request against many other responsibilities — fixing other bugs, answering other questions, new features, new documentation, etc. The issue list is not paid support and we cannot make guarantees about how fast your issue can be resolved.

Expand Down
31 changes: 31 additions & 0 deletions .github/sponsors/crabnebula.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 10 additions & 6 deletions .github/workflows/covector-version-or-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,18 @@ jobs:
repository: tauri-apps/tauri-docs
event-type: update-docs

- name: Process covector output
id: covectorOutput
- name: Get `@tauri-apps/cli` release id
uses: actions/github-script@v6
id: cliReleaseId
if: |
steps.covector.outputs.successfulPublish == 'true' &&
contains(steps.covector.outputs.packagesPublished, '@tauri-apps/cli')
run: |
id=$(node .scripts/covector/parse-output.js '${{ toJSON(steps.covector.outputs) }}' "-tauri-apps-cli-releaseId")
echo "cliReleaseId=$id" >> "$GITHUB_OUTPUT"
with:
result-encoding: string
script: |
const output = `${{ toJSON(steps.covector.outputs) }}`;
const [_, id] = /"-tauri-apps-cli-releaseId": "([0-9]+)"/g.exec(output);
return id;
- name: Trigger `@tauri-apps/cli` publishing workflow
if: |
Expand All @@ -130,7 +134,7 @@ jobs:
token: ${{ secrets.ORG_TAURI_BOT_PAT }}
repository: tauri-apps/tauri
event-type: publish-js-cli
client-payload: '{"releaseId": "${{ steps.covectorOutput.outputs.cliReleaseId }}" }'
client-payload: '{"releaseId": "${{ steps.cliReleaseId.outputs.result }}" }'

- name: Trigger `tauri-cli` publishing workflow
if: |
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/lint-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ jobs:
- name: install deps via yarn
working-directory: ./tooling/api/
run: yarn
- name: run ts:check
working-directory: ./tooling/api/
run: yarn ts:check
- name: run lint
working-directory: ./tooling/api/
run: yarn lint
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/publish-cli-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -294,14 +294,10 @@ jobs:
- name: List packages
run: ls -R .
shell: bash
- name: Install system dependencies
run: |
apk add openssl-dev musl-dev glib-dev cairo-dev pkgconfig gdk-pixbuf-dev webkit2gtk-dev curl gtk+3.0-dev
- name: Setup and run tests
run: |
yarn tauri --help
ls -la
# TODO: fix this test: https://github.com/tauri-apps/tauri/runs/5145729140?check_suite_focus=true#step:9:704
#- name: Setup and run tests
# run: |
# rustup install stable
Expand Down
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [ -z "$(git diff --name-only tooling/api)" ]; then
else
cd tooling/api
yarn format
yarn lint-fix
yarn lint:fix
cd ../..
fi

Expand Down
Loading

0 comments on commit b488447

Please sign in to comment.