diff --git a/.circleci/config.yml b/.circleci/config.yml index 372018b9e253..d169c7f0c5eb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ parameters: run-docs-only: type: boolean default: false - + upload-to-storage: type: string default: '1' diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml index 4098e78e1afa..7f1452b62e93 100644 --- a/.circleci/config/base.yml +++ b/.circleci/config/base.yml @@ -4,7 +4,7 @@ parameters: run-docs-only: type: boolean default: false - + upload-to-storage: type: string default: '1' @@ -141,7 +141,7 @@ env-mas-apple-silicon: &env-mas-apple-silicon env-send-slack-notifications: &env-send-slack-notifications NOTIFY_SLACK: true - + env-global: &env-global ELECTRON_OUT_DIR: Default @@ -694,7 +694,7 @@ step-show-goma-stats: &step-show-goma-stats run: shell: /bin/bash name: Check goma stats after build - command: | + command: | set +e set +o pipefail $LOCAL_GOMA_DIR/goma_ctl.py stat @@ -798,7 +798,7 @@ step-maybe-cross-arch-snapshot: &step-maybe-cross-arch-snapshot elif [ "$TARGET_ARCH" == "arm64" ]; then export MKSNAPSHOT_PATH="clang_x64_v8_arm64" fi - cp "out/Default/$MKSNAPSHOT_PATH/mksnapshot" out/Default + cp "out/Default/$MKSNAPSHOT_PATH/mksnapshot" out/Default cp "out/Default/$MKSNAPSHOT_PATH/v8_context_snapshot_generator" out/Default if [ "`uname`" == "Linux" ]; then cp "out/Default/$MKSNAPSHOT_PATH/libffmpeg.so" out/Default @@ -1012,7 +1012,7 @@ commands: else echo 'Using Python install from cache' fi - sudo installer -pkg python-downloads/python-2.7.18-macosx10.9.pkg -target / + sudo installer -pkg python-downloads/python-2.7.18-macosx10.9.pkg -target / fi - save_cache: paths: @@ -1420,7 +1420,7 @@ commands: artifact-key: << parameters.artifact-key >> build-nonproprietary-ffmpeg: << parameters.build-nonproprietary-ffmpeg >> - steps: << parameters.after-build-and-save >> - + # Save all data needed for a further tests run. - when: condition: << parameters.persist >> @@ -2124,7 +2124,7 @@ jobs: - electron-tests: artifact-key: darwin-x64 - darwin-testing-arm64-tests: + darwin-testing-arm64-tests: executor: apple-silicon environment: <<: *env-mac-large @@ -2239,9 +2239,9 @@ workflows: filters: branches: # Do not run this on forked pull requests - ignore: /pull\/[0-9]+/ + ignore: /pull\/[0-9]+/ requires: - - linux-arm-testing + - linux-arm-testing - linux-arm64-testing: requires: - linux-make-src-cache @@ -2249,7 +2249,7 @@ workflows: filters: branches: # Do not run this on forked pull requests - ignore: /pull\/[0-9]+/ + ignore: /pull\/[0-9]+/ requires: - linux-arm64-testing - linux-arm64-testing-gn-check: diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index f2298088915b..cfb043a52ebd 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -7,9 +7,9 @@ services: volumes: - ..:/workspaces/gclient/src/electron:cached - - /var/run/docker.sock:/var/run/docker.sock + - /var/run/docker.sock:/var/run/docker.sock - command: /bin/sh -c "while sleep 1000; do :; done" + command: /bin/sh -c "while sleep 1000; do :; done" user: builduser diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 7ea654e33ece..66196fe99ba9 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -19,7 +19,7 @@ body: label: Electron Version description: | What version of Electron are you using? - + Note: Please only report issues for [currently supported versions of Electron](https://www.electronjs.org/docs/latest/tutorial/support#currently-supported-versions). placeholder: 17.0.0 validations: diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 9e8c1cd168b5..cf6f66b5e605 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -29,7 +29,7 @@ body: - type: textarea attributes: label: Alternatives Considered - description: A clear and concise description of any alternative solutions or features you've considered. + description: A clear and concise description of any alternative solutions or features you've considered. validations: required: true - type: textarea diff --git a/.github/workflows/issue-labeled.yml b/.github/workflows/issue-labeled.yml index 427db8209d65..f090208ae92d 100644 --- a/.github/workflows/issue-labeled.yml +++ b/.github/workflows/issue-labeled.yml @@ -23,6 +23,6 @@ jobs: Would it be possible for you to make a standalone testcase with only the code necessary to reproduce the issue? For example, [Electron Fiddle](https://www.electronjs.org/fiddle) is a great tool for making small test cases and makes it easy to publish your test case to a [gist](https://gist.github.com) that Electron maintainers can use. - Stand-alone test cases make fixing issues go more smoothly: it ensure everyone's looking at the same issue, it removes all unnecessary variables from the equation, and it can also provide the basis for automated regression tests. + Stand-alone test cases make fixing issues go more smoothly: it ensure everyone's looking at the same issue, it removes all unnecessary variables from the equation, and it can also provide the basis for automated regression tests. Now adding the `blocked/need-repro` label for this reason. After you make a test case, please link to it in a followup comment. This issue will be closed in 10 days if the above is not addressed. diff --git a/appveyor-bake.yml b/appveyor-bake.yml index aae54a9ab214..ad457feb7ef9 100644 --- a/appveyor-bake.yml +++ b/appveyor-bake.yml @@ -18,7 +18,7 @@ environment: PYTHONIOENCODING: UTF-8 # Uncomment these lines and set APPVEYOR_RDP_PASSWORD in project settings to enable RDP before bake begins # install: -# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) +# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) build_script: # Uncomment/change the following line if the hard drive/partition size needs to change # - ps: Resize-Partition -DriveLetter C -Size (256GB) # ensure initial partition size @@ -28,8 +28,8 @@ build_script: if (-not (Test-Path -Path .\src)) { New-Item -Path .\src -ItemType Directory } - - ps: git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git - - ps: $env:PATH="$pwd\depot_tools;$env:PATH" + - ps: git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git + - ps: $env:PATH="$pwd\depot_tools;$env:PATH" - update_depot_tools.bat - ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron # Uncomment the following line if windows deps change diff --git a/appveyor-woa.yml b/appveyor-woa.yml index 0f545260ce08..b6ac4224d176 100644 --- a/appveyor-woa.yml +++ b/appveyor-woa.yml @@ -1,5 +1,5 @@ -# NOTE IF CHANGING THIS FILE, ALSO APPLY THE CHANGE TO appveyor.yml -# IF APPLICABLE!!!! +# NOTE IF CHANGING THIS FILE, ALSO APPLY THE CHANGE TO appveyor.yml +# IF APPLICABLE!!!! # # # The config expects the following environment variables to be set: @@ -119,7 +119,7 @@ for: $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] " } - gclient config --name "src\electron" --unmanaged %GCLIENT_EXTRA_ARGS% "https://github.com/electron/electron" - # Patches are applied in the image bake. Check depshash to see if patches have changed. + # Patches are applied in the image bake. Check depshash to see if patches have changed. - ps: $env:RUN_GCLIENT_SYNC="false" - ps: $depshash_baked = Get-Content .\src\.depshash -Raw - ps: cd src\electron @@ -261,7 +261,7 @@ for: cd src New-Item .\out\Default\gen\node_headers\Release -Type directory Copy-Item -path .\out\Default\electron.lib -destination .\out\Default\gen\node_headers\Release\node.lib - - set npm_config_nodedir=%cd%\out\Default\gen\node_headers + - set npm_config_nodedir=%cd%\out\Default\gen\node_headers - set npm_config_arch=arm64 - cd electron # Explicitly set npm_config_arch because the .env doesn't persist @@ -272,7 +272,7 @@ for: - echo Running main test suite & node script/yarn test --runners=main --enable-logging --disable-features=CalculateNativeWinOcclusion - cd .. - echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg - + on_finish: # Uncomment these lines to enable RDP # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) diff --git a/appveyor.yml b/appveyor.yml index 04f7473ab83e..34a769e0cf33 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ -# NOTE IF CHANGING THIS FILE, ALSO APPLY THE CHANGE TO appveyor-woa.yml -# IF APPLICABLE!!!! +# NOTE IF CHANGING THIS FILE, ALSO APPLY THE CHANGE TO appveyor-woa.yml +# IF APPLICABLE!!!! # # # The config expects the following environment variables to be set: @@ -117,7 +117,7 @@ for: $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] " } - gclient config --name "src\electron" --unmanaged %GCLIENT_EXTRA_ARGS% "https://github.com/electron/electron" - # Patches are applied in the image bake. Check depshash to see if patches have changed. + # Patches are applied in the image bake. Check depshash to see if patches have changed. - ps: $env:RUN_GCLIENT_SYNC="false" - ps: $depshash_baked = Get-Content .\src\.depshash -Raw - ps: cd src\electron @@ -272,7 +272,7 @@ for: - echo "Done verifying mksnapshot" - echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd% - echo "Done verifying chromedriver" - + on_finish: # Uncomment these lines to enable RDP # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) diff --git a/docs/fiddles/features/keyboard-shortcuts/web-apis/index.html b/docs/fiddles/features/keyboard-shortcuts/web-apis/index.html index b19f3e92fd07..4effa03fc9f2 100644 --- a/docs/fiddles/features/keyboard-shortcuts/web-apis/index.html +++ b/docs/fiddles/features/keyboard-shortcuts/web-apis/index.html @@ -9,7 +9,7 @@

