Merge remote-tracking branch 'origin/1.x' into dev

tauri-apps · Jun 17, 2023 · 1e9c463 · 1e9c463
2 parents c7534e7 + 2acc474
commit 1e9c463
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 19 deletions.
diff --git a/.changes/config.json b/.changes/config.json
@@ -7,6 +7,7 @@
     "bug": "Bug Fixes",
     "pref": "Performance Improvements",
     "changes": "What's Changed",
+    "sec": "Security fixes",
     "deps": "Dependencies"
   },
   "defaultChangeTag": "changes",

diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -8,7 +8,7 @@ on:
   push:
     branches:
       - dev
-      - next
+      - 1.x
   workflow_dispatch:
 
 env:

diff --git a/.github/workflows/check-change-tags.yml b/.github/workflows/check-change-tags.yml
@@ -25,7 +25,7 @@ jobs:
           list-files: shell
           filters: |
             changes:
-              - '.changes/*.md'
+              - added|modified: '.changes/*.md'
 
       - name: check
         run: node ./.scripts/ci/check-change-tags.js ${{ steps.filter.outputs.changes_files }}

diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml
@@ -7,7 +7,7 @@ name: covector version or publish
 on:
   push:
     branches:
-      - dev
+      - 1.x
 
 jobs:
   run-integration-tests:
@@ -99,8 +99,8 @@ jobs:
         uses: tauri-apps/create-pull-request@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          branch: release/version-updates
-          title: Apply Version Updates From Current Changes
+          branch: release/version-updates-v1
+          title: Apply Version Updates From Current Changes (v1)
           commit-message: 'apply version updates'
           labels: 'version updates'
           body: ${{ steps.covector.outputs.change }}

diff --git a/.github/workflows/lint-cli.yml b/.github/workflows/lint-cli.yml
@@ -8,7 +8,7 @@ on:
   push:
     branches:
       - dev
-      - next
+      - 1.x
   pull_request:
     paths:
       - '.github/workflows/lint-cli.yml'

diff --git a/.github/workflows/lint-core.yml b/.github/workflows/lint-core.yml
@@ -8,7 +8,7 @@ on:
   push:
     branches:
       - dev
-      - next
+      - 1.x
   pull_request:
     paths:
       - '.github/workflows/lint-core.yml'

diff --git a/.github/workflows/test-cli-js.yml b/.github/workflows/test-cli-js.yml
@@ -8,7 +8,7 @@ on:
   push:
     branches:
       - dev
-      - next
+      - 1.x
   pull_request:
     paths:
       - '.github/workflows/test-cli-js.yml'

diff --git a/.github/workflows/test-cli-rs.yml b/.github/workflows/test-cli-rs.yml
@@ -8,7 +8,7 @@ on:
   push:
     branches:
       - dev
-      - next
+      - 1.x
   pull_request:
     paths:
       - '.github/workflows/test-cli-rs.yml'

diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
@@ -8,7 +8,7 @@ on:
   push:
     branches:
       - dev
-      - next
+      - 1.x
   pull_request:
     paths:
       - '.github/workflows/test-core.yml'

diff --git a/.github/workflows/test-lint-bundler.yml b/.github/workflows/test-lint-bundler.yml
@@ -8,7 +8,7 @@ on:
   push:
     branches:
       - dev
-      - next
+      - 1.x
   pull_request:
     paths:
       - '.github/workflows/test-bundler.yml'

diff --git a/.github/workflows/udeps.yml b/.github/workflows/udeps.yml
@@ -8,7 +8,7 @@ on:
   push:
     branches:
       - dev
-      - next
+      - 1.x
 
 env:
   RUST_BACKTRACE: 1

