Skip to content

Commit

Permalink
Merge branch 'main' into clavin/fix-wco-drag
Browse files Browse the repository at this point in the history
  • Loading branch information
clavin committed Mar 4, 2022
2 parents 7ee6dda + 41c81ed commit c12fa55
Show file tree
Hide file tree
Showing 15 changed files with 130 additions and 67 deletions.
2 changes: 1 addition & 1 deletion ELECTRON_VERSION
@@ -1 +1 @@
19.0.0-nightly.20220228
19.0.0-nightly.20220303
3 changes: 0 additions & 3 deletions build/args/all.gn
Expand Up @@ -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

Expand Down
9 changes: 8 additions & 1 deletion 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

Expand Down
6 changes: 3 additions & 3 deletions 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

Expand Down
11 changes: 9 additions & 2 deletions 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

Expand Down Expand Up @@ -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
15 changes: 8 additions & 7 deletions 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
Expand All @@ -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')

Expand Down
9 changes: 8 additions & 1 deletion 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

Expand Down
86 changes: 43 additions & 43 deletions docs/tutorial/quick-start.md
Expand Up @@ -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
```
9 changes: 8 additions & 1 deletion 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

Expand Down
9 changes: 8 additions & 1 deletion 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

Expand Down
9 changes: 8 additions & 1 deletion 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

Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "electron",
"version": "19.0.0-nightly.20220228",
"version": "19.0.0-nightly.20220303",
"repository": "https://github.com/electron/electron",
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
"devDependencies": {
Expand Down
1 change: 1 addition & 0 deletions patches/chromium/.patches
Expand Up @@ -113,3 +113,4 @@ fix_crash_when_saving_edited_pdf_files.patch
port_autofill_colors_to_the_color_pipeline.patch
build_disable_partition_alloc_on_mac.patch
fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
build_disable_thin_lto_on_mac.patch
22 changes: 22 additions & 0 deletions patches/chromium/build_disable_thin_lto_on_mac.patch
@@ -0,0 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: VerteDinde <vertedinde@electronjs.org>
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)))

4 changes: 2 additions & 2 deletions shell/browser/resources/win/electron.rc
Expand Up @@ -50,8 +50,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 19,0,0,20220228
PRODUCTVERSION 19,0,0,20220228
FILEVERSION 19,0,0,20220303
PRODUCTVERSION 19,0,0,20220303
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand Down

0 comments on commit c12fa55

Please sign in to comment.