From 318c91b78cf59f6bc5594b83724feb12159c2405 Mon Sep 17 00:00:00 2001 From: Sudowoodo Release Bot <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 16:48:02 -0800 Subject: [PATCH 1/7] Revert "Bump v19.0.0-nightly.20220228" This reverts commit 998c85af131b28c9f7e37b4833e96760a9cd6bf1. --- ELECTRON_VERSION | 2 +- package.json | 2 +- shell/browser/resources/win/electron.rc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION index caf0f88d626a1..a6a5f8ce0ccfc 100644 --- a/ELECTRON_VERSION +++ b/ELECTRON_VERSION @@ -1 +1 @@ -19.0.0-nightly.20220228 \ No newline at end of file +19.0.0-nightly.20220224 \ No newline at end of file diff --git a/package.json b/package.json index 873d16c36ec2b..7a4f69d852f58 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "19.0.0-nightly.20220228", + "version": "19.0.0-nightly.20220224", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc index 6cad93bff94d6..d08e9317043cd 100644 --- a/shell/browser/resources/win/electron.rc +++ b/shell/browser/resources/win/electron.rc @@ -50,8 +50,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 19,0,0,20220228 - PRODUCTVERSION 19,0,0,20220228 + FILEVERSION 19,0,0,20220224 + PRODUCTVERSION 19,0,0,20220224 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L From d9bf02d9b64c56009703e754513486f1c84a74df Mon Sep 17 00:00:00 2001 From: Sudowoodo Release Bot <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com> Date: Wed, 2 Mar 2022 05:01:04 -0800 Subject: [PATCH 2/7] Bump v19.0.0-nightly.20220302 --- ELECTRON_VERSION | 2 +- package.json | 2 +- shell/browser/resources/win/electron.rc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION index a6a5f8ce0ccfc..df13fb751cdbc 100644 --- a/ELECTRON_VERSION +++ b/ELECTRON_VERSION @@ -1 +1 @@ -19.0.0-nightly.20220224 \ No newline at end of file +19.0.0-nightly.20220302 \ No newline at end of file diff --git a/package.json b/package.json index 7a4f69d852f58..6aa18a88567d1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "19.0.0-nightly.20220224", + "version": "19.0.0-nightly.20220302", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc index d08e9317043cd..c72320eb30844 100644 --- a/shell/browser/resources/win/electron.rc +++ b/shell/browser/resources/win/electron.rc @@ -50,8 +50,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 19,0,0,20220224 - PRODUCTVERSION 19,0,0,20220224 + FILEVERSION 19,0,0,20220302 + PRODUCTVERSION 19,0,0,20220302 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L From c040305db4f94f12495a95ddbb1636e0c67a1937 Mon Sep 17 00:00:00 2001 From: Sudowoodo Release Bot <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com> Date: Wed, 2 Mar 2022 08:56:25 -0800 Subject: [PATCH 3/7] Revert "Bump v19.0.0-nightly.20220302" This reverts commit d9bf02d9b64c56009703e754513486f1c84a74df. --- ELECTRON_VERSION | 2 +- package.json | 2 +- shell/browser/resources/win/electron.rc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION index df13fb751cdbc..a6a5f8ce0ccfc 100644 --- a/ELECTRON_VERSION +++ b/ELECTRON_VERSION @@ -1 +1 @@ -19.0.0-nightly.20220302 \ No newline at end of file +19.0.0-nightly.20220224 \ No newline at end of file diff --git a/package.json b/package.json index 6aa18a88567d1..7a4f69d852f58 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "19.0.0-nightly.20220302", + "version": "19.0.0-nightly.20220224", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc index c72320eb30844..d08e9317043cd 100644 --- a/shell/browser/resources/win/electron.rc +++ b/shell/browser/resources/win/electron.rc @@ -50,8 +50,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 19,0,0,20220302 - PRODUCTVERSION 19,0,0,20220302 + FILEVERSION 19,0,0,20220224 + PRODUCTVERSION 19,0,0,20220224 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L From f71a6db3fff711b27b4b4120343e2a568ca42cc1 Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Wed, 2 Mar 2022 16:57:26 -0800 Subject: [PATCH 4/7] ci: disable use-thin-lto on Mac only (#33115) * build: remove use_thin_lto = false * ci: enabling if things get really bad (all darwin) * build: lol don't enable that * build: add patch to disable thin lto for mac --- build/args/all.gn | 3 --- patches/chromium/.patches | 1 + .../build_disable_thin_lto_on_mac.patch | 22 +++++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 patches/chromium/build_disable_thin_lto_on_mac.patch diff --git a/build/args/all.gn b/build/args/all.gn index 332a3660fd292..a346a9b3d4939 100644 --- a/build/args/all.gn +++ b/build/args/all.gn @@ -35,9 +35,6 @@ enable_pseudolocales = false is_cfi = false -# This consumes a bit too much disk space on macOS -use_thin_lto = false - # Make application name configurable at runtime for cookie crypto allow_runtime_configurable_key_storage = true diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 65d9285761986..995bb12ffa7c7 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -112,3 +112,4 @@ feat_add_data_transfer_to_requestsingleinstancelock.patch fix_crash_when_saving_edited_pdf_files.patch port_autofill_colors_to_the_color_pipeline.patch build_disable_partition_alloc_on_mac.patch +build_disable_thin_lto_on_mac.patch diff --git a/patches/chromium/build_disable_thin_lto_on_mac.patch b/patches/chromium/build_disable_thin_lto_on_mac.patch new file mode 100644 index 0000000000000..f5ffa86766c1a --- /dev/null +++ b/patches/chromium/build_disable_thin_lto_on_mac.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: VerteDinde +Date: Tue, 1 Mar 2022 11:31:59 -0800 +Subject: build: disable thin lto on mac + +Ths build disables thin lto for mac, in order to preserve +disk space on mac without breaking win-ia32. +The patch can be removed when we have more disk space on CircleCI + +diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni +index 9d25c10587c7ab4e2053f8f69aef3f135ef8e9f9..8d8b8d13c62da1fdd051019c8b726de7d1783113 100644 +--- a/build/config/compiler/compiler.gni ++++ b/build/config/compiler/compiler.gni +@@ -74,7 +74,7 @@ declare_args() { + use_thin_lto = + is_cfi || + (is_clang && is_official_build && chrome_pgo_phase != 1 && +- (is_linux || is_win || is_mac || ++ (is_linux || is_win || + (is_android && target_os != "chromeos") || + ((is_chromeos_ash || is_chromeos_lacros) && is_chromeos_device))) + From 89725f31bf014dfc076d7df1083c8875d7914a70 Mon Sep 17 00:00:00 2001 From: Sudowoodo Release Bot <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com> Date: Thu, 3 Mar 2022 05:02:08 -0800 Subject: [PATCH 5/7] Bump v19.0.0-nightly.20220303 --- ELECTRON_VERSION | 2 +- package.json | 2 +- shell/browser/resources/win/electron.rc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION index a6a5f8ce0ccfc..3ad593042d37d 100644 --- a/ELECTRON_VERSION +++ b/ELECTRON_VERSION @@ -1 +1 @@ -19.0.0-nightly.20220224 \ No newline at end of file +19.0.0-nightly.20220303 \ No newline at end of file diff --git a/package.json b/package.json index 7a4f69d852f58..3206ab236ea60 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "19.0.0-nightly.20220224", + "version": "19.0.0-nightly.20220303", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc index d08e9317043cd..fd2efd8528395 100644 --- a/shell/browser/resources/win/electron.rc +++ b/shell/browser/resources/win/electron.rc @@ -50,8 +50,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 19,0,0,20220224 - PRODUCTVERSION 19,0,0,20220224 + FILEVERSION 19,0,0,20220303 + PRODUCTVERSION 19,0,0,20220303 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L From 62366aeb95f0ec352abd4fdf320d8fc4e65d7bf7 Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Thu, 3 Mar 2022 09:56:00 -0800 Subject: [PATCH 6/7] docs: remove platform notices from tutorial titles (#32937) * docs: remove platform notices from tutorial titles * Update docs/tutorial/launch-app-from-url-in-another-app.md Co-authored-by: Mark Lee Co-authored-by: Mark Lee --- docs/tutorial/in-app-purchases.md | 9 ++++++++- .../launch-app-from-url-in-another-app.md | 6 +++--- docs/tutorial/linux-desktop-actions.md | 11 +++++++++-- docs/tutorial/macos-dock.md | 15 ++++++++------- docs/tutorial/progress-bar.md | 9 ++++++++- docs/tutorial/recent-documents.md | 9 ++++++++- docs/tutorial/represented-file.md | 9 ++++++++- docs/tutorial/windows-taskbar.md | 9 ++++++++- 8 files changed, 60 insertions(+), 17 deletions(-) diff --git a/docs/tutorial/in-app-purchases.md b/docs/tutorial/in-app-purchases.md index d4a27c854f6c5..ced192ba296cc 100644 --- a/docs/tutorial/in-app-purchases.md +++ b/docs/tutorial/in-app-purchases.md @@ -1,4 +1,11 @@ -# In-App Purchases (macOS) +--- +title: In-App Purchases +description: Add in-app purchases to your Mac App Store (MAS) application +slug: in-app-purchases +hide_title: true +--- + +# In-App Purchases ## Preparing diff --git a/docs/tutorial/launch-app-from-url-in-another-app.md b/docs/tutorial/launch-app-from-url-in-another-app.md index d02b28075d514..d99c1f9503342 100644 --- a/docs/tutorial/launch-app-from-url-in-another-app.md +++ b/docs/tutorial/launch-app-from-url-in-another-app.md @@ -1,11 +1,11 @@ --- -title: Launching Your Electron App From a URL In Another App -description: This guide will take you through the process of setting your electron app as the default handler for a specific protocol. +title: Deep Links +description: Set your Electron app as the default handler for a specific protocol. slug: launch-app-from-url-in-another-app hide_title: true --- -# Launching Your Electron App From A URL In Another App +# Deep Links ## Overview diff --git a/docs/tutorial/linux-desktop-actions.md b/docs/tutorial/linux-desktop-actions.md index 5fa3c5abedaba..7f09d0a4e5255 100644 --- a/docs/tutorial/linux-desktop-actions.md +++ b/docs/tutorial/linux-desktop-actions.md @@ -1,4 +1,11 @@ -# Desktop Launcher Actions (Linux) +--- +title: Desktop Launcher Actions +description: Add actions to the system launcher on Linux environments. +slug: linux-desktop-actions +hide_title: true +--- + +# Desktop Launcher Actions ## Overview @@ -42,4 +49,4 @@ parameters. You can find them in your application in the global variable [unity-launcher]: https://help.ubuntu.com/community/UnityLaunchersAndDesktopFiles#Adding_shortcuts_to_a_launcher [audacious-launcher]: https://help.ubuntu.com/community/UnityLaunchersAndDesktopFiles?action=AttachFile&do=get&target=shortcuts.png -[spec]: https://specifications.freedesktop.org/desktop-entry-spec/1.1/ar01s11.html +[spec]: https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html diff --git a/docs/tutorial/macos-dock.md b/docs/tutorial/macos-dock.md index 0a080e763d01f..38cfcb48e6240 100644 --- a/docs/tutorial/macos-dock.md +++ b/docs/tutorial/macos-dock.md @@ -1,4 +1,11 @@ -# Dock (macOS) +--- +title: Dock +description: Configure your application's Dock presence on macOS. +slug: macos-dock +hide_title: true +--- + +# Dock Electron has APIs to configure the app's icon in the macOS Dock. A macOS-only API exists to create a custom dock menu, but Electron also uses the app dock @@ -16,12 +23,6 @@ To set your custom dock menu, you need to use the [`app.dock.setMenu`](../api/dock.md#docksetmenumenu-macos) API, which is only available on macOS. -## Example - -Starting with a working application from the - [Quick Start Guide](quick-start.md), update the `main.js` file with the - following lines: - ```javascript fiddle='docs/fiddles/features/macos-dock-menu' const { app, BrowserWindow, Menu } = require('electron') diff --git a/docs/tutorial/progress-bar.md b/docs/tutorial/progress-bar.md index 58bdab8e8def7..9df75ab96e8b5 100644 --- a/docs/tutorial/progress-bar.md +++ b/docs/tutorial/progress-bar.md @@ -1,4 +1,11 @@ -# Taskbar Progress Bar (Windows & macOS) +--- +title: Progress Bars +description: Provide progress information to users outside of a BrowserWindow. +slug: progress-bar +hide_title: true +--- + +# Progress Bars ## Overview diff --git a/docs/tutorial/recent-documents.md b/docs/tutorial/recent-documents.md index 8923b177806bb..f1ca0c3251cb8 100644 --- a/docs/tutorial/recent-documents.md +++ b/docs/tutorial/recent-documents.md @@ -1,4 +1,11 @@ -# Recent Documents (Windows & macOS) +--- +title: Recent Documents +description: Provide a list of recent documents via Windows JumpList or macOS Dock +slug: recent-documents +hide_title: true +--- + +# Recent Documents ## Overview diff --git a/docs/tutorial/represented-file.md b/docs/tutorial/represented-file.md index 7d703a37b4ff3..a4d94d20154b1 100644 --- a/docs/tutorial/represented-file.md +++ b/docs/tutorial/represented-file.md @@ -1,4 +1,11 @@ -# Representing Files in a BrowserWindow (macOS) +--- +title: Representing Files in a BrowserWindow +description: Set a represented file in the macOS title bar. +slug: represented-file +hide_title: true +--- + +# Representing Files in a BrowserWindow ## Overview diff --git a/docs/tutorial/windows-taskbar.md b/docs/tutorial/windows-taskbar.md index 1d88846a13a18..444c712b3607b 100644 --- a/docs/tutorial/windows-taskbar.md +++ b/docs/tutorial/windows-taskbar.md @@ -1,4 +1,11 @@ -# Taskbar Customization (Windows) +--- +title: Taskbar Customization +description: Customize the look and feel of your app's Windows taskbar presence. +slug: windows-taskbar +hide_title: true +--- + +# Taskbar Customization ## Overview From 41c81ed066116e8649548a90661c9c8f830b288c Mon Sep 17 00:00:00 2001 From: Alvin Philips Date: Fri, 4 Mar 2022 05:05:51 +0530 Subject: [PATCH 7/7] docs: Updated list numbering (#32991) * docs: Updated list numbering The steps to package and distribute an application using electron had incorrect numbering * Indented text within ordered list sections * Removed single space * Fixed indentation --- docs/tutorial/quick-start.md | 86 ++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/docs/tutorial/quick-start.md b/docs/tutorial/quick-start.md index 91c3317d336d6..d7252ac16bfdc 100644 --- a/docs/tutorial/quick-start.md +++ b/docs/tutorial/quick-start.md @@ -463,46 +463,46 @@ The fastest way to distribute your newly created app is using 1. Add Electron Forge as a development dependency of your app, and use its `import` command to set up Forge's scaffolding: -```sh npm2yarn -npm install --save-dev @electron-forge/cli -npx electron-forge import - -✔ Checking your system -✔ Initializing Git Repository -✔ Writing modified package.json file -✔ Installing dependencies -✔ Writing modified package.json file -✔ Fixing .gitignore - -We have ATTEMPTED to convert your app to be in a format that electron-forge understands. - -Thanks for using "electron-forge"!!! -``` - -1. Create a distributable using Forge's `make` command: - -```sh npm2yarn -npm run make - -> my-electron-app@1.0.0 make /my-electron-app -> electron-forge make - -✔ Checking your system -✔ Resolving Forge Config -We need to package your application before we can make it -✔ Preparing to Package Application for arch: x64 -✔ Preparing native dependencies -✔ Packaging Application -Making for the following targets: zip -✔ Making for target: zip - On platform: darwin - For arch: x64 -``` - -Electron Forge creates the `out` folder where your package will be located: - -```plain -// Example for macOS -out/ -├── out/make/zip/darwin/x64/my-electron-app-darwin-x64-1.0.0.zip -├── ... -└── out/my-electron-app-darwin-x64/my-electron-app.app/Contents/MacOS/my-electron-app -``` + ```sh npm2yarn + npm install --save-dev @electron-forge/cli + npx electron-forge import + + ✔ Checking your system + ✔ Initializing Git Repository + ✔ Writing modified package.json file + ✔ Installing dependencies + ✔ Writing modified package.json file + ✔ Fixing .gitignore + + We have ATTEMPTED to convert your app to be in a format that electron-forge understands. + + Thanks for using "electron-forge"!!! + ``` + +2. Create a distributable using Forge's `make` command: + + ```sh npm2yarn + npm run make + + > my-electron-app@1.0.0 make /my-electron-app + > electron-forge make + + ✔ Checking your system + ✔ Resolving Forge Config + We need to package your application before we can make it + ✔ Preparing to Package Application for arch: x64 + ✔ Preparing native dependencies + ✔ Packaging Application + Making for the following targets: zip + ✔ Making for target: zip - On platform: darwin - For arch: x64 + ``` + + Electron Forge creates the `out` folder where your package will be located: + + ```plain + // Example for macOS + out/ + ├── out/make/zip/darwin/x64/my-electron-app-darwin-x64-1.0.0.zip + ├── ... + └── out/my-electron-app-darwin-x64/my-electron-app.app/Contents/MacOS/my-electron-app + ```