diff --git a/core/tauri-config-schema/schema.json b/core/tauri-config-schema/schema.json
@@ -1935,7 +1935,7 @@
               }
             },
             "requireLiteralLeadingDot": {
-              "description": "Whether or not paths that contain components that start with a `.` will require that `.` appears literally in the pattern; `*`, `?`, `**`, or `[...]` will not match. This is useful because such files are conventionally considered hidden on Unix systems and it might be desirable to skip them when listing files.\n\nDefaults to `false` on Unix systems and `true` on Windows",
+              "description": "Whether or not paths that contain components that start with a `.` will require that `.` appears literally in the pattern; `*`, `?`, `**`, or `[...]` will not match. This is useful because such files are conventionally considered hidden on Unix systems and it might be desirable to skip them when listing files.\n\nDefaults to `true` on Unix systems and `false` on Windows",
               "type": [
                 "boolean",
                 "null"

diff --git a/core/tauri-utils/src/config.rs b/core/tauri-utils/src/config.rs
@@ -1195,7 +1195,7 @@ pub enum FsScope {
     /// conventionally considered hidden on Unix systems and it might be
     /// desirable to skip them when listing files.
     ///
-    /// Defaults to `false` on Unix systems and `true` on Windows
+    /// Defaults to `true` on Unix systems and `false` on Windows
     // dotfiles are not supposed to be exposed by default on unix
     #[serde(alias = "require-literal-leading-dot")]
     require_literal_leading_dot: Option<bool>,

diff --git a/core/tauri/CHANGELOG.md b/core/tauri/CHANGELOG.md
@@ -140,6 +140,16 @@
 - Export types required by the `mobile_entry_point` macro.
   - [98904863](https://www.github.com/tauri-apps/tauri/commit/9890486321c9c79ccfb7c547fafee85b5c3ffa71) feat(core): add `mobile_entry_point` macro ([#4983](https://www.github.com/tauri-apps/tauri/pull/4983)) on 2022-08-21
 
+## \[1.4.1]
+
+### Bug Fixes
+
+- [`6afd3472`](https://www.github.com/tauri-apps/tauri/commit/6afd34727f153b32dbc568d169dbb17fb8dc3539)([#6680](https://www.github.com/tauri-apps/tauri/pull/6680)) Revert [#6680](https://github.com/tauri-apps/tauri/pull/6680) which added a default sound for notifications on Windows. This introduced inconsistency with other platforms that has silent notifications by default. In the upcoming releases, we will add support for modifying the notification sound across all platforms.
+
+### Security fixes
+
+- [`066c09a6`](https://www.github.com/tauri-apps/tauri/commit/066c09a6ea06f42f550d090715e06beb65cd5564)([#7227](https://www.github.com/tauri-apps/tauri/pull/7227)) Fix regression in `1.4` where the default behavior of the file system scope was changed to allow reading hidden files and directories by default.
+
 ## \[1.4.0]
 
 ### New Features

diff --git a/core/tauri/src/scope/fs.rs b/core/tauri/src/scope/fs.rs
@@ -108,9 +108,9 @@ impl Scope {
       } => *require,
       // dotfiles are not supposed to be exposed by default on unix
       #[cfg(unix)]
-      _ => false,
-      #[cfg(windows)]
       _ => true,
+      #[cfg(windows)]
+      _ => false,
     };
 
     Ok(Self {
@@ -281,9 +281,9 @@ mod tests {
         require_literal_separator: true,
         // dotfiles are not supposed to be exposed by default on unix
         #[cfg(unix)]
-        require_literal_leading_dot: false,
-        #[cfg(windows)]
         require_literal_leading_dot: true,
+        #[cfg(windows)]
+        require_literal_leading_dot: false,
         ..Default::default()
       },
     }

diff --git a/tooling/cli/schema.json b/tooling/cli/schema.json
@@ -1935,7 +1935,7 @@
               }
             },
             "requireLiteralLeadingDot": {
-              "description": "Whether or not paths that contain components that start with a `.` will require that `.` appears literally in the pattern; `*`, `?`, `**`, or `[...]` will not match. This is useful because such files are conventionally considered hidden on Unix systems and it might be desirable to skip them when listing files.\n\nDefaults to `false` on Unix systems and `true` on Windows",
+              "description": "Whether or not paths that contain components that start with a `.` will require that `.` appears literally in the pattern; `*`, `?`, `**`, or `[...]` will not match. This is useful because such files are conventionally considered hidden on Unix systems and it might be desirable to skip them when listing files.\n\nDefaults to `true` on Unix systems and `false` on Windows",
               "type": [
                 "boolean",
                 "null"