From 3ad3ade828869052dabd19953a54e20198c6f72e Mon Sep 17 00:00:00 2001 From: Milan Burda Date: Tue, 2 Oct 2018 03:56:31 +0200 Subject: [PATCH] refactor: add prefer-const to .eslintrc + fix errors (#14880) --- .eslintrc | 5 +- lib/browser/api/app.js | 6 +- .../api/auto-updater/squirrel-update-win.js | 2 +- lib/browser/api/browser-window.js | 8 +-- lib/browser/api/dialog.js | 2 +- lib/browser/api/menu-item.js | 2 +- lib/browser/api/menu.js | 2 +- lib/browser/api/navigation-controller.js | 3 +- lib/browser/api/net.js | 18 ++--- lib/browser/api/web-contents.js | 2 +- lib/browser/objects-registry.js | 8 +-- lib/browser/rpc-server.js | 32 ++++----- lib/common/api/crash-reporter.js | 2 +- lib/renderer/api/remote.js | 18 ++--- lib/renderer/extensions/storage.js | 2 +- lib/renderer/init.js | 2 +- lib/sandboxed_renderer/init.js | 2 +- lib/worker/init.js | 2 +- script/ci-release-build.js | 16 ++--- script/find-release.js | 4 +- script/get-last-major-for-master.js | 2 +- script/prepare-release.js | 42 ++++++------ script/publish-to-npm.js | 8 +-- script/release.js | 67 +++++++++---------- script/upload-to-github.js | 12 ++-- spec/api-browser-view-spec.js | 8 +-- spec/api-browser-window-affinity-spec.js | 4 +- spec/api-browser-window-spec.js | 20 +++--- spec/api-crash-reporter-spec.js | 2 +- spec/api-deprecations-spec.js | 6 +- spec/api-menu-item-spec.js | 20 +++--- spec/api-net-log-spec.js | 6 +- spec/api-net-spec.js | 26 +++---- spec/api-notification-dbus-spec.js | 14 ++-- spec/api-protocol-spec.js | 4 +- spec/api-remote-spec.js | 8 +-- spec/api-session-spec.js | 4 +- spec/api-system-preferences-spec.js | 2 +- spec/api-web-contents-spec.js | 4 +- spec/chromium-spec.js | 56 ++++++++-------- spec/fixtures/api/mixed-sandbox-app/main.js | 2 +- spec/fixtures/api/relaunch/main.js | 2 +- spec/fixtures/workers/shared_worker_node.js | 2 +- spec/modules-spec.js | 2 +- spec/node-spec.js | 8 +-- spec/static/main.js | 4 +- spec/webview-spec.js | 4 +- 47 files changed, 239 insertions(+), 238 deletions(-) diff --git a/.eslintrc b/.eslintrc index 3f9bd5aac70ce..953c8c6aae188 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,9 @@ "browser": true }, "rules": { - "no-var": "error" + "no-var": "error", + "prefer-const": ["error", { + "destructuring": "all" + }] } } diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js index 5397b92c6c571..4cef536ff5133 100644 --- a/lib/browser/api/app.js +++ b/lib/browser/api/app.js @@ -42,7 +42,7 @@ Object.assign(app, { const nativeFn = app.getAppMetrics app.getAppMetrics = () => { - let metrics = nativeFn.call(app) + const metrics = nativeFn.call(app) for (const metric of metrics) { if ('memory' in metric) { deprecate.removeProperty(metric, 'memory') @@ -96,7 +96,7 @@ app.allowNTLMCredentialsForAllDomains = function (allow) { if (!process.noDeprecations) { deprecate.warn('app.allowNTLMCredentialsForAllDomains', 'session.allowNTLMCredentialsForDomains') } - let domains = allow ? '*' : '' + const domains = allow ? '*' : '' if (!this.isReady()) { this.commandLine.appendSwitch('auth-server-whitelist', domains) } else { @@ -106,7 +106,7 @@ app.allowNTLMCredentialsForAllDomains = function (allow) { // Routes the events to webContents. const events = ['login', 'certificate-error', 'select-client-certificate'] -for (let name of events) { +for (const name of events) { app.on(name, (event, webContents, ...args) => { webContents.emit(name, event, ...args) }) diff --git a/lib/browser/api/auto-updater/squirrel-update-win.js b/lib/browser/api/auto-updater/squirrel-update-win.js index c3a6d19f407eb..4954c678c0100 100644 --- a/lib/browser/api/auto-updater/squirrel-update-win.js +++ b/lib/browser/api/auto-updater/squirrel-update-win.js @@ -17,7 +17,7 @@ const isSameArgs = (args) => args.length === spawnedArgs.length && args.every((e // Spawn a command and invoke the callback when it completes with an error // and the output from standard out. -let spawnUpdate = function (args, detached, callback) { +const spawnUpdate = function (args, detached, callback) { let error, errorEmitted, stderr, stdout try { diff --git a/lib/browser/api/browser-window.js b/lib/browser/api/browser-window.js index 7f083edb127ed..9d377d4e3565a 100644 --- a/lib/browser/api/browser-window.js +++ b/lib/browser/api/browser-window.js @@ -41,14 +41,14 @@ BrowserWindow.prototype._init = function () { this.webContents.on('-add-new-contents', (event, webContents, disposition, userGesture, left, top, width, height) => { - let urlFrameName = v8Util.getHiddenValue(webContents, 'url-framename') + const urlFrameName = v8Util.getHiddenValue(webContents, 'url-framename') if ((disposition !== 'foreground-tab' && disposition !== 'new-window' && disposition !== 'background-tab') || !urlFrameName) { event.preventDefault() return } - let { url, frameName } = urlFrameName + const { url, frameName } = urlFrameName v8Util.deleteHiddenValue(webContents, 'url-framename') const options = { show: true, @@ -115,7 +115,7 @@ BrowserWindow.prototype._init = function () { } const visibilityEvents = ['show', 'hide', 'minimize', 'maximize', 'restore'] - for (let event of visibilityEvents) { + for (const event of visibilityEvents) { this.on(event, visibilityChanged) } @@ -145,7 +145,7 @@ BrowserWindow.getAllWindows = () => { } BrowserWindow.getFocusedWindow = () => { - for (let window of BrowserWindow.getAllWindows()) { + for (const window of BrowserWindow.getAllWindows()) { if (window.isFocused() || window.isDevToolsFocused()) return window } return null diff --git a/lib/browser/api/dialog.js b/lib/browser/api/dialog.js index fcbea9e6cd6ce..861f0a0d0646b 100644 --- a/lib/browser/api/dialog.js +++ b/lib/browser/api/dialog.js @@ -284,7 +284,7 @@ module.exports = { }, showCertificateTrustDialog: function (...args) { - let [window, options, callback] = parseArgs(...args) + const [window, options, callback] = parseArgs(...args) if (options == null || typeof options !== 'object') { throw new TypeError('options must be an object') diff --git a/lib/browser/api/menu-item.js b/lib/browser/api/menu-item.js index 41f5472f06f4d..699a63e1da38a 100644 --- a/lib/browser/api/menu-item.js +++ b/lib/browser/api/menu-item.js @@ -8,7 +8,7 @@ const MenuItem = function (options) { const { Menu } = require('electron') // Preserve extra fields specified by user - for (let key in options) { + for (const key in options) { if (!(key in this)) this[key] = options[key] } if (typeof this.role === 'string' || this.role instanceof String) { diff --git a/lib/browser/api/menu.js b/lib/browser/api/menu.js index 5167a7c789987..691b624f936ed 100644 --- a/lib/browser/api/menu.js +++ b/lib/browser/api/menu.js @@ -180,7 +180,7 @@ function areValidTemplateItems (template) { function sortTemplate (template) { const sorted = sortMenuItems(template) - for (let id in sorted) { + for (const id in sorted) { const item = sorted[id] if (Array.isArray(item.submenu)) { item.submenu = sortTemplate(item.submenu) diff --git a/lib/browser/api/navigation-controller.js b/lib/browser/api/navigation-controller.js index d44dd2fbcec58..846e487eae77b 100644 --- a/lib/browser/api/navigation-controller.js +++ b/lib/browser/api/navigation-controller.js @@ -141,11 +141,10 @@ const NavigationController = (function () { } NavigationController.prototype.goToOffset = function (offset) { - let pendingIndex if (!this.canGoToOffset(offset)) { return } - pendingIndex = this.currentIndex + offset + const pendingIndex = this.currentIndex + offset if (this.inPageIndex > -1 && pendingIndex >= this.inPageIndex) { this.pendingIndex = pendingIndex return this.webContents._goToOffset(offset) diff --git a/lib/browser/api/net.js b/lib/browser/api/net.js index 08f8f8d1f59a0..0d8cb71653d01 100644 --- a/lib/browser/api/net.js +++ b/lib/browser/api/net.js @@ -119,7 +119,7 @@ class ClientRequest extends EventEmitter { let urlStr = options.url if (!urlStr) { - let urlObj = {} + const urlObj = {} const protocol = options.protocol || 'http:' if (!kSupportedProtocols.has(protocol)) { throw new Error('Protocol "' + protocol + '" not supported. ') @@ -149,7 +149,7 @@ class ClientRequest extends EventEmitter { // an invalid request. throw new TypeError('Request path contains unescaped characters.') } - let pathObj = url.parse(options.path || '/') + const pathObj = url.parse(options.path || '/') urlObj.pathname = pathObj.pathname urlObj.search = pathObj.search urlObj.hash = pathObj.hash @@ -161,7 +161,7 @@ class ClientRequest extends EventEmitter { throw new Error('redirect mode should be one of follow, error or manual') } - let urlRequestOptions = { + const urlRequestOptions = { method: method, url: urlStr, redirect: redirectPolicy @@ -180,7 +180,7 @@ class ClientRequest extends EventEmitter { } } - let urlRequest = new URLRequest(urlRequestOptions) + const urlRequest = new URLRequest(urlRequestOptions) // Set back and forward links. this.urlRequest = urlRequest @@ -192,7 +192,7 @@ class ClientRequest extends EventEmitter { this.extraHeaders = {} if (options.headers) { - for (let key in options.headers) { + for (const key in options.headers) { this.setHeader(key, options.headers[key]) } } @@ -286,8 +286,8 @@ class ClientRequest extends EventEmitter { } _write (chunk, encoding, callback, isLast) { - let chunkIsString = typeof chunk === 'string' - let chunkIsBuffer = chunk instanceof Buffer + const chunkIsString = typeof chunk === 'string' + const chunkIsBuffer = chunk instanceof Buffer if (!chunkIsString && !chunkIsBuffer) { throw new TypeError('First argument must be a string or Buffer.') } @@ -306,7 +306,7 @@ class ClientRequest extends EventEmitter { // Headers are assumed to be sent on first call to _writeBuffer, // i.e. after the first call to write or end. - let result = this.urlRequest.write(chunk, isLast) + const result = this.urlRequest.write(chunk, isLast) // The write callback is fired asynchronously to mimic Node.js. if (callback) { @@ -318,7 +318,7 @@ class ClientRequest extends EventEmitter { write (data, encoding, callback) { if (this.urlRequest.finished) { - let error = new Error('Write after end.') + const error = new Error('Write after end.') process.nextTick(writeAfterEndNT, this, error, callback) return true } diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js index fd4aaa2d64931..e833e85e7b6a2 100644 --- a/lib/browser/api/web-contents.js +++ b/lib/browser/api/web-contents.js @@ -317,7 +317,7 @@ module.exports = { getFocusedWebContents () { let focused = null - for (let contents of binding.getAllWebContents()) { + for (const contents of binding.getAllWebContents()) { if (!contents.isFocused()) continue if (focused == null) focused = contents // Return webview web contents which may be embedded inside another diff --git a/lib/browser/objects-registry.js b/lib/browser/objects-registry.js index 8209605fe5723..c3bbfaed42556 100644 --- a/lib/browser/objects-registry.js +++ b/lib/browser/objects-registry.js @@ -51,7 +51,7 @@ class ObjectsRegistry { // then garbage collected in old page). remove (webContents, contextId, id) { const ownerKey = getOwnerKey(webContents, contextId) - let owner = this.owners[ownerKey] + const owner = this.owners[ownerKey] if (owner) { // Remove the reference in owner. owner.delete(id) @@ -63,10 +63,10 @@ class ObjectsRegistry { // Clear all references to objects refrenced by the WebContents. clear (webContents, contextId) { const ownerKey = getOwnerKey(webContents, contextId) - let owner = this.owners[ownerKey] + const owner = this.owners[ownerKey] if (!owner) return - for (let id of owner) this.dereference(id) + for (const id of owner) this.dereference(id) delete this.owners[ownerKey] } @@ -87,7 +87,7 @@ class ObjectsRegistry { // Private: Dereference the object from store. dereference (id) { - let pointer = this.storage[id] + const pointer = this.storage[id] if (pointer == null) { return } diff --git a/lib/browser/rpc-server.js b/lib/browser/rpc-server.js index c8e99b8c8f754..de01b64e4ba93 100644 --- a/lib/browser/rpc-server.js +++ b/lib/browser/rpc-server.js @@ -37,8 +37,8 @@ const getObjectMembers = function (object) { } // Map properties to descriptors. return names.map((name) => { - let descriptor = Object.getOwnPropertyDescriptor(object, name) - let member = { name, enumerable: descriptor.enumerable, writable: false } + const descriptor = Object.getOwnPropertyDescriptor(object, name) + const member = { name, enumerable: descriptor.enumerable, writable: false } if (descriptor.get === undefined && typeof object[name] === 'function') { member.type = 'method' } else { @@ -51,7 +51,7 @@ const getObjectMembers = function (object) { // Return the description of object's prototype. const getObjectPrototype = function (object) { - let proto = Object.getPrototypeOf(object) + const proto = Object.getPrototypeOf(object) if (proto === null || proto === Object.prototype) return null return { members: getObjectMembers(proto), @@ -189,7 +189,7 @@ const unwrapArgs = function (sender, contextId, args) { then: metaToValue(meta.then) }) case 'object': { - let ret = {} + const ret = {} Object.defineProperty(ret.constructor, 'name', { value: meta.name }) for (const { name, value } of meta.members) { @@ -213,7 +213,7 @@ const unwrapArgs = function (sender, contextId, args) { } const processId = sender.getProcessId() - let callIntoRenderer = function (...args) { + const callIntoRenderer = function (...args) { if (!sender.isDestroyed() && processId === sender.getProcessId()) { sender.send('ELECTRON_RENDERER_CALLBACK', contextId, meta.id, valueToMeta(sender, contextId, args)) } else { @@ -295,7 +295,7 @@ handleRemoteCommand('ELECTRON_BROWSER_CURRENT_WEB_CONTENTS', function (event, co handleRemoteCommand('ELECTRON_BROWSER_CONSTRUCTOR', function (event, contextId, id, args) { args = unwrapArgs(event.sender, contextId, args) - let constructor = objectsRegistry.get(id) + const constructor = objectsRegistry.get(id) if (constructor == null) { throwRPCError(`Cannot call constructor on missing remote object ${id}`) @@ -306,7 +306,7 @@ handleRemoteCommand('ELECTRON_BROWSER_CONSTRUCTOR', function (event, contextId, handleRemoteCommand('ELECTRON_BROWSER_FUNCTION_CALL', function (event, contextId, id, args) { args = unwrapArgs(event.sender, contextId, args) - let func = objectsRegistry.get(id) + const func = objectsRegistry.get(id) if (func == null) { throwRPCError(`Cannot call function on missing remote object ${id}`) @@ -317,7 +317,7 @@ handleRemoteCommand('ELECTRON_BROWSER_FUNCTION_CALL', function (event, contextId handleRemoteCommand('ELECTRON_BROWSER_MEMBER_CONSTRUCTOR', function (event, contextId, id, method, args) { args = unwrapArgs(event.sender, contextId, args) - let object = objectsRegistry.get(id) + const object = objectsRegistry.get(id) if (object == null) { throwRPCError(`Cannot call constructor '${method}' on missing remote object ${id}`) @@ -328,7 +328,7 @@ handleRemoteCommand('ELECTRON_BROWSER_MEMBER_CONSTRUCTOR', function (event, cont handleRemoteCommand('ELECTRON_BROWSER_MEMBER_CALL', function (event, contextId, id, method, args) { args = unwrapArgs(event.sender, contextId, args) - let obj = objectsRegistry.get(id) + const obj = objectsRegistry.get(id) if (obj == null) { throwRPCError(`Cannot call function '${method}' on missing remote object ${id}`) @@ -339,7 +339,7 @@ handleRemoteCommand('ELECTRON_BROWSER_MEMBER_CALL', function (event, contextId, handleRemoteCommand('ELECTRON_BROWSER_MEMBER_SET', function (event, contextId, id, name, args) { args = unwrapArgs(event.sender, contextId, args) - let obj = objectsRegistry.get(id) + const obj = objectsRegistry.get(id) if (obj == null) { throwRPCError(`Cannot set property '${name}' on missing remote object ${id}`) @@ -350,7 +350,7 @@ handleRemoteCommand('ELECTRON_BROWSER_MEMBER_SET', function (event, contextId, i }) handleRemoteCommand('ELECTRON_BROWSER_MEMBER_GET', function (event, contextId, id, name) { - let obj = objectsRegistry.get(id) + const obj = objectsRegistry.get(id) if (obj == null) { throwRPCError(`Cannot get property '${name}' on missing remote object ${id}`) @@ -369,14 +369,14 @@ handleRemoteCommand('ELECTRON_BROWSER_CONTEXT_RELEASE', (event, contextId) => { }) handleRemoteCommand('ELECTRON_BROWSER_GUEST_WEB_CONTENTS', function (event, contextId, guestInstanceId) { - let guestViewManager = require('@electron/internal/browser/guest-view-manager') + const guestViewManager = require('@electron/internal/browser/guest-view-manager') return valueToMeta(event.sender, contextId, guestViewManager.getGuest(guestInstanceId)) }) ipcMain.on('ELECTRON_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', function (event, requestId, guestInstanceId, method, args, hasCallback) { new Promise(resolve => { - let guestViewManager = require('./guest-view-manager') - let guest = guestViewManager.getGuest(guestInstanceId) + const guestViewManager = require('./guest-view-manager') + const guest = guestViewManager.getGuest(guestInstanceId) if (guest.hostWebContents !== event.sender) { throw new Error('Access denied') } @@ -396,8 +396,8 @@ ipcMain.on('ELECTRON_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', function (event, request ipcMain.on('ELECTRON_BROWSER_SYNC_CALL_TO_GUEST_VIEW', function (event, guestInstanceId, method, args) { try { - let guestViewManager = require('@electron/internal/browser/guest-view-manager') - let guest = guestViewManager.getGuest(guestInstanceId) + const guestViewManager = require('@electron/internal/browser/guest-view-manager') + const guest = guestViewManager.getGuest(guestInstanceId) if (guest.hostWebContents !== event.sender) { throw new Error('Access denied') } diff --git a/lib/common/api/crash-reporter.js b/lib/common/api/crash-reporter.js index cd75af1d0d633..25fb45aa82cb6 100644 --- a/lib/common/api/crash-reporter.js +++ b/lib/common/api/crash-reporter.js @@ -5,7 +5,7 @@ const binding = process.atomBinding('crash_reporter') const sendSync = function (channel, ...args) { if (process.type === 'browser') { - let event = {} + const event = {} electron.ipcMain.emit(channel, event, ...args) return event.returnValue } else { diff --git a/lib/renderer/api/remote.js b/lib/renderer/api/remote.js index 6ad9aed146acd..e5ae256f4bc10 100644 --- a/lib/renderer/api/remote.js +++ b/lib/renderer/api/remote.js @@ -36,7 +36,7 @@ function wrapArgs (args, visited = new Set()) { if (Array.isArray(value)) { visited.add(value) - let meta = { + const meta = { type: 'array', value: wrapArgs(value, visited) } @@ -67,13 +67,13 @@ function wrapArgs (args, visited = new Set()) { } } - let meta = { + const meta = { type: 'object', name: value.constructor ? value.constructor.name : '', members: [] } visited.add(value) - for (let prop in value) { + for (const prop in value) { meta.members.push({ name: prop, value: valueToMeta(value[prop]) @@ -109,10 +109,10 @@ function wrapArgs (args, visited = new Set()) { function setObjectMembers (ref, object, metaId, members) { if (!Array.isArray(members)) return - for (let member of members) { + for (const member of members) { if (object.hasOwnProperty(member.name)) continue - let descriptor = { enumerable: member.enumerable } + const descriptor = { enumerable: member.enumerable } if (member.type === 'method') { const remoteMemberFunction = function (...args) { let command @@ -163,7 +163,7 @@ function setObjectMembers (ref, object, metaId, members) { // This matches |getObjectPrototype| in rpc-server. function setObjectPrototype (ref, object, metaId, descriptor) { if (descriptor === null) return - let proto = {} + const proto = {} setObjectMembers(ref, proto, metaId, descriptor.members) setObjectPrototype(ref, proto, metaId, descriptor.proto) Object.setPrototypeOf(object, proto) @@ -201,7 +201,7 @@ function proxyFunctionProperties (remoteMemberFunction, metaId, name) { return Object.getOwnPropertyNames(target) }, getOwnPropertyDescriptor: (target, property) => { - let descriptor = Object.getOwnPropertyDescriptor(target, property) + const descriptor = Object.getOwnPropertyDescriptor(target, property) if (descriptor) return descriptor loadRemoteProperties() return Object.getOwnPropertyDescriptor(target, property) @@ -231,7 +231,7 @@ function metaToValue (meta) { // A shadow class to represent the remote function object. if (meta.type === 'function') { - let remoteFunction = function (...args) { + const remoteFunction = function (...args) { let command if (this && this.constructor === remoteFunction) { command = 'ELECTRON_BROWSER_CONSTRUCTOR' @@ -262,7 +262,7 @@ function metaToValue (meta) { function metaToPlainObject (meta) { const obj = (() => meta.type === 'error' ? new Error() : {})() for (let i = 0; i < meta.members.length; i++) { - let { name, value } = meta.members[i] + const { name, value } = meta.members[i] obj[name] = value } return obj diff --git a/lib/renderer/extensions/storage.js b/lib/renderer/extensions/storage.js index 01be4c05df407..8afaac765534a 100644 --- a/lib/renderer/extensions/storage.js +++ b/lib/renderer/extensions/storage.js @@ -91,7 +91,7 @@ const getStorageManager = (storageType, extensionId) => { // eslint-disable-next-line standard/no-callback-literal if (keys.length === 0) return callback({}) - let items = {} + const items = {} keys.forEach(function (key) { let value = storage[key] if (value == null) value = defaults[key] diff --git a/lib/renderer/init.js b/lib/renderer/init.js index 3a34c2da64dca..1cd7c8ba24b1b 100644 --- a/lib/renderer/init.js +++ b/lib/renderer/init.js @@ -48,7 +48,7 @@ let preloadScript = null let preloadScripts = [] let isBackgroundPage = false let appPath = null -for (let arg of process.argv) { +for (const arg of process.argv) { if (arg.indexOf('--guest-instance-id=') === 0) { // This is a guest web view. process.guestInstanceId = parseInt(arg.substr(arg.indexOf('=') + 1)) diff --git a/lib/sandboxed_renderer/init.js b/lib/sandboxed_renderer/init.js index c8db593626108..bc478faaab716 100644 --- a/lib/sandboxed_renderer/init.js +++ b/lib/sandboxed_renderer/init.js @@ -19,7 +19,7 @@ v8Util.setHiddenValue(global, 'Buffer', Buffer) v8Util.setHiddenValue(global, 'ipc', new EventEmitter()) // The process object created by browserify is not an event emitter, fix it so // the API is more compatible with non-sandboxed renderers. -for (let prop of Object.keys(EventEmitter.prototype)) { +for (const prop of Object.keys(EventEmitter.prototype)) { if (process.hasOwnProperty(prop)) { delete process[prop] } diff --git a/lib/worker/init.js b/lib/worker/init.js index 7a59489abd5c0..e4f82501be1a3 100644 --- a/lib/worker/init.js +++ b/lib/worker/init.js @@ -22,7 +22,7 @@ global.module = module // Set the __filename to the path of html file if it is file: protocol. if (self.location.protocol === 'file:') { - let pathname = process.platform === 'win32' && self.location.pathname[0] === '/' ? self.location.pathname.substr(1) : self.location.pathname + const pathname = process.platform === 'win32' && self.location.pathname[0] === '/' ? self.location.pathname.substr(1) : self.location.pathname global.__filename = path.normalize(decodeURIComponent(pathname)) global.__dirname = path.dirname(global.__filename) diff --git a/script/ci-release-build.js b/script/ci-release-build.js index 42d88a9583c2b..77651e8079f10 100644 --- a/script/ci-release-build.js +++ b/script/ci-release-build.js @@ -51,7 +51,7 @@ async function makeRequest (requestOptions, parseResponse) { async function circleCIcall (buildUrl, targetBranch, job, options) { console.log(`Triggering CircleCI to run build job: ${job} on branch: ${targetBranch} with release flag.`) - let buildRequest = { + const buildRequest = { 'build_parameters': { 'CIRCLE_JOB': job } @@ -67,7 +67,7 @@ async function circleCIcall (buildUrl, targetBranch, job, options) { buildRequest.build_parameters.AUTO_RELEASE = 'true' } - let circleResponse = await makeRequest({ + const circleResponse = await makeRequest({ method: 'POST', url: buildUrl, headers: { @@ -117,7 +117,7 @@ async function callAppVeyor (targetBranch, job, options) { }), method: 'POST' } - let appVeyorResponse = await makeRequest(requestOpts, true).catch(err => { + const appVeyorResponse = await makeRequest(requestOpts, true).catch(err => { console.log('Error calling AppVeyor:', err) }) const buildUrl = `https://windows-ci.electronjs.org/project/AppVeyor/${appVeyorJobs[job]}/build/${appVeyorResponse.version}` @@ -147,7 +147,7 @@ async function buildVSTS (targetBranch, options) { environmentVariables.UPLOAD_TO_S3 = 1 } - let requestOpts = { + const requestOpts = { url: `${vstsURL}/definitions?api-version=4.1`, auth: { user: '', @@ -157,7 +157,7 @@ async function buildVSTS (targetBranch, options) { 'Content-Type': 'application/json' } } - let vstsResponse = await makeRequest(requestOpts, true).catch(err => { + const vstsResponse = await makeRequest(requestOpts, true).catch(err => { console.log('Error calling VSTS to get build definitions:', err) }) let buildsToRun = [] @@ -170,14 +170,14 @@ async function buildVSTS (targetBranch, options) { } async function callVSTSBuild (build, targetBranch, environmentVariables) { - let buildBody = { + const buildBody = { definition: build, sourceBranch: targetBranch } if (Object.keys(environmentVariables).length !== 0) { buildBody.parameters = JSON.stringify(environmentVariables) } - let requestOpts = { + const requestOpts = { url: `${vstsURL}/builds?api-version=4.1`, auth: { user: '', @@ -189,7 +189,7 @@ async function callVSTSBuild (build, targetBranch, environmentVariables) { body: JSON.stringify(buildBody), method: 'POST' } - let vstsResponse = await makeRequest(requestOpts, true).catch(err => { + const vstsResponse = await makeRequest(requestOpts, true).catch(err => { console.log(`Error calling VSTS for job ${build.name}`, err) }) console.log(`VSTS release build request for ${build.name} successful. Check ${vstsResponse._links.web.href} for status.`) diff --git a/script/find-release.js b/script/find-release.js index 08380c7471f1a..7f34d56dbaff1 100644 --- a/script/find-release.js +++ b/script/find-release.js @@ -12,11 +12,11 @@ const version = process.argv[2] async function findRelease () { github.authenticate({ type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN }) - let releases = await github.repos.getReleases({ + const releases = await github.repos.getReleases({ owner: 'electron', repo: version.indexOf('nightly') > 0 ? 'nightlies' : 'electron' }) - let targetRelease = releases.data.find(release => { + const targetRelease = releases.data.find(release => { return release.tag_name === version }) let returnObject = {} diff --git a/script/get-last-major-for-master.js b/script/get-last-major-for-master.js index fa3476f14c769..3b0f20f48632e 100644 --- a/script/get-last-major-for-master.js +++ b/script/get-last-major-for-master.js @@ -5,7 +5,7 @@ const gitDir = path.resolve(__dirname, '..') async function determineNextMajorForMaster () { let branchNames - let result = await GitProcess.exec(['branch', '-a', '--remote', '--list', 'origin/[0-9]-[0-9]-x'], gitDir) + const result = await GitProcess.exec(['branch', '-a', '--remote', '--list', 'origin/[0-9]-[0-9]-x'], gitDir) if (result.exitCode === 0) { branchNames = result.stdout.trim().split('\n') const filtered = branchNames.map(b => b.replace('origin/', '')) diff --git a/script/prepare-release.js b/script/prepare-release.js index 674c37cc3133f..8afc46e67228e 100755 --- a/script/prepare-release.js +++ b/script/prepare-release.js @@ -34,15 +34,15 @@ async function getNewVersion (dryRun) { if (!dryRun) { console.log(`Bumping for new "${versionType}" version.`) } - let bumpScript = path.join(__dirname, 'bump-version.py') - let scriptArgs = [bumpScript, '--bump', versionType] + const bumpScript = path.join(__dirname, 'bump-version.py') + const scriptArgs = [bumpScript, '--bump', versionType] if (dryRun) { scriptArgs.push('--dry-run') } try { let bumpVersion = execSync(scriptArgs.join(' '), { encoding: 'UTF-8' }) bumpVersion = bumpVersion.substr(bumpVersion.indexOf(':') + 1).trim() - let newVersion = `v${bumpVersion}` + const newVersion = `v${bumpVersion}` if (!dryRun) { console.log(`${pass} Successfully bumped version to ${newVersion}`) } @@ -55,15 +55,15 @@ async function getNewVersion (dryRun) { async function getCurrentBranch (gitDir) { console.log(`Determining current git branch`) - let gitArgs = ['rev-parse', '--abbrev-ref', 'HEAD'] - let branchDetails = await GitProcess.exec(gitArgs, gitDir) + const gitArgs = ['rev-parse', '--abbrev-ref', 'HEAD'] + const branchDetails = await GitProcess.exec(gitArgs, gitDir) if (branchDetails.exitCode === 0) { - let currentBranch = branchDetails.stdout.trim() + const currentBranch = branchDetails.stdout.trim() console.log(`${pass} Successfully determined current git branch is ` + `${currentBranch}`) return currentBranch } else { - let error = GitProcess.parseError(branchDetails.stderr) + const error = GitProcess.parseError(branchDetails.stderr) console.log(`${fail} Could not get details for the current branch, error was ${branchDetails.stderr}`, error) process.exit(1) @@ -75,7 +75,7 @@ async function getReleaseNotes (currentBranch) { return 'Nightlies do not get release notes, please compare tags for info' } console.log(`Generating release notes for ${currentBranch}.`) - let githubOpts = { + const githubOpts = { owner: 'electron', repo: targetRepo, base: `v${pkg.version}`, @@ -88,7 +88,7 @@ async function getReleaseNotes (currentBranch) { releaseNotes = '(placeholder)\n' } console.log(`Checking for commits from ${pkg.version} to ${currentBranch}`) - let commitComparison = await github.repos.compareCommits(githubOpts) + const commitComparison = await github.repos.compareCommits(githubOpts) .catch(err => { console.log(`${fail} Error checking for commits from ${pkg.version} to ` + `${currentBranch}`, err) @@ -112,7 +112,7 @@ async function getReleaseNotes (currentBranch) { let prNumber if (prMatch) { commitMessage = commitMessage.replace(mergeRE, '').replace('\n', '') - let newlineMatch = commitMessage.match(newlineRE) + const newlineMatch = commitMessage.match(newlineRE) if (newlineMatch) { commitMessage = newlineMatch[1] } @@ -138,19 +138,19 @@ async function getReleaseNotes (currentBranch) { } async function createRelease (branchToTarget, isBeta) { - let releaseNotes = await getReleaseNotes(branchToTarget) - let newVersion = await getNewVersion() + const releaseNotes = await getReleaseNotes(branchToTarget) + const newVersion = await getNewVersion() await tagRelease(newVersion) const githubOpts = { owner: 'electron', repo: targetRepo } console.log(`Checking for existing draft release.`) - let releases = await github.repos.getReleases(githubOpts) + const releases = await github.repos.getReleases(githubOpts) .catch(err => { console.log('$fail} Could not get releases. Error was', err) }) - let drafts = releases.data.filter(release => release.draft && + const drafts = releases.data.filter(release => release.draft && release.tag_name === newVersion) if (drafts.length > 0) { console.log(`${fail} Aborting because draft release for @@ -188,7 +188,7 @@ async function createRelease (branchToTarget, isBeta) { } async function pushRelease (branch) { - let pushDetails = await GitProcess.exec(['push', 'origin', `HEAD:${branch}`, '--follow-tags'], gitDir) + const pushDetails = await GitProcess.exec(['push', 'origin', `HEAD:${branch}`, '--follow-tags'], gitDir) if (pushDetails.exitCode === 0) { console.log(`${pass} Successfully pushed the release. Wait for ` + `release builds to finish before running "npm run release".`) @@ -208,7 +208,7 @@ async function runReleaseBuilds (branch) { async function tagRelease (version) { console.log(`Tagging release ${version}.`) - let checkoutDetails = await GitProcess.exec([ 'tag', '-a', '-m', version, version ], gitDir) + const checkoutDetails = await GitProcess.exec([ 'tag', '-a', '-m', version, version ], gitDir) if (checkoutDetails.exitCode === 0) { console.log(`${pass} Successfully tagged ${version}.`) } else { @@ -219,7 +219,7 @@ async function tagRelease (version) { } async function verifyNewVersion () { - let newVersion = await getNewVersion(true) + const newVersion = await getNewVersion(true) let response if (args.automaticRelease) { response = 'y' @@ -249,19 +249,19 @@ async function promptForVersion (version) { // function to determine if there have been commits to master since the last release async function changesToRelease () { - let lastCommitWasRelease = new RegExp(`^Bump v[0-9.]*(-beta[0-9.]*)?(-nightly[0-9.]*)?$`, 'g') - let lastCommit = await GitProcess.exec(['log', '-n', '1', `--pretty=format:'%s'`], gitDir) + const lastCommitWasRelease = new RegExp(`^Bump v[0-9.]*(-beta[0-9.]*)?(-nightly[0-9.]*)?$`, 'g') + const lastCommit = await GitProcess.exec(['log', '-n', '1', `--pretty=format:'%s'`], gitDir) return !lastCommitWasRelease.test(lastCommit.stdout) } async function prepareRelease (isBeta, notesOnly) { if (args.dryRun) { - let newVersion = await getNewVersion(true) + const newVersion = await getNewVersion(true) console.log(newVersion) } else { const currentBranch = (args.branch) ? args.branch : await getCurrentBranch(gitDir) if (notesOnly) { - let releaseNotes = await getReleaseNotes(currentBranch) + const releaseNotes = await getReleaseNotes(currentBranch) console.log(`Draft release notes are: \n${releaseNotes}`) } else { const changes = await changesToRelease(currentBranch) diff --git a/script/publish-to-npm.js b/script/publish-to-npm.js index 0fcbd7b0ea85f..e1812249c8f1b 100644 --- a/script/publish-to-npm.js +++ b/script/publish-to-npm.js @@ -141,15 +141,15 @@ new Promise((resolve, reject) => { async function getCurrentBranch () { const gitDir = path.resolve(__dirname, '..') console.log(`Determining current git branch`) - let gitArgs = ['rev-parse', '--abbrev-ref', 'HEAD'] - let branchDetails = await GitProcess.exec(gitArgs, gitDir) + const gitArgs = ['rev-parse', '--abbrev-ref', 'HEAD'] + const branchDetails = await GitProcess.exec(gitArgs, gitDir) if (branchDetails.exitCode === 0) { - let currentBranch = branchDetails.stdout.trim() + const currentBranch = branchDetails.stdout.trim() console.log(`Successfully determined current git branch is ` + `${currentBranch}`) return currentBranch } else { - let error = GitProcess.parseError(branchDetails.stderr) + const error = GitProcess.parseError(branchDetails.stderr) console.log(`Could not get details for the current branch, error was ${branchDetails.stderr}`, error) process.exit(1) diff --git a/script/release.js b/script/release.js index 81effcf35630d..d1b610ad5b64c 100755 --- a/script/release.js +++ b/script/release.js @@ -24,15 +24,14 @@ const github = new GitHub({ github.authenticate({ type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN }) async function getDraftRelease (version, skipValidation) { - let releaseInfo = await github.repos.getReleases({ owner: 'electron', repo: targetRepo }) - let drafts + const releaseInfo = await github.repos.getReleases({ owner: 'electron', repo: targetRepo }) let versionToCheck if (version) { versionToCheck = version } else { versionToCheck = pkgVersion } - drafts = releaseInfo.data + const drafts = releaseInfo.data .filter(release => release.tag_name === versionToCheck && release.draft === true) const draft = drafts[0] @@ -143,19 +142,19 @@ function checkVersion () { if (args.skipVersionCheck) return console.log(`Verifying that app version matches package version ${pkgVersion}.`) - let startScript = path.join(__dirname, 'start.py') - let scriptArgs = ['--version'] + const startScript = path.join(__dirname, 'start.py') + const scriptArgs = ['--version'] if (args.automaticRelease) { scriptArgs.unshift('-R') } - let appVersion = runScript(startScript, scriptArgs).trim() + const appVersion = runScript(startScript, scriptArgs).trim() check((pkgVersion.indexOf(appVersion) === 0), `App version ${appVersion} matches ` + `package version ${pkgVersion}.`, true) } function runScript (scriptName, scriptArgs, cwd) { - let scriptCommand = `${scriptName} ${scriptArgs.join(' ')}` - let scriptOptions = { + const scriptCommand = `${scriptName} ${scriptArgs.join(' ')}` + const scriptOptions = { encoding: 'UTF-8' } if (cwd) { @@ -171,21 +170,21 @@ function runScript (scriptName, scriptArgs, cwd) { function uploadNodeShasums () { console.log('Uploading Node SHASUMS file to S3.') - let scriptPath = path.join(__dirname, 'upload-node-checksums.py') + const scriptPath = path.join(__dirname, 'upload-node-checksums.py') runScript(scriptPath, ['-v', pkgVersion]) console.log(`${pass} Done uploading Node SHASUMS file to S3.`) } function uploadIndexJson () { console.log('Uploading index.json to S3.') - let scriptPath = path.join(__dirname, 'upload-index-json.py') + const scriptPath = path.join(__dirname, 'upload-index-json.py') runScript(scriptPath, [pkgVersion]) console.log(`${pass} Done uploading index.json to S3.`) } async function createReleaseShasums (release) { - let fileName = 'SHASUMS256.txt' - let existingAssets = release.assets.filter(asset => asset.name === fileName) + const fileName = 'SHASUMS256.txt' + const existingAssets = release.assets.filter(asset => asset.name === fileName) if (existingAssets.length > 0) { console.log(`${fileName} already exists on GitHub; deleting before creating new file.`) await github.repos.deleteAsset({ @@ -197,17 +196,17 @@ async function createReleaseShasums (release) { }) } console.log(`Creating and uploading the release ${fileName}.`) - let scriptPath = path.join(__dirname, 'merge-electron-checksums.py') - let checksums = runScript(scriptPath, ['-v', pkgVersion]) + const scriptPath = path.join(__dirname, 'merge-electron-checksums.py') + const checksums = runScript(scriptPath, ['-v', pkgVersion]) console.log(`${pass} Generated release SHASUMS.`) - let filePath = await saveShaSumFile(checksums, fileName) + const filePath = await saveShaSumFile(checksums, fileName) console.log(`${pass} Created ${fileName} file.`) await uploadShasumFile(filePath, fileName, release) console.log(`${pass} Successfully uploaded ${fileName} to GitHub.`) } async function uploadShasumFile (filePath, fileName, release) { - let githubOpts = { + const githubOpts = { owner: 'electron', repo: targetRepo, id: release.id, @@ -242,7 +241,7 @@ function saveShaSumFile (checksums, fileName) { } async function publishRelease (release) { - let githubOpts = { + const githubOpts = { owner: 'electron', repo: targetRepo, id: release.id, @@ -264,7 +263,7 @@ async function makeRelease (releaseToValidate) { console.log('Release to validate !=== true') } console.log(`Validating release ${releaseToValidate}`) - let release = await getDraftRelease(releaseToValidate) + const release = await getDraftRelease(releaseToValidate) await validateReleaseAssets(release, true) } else { checkVersion() @@ -295,8 +294,8 @@ async function makeTempDir () { } async function verifyAssets (release) { - let downloadDir = await makeTempDir() - let githubOpts = { + const downloadDir = await makeTempDir() + const githubOpts = { owner: 'electron', repo: targetRepo, headers: { @@ -304,10 +303,10 @@ async function verifyAssets (release) { } } console.log(`Downloading files from GitHub to verify shasums`) - let shaSumFile = 'SHASUMS256.txt' + const shaSumFile = 'SHASUMS256.txt' let filesToCheck = await Promise.all(release.assets.map(async (asset) => { githubOpts.id = asset.id - let assetDetails = await github.repos.getAsset(githubOpts) + const assetDetails = await github.repos.getAsset(githubOpts) await downloadFiles(assetDetails.meta.location, downloadDir, false, asset.name) return asset.name })).catch(err => { @@ -328,7 +327,7 @@ async function verifyAssets (release) { function downloadFiles (urls, directory, quiet, targetName) { return new Promise((resolve, reject) => { - let nuggetOpts = { + const nuggetOpts = { dir: directory } if (quiet) { @@ -348,32 +347,32 @@ function downloadFiles (urls, directory, quiet, targetName) { } async function verifyShasums (urls, isS3) { - let fileSource = isS3 ? 'S3' : 'GitHub' + const fileSource = isS3 ? 'S3' : 'GitHub' console.log(`Downloading files from ${fileSource} to verify shasums`) - let downloadDir = await makeTempDir() + const downloadDir = await makeTempDir() let filesToCheck = [] try { if (!isS3) { await downloadFiles(urls, downloadDir) filesToCheck = urls.map(url => { - let currentUrl = new URL(url) + const currentUrl = new URL(url) return path.basename(currentUrl.pathname) }).filter(file => file.indexOf('SHASUMS') === -1) } else { const s3VersionPath = `/atom-shell/dist/${pkgVersion}/` await Promise.all(urls.map(async (url) => { - let currentUrl = new URL(url) - let dirname = path.dirname(currentUrl.pathname) - let filename = path.basename(currentUrl.pathname) - let s3VersionPathIdx = dirname.indexOf(s3VersionPath) + const currentUrl = new URL(url) + const dirname = path.dirname(currentUrl.pathname) + const filename = path.basename(currentUrl.pathname) + const s3VersionPathIdx = dirname.indexOf(s3VersionPath) if (s3VersionPathIdx === -1 || dirname === s3VersionPath) { if (s3VersionPathIdx !== -1 && filename.indexof('SHASUMS') === -1) { filesToCheck.push(filename) } await downloadFiles(url, downloadDir, true) } else { - let subDirectory = dirname.substr(s3VersionPathIdx + s3VersionPath.length) - let fileDirectory = path.join(downloadDir, subDirectory) + const subDirectory = dirname.substr(s3VersionPathIdx + s3VersionPath.length) + const fileDirectory = path.join(downloadDir, subDirectory) try { fs.statSync(fileDirectory) } catch (err) { @@ -418,8 +417,8 @@ async function verifyShasums (urls, isS3) { async function validateChecksums (validationArgs) { console.log(`Validating checksums for files from ${validationArgs.fileSource} ` + `against ${validationArgs.shaSumFile}.`) - let shaSumFilePath = path.join(validationArgs.fileDirectory, validationArgs.shaSumFile) - let checker = new sumchecker.ChecksumValidator(validationArgs.algorithm, + const shaSumFilePath = path.join(validationArgs.fileDirectory, validationArgs.shaSumFile) + const checker = new sumchecker.ChecksumValidator(validationArgs.algorithm, shaSumFilePath, validationArgs.checkerOpts) await checker.validate(validationArgs.fileDirectory, validationArgs.filesToCheck) .catch(err => { diff --git a/script/upload-to-github.js b/script/upload-to-github.js index a93146d9a6c78..ee275ae53e1c1 100644 --- a/script/upload-to-github.js +++ b/script/upload-to-github.js @@ -8,14 +8,14 @@ if (process.argv.length < 6) { console.log('Usage: upload-to-github filePath fileName releaseId') process.exit(1) } -let filePath = process.argv[2] -let fileName = process.argv[3] -let releaseId = process.argv[4] -let releaseVersion = process.argv[5] +const filePath = process.argv[2] +const fileName = process.argv[3] +const releaseId = process.argv[4] +const releaseVersion = process.argv[5] const targetRepo = releaseVersion.indexOf('nightly') > 0 ? 'nightlies' : 'electron' -let githubOpts = { +const githubOpts = { owner: 'electron', repo: targetRepo, id: releaseId, @@ -34,7 +34,7 @@ function uploadToGitHub () { console.log(`Error uploading ${fileName} to GitHub, will retry. Error was:`, err) retry++ github.repos.getRelease(githubOpts).then(release => { - let existingAssets = release.data.assets.filter(asset => asset.name === fileName) + const existingAssets = release.data.assets.filter(asset => asset.name === fileName) if (existingAssets.length > 0) { console.log(`${fileName} already exists; will delete before retrying upload.`) github.repos.deleteAsset({ diff --git a/spec/api-browser-view-spec.js b/spec/api-browser-view-spec.js index adf6ea161509e..5dd1ea3615fde 100644 --- a/spec/api-browser-view-spec.js +++ b/spec/api-browser-view-spec.js @@ -116,12 +116,12 @@ describe('BrowserView module', () => { w.setBrowserView(view) expect(view.id).to.not.be.null() - let view2 = w.getBrowserView() + const view2 = w.getBrowserView() expect(view2.webContents.id).to.equal(view.webContents.id) }) it('returns null if none is set', () => { - let view = w.getBrowserView() + const view = w.getBrowserView() expect(view).to.be.null() }) }) @@ -145,7 +145,7 @@ describe('BrowserView module', () => { w.setBrowserView(view) expect(view.id).to.not.be.null() - let view2 = BrowserView.fromId(view.id) + const view2 = BrowserView.fromId(view.id) expect(view2.webContents.id).to.equal(view.webContents.id) }) }) @@ -156,7 +156,7 @@ describe('BrowserView module', () => { w.setBrowserView(view) expect(view.id).to.not.be.null() - let view2 = BrowserView.fromWebContents(view.webContents) + const view2 = BrowserView.fromWebContents(view.webContents) expect(view2.webContents.id).to.equal(view.webContents.id) }) }) diff --git a/spec/api-browser-window-affinity-spec.js b/spec/api-browser-window-affinity-spec.js index 9d383ee30578e..21d6d769bcfad 100644 --- a/spec/api-browser-window-affinity-spec.js +++ b/spec/api-browser-window-affinity-spec.js @@ -129,7 +129,7 @@ describe('BrowserWindow with affinity module', () => { nodeIntegration: false }) ]).then(args => { - let w1 = args[1] + const w1 = args[1] return Promise.all([ testNodeIntegration(false), w1, @@ -169,7 +169,7 @@ describe('BrowserWindow with affinity module', () => { nodeIntegration: true }) ]).then(args => { - let w1 = args[1] + const w1 = args[1] return Promise.all([ testNodeIntegration(true), w1, diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js index 8c37a07dfa055..808ec421d8a0c 100644 --- a/spec/api-browser-window-spec.js +++ b/spec/api-browser-window-spec.js @@ -75,7 +75,7 @@ describe('BrowserWindow module', () => { if (data) body += data }) req.on('end', () => { - let parsedData = qs.parse(body) + const parsedData = qs.parse(body) fs.readFile(filePath, (err, data) => { if (err) return if (parsedData.username === 'test' && @@ -187,7 +187,7 @@ describe('BrowserWindow module', () => { function * genNavigationEvent () { let eventOptions = null while ((eventOptions = events.shift()) && events.length) { - let w = new BrowserWindow({ show: false }) + const w = new BrowserWindow({ show: false }) eventOptions.id = w.id eventOptions.responseEvent = responseEvent ipcRenderer.send('test-webcontents-navigation-observer', eventOptions) @@ -195,7 +195,7 @@ describe('BrowserWindow module', () => { } } - let gen = genNavigationEvent() + const gen = genNavigationEvent() ipcRenderer.on(responseEvent, () => { if (!gen.next().value) done() }) @@ -1399,7 +1399,7 @@ describe('BrowserWindow module', () => { describe('"sandbox" option', () => { function waitForEvents (emitter, events, callback) { let count = events.length - for (let event of events) { + for (const event of events) { emitter.once(event, () => { if (!--count) callback() }) @@ -1473,7 +1473,7 @@ describe('BrowserWindow module', () => { preload: preload } }) - let htmlPath = path.join(fixtures, 'api', 'sandbox.html?exit-event') + const htmlPath = path.join(fixtures, 'api', 'sandbox.html?exit-event') const pageUrl = 'file://' + htmlPath w.loadURL(pageUrl) ipcMain.once('answer', function (event, url) { @@ -1496,7 +1496,7 @@ describe('BrowserWindow module', () => { } }) ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preload) - let htmlPath = path.join(fixtures, 'api', 'sandbox.html?window-open') + const htmlPath = path.join(fixtures, 'api', 'sandbox.html?window-open') const pageUrl = 'file://' + htmlPath w.loadURL(pageUrl) w.webContents.once('new-window', (e, url, frameName, disposition, options) => { @@ -2763,7 +2763,7 @@ describe('BrowserWindow module', () => { // dynamically. it('can be changed with hasShadow option', () => { w.destroy() - let hasShadow = process.platform !== 'darwin' + const hasShadow = process.platform !== 'darwin' w = new BrowserWindow({ show: false, hasShadow: hasShadow }) assert.strictEqual(w.hasShadow(), hasShadow) }) @@ -2964,7 +2964,7 @@ describe('BrowserWindow module', () => { c.close() }) it('disables parent window recursively', () => { - let c2 = new BrowserWindow({ show: false, parent: w, modal: true }) + const c2 = new BrowserWindow({ show: false, parent: w, modal: true }) c.show() assert.strictEqual(w.isEnabled(), false) c2.show() @@ -3435,7 +3435,7 @@ describe('BrowserWindow module', () => { it('creates offscreen window with correct size', (done) => { w.webContents.once('paint', function (event, rect, data) { assert.notStrictEqual(data.length, 0) - let size = data.getSize() + const size = data.getSize() assertWithinDelta(size.width, 100, 2, 'width') assertWithinDelta(size.height, 100, 2, 'height') done() @@ -3450,7 +3450,7 @@ describe('BrowserWindow module', () => { }) it('is false for regular window', () => { - let c = new BrowserWindow({ show: false }) + const c = new BrowserWindow({ show: false }) assert.strictEqual(c.webContents.isOffscreen(), false) c.destroy() }) diff --git a/spec/api-crash-reporter-spec.js b/spec/api-crash-reporter-spec.js index f5d94fcdc6b16..e626fe025aef2 100644 --- a/spec/api-crash-reporter-spec.js +++ b/spec/api-crash-reporter-spec.js @@ -412,7 +412,7 @@ const waitForCrashReport = () => { const startServer = ({ callback, processType, done }) => { let called = false - let server = http.createServer((req, res) => { + const server = http.createServer((req, res) => { const form = new multiparty.Form() form.parse(req, (error, fields) => { if (error) throw error diff --git a/spec/api-deprecations-spec.js b/spec/api-deprecations-spec.js index f14e23f847ec7..ccd25fcbb6e60 100644 --- a/spec/api-deprecations-spec.js +++ b/spec/api-deprecations-spec.js @@ -71,7 +71,7 @@ describe('deprecations', () => { deprecations.setHandler(m => { msg = m }) const prop = 'itMustGo' - let o = { [prop]: 0 } + const o = { [prop]: 0 } deprecate.removeProperty(o, prop) @@ -88,7 +88,7 @@ describe('deprecations', () => { const key = 'foo' const val = 'bar' - let o = { [key]: val } + const o = { [key]: val } deprecate.removeProperty(o, key) for (let i = 0; i < 3; ++i) { @@ -104,7 +104,7 @@ describe('deprecations', () => { const oldProp = 'dingyOldName' const newProp = 'shinyNewName' - let o = { [oldProp]: 0 } + const o = { [oldProp]: 0 } deprecate.renameProperty(o, oldProp, newProp) expect(msg).to.be.a('string') diff --git a/spec/api-menu-item-spec.js b/spec/api-menu-item-spec.js index bffa0ecad5832..5978f23d210f2 100644 --- a/spec/api-menu-item-spec.js +++ b/spec/api-menu-item-spec.js @@ -49,10 +49,10 @@ describe('MenuItems', () => { }) describe('MenuItem group properties', () => { - let template = [] + const template = [] const findRadioGroups = (template) => { - let groups = [] + const groups = [] let cur = null for (let i = 0; i <= template.length; i++) { if (cur && ((i === template.length) || (template[i].type !== 'radio'))) { @@ -68,7 +68,7 @@ describe('MenuItems', () => { // returns array of checked menuitems in [begin,end) const findChecked = (menuItems, begin, end) => { - let checked = [] + const checked = [] for (let i = begin; i < end; i++) { if (menuItems[i].checked) checked.push(i) } @@ -107,7 +107,7 @@ describe('MenuItems', () => { it('should assign groupId automatically', () => { const menu = Menu.buildFromTemplate(template) - let usedGroupIds = new Set() + const usedGroupIds = new Set() const groups = findRadioGroups(template) groups.forEach(g => { const groupId = menu.items[g.begin].groupId @@ -143,7 +143,7 @@ describe('MenuItems', () => { describe('MenuItem role execution', () => { it('does not try to execute roles without a valid role property', () => { let win = new BrowserWindow({ show: false, width: 200, height: 200 }) - let item = new MenuItem({ role: 'asdfghjkl' }) + const item = new MenuItem({ role: 'asdfghjkl' }) const canExecute = roles.execute(item.role, win, win.webContents) expect(canExecute).to.be.false() @@ -153,7 +153,7 @@ describe('MenuItems', () => { it('executes roles with native role functions', () => { let win = new BrowserWindow({ show: false, width: 200, height: 200 }) - let item = new MenuItem({ role: 'reload' }) + const item = new MenuItem({ role: 'reload' }) const canExecute = roles.execute(item.role, win, win.webContents) expect(canExecute).to.be.true() @@ -163,7 +163,7 @@ describe('MenuItems', () => { it('execute roles with non-native role functions', () => { let win = new BrowserWindow({ show: false, width: 200, height: 200 }) - let item = new MenuItem({ role: 'resetzoom' }) + const item = new MenuItem({ role: 'resetzoom' }) const canExecute = roles.execute(item.role, win, win.webContents) expect(canExecute).to.be.true() @@ -229,7 +229,7 @@ describe('MenuItems', () => { 'zoomout' ] - for (let role in roleList) { + for (const role in roleList) { const item = new MenuItem({ role }) expect(item.getDefaultRoleAccelerator()).to.be.undefined() } @@ -258,7 +258,7 @@ describe('MenuItems', () => { 'zoomout': 'Zoom Out' } - for (let role in roleList) { + for (const role in roleList) { const item = new MenuItem({ role }) expect(item.label).to.equal(roleList[role]) } @@ -287,7 +287,7 @@ describe('MenuItems', () => { 'zoomout': 'CommandOrControl+-' } - for (let role in roleList) { + for (const role in roleList) { const item = new MenuItem({ role }) expect(item.getDefaultRoleAccelerator()).to.equal(roleList[role]) } diff --git a/spec/api-net-log-spec.js b/spec/api-net-log-spec.js index e577cad1d5537..8157893ccb277 100644 --- a/spec/api-net-log-spec.js +++ b/spec/api-net-log-spec.js @@ -97,7 +97,7 @@ describe('netLog module', () => { return } - let appProcess = ChildProcess.spawn(remote.process.execPath, + const appProcess = ChildProcess.spawn(remote.process.execPath, [appPath, `--log-net-log=${dumpFile}`], { env: { TEST_REQUEST_URL: server.url @@ -116,7 +116,7 @@ describe('netLog module', () => { return } - let appProcess = ChildProcess.spawn(remote.process.execPath, + const appProcess = ChildProcess.spawn(remote.process.execPath, [appPath, `--log-net-log=${dumpFile}`], { env: { TEST_REQUEST_URL: server.url, @@ -142,7 +142,7 @@ describe('netLog module', () => { return } - let appProcess = ChildProcess.spawn(remote.process.execPath, + const appProcess = ChildProcess.spawn(remote.process.execPath, [appPath], { env: { TEST_REQUEST_URL: server.url, diff --git a/spec/api-net-spec.js b/spec/api-net-spec.js index 6aca9992f7255..41dc9d128ee9d 100644 --- a/spec/api-net-spec.js +++ b/spec/api-net-spec.js @@ -12,7 +12,7 @@ const { session } = remote function randomBuffer (size, start, end) { start = start || 0 end = end || 255 - let range = 1 + end - start + const range = 1 + end - start const buffer = Buffer.allocUnsafe(size) for (let i = 0; i < size; ++i) { buffer[i] = start + Math.floor(Math.random() * range) @@ -21,7 +21,7 @@ function randomBuffer (size, start, end) { } function randomString (length) { - let buffer = randomBuffer(length, '0'.charCodeAt(0), 'z'.charCodeAt(0)) + const buffer = randomBuffer(length, '0'.charCodeAt(0), 'z'.charCodeAt(0)) return buffer.toString() } @@ -209,8 +209,8 @@ describe('net module', () => { let chunkIndex = 0 const chunkCount = 100 - let sentChunks = [] - let receivedChunks = [] + const sentChunks = [] + const receivedChunks = [] urlRequest.on('response', (response) => { assert.strictEqual(response.statusCode, 200) response.pause() @@ -218,8 +218,8 @@ describe('net module', () => { receivedChunks.push(chunk) }) response.on('end', () => { - let sentData = Buffer.concat(sentChunks) - let receivedData = Buffer.concat(receivedChunks) + const sentData = Buffer.concat(sentChunks) + const receivedData = Buffer.concat(receivedChunks) assert.strictEqual(sentData.toString(), receivedData.toString()) assert.strictEqual(chunkIndex, chunkCount) done() @@ -285,14 +285,14 @@ describe('net module', () => { requestResponseEventEmitted = true const statusCode = response.statusCode assert.strictEqual(statusCode, 200) - let buffers = [] + const buffers = [] response.pause() response.on('data', (chunk) => { buffers.push(chunk) responseDataEventEmitted = true }) response.on('end', () => { - let receivedBodyData = Buffer.concat(buffers) + const receivedBodyData = Buffer.concat(buffers) assert(receivedBodyData.toString() === bodyData) responseEndEventEmitted = true maybeDone(done) @@ -907,7 +907,7 @@ describe('net module', () => { assert.fail('Request should not be intercepted by the default session') }) - let customSession = session.fromPartition(customPartitionName, { cache: false }) + const customSession = session.fromPartition(customPartitionName, { cache: false }) let requestIsIntercepted = false customSession.webRequest.onBeforeRequest((details, callback) => { if (details.url === `${server.url}${requestUrl}`) { @@ -1189,7 +1189,7 @@ describe('net module', () => { assert.fail('Request should not be intercepted by the default session') }) - let customSession = session.fromPartition(customPartitionName, { + const customSession = session.fromPartition(customPartitionName, { cache: false }) let requestIsIntercepted = false @@ -1260,7 +1260,7 @@ describe('net module', () => { }) const serverUrl = url.parse(server.url) - let options = { + const options = { port: serverUrl.port, hostname: '127.0.0.1', headers: {} @@ -1312,7 +1312,7 @@ describe('net module', () => { } }) - let nodeRequest = http.request(`${server.url}${nodeRequestUrl}`) + const nodeRequest = http.request(`${server.url}${nodeRequestUrl}`) nodeRequest.on('response', (nodeResponse) => { const netRequest = net.request(`${server.url}${netRequestUrl}`) netRequest.on('response', (netResponse) => { @@ -1470,7 +1470,7 @@ describe('net module', () => { it('should not emit any event after close', (done) => { const requestUrl = '/requestUrl' - let bodyData = randomString(kOneKiloByte) + const bodyData = randomString(kOneKiloByte) server.on('request', (request, response) => { switch (request.url) { case requestUrl: diff --git a/spec/api-notification-dbus-spec.js b/spec/api-notification-dbus-spec.js index 4046898367e2e..d61275be1f6df 100644 --- a/spec/api-notification-dbus-spec.js +++ b/spec/api-notification-dbus-spec.js @@ -62,10 +62,10 @@ const skip = process.platform !== 'linux' || } function unmarshalDBusNotifyHints (dbusHints) { - let o = {} - for (let hint of dbusHints) { - let key = hint[0] - let value = hint[1][1][0] + const o = {} + for (const hint of dbusHints) { + const key = hint[0] + const value = hint[1][1][0] o[key] = value } return o @@ -102,11 +102,11 @@ const skip = process.platform !== 'linux' || const calls = await getCalls() expect(calls).to.be.an('array').of.lengthOf.at.least(1) - let lastCall = calls[calls.length - 1] - let methodName = lastCall[1] + const lastCall = calls[calls.length - 1] + const methodName = lastCall[1] expect(methodName).to.equal('Notify') - let args = unmarshalDBusNotifyArgs(lastCall[2]) + const args = unmarshalDBusNotifyArgs(lastCall[2]) expect(args).to.deep.equal({ app_name: appName, replaces_id: 0, diff --git a/spec/api-protocol-spec.js b/spec/api-protocol-spec.js index 53d98273dea1e..719f0d1ebdbba 100644 --- a/spec/api-protocol-spec.js +++ b/spec/api-protocol-spec.js @@ -1036,7 +1036,7 @@ describe('protocol module', () => { }) it('can access files through the FileSystem API', (done) => { - let filePath = path.join(__dirname, 'fixtures', 'pages', 'filesystem.html') + const filePath = path.join(__dirname, 'fixtures', 'pages', 'filesystem.html') const handler = (request, callback) => callback({ path: filePath }) protocol.registerFileProtocol(standardScheme, handler, (error) => { if (error) return done(error) @@ -1047,7 +1047,7 @@ describe('protocol module', () => { }) it('registers secure, when {secure: true}', (done) => { - let filePath = path.join(__dirname, 'fixtures', 'pages', 'cache-storage.html') + const filePath = path.join(__dirname, 'fixtures', 'pages', 'cache-storage.html') const handler = (request, callback) => callback({ path: filePath }) ipcMain.once('success', () => done()) ipcMain.once('failure', (event, err) => done(err)) diff --git a/spec/api-remote-spec.js b/spec/api-remote-spec.js index 854c5e4de8b26..43763d0f3e5d3 100644 --- a/spec/api-remote-spec.js +++ b/spec/api-remote-spec.js @@ -228,7 +228,7 @@ describe('remote module', () => { }) it('is referenced by its members', () => { - let stringify = remote.getGlobal('JSON').stringify + const stringify = remote.getGlobal('JSON').stringify global.gc() stringify({}) }) @@ -451,13 +451,13 @@ describe('remote module', () => { assert.strictEqual(derived.method(), 'method') assert.strictEqual(derived.readonly, 'readonly') assert(!derived.hasOwnProperty('method')) - let proto = Object.getPrototypeOf(derived) + const proto = Object.getPrototypeOf(derived) assert(!proto.hasOwnProperty('method')) assert(Object.getPrototypeOf(proto).hasOwnProperty('method')) }) it('is referenced by methods in prototype chain', () => { - let method = derived.method + const method = derived.method derived = null global.gc() assert.strictEqual(method(), 'method') @@ -474,7 +474,7 @@ describe('remote module', () => { }) it('throws custom errors from the main process', () => { - let err = new Error('error') + const err = new Error('error') err.cause = new Error('cause') err.prop = 'error prop' try { diff --git a/spec/api-session-spec.js b/spec/api-session-spec.js index fffa0fda7c0a3..30913316baa3a 100644 --- a/spec/api-session-spec.js +++ b/spec/api-session-spec.js @@ -537,7 +537,7 @@ describe('session module', () => { if (request.method === 'GET') { callback({ data: content, mimeType: 'text/html' }) } else if (request.method === 'POST') { - let uuid = request.uploadData[1].blobUUID + const uuid = request.uploadData[1].blobUUID assert(uuid) session.defaultSession.getBlobData(uuid, (result) => { assert.strictEqual(result.toString(), postData) @@ -648,7 +648,7 @@ describe('session module', () => { const fixtures = path.join(__dirname, 'fixtures') const downloadFilePath = path.join(fixtures, 'logo.png') const rangeServer = http.createServer((req, res) => { - let options = { root: fixtures } + const options = { root: fixtures } send(req, req.url, options) .on('error', (error) => { done(error) }).pipe(res) }) diff --git a/spec/api-system-preferences-spec.js b/spec/api-system-preferences-spec.js index 836bea4ead87b..653ae90b2ea60 100644 --- a/spec/api-system-preferences-spec.js +++ b/spec/api-system-preferences-spec.js @@ -11,7 +11,7 @@ describe('systemPreferences module', () => { }) it('should return a non-empty string', () => { - let accentColor = systemPreferences.getAccentColor() + const accentColor = systemPreferences.getAccentColor() assert.notStrictEqual(accentColor, null) assert(accentColor.length > 0) }) diff --git a/spec/api-web-contents-spec.js b/spec/api-web-contents-spec.js index 683da98912146..29b3974f1f4b5 100644 --- a/spec/api-web-contents-spec.js +++ b/spec/api-web-contents-spec.js @@ -103,7 +103,7 @@ describe('webContents module', () => { describe('setDevToolsWebContents() API', () => { it('sets arbitry webContents as devtools', (done) => { - let devtools = new BrowserWindow({ show: false }) + const devtools = new BrowserWindow({ show: false }) devtools.webContents.once('dom-ready', () => { assert.ok(devtools.getURL().startsWith('chrome-devtools://devtools')) devtools.webContents.executeJavaScript('InspectorFrontendHost.constructor.name', (name) => { @@ -756,7 +756,7 @@ describe('webContents module', () => { } } - let gen = genNavigationEvent() + const gen = genNavigationEvent() ipcRenderer.on(responseEvent, () => { if (!gen.next().value) done() }) diff --git a/spec/chromium-spec.js b/spec/chromium-spec.js index 7a48a79f08cd9..e26fa942bcea8 100644 --- a/spec/chromium-spec.js +++ b/spec/chromium-spec.js @@ -34,7 +34,7 @@ describe('chromium feature', () => { const appPath = path.join(__dirname, 'fixtures', 'api', 'locale-check') const electronPath = remote.getGlobal('process').execPath let output = '' - let appProcess = ChildProcess.spawn(electronPath, [appPath, `--lang=${locale}`]) + const appProcess = ChildProcess.spawn(electronPath, [appPath, `--lang=${locale}`]) appProcess.stdout.on('data', (data) => { output += data }) appProcess.stdout.on('end', () => { @@ -175,7 +175,7 @@ describe('chromium feature', () => { describe('navigator.languages', (done) => { it('should return the system locale only', () => { - let appLocale = app.getLocale() + const appLocale = app.getLocale() assert.strictEqual(navigator.languages.length, 1) assert.strictEqual(navigator.languages[0], appLocale) }) @@ -294,7 +294,7 @@ describe('chromium feature', () => { }) it('accepts "nodeIntegration" as feature', (done) => { - let b + let b = null listener = (event) => { assert.strictEqual(event.data.isProcessGlobalUndefined, true) b.close() @@ -305,7 +305,7 @@ describe('chromium feature', () => { }) it('inherit options of parent window', (done) => { - let b + let b = null listener = (event) => { const ref1 = remote.getCurrentWindow().getSize() const width = ref1[0] @@ -339,7 +339,7 @@ describe('chromium feature', () => { } it('disables node integration when it is disabled on the parent window', (done) => { - let b + let b = null listener = (event) => { assert.strictEqual(event.data.isProcessGlobalUndefined, true) b.close() @@ -359,7 +359,7 @@ describe('chromium feature', () => { }) it('disables webviewTag when node integration is disabled on the parent window', (done) => { - let b + let b = null listener = (event) => { assert.strictEqual(event.data.isWebViewUndefined, true) b.close() @@ -380,7 +380,7 @@ describe('chromium feature', () => { // TODO(codebytere): re-enable this test xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => { - let b + let b = null app.once('web-contents-created', (event, contents) => { contents.once('did-finish-load', () => { contents.executeJavaScript('typeof process').then((typeofProcessGlobal) => { @@ -394,7 +394,7 @@ describe('chromium feature', () => { }) it('disables JavaScript when it is disabled on the parent window', (done) => { - let b + let b = null app.once('web-contents-created', (event, contents) => { contents.once('did-finish-load', () => { app.once('browser-window-created', (event, window) => { @@ -419,7 +419,7 @@ describe('chromium feature', () => { }) it('disables the tag when it is disabled on the parent window', (done) => { - let b + let b = null listener = (event) => { assert.strictEqual(event.data.isWebViewGlobalUndefined, true) b.close() @@ -439,7 +439,7 @@ describe('chromium feature', () => { }) it('does not override child options', (done) => { - let b + let b = null const size = { width: 350, height: 450 @@ -476,7 +476,7 @@ describe('chromium feature', () => { }) it('defines a window.location getter', (done) => { - let b + let b = null let targetURL if (process.platform === 'win32') { targetURL = `file:///${fixtures.replace(/\\/g, '/')}/pages/base-page.html` @@ -494,7 +494,7 @@ describe('chromium feature', () => { }) it('defines a window.location setter', (done) => { - let b + let b = null app.once('browser-window-created', (event, { webContents }) => { webContents.once('did-finish-load', () => { // When it loads, redirect @@ -510,14 +510,14 @@ describe('chromium feature', () => { }) it('open a blank page when no URL is specified', (done) => { - let b + let b = null app.once('browser-window-created', (event, { webContents }) => { webContents.once('did-finish-load', () => { const { location } = b b.close() assert.strictEqual(location, 'about:blank') - let c + let c = null app.once('browser-window-created', (event, { webContents }) => { webContents.once('did-finish-load', () => { const { location } = c @@ -543,7 +543,7 @@ describe('chromium feature', () => { }) it('sets the window title to the specified frameName', (done) => { - let b + let b = null app.once('browser-window-created', (event, createdWindow) => { assert.strictEqual(createdWindow.getTitle(), 'hello') b.close() @@ -553,7 +553,7 @@ describe('chromium feature', () => { }) it('does not throw an exception when the frameName is a built-in object property', (done) => { - let b + let b = null app.once('browser-window-created', (event, createdWindow) => { assert.strictEqual(createdWindow.getTitle(), '__proto__') b.close() @@ -563,7 +563,7 @@ describe('chromium feature', () => { }) it('does not throw an exception when the features include webPreferences', () => { - let b + let b = null assert.doesNotThrow(() => { b = window.open('', '', 'webPreferences=') }) @@ -572,7 +572,7 @@ describe('chromium feature', () => { }) describe('window.opener', () => { - let url = `file://${fixtures}/pages/window-opener.html` + const url = `file://${fixtures}/pages/window-opener.html` it('is null for main window', (done) => { w = new BrowserWindow({ show: false }) w.webContents.once('ipc-message', (event, args) => { @@ -583,7 +583,7 @@ describe('chromium feature', () => { }) it('is not null for window opened by window.open', (done) => { - let b + let b = null listener = (event) => { assert.strictEqual(event.data, 'object') b.close() @@ -596,7 +596,7 @@ describe('chromium feature', () => { describe('window.opener access from BrowserWindow', () => { const scheme = 'other' - let url = `${scheme}://${fixtures}/pages/window-opener-location.html` + const url = `${scheme}://${fixtures}/pages/window-opener-location.html` let w = null before((done) => { @@ -720,7 +720,7 @@ describe('chromium feature', () => { describe('window.postMessage', () => { it('sets the source and origin correctly', (done) => { - let b + let b = null listener = (event) => { window.removeEventListener('message', listener) b.close() @@ -751,7 +751,7 @@ describe('chromium feature', () => { describe('window.opener.postMessage', () => { it('sets source and origin correctly', (done) => { - let b + let b = null listener = (event) => { window.removeEventListener('message', listener) b.close() @@ -803,7 +803,7 @@ describe('chromium feature', () => { }) it('delivers messages that match the origin', (done) => { - let b + let b = null listener = (event) => { window.removeEventListener('message', listener) b.close() @@ -856,7 +856,7 @@ describe('chromium feature', () => { }) it('Worker has no node integration by default', (done) => { - let worker = new Worker('../fixtures/workers/worker_node.js') + const worker = new Worker('../fixtures/workers/worker_node.js') worker.onmessage = (event) => { assert.strictEqual(event.data, 'undefined undefined undefined undefined') worker.terminate() @@ -865,7 +865,7 @@ describe('chromium feature', () => { }) it('Worker has node integration with nodeIntegrationInWorker', (done) => { - let webview = new WebView() + const webview = new WebView() webview.addEventListener('ipc-message', (e) => { assert.strictEqual(e.channel, 'object function object function') webview.remove() @@ -887,7 +887,7 @@ describe('chromium feature', () => { }) it('SharedWorker has no node integration by default', (done) => { - let worker = new SharedWorker('../fixtures/workers/shared_worker_node.js') + const worker = new SharedWorker('../fixtures/workers/shared_worker_node.js') worker.port.onmessage = (event) => { assert.strictEqual(event.data, 'undefined undefined undefined undefined') done() @@ -895,7 +895,7 @@ describe('chromium feature', () => { }) it('SharedWorker has node integration with nodeIntegrationInWorker', (done) => { - let webview = new WebView() + const webview = new WebView() webview.addEventListener('console-message', (e) => { console.log(e) }) @@ -944,7 +944,7 @@ describe('chromium feature', () => { let contents = null before((done) => { const handler = (request, callback) => { - let parsedUrl = url.parse(request.url) + const parsedUrl = url.parse(request.url) let filename switch (parsedUrl.pathname) { case '/localStorage' : filename = 'local_storage.html'; break diff --git a/spec/fixtures/api/mixed-sandbox-app/main.js b/spec/fixtures/api/mixed-sandbox-app/main.js index 50ed09dcd4e23..c63201a8de576 100644 --- a/spec/fixtures/api/mixed-sandbox-app/main.js +++ b/spec/fixtures/api/mixed-sandbox-app/main.js @@ -15,7 +15,7 @@ let currentWindowSandboxed = false app.once('ready', () => { function testWindow (isSandboxed, callback) { currentWindowSandboxed = isSandboxed - let currentWindow = new BrowserWindow({ + const currentWindow = new BrowserWindow({ show: false, webPreferences: { preload: path.join(__dirname, 'electron-app-mixed-sandbox-preload.js'), diff --git a/spec/fixtures/api/relaunch/main.js b/spec/fixtures/api/relaunch/main.js index 2f4dcf796aa08..69b634f3c2a00 100644 --- a/spec/fixtures/api/relaunch/main.js +++ b/spec/fixtures/api/relaunch/main.js @@ -8,7 +8,7 @@ process.on('uncaughtException', () => { }) app.once('ready', () => { - let lastArg = process.argv[process.argv.length - 1] + const lastArg = process.argv[process.argv.length - 1] const client = net.connect(socketPath) client.once('connect', () => { client.end(String(lastArg === '--second')) diff --git a/spec/fixtures/workers/shared_worker_node.js b/spec/fixtures/workers/shared_worker_node.js index 0a52d60fbf50d..03f4eced53b21 100644 --- a/spec/fixtures/workers/shared_worker_node.js +++ b/spec/fixtures/workers/shared_worker_node.js @@ -1,5 +1,5 @@ self.onconnect = function (event) { - let port = event.ports[0] + const port = event.ports[0] port.start() port.postMessage([typeof process, typeof setImmediate, typeof global, typeof Buffer].join(' ')) } diff --git a/spec/modules-spec.js b/spec/modules-spec.js index f7a7eee4539e2..ba8004c5eb092 100644 --- a/spec/modules-spec.js +++ b/spec/modules-spec.js @@ -131,7 +131,7 @@ describe('modules support', () => { describe('when the path is outside the resources path', () => { it('includes paths outside of the resources path', () => { - let modulePath = path.resolve('/foo') + const modulePath = path.resolve('/foo') assert.deepStrictEqual(Module._nodeModulePaths(modulePath), [ path.join(modulePath, 'node_modules'), path.resolve('/node_modules') diff --git a/spec/node-spec.js b/spec/node-spec.js index c3fd2188ef358..0112df2c09ae0 100644 --- a/spec/node-spec.js +++ b/spec/node-spec.js @@ -331,10 +331,10 @@ describe('node feature', () => { const key = 'q90K9yBqhWZnAMCMTOJfPQ==' const cipherText = '{"error_code":114,"error_message":"Tham số không hợp lệ","data":null}' for (let i = 0; i < 10000; ++i) { - let iv = Buffer.from('0'.repeat(32), 'hex') - let input = Buffer.from(data, 'base64') - let decipher = crypto.createDecipheriv('aes-128-cbc', Buffer.from(key, 'base64'), iv) - let result = Buffer.concat([decipher.update(input), decipher.final()]).toString('utf8') + const iv = Buffer.from('0'.repeat(32), 'hex') + const input = Buffer.from(data, 'base64') + const decipher = crypto.createDecipheriv('aes-128-cbc', Buffer.from(key, 'base64'), iv) + const result = Buffer.concat([decipher.update(input), decipher.final()]).toString('utf8') assert.strictEqual(cipherText, result) } }) diff --git a/spec/static/main.js b/spec/static/main.js index b4df4d0715891..7ec896cc2e8b1 100644 --- a/spec/static/main.js +++ b/spec/static/main.js @@ -56,7 +56,7 @@ if (process.platform !== 'darwin') { // Write output to file if OUTPUT_TO_FILE is defined. const outputToFile = process.env.OUTPUT_TO_FILE const print = function (_, args) { - let output = util.format.apply(null, args) + const output = util.format.apply(null, args) if (outputToFile) { fs.appendFileSync(outputToFile, output + '\n') } else { @@ -398,7 +398,7 @@ ipcMain.on('test-webcontents-navigation-observer', (event, options) => { }) ipcMain.on('test-browserwindow-destroy', (event, testOptions) => { - let focusListener = (event, win) => win.id + const focusListener = (event, win) => win.id app.on('browser-window-focus', focusListener) const windowCount = 3 const windowOptions = { diff --git a/spec/webview-spec.js b/spec/webview-spec.js index 173c3de742b9c..9febb98703b9c 100644 --- a/spec/webview-spec.js +++ b/spec/webview-spec.js @@ -987,7 +987,7 @@ describe(' tag', function () { describe('found-in-page event', () => { it('emits when a request is made', (done) => { let requestId = null - let activeMatchOrdinal = [] + const activeMatchOrdinal = [] const listener = (e) => { assert.strictEqual(e.result.requestId, requestId) assert.strictEqual(e.result.matches, 3) @@ -1157,7 +1157,7 @@ describe(' tag', function () { it('inherits the parent window visibility state and receives visibilitychange events', async () => { const w = await openTheWindow({ show: false }) w.loadFile(path.join(fixtures, 'pages', 'webview-visibilitychange.html')) - let [, visibilityState, hidden] = await emittedOnce(ipcMain, 'pong') + const [, visibilityState, hidden] = await emittedOnce(ipcMain, 'pong') assert.strictEqual(visibilityState, 'hidden') assert.strictEqual(hidden, true)