Skip to content

Commit cfe5192

Browse files
locloc
committed
Merge remote-tracking branch 'origin/master' into HEAD
2 parents e82794c + fbc3bb8 commit cfe5192

File tree

764 files changed

+18310
-13589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

764 files changed

+18310
-13589
lines changed

‎.circleci/config.yml

+176-140
Large diffs are not rendered by default.

‎.eslintrc.json

+11
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,29 @@
1717
"prefer-const": ["error", {
1818
"destructuring": "all"
1919
}],
20+
"standard/no-callback-literal": "off",
2021
"node/no-deprecated-api": 0
2122
},
2223
"parserOptions": {
2324
"ecmaVersion": 6,
2425
"sourceType": "module"
2526
},
27+
"globals": {
28+
"standardScheme": "readonly"
29+
},
2630
"overrides": [
2731
{
2832
"files": "*.js",
2933
"rules": {
3034
"@typescript-eslint/no-unused-vars": "off"
3135
}
36+
},
37+
{
38+
"files": "*.d.ts",
39+
"rules": {
40+
"no-useless-constructor": "off",
41+
"@typescript-eslint/no-unused-vars": "off"
42+
}
3243
}
3344
]
3445
}

‎.github/config.yml

-2
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,11 @@ firstPRMergeComment: >
2929
# Users authorized to run manual trop backports
3030
authorizedUsers:
3131
- alexeykuzmin
32-
- BinaryMuse
3332
- ckerr
3433
- codebytere
3534
- deepak1556
3635
- jkleinsc
3736
- MarshallOfSound
3837
- miniak
39-
- nitsakh
4038
- nornagon
4139
- zcbenz

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ spec/.hash
5858
.eslintcache
5959

6060
# Generated native addon files
61-
/spec/fixtures/native-addon/echo/build/
61+
/spec-main/fixtures/native-addon/echo/build/
6262

6363
# If someone runs tsc this is where stuff will end up
6464
ts-gen

‎BUILD.gn

+67-9
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import("//build/config/locales.gni")
22
import("//build/config/ui.gni")
33
import("//build/config/win/manifest.gni")
4+
import("//components/spellcheck/spellcheck_build_features.gni")
45
import("//content/public/app/mac_helpers.gni")
56
import("//pdf/features.gni")
7+
import("//ppapi/buildflags/buildflags.gni")
68
import("//printing/buildflags/buildflags.gni")
79
import("//testing/test.gni")
810
import("//third_party/ffmpeg/ffmpeg_options.gni")
@@ -21,12 +23,14 @@ import("buildflags/buildflags.gni")
2123
import("electron_paks.gni")
2224
import("filenames.auto.gni")
2325
import("filenames.gni")
26+
import("filenames.hunspell.gni")
2427

2528
if (is_mac) {
2629
import("//build/config/mac/rules.gni")
2730
import("//third_party/icu/config.gni")
2831
import("//ui/gl/features.gni")
2932
import("//v8/gni/v8.gni")
33+
import("build/rules.gni")
3034
}
3135