Hello World!

- +

Hit any key with this window focused to see it captured here.

Last Key Pressed:
diff --git a/docs/fiddles/features/keyboard-shortcuts/web-apis/main.js b/docs/fiddles/features/keyboard-shortcuts/web-apis/main.js index 5944f55c83f1..876d7632b223 100644 --- a/docs/fiddles/features/keyboard-shortcuts/web-apis/main.js +++ b/docs/fiddles/features/keyboard-shortcuts/web-apis/main.js @@ -19,7 +19,7 @@ function createWindow () { // Some APIs can only be used after this event occurs. app.whenReady().then(() => { createWindow() - + app.on('activate', function () { // On macOS it's common to re-create a window in the app when the // dock icon is clicked and there are no other windows open. diff --git a/docs/fiddles/features/online-detection/index.html b/docs/fiddles/features/online-detection/index.html index 372e5a963f77..2ff4b4f3633e 100644 --- a/docs/fiddles/features/online-detection/index.html +++ b/docs/fiddles/features/online-detection/index.html @@ -7,7 +7,7 @@

Connection status:

- + diff --git a/docs/fiddles/features/web-bluetooth/main.js b/docs/fiddles/features/web-bluetooth/main.js index 5d560579cc05..be44dc050731 100644 --- a/docs/fiddles/features/web-bluetooth/main.js +++ b/docs/fiddles/features/web-bluetooth/main.js @@ -7,14 +7,14 @@ function createWindow () { height: 600, webPreferences: { preload: path.join(__dirname, 'preload.js') - } + } }) mainWindow.webContents.on('select-bluetooth-device', (event, deviceList, callback) => { event.preventDefault() if (deviceList && deviceList.length > 0) { callback(deviceList[0].deviceId) - } + } }) // Listen for a message from the renderer to get the response for the Bluetooth pairing. @@ -27,14 +27,14 @@ function createWindow () { bluetoothPinCallback = callback // Send a message to the renderer to prompt the user to confirm the pairing. mainWindow.webContents.send('bluetooth-pairing-request', details) - }) + }) mainWindow.loadFile('index.html') } app.whenReady().then(() => { createWindow() - + app.on('activate', function () { if (BrowserWindow.getAllWindows().length === 0) createWindow() }) diff --git a/docs/fiddles/features/web-bluetooth/renderer.js b/docs/fiddles/features/web-bluetooth/renderer.js index 080fb6105b28..c51a06ca9177 100644 --- a/docs/fiddles/features/web-bluetooth/renderer.js +++ b/docs/fiddles/features/web-bluetooth/renderer.js @@ -9,7 +9,7 @@ document.getElementById('clickme').addEventListener('click',testIt) window.electronAPI.bluetoothPairingRequest((event, details) => { const response = {} - + switch (details.pairingKind) { case 'confirm': { response.confirmed = confirm(`Do you want to connect to device ${details.deviceId}?`) diff --git a/docs/fiddles/features/web-hid/index.html b/docs/fiddles/features/web-hid/index.html index 659b5bc12395..8b4243e32575 100644 --- a/docs/fiddles/features/web-hid/index.html +++ b/docs/fiddles/features/web-hid/index.html @@ -12,7 +12,7 @@

