Merge pull request #14613 from electron/update-standard

chore: update to standard 12 and fix CI

script/ci-release-build.js

@@ -14,7 +14,7 @@ const circleCIJobs = [
   'electron-linux-arm',
   'electron-linux-arm64',
   'electron-linux-ia32',
-//  'electron-linux-mips64el',
+  //  'electron-linux-mips64el',
   'electron-linux-x64'
 ]
 

script/cpplint.js

@@ -12,7 +12,7 @@ function callCpplint (filenames, args) {
   const linter = 'cpplint.py'
   if (args.verbose) console.log([linter, ...filenames].join(' '))
   try {
-    childProcess.execFile(linter, filenames, {cwd: SOURCE_ROOT}, error => {
+    childProcess.execFile(linter, filenames, { cwd: SOURCE_ROOT }, error => {
       if (error) {
         for (const line of error.message.split(/[\r\n]+/)) {
           if (line.length && !line.startsWith('Done processing ')) {

script/find-release.js

@@ -11,7 +11,7 @@ if (process.argv.length < 3) {
 const version = process.argv[2]
 
 async function findRelease () {
-  github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
+  github.authenticate({ type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN })
   let releases = await github.repos.getReleases({
     owner: 'electron',
     repo: version.indexOf('nightly') > 0 ? 'nightlies' : 'electron'

script/prepare-release.js

@@ -28,7 +28,7 @@ if (!versionType && !args.notesOnly) {
 
 const github = new GitHub()
 const gitDir = path.resolve(__dirname, '..')
-github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
+github.authenticate({ type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN })
 
 async function getNewVersion (dryRun) {
   if (!dryRun) {
@@ -43,7 +43,7 @@ async function getNewVersion (dryRun) {
     scriptArgs.push('--dry-run')
   }
   try {
-    let bumpVersion = execSync(scriptArgs.join(' '), {encoding: 'UTF-8'})
+    let bumpVersion = execSync(scriptArgs.join(' '), { encoding: 'UTF-8' })
     bumpVersion = bumpVersion.substr(bumpVersion.indexOf(':') + 1).trim()
     let newVersion = `v${bumpVersion}`
     if (!dryRun) {

script/publish-to-npm.js

@@ -3,7 +3,7 @@ const fs = require('fs')
 const path = require('path')
 const childProcess = require('child_process')
 const GitHubApi = require('github')
-const {GitProcess} = require('dugite')
+const { GitProcess } = require('dugite')
 const request = require('request')
 const rootPackageJson = require('../package.json')
 
@@ -19,7 +19,7 @@ const github = new GitHubApi({
 })
 
 let tempDir
-temp.track()   // track and cleanup files at exit
+temp.track() // track and cleanup files at exit
 
 const files = [
   'cli.js',
@@ -51,92 +51,92 @@ new Promise((resolve, reject) => {
     }
   })
 })
-.then((dirPath) => {
-  tempDir = dirPath
-  // copy files from `/npm` to temp directory
-  files.forEach((name) => {
-    const noThirdSegment = name === 'README.md' || name === 'LICENSE'
+  .then((dirPath) => {
+    tempDir = dirPath
+    // copy files from `/npm` to temp directory
+    files.forEach((name) => {
+      const noThirdSegment = name === 'README.md' || name === 'LICENSE'
+      fs.writeFileSync(
+        path.join(tempDir, name),
+        fs.readFileSync(path.join(__dirname, '..', noThirdSegment ? '' : 'npm', name))
+      )
+    })
+    // copy from root package.json to temp/package.json
+    const packageJson = require(path.join(tempDir, 'package.json'))
+    jsonFields.forEach((fieldName) => {
+      packageJson[fieldName] = rootPackageJson[fieldName]
+    })
     fs.writeFileSync(
-      path.join(tempDir, name),
-      fs.readFileSync(path.join(__dirname, '..', noThirdSegment ? '' : 'npm', name))
+      path.join(tempDir, 'package.json'),
+      JSON.stringify(packageJson, null, 2)
     )
-  })
-  // copy from root package.json to temp/package.json
-  const packageJson = require(path.join(tempDir, 'package.json'))
-  jsonFields.forEach((fieldName) => {
-    packageJson[fieldName] = rootPackageJson[fieldName]
-  })
-  fs.writeFileSync(
-    path.join(tempDir, 'package.json'),
-    JSON.stringify(packageJson, null, 2)
-  )
 
-  return github.repos.getReleases({
-    owner: 'electron',
-    repo: rootPackageJson.version.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
+    return github.repos.getReleases({
+      owner: 'electron',
+      repo: rootPackageJson.version.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
+    })
   })
-})
-.then((releases) => {
+  .then((releases) => {
   // download electron.d.ts from release
-  const release = releases.data.find(
-    (release) => release.tag_name === `v${rootPackageJson.version}`
-  )
-  if (!release) {
-    throw new Error(`cannot find release with tag v${rootPackageJson.version}`)
-  }
-  return release
-})
-.then((release) => {
-  const tsdAsset = release.assets.find((asset) => asset.name === 'electron.d.ts')
-  if (!tsdAsset) {
-    throw new Error(`cannot find electron.d.ts from v${rootPackageJson.version} release assets`)
-  }
-  return new Promise((resolve, reject) => {
-    request.get({
-      url: tsdAsset.url,
-      headers: {
-        'accept': 'application/octet-stream',
-        'user-agent': 'electron-npm-publisher'
-      }
-    }, (err, response, body) => {
-      if (err || response.statusCode !== 200) {
-        reject(err || new Error('Cannot download electron.d.ts'))
-      } else {
-        fs.writeFileSync(path.join(tempDir, 'electron.d.ts'), body)
-        resolve(release)
-      }
-    })
-  })
-})
-.then(async (release) => {
-  if (release.tag_name.indexOf('nightly') > 0) {
-    const currentBranch = await getCurrentBranch()
-    if (currentBranch === 'master') {
-      npmTag = 'nightly'
-    } else {
-      npmTag = `nightly-${currentBranch}`
+    const release = releases.data.find(
+      (release) => release.tag_name === `v${rootPackageJson.version}`
+    )
+    if (!release) {
+      throw new Error(`cannot find release with tag v${rootPackageJson.version}`)
     }
-  } else {
-    npmTag = release.prerelease ? 'beta' : 'latest'
-  }
-})
-.then(() => childProcess.execSync('npm pack', { cwd: tempDir }))
-.then(() => {
-  // test that the package can install electron prebuilt from github release
-  const tarballPath = path.join(tempDir, `${rootPackageJson.name}-${rootPackageJson.version}.tgz`)
-  return new Promise((resolve, reject) => {
-    childProcess.execSync(`npm install ${tarballPath} --force --silent`, {
-      env: Object.assign({}, process.env, { electron_config_cache: tempDir }),
-      cwd: tempDir
-    })
-    resolve(tarballPath)
+    return release
+  })
+  .then((release) => {
+    const tsdAsset = release.assets.find((asset) => asset.name === 'electron.d.ts')
+    if (!tsdAsset) {
+      throw new Error(`cannot find electron.d.ts from v${rootPackageJson.version} release assets`)
+    }
+    return new Promise((resolve, reject) => {
+      request.get({
+        url: tsdAsset.url,
+        headers: {
+          'accept': 'application/octet-stream',
+          'user-agent': 'electron-npm-publisher'
+        }
+      }, (err, response, body) => {
+        if (err || response.statusCode !== 200) {
+          reject(err || new Error('Cannot download electron.d.ts'))
+        } else {
+          fs.writeFileSync(path.join(tempDir, 'electron.d.ts'), body)
+          resolve(release)
+        }
+      })
+    })
+  })
+  .then(async (release) => {
+    if (release.tag_name.indexOf('nightly') > 0) {
+      const currentBranch = await getCurrentBranch()
+      if (currentBranch === 'master') {
+        npmTag = 'nightly'
+      } else {
+        npmTag = `nightly-${currentBranch}`
+      }
+    } else {
+      npmTag = release.prerelease ? 'beta' : 'latest'
+    }
+  })
+  .then(() => childProcess.execSync('npm pack', { cwd: tempDir }))
+  .then(() => {
+  // test that the package can install electron prebuilt from github release
+    const tarballPath = path.join(tempDir, `${rootPackageJson.name}-${rootPackageJson.version}.tgz`)
+    return new Promise((resolve, reject) => {
+      childProcess.execSync(`npm install ${tarballPath} --force --silent`, {
+        env: Object.assign({}, process.env, { electron_config_cache: tempDir }),
+        cwd: tempDir
+      })
+      resolve(tarballPath)
+    })
+  })
+  .then((tarballPath) => childProcess.execSync(`npm publish ${tarballPath} --tag ${npmTag} --otp=${process.env.ELECTRON_NPM_OTP}`))
+  .catch((err) => {
+    console.error(`Error: ${err}`)
+    process.exit(1)
   })
-})
-.then((tarballPath) => childProcess.execSync(`npm publish ${tarballPath} --tag ${npmTag} --otp=${process.env.ELECTRON_NPM_OTP}`))
-.catch((err) => {
-  console.error(`Error: ${err}`)
-  process.exit(1)
-})
 
 async function getCurrentBranch () {
   const gitDir = path.resolve(__dirname, '..')

script/release-notes/index.js

@@ -430,7 +430,7 @@ Some documentation updates, fixes and reworks: ${
     : this.docs.sort((a, b) => a.prNumber.localeCompare(b.prNumber)).map(note => note.prNumber).join(', ')
 }
 ${this.unknown.filter(n => !n.reverted).length > 0
-? `## Unknown (fix these before publishing release)
+    ? `## Unknown (fix these before publishing release)
 
 ${this.list(this.unknown)}
 ` : ''}`

script/release.js

@@ -22,10 +22,10 @@ let failureCount = 0
 const github = new GitHub({
   followRedirects: false
 })
-github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
+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 releaseInfo = await github.repos.getReleases({ owner: 'electron', repo: targetRepo })
   let drafts
   let versionToCheck
   if (version) {

script/upload-to-github.js

@@ -2,7 +2,7 @@ if (!process.env.CI) require('dotenv-safe').load()
 
 const GitHub = require('github')
 const github = new GitHub()
-github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
+github.authenticate({ type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN })
 
 if (process.argv.length < 6) {
   console.log('Usage: upload-to-github filePath fileName releaseId')