Merge branch 'dev' into set-theme

tauri-apps · Aug 21, 2024 · 81a3666 · 81a3666
2 parents a18c4ea + 762cf31
commit 81a3666
Show file tree

Hide file tree

Showing 91 changed files with 1,122 additions and 332 deletions.
diff --git a/.changes/append_invoke_initialization_script.md b/.changes/append_invoke_initialization_script.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch:enhance
+---
+
+Added `Builder::append_invoke_initialization_script`.
diff --git a/.changes/avoid-rebuilds.md b/.changes/avoid-rebuilds.md
@@ -0,0 +1,7 @@
+---
+"tauri": patch:bug
+"tauri-build": patch:bug
+"tauri-utils": patch:bug
+---
+
+Prevent build script from rerunning unnecessarily by only writing files when the content changes.
diff --git a/.changes/bundler-object-custom-sign-command.md b/.changes/bundler-object-custom-sign-command.md
@@ -0,0 +1,8 @@
+---
+"tauri-bundler": patch:feat
+"tauri-utils": patch:feat
+"@tauri-apps/cli": patch:feat
+"tauri-cli": patch:feat
+---
+
+Custom sign command with object notation for whitespaces in the command path and arguments.
diff --git a/.changes/change-pr-10676.md b/.changes/change-pr-10676.md
@@ -0,0 +1,6 @@
+---
+"@tauri-apps/cli": 'patch:bug'
+"tauri-cli": 'patch:bug'
+---
+
+Change plugin template call to `register_ios_plugin` params to snake case
diff --git a/.changes/config.json b/.changes/config.json
@@ -14,10 +14,13 @@
   "pkgManagers": {
     "rust": {
       "version": true,
-      "getPublishedVersion": "node ../../.scripts/covector/package-latest-version.js cargo ${ pkgFile.pkg.package.name } ${ pkgFile.pkg.package.version }",
+      "getPublishedVersion": {
+        "use": "fetch:check",
+        "options": {
+          "url": "https://crates.io/api/v1/crates/${ pkg.pkgFile.pkg.package.name }/${ pkg.pkgFile.version }"
+        }
+      },
       "prepublish": [
-        "sudo apt-get update",
-        "sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev",
         "cargo install cargo-audit --features=fix",
         {
           "command": "cargo generate-lockfile",
@@ -43,11 +46,6 @@
         }
       ],
       "publish": [
-        "sleep 15s",
-        {
-          "command": "cargo package --no-verify",
-          "dryRunCommand": true
-        },
         {
           "command": "echo '<details>\n<summary><em><h4>Cargo Publish</h4></em></summary>\n\n```'",
           "dryRunCommand": true,
@@ -64,21 +62,22 @@
           "pipe": true
         }
       ],
-      "postpublish": [
-        "git tag ${ pkg.pkg }-v${ pkgFile.versionMajor } -f",
-        "git tag ${ pkg.pkg }-v${ pkgFile.versionMajor }.${ pkgFile.versionMinor } -f",
-        "git push --tags -f"
-      ],
-      "assets": [
-        {
-          "path": "./target/package/${ pkg.pkg }-${ pkgFile.version }.crate",
-          "name": "${ pkg.pkg }-${ pkgFile.version }.crate"
-        }
-      ]
+      "postpublish": {
+        "use": "fetch:check",
+        "options": {
+          "url": "https://crates.io/api/v1/crates/${ pkg.pkgFile.pkg.package.name }/${ pkg.pkgFile.version }"
+        },
+        "retries": [5000, 5000, 5000]
+      }
     },
     "javascript": {
       "version": true,
-      "getPublishedVersion": "node ../../.scripts/covector/package-latest-version.js npm ${ pkgFile.pkg.name } ${ pkgFile.pkg.version }",
+      "getPublishedVersion": {
+        "use": "fetch:check",
+        "options": {
+          "url": "https://registry.npmjs.com/${ pkg.pkgFile.pkg.name }/${ pkg.pkgFile.version }"
+        }
+      },
       "prepublish": [
         {
           "command": "pnpm i --frozen-lockfile",
@@ -99,14 +98,9 @@
           "command": "echo '```\n\n</details>\n'",
           "dryRunCommand": true,
           "pipe": true
-        },
-        {
-          "command": "npm pack",
-          "dryRunCommand": true
         }
       ],
       "publish": [
-        "sleep 15s",
         {
           "command": "echo '<details>\n<summary><em><h4>PNPM Publish</h4></em></summary>\n\n```'",
           "dryRunCommand": true,
@@ -123,49 +117,19 @@
           "pipe": true
         }
       ],
-      "postpublish": [
-        "git tag ${ pkg.pkg }-v${ pkgFile.versionMajor } -f",
-        "git tag ${ pkg.pkg }-v${ pkgFile.versionMajor }.${ pkgFile.versionMinor } -f",
-        "git push --tags -f"
-      ]
+      "postpublish": {
+        "use": "fetch:check",
+        "options": {
+          "url": "https://registry.npmjs.com/${ pkg.pkgFile.pkg.name }/${ pkg.pkgFile.version }"
+        },
+        "retries": [5000, 5000, 5000]
+      }
     }
   },
   "packages": {
     "@tauri-apps/api": {
       "path": "./tooling/api",
       "manager": "javascript",
-      "assets": [
-        {
-          "path": "./tooling/api/dist/tauri-apps-api-${ pkgFile.version }.tgz",
-          "name": "tauri-apps-api-${ pkgFile.version }.tgz"
-        }
-      ],
-      "prepublish": [
-        {
-          "command": "pnpm i --frozen-lockfile",
-          "dryRunCommand": true
-        },
-        {
-          "command": "echo '<details>\n<summary><em><h4>PNPM Audit</h4></em></summary>\n\n```'",
-          "dryRunCommand": true,
-          "pipe": true
-        },
-        {
-          "command": "pnpm audit",
-          "dryRunCommand": true,
-          "runFromRoot": true,
-          "pipe": true
-        },
-        {
-          "command": "echo '```\n\n</details>\n'",
-          "dryRunCommand": true,
-          "pipe": true
-        },
-        {
-          "command": "pnpm npm-pack",
-          "dryRunCommand": true
-        }
-      ],
       "publish": [
         {
           "command": "echo '<details>\n<summary><em><h4>PNPM Publish</h4></em></summary>\n\n```'",
@@ -253,7 +217,6 @@
     "@tauri-apps/cli": {
       "path": "./tooling/cli/node",
       "manager": "javascript",
-      "getPublishedVersion": "node ../../../.scripts/covector/package-latest-version.js npm ${ pkgFile.pkg.name } ${ pkgFile.pkg.version }",
       "dependencies": ["tauri-cli"],
       "postversion": [
         "node ../../../.scripts/covector/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }",
@@ -270,12 +233,6 @@
       "postversion": [
         "cargo check",
         "cargo build --manifest-path ../../core/tauri-config-schema/Cargo.toml"
-      ],
-      "assets": [
-        {
-          "path": "${ pkg.path }/target/package/tauri-cli-${ pkgFile.version }.crate",
-          "name": "${ pkg.pkg }-${ pkgFile.version }.crate"
-        }
       ]
     },
     "tauri-driver": {

diff --git a/.changes/enhance-permission-error-message.md b/.changes/enhance-permission-error-message.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch:enhance
+---
+
+Include more information in the IPC permission error message.
diff --git a/.changes/fix-cli-add-plugin-version.md b/.changes/fix-cli-add-plugin-version.md
@@ -0,0 +1,6 @@
+---
+'tauri-cli': 'patch:bug'
+'@tauri-apps/cli': 'patch:bug'
+---
+
+Changed the `add` command to use a version requirement that matches the CLI's stable and prerelease numbers.
diff --git a/.changes/fix-export-default-permissions.md b/.changes/fix-export-default-permissions.md
@@ -0,0 +1,5 @@
+---
+"tauri-build": patch:bug
+---
+
+Correctly export `DefaultPermissionsRule`
diff --git a/.changes/fix-ios-build-older-swift.md b/.changes/fix-ios-build-older-swift.md
@@ -0,0 +1,6 @@
+---
+'tauri-cli': 'patch:bug'
+'@tauri-apps/cli': 'patch:bug'
+---
+
+Fix Swift plugin compilation on older versions.
diff --git a/.changes/fix-tslib-path.md b/.changes/fix-tslib-path.md
@@ -0,0 +1,5 @@
+---
+"@tauri-apps/api": patch:bug
+---
+
+Fix tslib path in dist.
diff --git a/.changes/fix-xcodebuild-arch.md b/.changes/fix-xcodebuild-arch.md
@@ -0,0 +1,7 @@
+---
+'tauri-cli': 'patch:bug'
+'@tauri-apps/cli': 'patch:bug'
+---
+
+Do not include the target arch when building and archiving the iOS application,
+which makes Xcode project modifications more flexible.
diff --git a/.changes/inject-mobile-resources.md b/.changes/inject-mobile-resources.md
@@ -0,0 +1,6 @@
+---
+"tauri-cli": patch:feat
+"@tauri-apps/cli": patch:feat
+---
+
+Inject configured resources on mobile apps.
diff --git a/.changes/pre.json b/.changes/pre.json
@@ -6,12 +6,16 @@
     ".changes/android-dev-open-adb-fix.md",
     ".changes/android-gradle-8-9.md",
     ".changes/android-port-forward-fixes.md",
+    ".changes/append_invoke_initialization_script.md",
     ".changes/asset-resolver-dev-fallback.md",
+    ".changes/avoid-rebuilds.md",
     ".changes/brotli-6.md",
+    ".changes/bundler-object-custom-sign-command.md",
     ".changes/change-default-export-option-debugging.md",
     ".changes/change-pr-10435.md",
     ".changes/change-pr-10498.md",
     ".changes/change-pr-10619.md",
+    ".changes/change-pr-10676.md",
     ".changes/check-android-lib-symbols.md",
     ".changes/cli-add-no-fmt.md",
     ".changes/cli-android-template-androidtv.md",
@@ -21,22 +25,29 @@
     ".changes/cli-signtool-path.md",
     ".changes/core-plugin-namespace.md",
     ".changes/dev-url-localhost-mobile.md",
+    ".changes/enhance-permission-error-message.md",
     ".changes/feat-remove-target-sdk.md",
     ".changes/fix-adb.md",
+    ".changes/fix-cli-add-plugin-version.md",
     ".changes/fix-cli-dev-server-android.md",
     ".changes/fix-cli-panic-bun.md",
     ".changes/fix-colon-in-file-path.md",
     ".changes/fix-conf-parsing-error-filepath.md",
     ".changes/fix-config-override.md",
+    ".changes/fix-export-default-permissions.md",
+    ".changes/fix-ios-build-older-swift.md",
     ".changes/fix-ios-bun-support.md",
     ".changes/fix-ipc-fallback.md",
     ".changes/fix-manifest-migration.md",
     ".changes/fix-missing-codesign-error-macos.md",
+    ".changes/fix-tslib-path.md",
     ".changes/fix-usage-without-compression.md",
     ".changes/fix-v1-frontend-migration.md",
+    ".changes/fix-xcodebuild-arch.md",
     ".changes/get-window-async.md",
     ".changes/improve-cli-init.md",
     ".changes/infer-signing-identity.md",
+    ".changes/inject-mobile-resources.md",
     ".changes/ios-custom-project-template.md",
     ".changes/ios-default-minversion.md",
     ".changes/ios-frameworks.md",
@@ -54,6 +65,8 @@
     ".changes/refactor-ipc-response.md",
     ".changes/remove-open-command.md",
     ".changes/remove-unsecure-configs.md",
+    ".changes/resource-dir-android.md",
+    ".changes/resource-dir-ios.md",
     ".changes/resources-map-becoming-dirs.md",
     ".changes/universal-bin-build-fails.md",
     ".changes/update-tao-wry.md",

diff --git a/.changes/resource-dir-android.md b/.changes/resource-dir-android.md
@@ -0,0 +1,5 @@
+---
+"tauri-utils": patch:bug
+---
+
+Implemented `resource_dir` on Android, which returns a URI that needs to be resolved using [AssetManager::open](https://developer.android.com/reference/android/content/res/AssetManager#open(java.lang.String,%20int)). This will be handled by the file system plugin.
diff --git a/.changes/resource-dir-ios.md b/.changes/resource-dir-ios.md
@@ -0,0 +1,5 @@
+---
+"tauri-utils": patch:bug
+---
+
+Fix `resource_dir` on iOS.
diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml
@@ -87,6 +87,11 @@ jobs:
           git config --global user.name "${{ github.event.pusher.name }}"
           git config --global user.email "${{ github.event.pusher.email }}"
 
+      - name: install Linux dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev
+
       - name: covector version or publish (publish when no change files present)
         uses: jbolda/covector/packages/action@covector-v0
         id: covector

diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml
@@ -23,7 +23,7 @@ jobs:
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: 'lts/*'
           cache: 'pnpm'
       - run: pnpm i --frozen-lockfile
       - run: pnpm format:check
@@ -35,7 +35,7 @@ jobs:
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: 'lts/*'
           cache: 'pnpm'
       - run: pnpm i --frozen-lockfile
       - run: pnpm eslint:check
@@ -47,7 +47,7 @@ jobs:
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: 'lts/*'
           cache: 'pnpm'
       - run: pnpm i --frozen-lockfile
       - run: pnpm ts:check