3236
if (is_linux) {
@@ -357,12 +361,13 @@ source_set("electron_lib") {
357361
"//chrome/app/resources:platform_locale_settings",
358362
"//chrome/services/printing/public/mojom",
359363
"//components/certificate_transparency",
364+
"//components/language/core/browser",
360365
"//components/net_log",
361-
"//components/network_hints/common",
366+
"//components/network_hints/browser",
367+
"//components/network_hints/common:mojo_bindings",
362368
"//components/network_hints/renderer",
363369
"//components/network_session_configurator/common",
364370
"//components/prefs",
365-
"//components/spellcheck/renderer",
366371
"//components/viz/host",
367372
"//components/viz/service",
368373
"//content/public/browser",
@@ -477,6 +482,10 @@ source_set("electron_lib") {
477482
]
478483
}
479484

485+
if (enable_builtin_spellchecker) {
486+
deps += [ "chromium_src:chrome_spellchecker" ]
487+
}
488+
480489
if (is_mac) {
481490
deps += [
482491
"//components/remote_cocoa/app_shim",
@@ -545,6 +554,10 @@ source_set("electron_lib") {
545554
]
546555

547556
sources += filenames.lib_sources_nss
557+
sources += [
558+
"shell/browser/ui/gtk_util.cc",
559+
"shell/browser/ui/gtk_util.h",
560+
]
548561
}
549562
if (is_win) {
550563
libs += [ "dwmapi.lib" ]
@@ -568,8 +581,12 @@ source_set("electron_lib") {
568581
deps += [ "//third_party/crashpad/crashpad/client" ]
569582
}
570583

571-
if (enable_pdf) {
572-
deps += [ "//pdf" ]
584+
if (enable_plugins) {
585+
deps += [ "chromium_src:plugins" ]
586+
sources += [
587+
"shell/renderer/pepper_helper.cc",
588+
"shell/renderer/pepper_helper.h",
589+
]
573590
}
574591

575592
if (enable_run_as_node) {
@@ -653,10 +670,6 @@ source_set("electron_lib") {
653670
]
654671
}
655672

656-
if (enable_pepper_flash) {
657-
deps += [ "components/pepper_flash" ]
658-
}
659-
660673
public_deps += [ "shell/common/extensions/api:extensions_features" ]
661674
deps += [
662675
"//components/pref_registry",
@@ -670,6 +683,22 @@ source_set("electron_lib") {
670683
if (enable_electron_extensions) {
671684
sources += filenames.lib_sources_extensions
672685
}
686+
687+
if (enable_pdf) {
688+
# Printing depends on some //pdf code, so it needs to be built even if the
689+
# pdf viewer isn't enabled.
690+
deps += [ "//pdf" ]
691+
}
692+
if (enable_pdf_viewer) {
693+
deps += [
694+
"//components/pdf/browser",
695+
"//components/pdf/renderer",
696+
]
697+
sources += [
698+
"shell/browser/electron_pdf_web_contents_helper_client.cc",
699+
"shell/browser/electron_pdf_web_contents_helper_client.h",
700+
]
701+
}
673702
}
674703

675704
electron_paks("packed_resources") {
@@ -688,6 +717,12 @@ if (is_mac) {
688717
electron_framework_version = "A"
689718
electron_version = read_file("ELECTRON_VERSION", "trim string")
690719

720+
mac_xib_bundle_data("electron_xibs") {
721+
sources = [
722+
"shell/common/resources/mac/MainMenu.xib",
723+
]
724+
}
725+
691726
bundle_data("electron_framework_resources") {
692727
public_deps = [
693728
":packed_resources",
@@ -698,7 +733,6 @@ if (is_mac) {
698733
public_deps += [ "//third_party/icu:icudata" ]
699734
}
700735
if (v8_use_external_startup_data) {
701-
sources += [ "$root_out_dir/natives_blob.bin" ]
702736
public_deps += [ "//v8" ]
703737
if (use_v8_context_snapshot) {
704738
sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
@@ -803,6 +837,7 @@ if (is_mac) {
803837
":electron_framework_libraries",
804838
":electron_framework_resources",
805839
":electron_swiftshader_library",
840+
":electron_xibs",
806841
]
807842
if (!is_mas_build) {
808843
deps += [ ":electron_crashpad_helper" ]
@@ -1257,9 +1292,14 @@ template("dist_zip") {
12571292
"outputs",
12581293
"testonly",
12591294
])
1295+
flatten = false
1296+
if (defined(invoker.flatten)) {
1297+
flatten = invoker.flatten
1298+
}
12601299
args = rebase_path(outputs + [ _runtime_deps_file ], root_build_dir) + [
12611300
target_cpu,
12621301
target_os,
1302+
"$flatten",
12631303
]
12641304
}
12651305
}
@@ -1345,6 +1385,24 @@ dist_zip("electron_mksnapshot_zip") {
13451385
]
13461386
}
13471387

1388+
copy("hunspell_dictionaries") {
1389+
sources = hunspell_dictionaries + hunspell_licenses
1390+
outputs = [
1391+
"$target_gen_dir/electron_hunspell/{{source_file_part}}",
1392+
]
1393+
}
1394+
1395+
dist_zip("hunspell_dictionaries_zip") {
1396+
data_deps = [
1397+
":hunspell_dictionaries",
1398+
]
1399+
flatten = true
1400+
1401+
outputs = [
1402+
"$root_build_dir/hunspell_dictionaries.zip",
1403+
]
1404+
}
1405+
13481406
group("electron") {
13491407
public_deps = [
13501408
":electron_app",

‎CONTRIBUTING.md

+5-7
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ Issues are created [here](https://github.com/electron/electron/issues/new).
2020
* [Triaging a Bug Report](https://electronjs.org/docs/development/issues#triaging-a-bug-report)
2121
* [Resolving a Bug Report](https://electronjs.org/docs/development/issues#resolving-a-bug-report)
2222

23-
### Issue Maintenance and Closure
24-
* If an issue is inactive for 45 days (no activity of any kind), it will be
25-
marked for closure with `stale`.
26-
* If after this label is applied, no further activity occurs in the next 7 days,
27-
the issue will be closed.
28-
* If an issue has been closed and you still feel it's relevant, feel free to
29-
ping a maintainer or add a comment!
23+
### Issue Closure
24+
25+
Bug reports will be closed if the issue has been inactive and the latest affected version no longer receives support. At the moment, Electron maintains its three latest major versions, with a new major version being released every 12 weeks. (For more information on Electron's release cadence, see [this blog post](https://electronjs.org/blog/12-week-cadence).)
26+
27+
_If an issue has been closed and you still feel it's relevant, feel free to ping a maintainer or add a comment!_
3028

3129
### Languages
3230

‎DEPS

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ gclient_gn_args = [
1111

1212
vars = {
1313
'chromium_version':
14-
'6c775c358b709f4353bc693623bf58820adf3918',
14+
'dc9525d251bf30828899e4cd7161f6dc6507023f',
1515
'node_version':
16-
'v12.9.1',
16+
'v12.13.0',
1717
'nan_version':
1818
'2ee313aaca52e2b478965ac50eb5082520380d1b',
1919

‎Dockerfile

-50
This file was deleted.

‎Dockerfile.arm32v7

-59
This file was deleted.

0 commit comments

Comments
 (0)