Merge branch 'tauri-apps:v2' into develop

Author: J1-takai

src/content/docs/distribute/app-store.mdx

@@ -47,6 +47,20 @@ The value provided in the _Bundle ID_ field **must** match the identifier define
 
 The Tauri CLI can package your app for macOS and iOS. Running on a macOS machine is a requirement.
 
+Tauri derives the [`CFBundleVersion`](https://developer.apple.com/documentation/bundleresources/information-property-list/cfbundleversion) from the value defined in [`tauri.conf.json > version`].
+You can set a custom bundle version in the [`tauri.conf.json > bundle > ios > bundleVersion`] or [`tauri.conf.json > bundle > macOS > bundleVersion`] configuration
+if you need a different bundle version scheme e.g. sequential codes:
+
+```json title="tauri.conf.json" ins={4}
+{
+  "bundle": {
+    "ios": {
+      "bundleVersion": "100"
+    }
+  }
+}
+```
+
 :::caution
 Code signing is required. See the documentation for [macOS][macOS code signing] and [iOS][iOS code signing].
 :::

src/content/docs/learn/window-menu.mdx

@@ -149,54 +149,70 @@ To create a multi-level menu, you can add some submenus to the menu item:
 <TabItem label="JavaScript">
 
 ```javascript
-#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
-
-use tauri::{image::Image, menu::{CheckMenuItemBuilder, IconMenuItemBuilder, MenuBuilder, SubmenuBuilder}};
-
-fn main() {
-    tauri::Builder::default()
-        .setup(|app| {
-            let text_menu = SubmenuBuilder::new(app, "File")
-                .text("open", "Open")
-                .text("quit", "Quit")
-                .build()?;
-
-            let lang_str = "en";
-            let check_sub_item_1 = CheckMenuItemBuilder::new("English")
-                .id("en")
-                .checked(lang_str == "en")
-                .build(app)?;
-
-            let check_sub_item_2 = CheckMenuItemBuilder::new("Chinese")
-                .id("en")
-                .checked(lang_str == "en")
-                .enabled(false)
-                .build(app)?;
-
-            let icon_image = Image::from_bytes(include_bytes!("../icons/icon.png")).unwrap();
-
-            let icon_item = IconMenuItemBuilder::new("icon")
-                .icon(icon_image)
-                .build(app)?;
-
-            let check_menus = SubmenuBuilder::new(app, "language")
-                .item(&check_sub_item_1)
-                .item(&check_sub_item_2)
-                .build()?;
+import { Menu, MenuItem, Submenu } from '@tauri-apps/api/menu';
 
+const fileSubmenu = await Submenu.new({
+  text: 'File',
+  items: [
+    await MenuItem.new({
+      id: 'new',
+      text: 'New',
+      action: () => {
+        console.log('New clicked');
+      },
+    }),
+    await MenuItem.new({
+      id: 'open',
+      text: 'Open',
+      action: () => {
+        console.log('Open clicked');
+      },
+    }),
+    await MenuItem.new({
+      id: 'save_as',
+      text: 'Save As...',
+      action: () => {
+        console.log('Save As clicked');
+      },
+    }),
+  ],
+});
 
-            let menu = MenuBuilder::new(app)
-                .items(&[&text_menu, &check_menus, &icon_item])
-                .build()?;
+const editSubmenu = await Submenu.new({
+  text: 'Edit',
+  items: [
+    await MenuItem.new({
+      id: 'undo',
+      text: 'Undo',
+      action: () => {
+        console.log('Undo clicked');
+      },
+    }),
+    await MenuItem.new({
+      id: 'redo',
+      text: 'Redo',
+      action: () => {
+        console.log('Redo clicked');
+      },
+    }),
+  ],
+});
 
-            app.set_menu(menu)?;
+const menu = await Menu.new({
+  items: [
+    fileSubmenu,
+    editSubmenu,
+    await MenuItem.new({
+      id: 'quit',
+      text: 'Quit',
+      action: () => {
+        console.log('Quit pressed');
+      },
+    }),
+  ],
+});
 
-            print!("Hello from setup");
-            Ok(())
-        })
-        .run(tauri::generate_context!())
-        .expect("error while running tauri application");
-}
+menu.setAsAppMenu();
 ```
 
 </TabItem>