diff --git a/.circleci/config.yml b/.circleci/config.yml
index fcbc2ee0f4d..162a9f8f66e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,7 +11,7 @@ jobs:
- deps-{{ checksum "yarn.lock" }}
- restore_cache:
keys:
- - v-3.0.8-electron
+ - v-3.0.10-electron
- run:
command: yarn --frozen-lockfile
- run:
@@ -23,7 +23,7 @@ jobs:
- run:
command: node ./test/out/helpers/downloadElectron.js
- save_cache:
- key: v-3.0.8-electron
+ key: v-3.0.10-electron
paths:
- ~/.cache/electron
@@ -41,7 +41,7 @@ jobs:
- deps-{{ checksum "yarn.lock" }}
- restore_cache:
keys:
- - v-3.0.8-electron
+ - v-3.0.10-electron
# because in the build job we use circleci docker image and circleci restores cache to original user home
- run:
command: |
diff --git a/.idea/dictionaries/develar.xml b/.idea/dictionaries/develar.xml
index 70aa01398fb..a34e3dbbd24 100644
--- a/.idea/dictionaries/develar.xml
+++ b/.idea/dictionaries/develar.xml
@@ -257,6 +257,7 @@
muon
mutators
napi
+ netlify
nevershow
nokeys
nomacver
diff --git a/package.json b/package.json
index b821ecda02d..be63cb8a298 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
"schema": "typescript-json-schema packages/app-builder-lib/tsconfig.json Configuration --out packages/app-builder-lib/scheme.json --noExtraProps --useTypeOfKeyword --strictNullChecks --titles --required",
"jsdoc": "ts2jsdoc packages/builder-util-runtime packages/builder-util packages/app-builder-lib packages/electron-builder packages/electron-publish",
"jsdoc2md": "node scripts/jsdoc2md.js",
+ "/////": " git clone --single-branch -b docs git@github.com:electron-userland/electron-builder.git docs",
"docs": "tsc -p ./scripts/renderer/tsconfig.json && yarn jsdoc && yarn jsdoc2md",
"deploy-docs": "mkdocs build --clean && netlifyctl deploy --publish-directory site",
"////": "pip3 install mkdocs-material mkdocs pymdown-extensions markdown-include Pygments --upgrade"
@@ -31,7 +32,7 @@
"dependencies": {
"7zip-bin": "~4.1.0",
"@types/is-ci": "^1.1.0",
- "app-builder-bin": "2.5.1",
+ "app-builder-bin": "2.5.4",
"archiver": "^3.0.0",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.6",
@@ -65,7 +66,7 @@
"temp-file": "^3.3.2",
"tunnel-agent": "^0.6.0",
"update-notifier": "^2.5.0",
- "yargs": "^12.0.2"
+ "yargs": "^12.0.5"
},
"devDependencies": {
"@babel/core": "^7.1.6",
diff --git a/packages/app-builder-lib/package.json b/packages/app-builder-lib/package.json
index a5c7dddb941..f40ccac7fce 100644
--- a/packages/app-builder-lib/package.json
+++ b/packages/app-builder-lib/package.json
@@ -42,7 +42,7 @@
"homepage": "https://github.com/electron-userland/electron-builder",
"dependencies": {
"7zip-bin": "~4.1.0",
- "app-builder-bin": "2.5.1",
+ "app-builder-bin": "2.5.4",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.6",
"chromium-pickle-js": "^0.2.0",
diff --git a/packages/app-builder-lib/src/macPackager.ts b/packages/app-builder-lib/src/macPackager.ts
index 4b887cbb1c8..203107e5675 100644
--- a/packages/app-builder-lib/src/macPackager.ts
+++ b/packages/app-builder-lib/src/macPackager.ts
@@ -295,6 +295,10 @@ export default class MacPackager extends PlatformPackager {
use(this.platformSpecificBuildOptions.category || (this.config as any).category, it => appPlist.LSApplicationCategoryType = it)
appPlist.NSHumanReadableCopyright = appInfo.copyright
+ if (this.platformSpecificBuildOptions.darkModeSupport) {
+ appPlist.NSRequiresAquaSystemAppearance = false
+ }
+
const extendInfo = this.platformSpecificBuildOptions.extendInfo
if (extendInfo != null) {
Object.assign(appPlist, extendInfo)
diff --git a/packages/app-builder-lib/src/options/macOptions.ts b/packages/app-builder-lib/src/options/macOptions.ts
index f478f10cbc8..10add0bcbb9 100644
--- a/packages/app-builder-lib/src/options/macOptions.ts
+++ b/packages/app-builder-lib/src/options/macOptions.ts
@@ -58,6 +58,12 @@ export interface MacConfiguration extends PlatformSpecificBuildOptions {
*/
readonly bundleShortVersion?: string | null
+ /**
+ * Whether a dark mode is supported. If your app does have a dark mode, you can make your app follow the system-wide dark mode setting.
+ * @default false
+ */
+ readonly darkModeSupport?: boolean
+
/**
* The bundle identifier to use in the application helper's plist.
* @default ${appBundleIdentifier}.helper
diff --git a/packages/builder-util/package.json b/packages/builder-util/package.json
index 85d4a1b87ec..57d00b36032 100644
--- a/packages/builder-util/package.json
+++ b/packages/builder-util/package.json
@@ -11,7 +11,7 @@
"out"
],
"dependencies": {
- "app-builder-bin": "2.5.1",
+ "app-builder-bin": "2.5.4",
"temp-file": "^3.3.2",
"fs-extra-p": "^7.0.0",
"is-ci": "^1.2.1",
diff --git a/packages/electron-builder/package.json b/packages/electron-builder/package.json
index fe674f21763..ba639591008 100644
--- a/packages/electron-builder/package.json
+++ b/packages/electron-builder/package.json
@@ -55,7 +55,7 @@
"read-config-file": "3.2.0",
"sanitize-filename": "^1.6.1",
"update-notifier": "^2.5.0",
- "yargs": "^12.0.2",
+ "yargs": "^12.0.5",
"lazy-val": "^1.0.3",
"app-builder-lib": "0.0.0-semantic-release",
"dmg-builder": "0.0.0-semantic-release"
diff --git a/test/fixtures/test-app-build-sub/electron-builder.yml b/test/fixtures/test-app-build-sub/electron-builder.yml
index cfd31468321..976e8e337ff 100644
--- a/test/fixtures/test-app-build-sub/electron-builder.yml
+++ b/test/fixtures/test-app-build-sub/electron-builder.yml
@@ -1,4 +1,4 @@
-electronVersion: 3.0.8
+electronVersion: 3.0.10
appId: org.electron-builder.testApp
compression: store
npmRebuild: false
diff --git a/test/fixtures/test-app-one/package.json b/test/fixtures/test-app-one/package.json
index 6673e1dcfea..0ef8f77ccbf 100644
--- a/test/fixtures/test-app-one/package.json
+++ b/test/fixtures/test-app-one/package.json
@@ -8,7 +8,7 @@
"author": "Foo Bar ",
"license": "MIT",
"build": {
- "electronVersion": "3.0.8",
+ "electronVersion": "3.0.10",
"appId": "org.electron-builder.testApp",
"compression": "store",
"npmRebuild": false,
diff --git a/test/fixtures/test-app-yarn-several-workspace/packages/test-app/package.json b/test/fixtures/test-app-yarn-several-workspace/packages/test-app/package.json
index 3ed0374c7ff..9fc50bfd40f 100644
--- a/test/fixtures/test-app-yarn-several-workspace/packages/test-app/package.json
+++ b/test/fixtures/test-app-yarn-several-workspace/packages/test-app/package.json
@@ -7,7 +7,7 @@
"author": "Foo Bar ",
"license": "MIT",
"build": {
- "electronVersion": "3.0.8",
+ "electronVersion": "3.0.10",
"appId": "org.electron-builder.testApp",
"compression": "store",
"npmRebuild": false,
diff --git a/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/package.json b/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/package.json
index 5e74234a3d2..fff6f34ae4e 100644
--- a/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/package.json
+++ b/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/package.json
@@ -7,7 +7,7 @@
"author": "Foo Bar ",
"license": "MIT",
"build": {
- "electronVersion": "3.0.8",
+ "electronVersion": "3.0.10",
"appId": "org.electron-builder.testApp",
"compression": "store",
"npmRebuild": false,
diff --git a/test/fixtures/test-app-yarn-workspace/packages/test-app/package.json b/test/fixtures/test-app-yarn-workspace/packages/test-app/package.json
index d24165fbf6d..54d66303160 100644
--- a/test/fixtures/test-app-yarn-workspace/packages/test-app/package.json
+++ b/test/fixtures/test-app-yarn-workspace/packages/test-app/package.json
@@ -7,7 +7,7 @@
"author": "Foo Bar ",
"license": "MIT",
"build": {
- "electronVersion": "3.0.8",
+ "electronVersion": "3.0.10",
"appId": "org.electron-builder.testApp",
"compression": "store",
"npmRebuild": false,
diff --git a/test/fixtures/test-app/package.json b/test/fixtures/test-app/package.json
index 91ae63b3966..c21f2dcfd40 100644
--- a/test/fixtures/test-app/package.json
+++ b/test/fixtures/test-app/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"build": {
- "electronVersion": "3.0.8",
+ "electronVersion": "3.0.10",
"appId": "org.electron-builder.testApp",
"compression": "store",
"npmRebuild": false,
diff --git a/test/out/__snapshots__/PublishManagerTest.js.snap b/test/out/__snapshots__/PublishManagerTest.js.snap
index 3aca84d5783..c456d52cd76 100644
--- a/test/out/__snapshots__/PublishManagerTest.js.snap
+++ b/test/out/__snapshots__/PublishManagerTest.js.snap
@@ -169,7 +169,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -275,7 +274,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -353,7 +351,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
diff --git a/test/out/mac/__snapshots__/dmgTest.js.snap b/test/out/mac/__snapshots__/dmgTest.js.snap
index 3805ec0ce0c..131c4713223 100644
--- a/test/out/mac/__snapshots__/dmgTest.js.snap
+++ b/test/out/mac/__snapshots__/dmgTest.js.snap
@@ -33,7 +33,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "2017.1-alpha5",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -56,6 +55,7 @@ Object {
"NSHighResolutionCapable": true,
"NSMainNibFile": "MainMenu",
"NSPrincipalClass": "AtomApplication",
+ "NSRequiresAquaSystemAppearance": false,
"NSSupportsAutomaticGraphicsSwitching": true,
}
`;
@@ -88,7 +88,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -143,7 +142,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -2267,7 +2265,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -2329,7 +2326,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -2391,7 +2387,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -2453,7 +2448,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -2515,7 +2509,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -2599,7 +2592,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -2659,7 +2651,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -2734,7 +2725,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -2789,7 +2779,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -2851,7 +2840,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
diff --git a/test/out/mac/__snapshots__/macArchiveTest.js.snap b/test/out/mac/__snapshots__/macArchiveTest.js.snap
index 2a17212962f..d566e77033e 100644
--- a/test/out/mac/__snapshots__/macArchiveTest.js.snap
+++ b/test/out/mac/__snapshots__/macArchiveTest.js.snap
@@ -23,7 +23,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -78,7 +77,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -135,7 +133,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.10.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -185,7 +182,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -235,7 +231,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -285,7 +280,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -847,7 +841,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
diff --git a/test/out/mac/__snapshots__/macPackagerTest.js.snap b/test/out/mac/__snapshots__/macPackagerTest.js.snap
index 404d480200b..efd12bf972c 100644
--- a/test/out/mac/__snapshots__/macPackagerTest.js.snap
+++ b/test/out/mac/__snapshots__/macPackagerTest.js.snap
@@ -188,7 +188,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.1.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
diff --git a/test/out/mac/__snapshots__/masTest.js.snap b/test/out/mac/__snapshots__/masTest.js.snap
index 4748780678e..aa678b59734 100644
--- a/test/out/mac/__snapshots__/masTest.js.snap
+++ b/test/out/mac/__snapshots__/masTest.js.snap
@@ -18,7 +18,6 @@ Object {
"CFBundleShortVersionString": "1.1.0",
"ElectronTeamID": "744739DJ4Y",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSHighResolutionCapable": true,
"NSMainNibFile": "MainMenu",
"NSPrincipalClass": "AtomApplication",
@@ -50,7 +49,6 @@ Object {
"CFBundleShortVersionString": "1.1.0",
"ElectronTeamID": "X8C9Z9L4HW",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSHighResolutionCapable": true,
"NSMainNibFile": "MainMenu",
"NSPrincipalClass": "AtomApplication",
@@ -87,7 +85,6 @@ Object {
"CFBundleShortVersionString": "1.1.0",
"ElectronTeamID": "X8C9Z9L4HW",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSHighResolutionCapable": true,
"NSMainNibFile": "MainMenu",
"NSPrincipalClass": "AtomApplication",
diff --git a/test/out/updater/__snapshots__/differentialUpdateTest.js.snap b/test/out/updater/__snapshots__/differentialUpdateTest.js.snap
index 1857510d2eb..15c2307d3c9 100644
--- a/test/out/updater/__snapshots__/differentialUpdateTest.js.snap
+++ b/test/out/updater/__snapshots__/differentialUpdateTest.js.snap
@@ -247,7 +247,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.0.0",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
@@ -341,7 +340,6 @@ Object {
"CFBundlePackageType": "APPL",
"CFBundleShortVersionString": "1.0.1",
"LSApplicationCategoryType": "your.app.category.type",
- "LSMinimumSystemVersion": "10.9.0",
"NSAppTransportSecurity": Object {
"NSAllowsLocalNetworking": true,
"NSExceptionDomains": Object {
diff --git a/test/src/BuildTest.ts b/test/src/BuildTest.ts
index f9dbe45a7bb..05b63e5fb2d 100644
--- a/test/src/BuildTest.ts
+++ b/test/src/BuildTest.ts
@@ -321,7 +321,7 @@ test.ifAll.ifDevOrLinuxCi("posix smart unpack", app({
debug: "3.1.0",
"edge-cs": "1.2.1",
// no prebuilt for electron 3
- // "lzma-native": "3.0.8",
+ // "lzma-native": "3.0.10",
keytar: "4.3.0",
}
}),
diff --git a/test/src/helpers/packTester.ts b/test/src/helpers/packTester.ts
index dd2bd2743ab..eb2ad7195e0 100644
--- a/test/src/helpers/packTester.ts
+++ b/test/src/helpers/packTester.ts
@@ -318,6 +318,10 @@ async function checkMacResult(packager: Packager, packagerOptions: PackagerOptio
delete info.DTSDKBuild
delete info.DTSDKName
delete info.DTCompiler
+ // test value
+ if (info.LSMinimumSystemVersion !== "10.12.0") {
+ delete info.LSMinimumSystemVersion
+ }
expect(info).toMatchSnapshot()
diff --git a/test/src/helpers/testConfig.ts b/test/src/helpers/testConfig.ts
index 10ee03d9ac6..5d90d0275a0 100644
--- a/test/src/helpers/testConfig.ts
+++ b/test/src/helpers/testConfig.ts
@@ -1,7 +1,7 @@
import * as os from "os"
import * as path from "path"
-export const ELECTRON_VERSION = "3.0.8"
+export const ELECTRON_VERSION = "3.0.10"
export function getElectronCacheDir() {
if (process.platform === "win32") {
diff --git a/test/src/mac/dmgTest.ts b/test/src/mac/dmgTest.ts
index 034a7bc4538..6ccad00aa07 100644
--- a/test/src/mac/dmgTest.ts
+++ b/test/src/mac/dmgTest.ts
@@ -172,6 +172,7 @@ test.ifMac("no background", app({
}
}))
+// test also darkModeSupport
test.ifAll.ifMac("bundleShortVersion", app({
targets: Platform.MAC.createTarget("dmg"),
config: {
@@ -180,6 +181,7 @@ test.ifAll.ifMac("bundleShortVersion", app({
productName: "BundleShortVersion",
mac: {
bundleShortVersion: "2017.1-alpha5",
+ darkModeSupport: true,
},
}
}))
diff --git a/test/src/mac/macArchiveTest.ts b/test/src/mac/macArchiveTest.ts
index b1c5663f066..eebf2ec6ba6 100644
--- a/test/src/mac/macArchiveTest.ts
+++ b/test/src/mac/macArchiveTest.ts
@@ -22,8 +22,9 @@ it("pkg", createMacTargetTest(["pkg"]))
test.ifAll.ifMac("empty installLocation", app({
targets: Platform.MAC.createTarget("pkg"),
config: {
+ electronVersion: "4.0.0-beta.7",
pkg: {
- installLocation: ""
+ installLocation: "",
}
}
}, {
diff --git a/typings/electron.d.ts b/typings/electron.d.ts
index 05db6c29c03..e2c0c74ae71 100644
--- a/typings/electron.d.ts
+++ b/typings/electron.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Electron 3.0.8
+// Type definitions for Electron 3.0.10
// Project: http://electronjs.org/
// Definitions by: The Electron Team
// Definitions: https://github.com/electron/electron-typescript-definitions
diff --git a/yarn.lock b/yarn.lock
index ddc41ffcb90..d24169085d4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -923,9 +923,9 @@
integrity sha512-+LiY4f3HMAgQGjte8Lg4K6xpTR+glwZolVrreU+ShACr6H/IzYN1VQAitHVeQrNKgZeuOegxE3IACh7Jo2qk0w==
"@types/node@*":
- version "10.12.8"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.8.tgz#d0a3ab5a6e61458c492304e2776ac136b81db927"
- integrity sha512-INamyRZG4rW3lDCUmwVd5Xho/bXvQm/v1yP8V0UN1RuInU7RoWoaO570b+yLX4Ia/0szsx1wa8VzcsVlsvbWLA==
+ version "10.12.10"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.10.tgz#4fa76e6598b7de3f0cb6ec3abacc4f59e5b3a2ce"
+ integrity sha512-8xZEYckCbUVgK8Eg7lf5Iy4COKJ5uXlnIOnePN0WUwSQggy9tolM+tDJf7wMOnT/JT/W9xDYIaYggt3mRV2O5w==
"@types/sanitize-filename@^1.1.28":
version "1.1.28"
@@ -1053,10 +1053,10 @@ anymatch@^2.0.0:
micromatch "^3.1.4"
normalize-path "^2.1.1"
-app-builder-bin@2.5.1:
- version "2.5.1"
- resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.5.1.tgz#a5bcff31e4572d8a179bd88a1335bad8e5d62d81"
- integrity sha512-Hm+eyyfQCs5N5avLAw3w9Cf1S5TX/t6ecAfHusbzCDh/rLKLKYso2vwDWH4OQZ8uWLnuJwaAUDf3PstRcn0H+A==
+app-builder-bin@2.5.4:
+ version "2.5.4"
+ resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.5.4.tgz#b4f060d9e55f7d5fe7b7ad0557cb1dc0b6ad7625"
+ integrity sha512-/rcJkuCqVmf9RzDyUojW3gwA2CbIIG65Z9NZpjFgEDzXd92KFgZyLKmu/2+ue4EjnseEQDc+BmW3GMeciAGJBQ==
append-transform@^0.4.0:
version "0.4.0"
@@ -1647,10 +1647,15 @@ camelcase@^4.0.0, camelcase@^4.1.0:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
+camelcase@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
+ integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
+
caniuse-lite@^1.0.30000899:
- version "1.0.30000907"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000907.tgz#0b9899bde53fb1c30e214fb12402361e02ff5c42"
- integrity sha512-No5sQ/OB2Nmka8MNOOM6nJx+Hxt6MQ6h7t7kgJFu9oTuwjykyKRSBP/+i/QAyFHxeHB+ddE0Da1CG5ihx9oehQ==
+ version "1.0.30000910"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000910.tgz#755d5181d4b006e5a2b59b1ffa05d0a0470039f5"
+ integrity sha512-u/nxtHGAzCGZzIxt3dA/tpSPOcirBZFWKwz1EPz4aaupnBI2XR0Rbr74g0zc6Hzy41OEM4uMoZ38k56TpYAWjQ==
capture-exit@^1.2.0:
version "1.2.0"
@@ -2015,18 +2020,11 @@ debug@^4.1.0:
dependencies:
ms "^2.1.1"
-decamelize@^1.1.1:
+decamelize@^1.1.1, decamelize@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-decamelize@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
- integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
- dependencies:
- xregexp "4.0.0"
-
decode-uri-component@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -4108,12 +4106,12 @@ lowercase-keys@^1.0.0:
integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
lru-cache@^4.0.1:
- version "4.1.3"
- resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
- integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
+ version "4.1.4"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.4.tgz#51cc46e8e6d9530771c857e24ccc720ecdbcc031"
+ integrity sha512-EPstzZ23znHUVLKj+lcXO1KvZkrlw+ZirdwvOmnAnA/1PB4ggyXJ77LRkCqkff+ShQ+cqoxCxLQOh4cKITO5iA==
dependencies:
pseudomap "^1.0.2"
- yallist "^2.1.2"
+ yallist "^3.0.2"
make-dir@^1.0.0:
version "1.3.0"
@@ -4396,9 +4394,9 @@ node-pre-gyp@^0.10.0:
tar "^4"
node-releases@^1.0.1:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.3.tgz#3414ed84595096459c251699bfcb47d88324a9e4"
- integrity sha512-ZaZWMsbuDcetpHmYeKWPO6e63pSXLb50M7lJgCbcM2nC/nQC3daNifmtp5a2kp7EWwYfhuvH6zLPWkrF8IiDdw==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.4.tgz#2d585de8c6c81d00017e063e7810a63889aa6756"
+ integrity sha512-GqRV9GcHw8JCRDaP/JoeNMNzEGzHAknMvIHqMb2VeTOmg1Cf9+ej8bkV12tHfzWHQMCkQ5zUFgwFUkfraynNCw==
dependencies:
semver "^5.3.0"
@@ -6123,9 +6121,9 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
iconv-lite "0.4.24"
whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.2.0.tgz#a3d58ef10b76009b042d03e25591ece89b88d171"
- integrity sha512-5YSO1nMd5D1hY3WzAQV3PzZL83W3YeyR1yW9PcH26Weh1t+Vzh9B6XkDh7aXm83HBZ4nSMvkjvN2H2ySWIvBgw==
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+ integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
whatwg-url@^6.4.1:
version "6.5.0"
@@ -6264,11 +6262,6 @@ xmldom@0.1.x:
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
-xregexp@4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
- integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
-
xtend@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -6284,22 +6277,18 @@ y18n@^3.2.1:
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
-yallist@^2.1.2:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
- integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-
yallist@^3.0.0, yallist@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
- integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
+ integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
-yargs-parser@^10.1.0:
- version "10.1.0"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
- integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
+yargs-parser@^11.1.1:
+ version "11.1.1"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+ integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
dependencies:
- camelcase "^4.1.0"
+ camelcase "^5.0.0"
+ decamelize "^1.2.0"
yargs-parser@^7.0.0:
version "7.0.0"
@@ -6333,13 +6322,13 @@ yargs@^11.0.0:
y18n "^3.2.1"
yargs-parser "^9.0.2"
-yargs@^12.0.2:
- version "12.0.2"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
- integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
+yargs@^12.0.5:
+ version "12.0.5"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+ integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
dependencies:
cliui "^4.0.0"
- decamelize "^2.0.0"
+ decamelize "^1.2.0"
find-up "^3.0.0"
get-caller-file "^1.0.1"
os-locale "^3.0.0"
@@ -6349,7 +6338,7 @@ yargs@^12.0.2:
string-width "^2.0.0"
which-module "^2.0.0"
y18n "^3.2.1 || ^4.0.0"
- yargs-parser "^10.1.0"
+ yargs-parser "^11.1.1"
yargs@^8.0.2:
version "8.0.2"