HID devices automatically granted access via setDevicePermissionHandler

- +

HID devices automatically granted access via select-hid-device

diff --git a/docs/fiddles/features/web-hid/main.js b/docs/fiddles/features/web-hid/main.js index 3304457db822..5626a919beb1 100644 --- a/docs/fiddles/features/web-hid/main.js +++ b/docs/fiddles/features/web-hid/main.js @@ -6,16 +6,16 @@ function createWindow () { width: 800, height: 600 }) - + mainWindow.webContents.session.on('select-hid-device', (event, details, callback) => { //Add events to handle devices being added or removed before the callback on //`select-hid-device` is called. - mainWindow.webContents.session.on('hid-device-added', (event, device) => { + mainWindow.webContents.session.on('hid-device-added', (event, device) => { console.log('hid-device-added FIRED WITH', device) //Optionally update details.deviceList }) - - mainWindow.webContents.session.on('hid-device-removed', (event, device) => { + + mainWindow.webContents.session.on('hid-device-removed', (event, device) => { console.log('hid-device-removed FIRED WITH', device) //Optionally update details.deviceList }) @@ -37,13 +37,13 @@ function createWindow () { return true } }) - + mainWindow.loadFile('index.html') } app.whenReady().then(() => { createWindow() - + app.on('activate', function () { if (BrowserWindow.getAllWindows().length === 0) createWindow() }) diff --git a/docs/fiddles/features/web-serial/main.js b/docs/fiddles/features/web-serial/main.js index 7150ec60651e..e88c509fc400 100644 --- a/docs/fiddles/features/web-serial/main.js +++ b/docs/fiddles/features/web-serial/main.js @@ -6,7 +6,7 @@ function createWindow () { width: 800, height: 600 }) - + mainWindow.webContents.session.on('select-serial-port', (event, portList, webContents, callback) => { //Add listeners to handle ports being added or removed before the callback for `select-serial-port` @@ -15,7 +15,7 @@ function createWindow () { console.log('serial-port-added FIRED WITH', port) //Optionally update portList to add the new port }) - + mainWindow.webContents.session.on('serial-port-removed', (event, port) => { console.log('serial-port-removed FIRED WITH', port) //Optionally update portList to remove the port @@ -33,7 +33,7 @@ function createWindow () { if (permission === 'serial' && details.securityOrigin === 'file:///') { return true } - + return false }) @@ -41,10 +41,10 @@ function createWindow () { if (details.deviceType === 'serial' && details.origin === 'file://') { return true } - + return false }) - + mainWindow.loadFile('index.html') mainWindow.webContents.openDevTools() @@ -52,7 +52,7 @@ function createWindow () { app.whenReady().then(() => { createWindow() - + app.on('activate', function () { if (BrowserWindow.getAllWindows().length === 0) createWindow() }) diff --git a/docs/fiddles/features/web-usb/index.html b/docs/fiddles/features/web-usb/index.html index 95541d9a1fee..59c0cb9264dc 100644 --- a/docs/fiddles/features/web-usb/index.html +++ b/docs/fiddles/features/web-usb/index.html @@ -12,7 +12,7 @@

USB devices automatically granted access via setDevicePermissionHandler

- +

USB devices automatically granted access via select-usb-device

diff --git a/docs/fiddles/features/web-usb/main.js b/docs/fiddles/features/web-usb/main.js index 316a0dbdf86a..580c6686bcc3 100644 --- a/docs/fiddles/features/web-usb/main.js +++ b/docs/fiddles/features/web-usb/main.js @@ -7,17 +7,17 @@ function createWindow () { width: 800, height: 600 }) - + let grantedDeviceThroughPermHandler mainWindow.webContents.session.on('select-usb-device', (event, details, callback) => { //Add events to handle devices being added or removed before the callback on //`select-usb-device` is called. - mainWindow.webContents.session.on('usb-device-added', (event, device) => { + mainWindow.webContents.session.on('usb-device-added', (event, device) => { console.log('usb-device-added FIRED WITH', device) //Optionally update details.deviceList }) - + mainWindow.webContents.session.on('usb-device-removed', (event, device) => { console.log('usb-device-removed FIRED WITH', device) //Optionally update details.deviceList @@ -31,7 +31,7 @@ function createWindow () { } }) if (deviceToReturn) { - callback(deviceToReturn.deviceId) + callback(deviceToReturn.deviceId) } else { callback() } @@ -44,10 +44,10 @@ function createWindow () { } }) - + mainWindow.webContents.session.setDevicePermissionHandler((details) => { if (details.deviceType === 'usb' && details.origin === 'file://') { - if (!grantedDeviceThroughPermHandler) { + if (!grantedDeviceThroughPermHandler) { grantedDeviceThroughPermHandler = details.device return true } else { @@ -55,13 +55,13 @@ function createWindow () { } } }) - + mainWindow.loadFile('index.html') } app.whenReady().then(() => { createWindow() - + app.on('activate', function () { if (BrowserWindow.getAllWindows().length === 0) createWindow() }) diff --git a/docs/fiddles/features/web-usb/renderer.js b/docs/fiddles/features/web-usb/renderer.js index f1aa3be30b46..3983a6fbf773 100644 --- a/docs/fiddles/features/web-usb/renderer.js +++ b/docs/fiddles/features/web-usb/renderer.js @@ -6,10 +6,10 @@ async function testIt() { const noDevicesFoundMsg = 'No devices found' const grantedDevices = await navigator.usb.getDevices() let grantedDeviceList = '' - if (grantedDevices.length > 0) { + if (grantedDevices.length > 0) { grantedDevices.forEach(device => { grantedDeviceList += `
${getDeviceDetails(device)}` - }) + }) } else { grantedDeviceList = noDevicesFoundMsg } @@ -21,7 +21,7 @@ async function testIt() { filters: [] }) grantedDeviceList += `
${getDeviceDetails(device)}` - + } catch (ex) { if (ex.name === 'NotFoundError') { grantedDeviceList = noDevicesFoundMsg diff --git a/docs/fiddles/ipc/pattern-1/main.js b/docs/fiddles/ipc/pattern-1/main.js index 2e9e97edb81b..c561edc78389 100644 --- a/docs/fiddles/ipc/pattern-1/main.js +++ b/docs/fiddles/ipc/pattern-1/main.js @@ -19,7 +19,7 @@ function createWindow () { app.whenReady().then(() => { createWindow() - + app.on('activate', function () { if (BrowserWindow.getAllWindows().length === 0) createWindow() }) diff --git a/docs/fiddles/ipc/pattern-3/main.js b/docs/fiddles/ipc/pattern-3/main.js index 357aa64e0fb4..4f1e1b4bf16e 100644 --- a/docs/fiddles/ipc/pattern-3/main.js +++ b/docs/fiddles/ipc/pattern-3/main.js @@ -37,7 +37,7 @@ app.whenReady().then(() => { console.log(value) // will print value to Node console }) createWindow() - + app.on('activate', function () { if (BrowserWindow.getAllWindows().length === 0) createWindow() }) diff --git a/docs/fiddles/native-ui/external-links-file-manager/external-links/index.html b/docs/fiddles/native-ui/external-links-file-manager/external-links/index.html index f96fae00f79c..3a7a983145cf 100644 --- a/docs/fiddles/native-ui/external-links-file-manager/external-links/index.html +++ b/docs/fiddles/native-ui/external-links-file-manager/external-links/index.html @@ -28,7 +28,7 @@ const exLinksBtn = document.getElementById('open-ex-links') exLinksBtn.addEventListener('click', (event) => { shell.openExternal('https://electronjs.org') - }) + })
diff --git a/docs/fiddles/native-ui/external-links-file-manager/index.html b/docs/fiddles/native-ui/external-links-file-manager/index.html index c4b41b990555..c9e9e6f849e2 100644 --- a/docs/fiddles/native-ui/external-links-file-manager/index.html +++ b/docs/fiddles/native-ui/external-links-file-manager/index.html @@ -6,7 +6,7 @@
-

+

Open external links and the file manager

diff --git a/docs/fiddles/native-ui/notifications/index.html b/docs/fiddles/native-ui/notifications/index.html index 2848ad6d552d..99b8633fe455 100644 --- a/docs/fiddles/native-ui/notifications/index.html +++ b/docs/fiddles/native-ui/notifications/index.html @@ -14,7 +14,7 @@

Electron conveniently allows developers to send notifications with the - HTML5 Notification API, + HTML5 Notification API, using the currently running operating system’s native notification APIs to display it.

diff --git a/docs/fiddles/system/clipboard/copy/main.js b/docs/fiddles/system/clipboard/copy/main.js index 656b990429ab..8d565f33f6d5 100644 --- a/docs/fiddles/system/clipboard/copy/main.js +++ b/docs/fiddles/system/clipboard/copy/main.js @@ -27,7 +27,7 @@ ipcMain.handle('clipboard:writeText', (event, text) => { app.whenReady().then(() => { createWindow() - + app.on('activate', function () { if (BrowserWindow.getAllWindows().length === 0) createWindow() }) diff --git a/docs/fiddles/system/clipboard/paste/main.js b/docs/fiddles/system/clipboard/paste/main.js index a1d2f6ad3094..ac8ee073c17d 100644 --- a/docs/fiddles/system/clipboard/paste/main.js +++ b/docs/fiddles/system/clipboard/paste/main.js @@ -31,7 +31,7 @@ ipcMain.handle('clipboard:writeText', (event, text) => { app.whenReady().then(() => { createWindow() - + app.on('activate', function () { if (BrowserWindow.getAllWindows().length === 0) createWindow() }) diff --git a/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/main.js b/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/main.js index 6e875809301c..fafb18143d5b 100644 --- a/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/main.js +++ b/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/main.js @@ -23,7 +23,7 @@ if (!gotTheLock) { if (mainWindow.isMinimized()) mainWindow.restore() mainWindow.focus() } - + dialog.showErrorBox('Welcome Back', `You arrived from: ${commandLine.pop().slice(0,-1)}`) }) @@ -31,7 +31,7 @@ if (!gotTheLock) { app.whenReady().then(() => { createWindow() }) - + app.on('open-url', (event, url) => { dialog.showErrorBox('Welcome Back', `You arrived from: ${url}`) }) diff --git a/docs/fiddles/system/system-app-user-information/app-information/index.html b/docs/fiddles/system/system-app-user-information/app-information/index.html index 18b05ae23dae..68e3143ea733 100644 --- a/docs/fiddles/system/system-app-user-information/app-information/index.html +++ b/docs/fiddles/system/system-app-user-information/app-information/index.html @@ -23,4 +23,4 @@ require('./renderer.js') - \ No newline at end of file + \ No newline at end of file diff --git a/docs/fiddles/windows/manage-windows/create-frameless-window/index.html b/docs/fiddles/windows/manage-windows/create-frameless-window/index.html index c83c43d636ed..bd075bbfbcd0 100644 --- a/docs/fiddles/windows/manage-windows/create-frameless-window/index.html +++ b/docs/fiddles/windows/manage-windows/create-frameless-window/index.html @@ -10,7 +10,7 @@ Supports: Win, macOS, Linux | Process: Main

A frameless window is a window that has no "chrome", - such as toolbars, title bars, status bars, borders, etc. You can make + such as toolbars, title bars, status bars, borders, etc. You can make a browser window frameless by setting frame to false when creating the window.

diff --git a/script/copy-debug-symbols.py b/script/copy-debug-symbols.py index d1cd4c8b4868..2658f9e0d034 100755 --- a/script/copy-debug-symbols.py +++ b/script/copy-debug-symbols.py @@ -17,7 +17,7 @@ def copy_debug_from_binaries(directory, out_dir, target_cpu, compress): def copy_debug_from_binary(binary_path, out_dir, target_cpu, compress): if PLATFORM == 'linux' and target_cpu in ('x86', 'arm', 'arm64'): # Skip because no objcopy binary on the given target. - return + return debug_name = get_debug_name(binary_path) cmd = ['objcopy', '--only-keep-debug'] if compress: diff --git a/script/release/uploaders/upload-node-headers.py b/script/release/uploaders/upload-node-headers.py index d70a5b704ac2..1691e77fe11a 100755 --- a/script/release/uploaders/upload-node-headers.py +++ b/script/release/uploaders/upload-node-headers.py @@ -58,7 +58,7 @@ def upload_node(version): elif get_target_arch() == 'arm64': node_lib = os.path.join(DIST_DIR, 'arm64', 'node.lib') iojs_lib = os.path.join(DIST_DIR, 'win-arm64', 'iojs.lib') - v4_node_lib = os.path.join(DIST_DIR, 'win-arm64', 'node.lib') + v4_node_lib = os.path.join(DIST_DIR, 'win-arm64', 'node.lib') else: node_lib = os.path.join(DIST_DIR, 'x64', 'node.lib') iojs_lib = os.path.join(DIST_DIR, 'win-x64', 'iojs.lib') diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py index 9fdf8a2fd142..00fdb8622753 100755 --- a/script/release/uploaders/upload.py +++ b/script/release/uploaders/upload.py @@ -93,7 +93,7 @@ def main(): dsym_snapshot_zip = os.path.join(OUT_DIR, DSYM_SNAPSHOT_NAME) shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snapshot_zip) - upload_electron(release, dsym_snapshot_zip, args) + upload_electron(release, dsym_snapshot_zip, args) elif PLATFORM == 'win32': pdb_zip = os.path.join(OUT_DIR, PDB_NAME) shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip) diff --git a/script/release/version-bumper.js b/script/release/version-bumper.js index 51865bc46439..104534578812 100644 --- a/script/release/version-bumper.js +++ b/script/release/version-bumper.js @@ -20,7 +20,7 @@ function parseCommandLine () { --bump=patch to increment patch version\n --version={version} to set version number directly\n --dryRun to print the next version without updating files - Note that you can use both --bump and --stable simultaneously. + Note that you can use both --bump and --stable simultaneously. `); process.exit(0); } diff --git a/script/start-goma.ps1 b/script/start-goma.ps1 index f63d46c7e0fc..0d72c413afcd 100755 --- a/script/start-goma.ps1 +++ b/script/start-goma.ps1 @@ -1,10 +1,10 @@ param([string]$gomaDir=$PWD) -$cmdPath = Join-Path -Path $gomaDir -ChildPath "goma_ctl.py" +$cmdPath = Join-Path -Path $gomaDir -ChildPath "goma_ctl.py" Start-Process -FilePath cmd -ArgumentList "/C", "python", "$cmdPath", "ensure_start" $timedOut = $false; $waitTime = 0; $waitIncrement = 5; $timeout=120; -Do { sleep $waitIncrement; $timedOut = (($waitTime+=$waitIncrement) -gt $timeout); iex "$gomaDir\gomacc.exe port 2" > $null; } Until(($LASTEXITCODE -eq 0) -or $timedOut) -if ($timedOut) { - write-error 'Timed out waiting for goma to start'; exit 1; +Do { sleep $waitIncrement; $timedOut = (($waitTime+=$waitIncrement) -gt $timeout); iex "$gomaDir\gomacc.exe port 2" > $null; } Until(($LASTEXITCODE -eq 0) -or $timedOut) +if ($timedOut) { + write-error 'Timed out waiting for goma to start'; exit 1; } else { Write-Output "Successfully started goma!" } diff --git a/shell/browser/resources/mac/Info.plist b/shell/browser/resources/mac/Info.plist index 39ca2170dee2..9e01bf50a263 100644 --- a/shell/browser/resources/mac/Info.plist +++ b/shell/browser/resources/mac/Info.plist @@ -28,7 +28,7 @@ MainMenu NSPrincipalClass AtomApplication - NSAppTransportSecurity + NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/spec/api-context-bridge-spec.ts b/spec/api-context-bridge-spec.ts index 81133f633a9e..667eecd43db0 100644 --- a/spec/api-context-bridge-spec.ts +++ b/spec/api-context-bridge-spec.ts @@ -76,7 +76,7 @@ describe('contextBridge', () => { const gc=require('vm').runInNewContext('gc'); renderer_1.webFrame.setIsolatedWorldInfo(${worldId}, { name: "Isolated World" - }); + }); renderer_1.contextBridge.exposeInIsolatedWorld(${worldId}, 'GCRunner', { run: () => gc() });`} diff --git a/spec/api-ipc-renderer-spec.ts b/spec/api-ipc-renderer-spec.ts index f397495a9a26..64639dade477 100644 --- a/spec/api-ipc-renderer-spec.ts +++ b/spec/api-ipc-renderer-spec.ts @@ -74,7 +74,7 @@ describe('ipcRenderer module', () => { it('can send objects that both reference the same object', async () => { w.webContents.executeJavaScript(`{ const { ipcRenderer } = require('electron') - + const child = { hello: 'world' } const foo = { name: 'foo', child: child } const bar = { name: 'bar', child: child } diff --git a/spec/asar-spec.ts b/spec/asar-spec.ts index 270b46775bf4..248010ad973b 100644 --- a/spec/asar-spec.ts +++ b/spec/asar-spec.ts @@ -163,7 +163,7 @@ describe('asar package', function () { fs = require('fs') path = require('path') asarDir = ${JSON.stringify(asarDir)} - + // This is used instead of util.promisify for some tests to dodge the // util.promisify.custom behavior. promisify = (f) => { @@ -174,7 +174,7 @@ describe('asar package', function () { }) }) } - + null ` }); diff --git a/spec/fixtures/extensions/content-script-document-end/manifest.json b/spec/fixtures/extensions/content-script-document-end/manifest.json index e219a532bd63..cd2ce51be9d7 100644 --- a/spec/fixtures/extensions/content-script-document-end/manifest.json +++ b/spec/fixtures/extensions/content-script-document-end/manifest.json @@ -10,5 +10,4 @@ } ], "manifest_version": 2 - } - \ No newline at end of file +} diff --git a/spec/fixtures/extensions/content-script-document-idle/manifest.json b/spec/fixtures/extensions/content-script-document-idle/manifest.json index f2e0ba3e40b5..bd2bb5fcebca 100644 --- a/spec/fixtures/extensions/content-script-document-idle/manifest.json +++ b/spec/fixtures/extensions/content-script-document-idle/manifest.json @@ -10,5 +10,4 @@ } ], "manifest_version": 2 - } - \ No newline at end of file +} diff --git a/spec/fixtures/extensions/content-script-document-start/manifest.json b/spec/fixtures/extensions/content-script-document-start/manifest.json index 1dfd396807e3..9b58263d1fe6 100644 --- a/spec/fixtures/extensions/content-script-document-start/manifest.json +++ b/spec/fixtures/extensions/content-script-document-start/manifest.json @@ -10,5 +10,4 @@ } ], "manifest_version": 2 - } - \ No newline at end of file +} diff --git a/spec/fixtures/pages/overlay.html b/spec/fixtures/pages/overlay.html index e866725574d5..7ee96f59fd03 100644 --- a/spec/fixtures/pages/overlay.html +++ b/spec/fixtures/pages/overlay.html @@ -55,7 +55,7 @@ const {x, y, width, height} = navigator.windowControlsOverlay.getTitlebarAreaRect(); ipcRenderer.send('geometrychange', {x, y, width, height}); }; - +
Title goes here @@ -76,7 +76,7 @@ } function getJSOverlayProperties() { - const {x, y, width, height} = navigator.windowControlsOverlay.getTitlebarAreaRect(); + const {x, y, width, height} = navigator.windowControlsOverlay.getTitlebarAreaRect(); return {x, y, width, height}; } diff --git a/spec/fixtures/pages/service-worker/badge-index.html b/spec/fixtures/pages/service-worker/badge-index.html index 480a60a9aee8..06df4b230387 100644 --- a/spec/fixtures/pages/service-worker/badge-index.html +++ b/spec/fixtures/pages/service-worker/badge-index.html @@ -1,6 +1,6 @@