electron-chromedriver 7.0.0-beta.5 → 9.0.0

package/.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   install-test-linux:
     docker:
       # specify the version you desire here
-      - image: circleci/node:9-browsers
+      - image: circleci/node:10
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -43,7 +43,6 @@ jobs:
         xcode: "9.0"
     steps:
       - checkout
-
       # Download and cache dependencies
       - restore_cache:
           keys:
@@ -51,6 +50,19 @@ jobs:
           # fallback to using the latest cache if no exact match is found
           - v1-mac-dependencies-
 
+      # Lock into Node.js version
+      - run:
+          name: Install Node.js
+          command: |
+            curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
+            export NVM_DIR="$HOME/.nvm"
+            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+            nvm install v10.19.0
+            nvm alias default v10.19.0
+            echo 'export NVM_DIR=${HOME}/.nvm' >> $BASH_ENV	
+            echo "[ -s '${NVM_DIR}/nvm.sh' ] && . '${NVM_DIR}/nvm.sh'" >> $BASH_ENV
+      - run: node --version
+      - run: npm --version
       - run: npm install
 
       - save_cache:
@@ -59,8 +71,6 @@ jobs:
           key: v1-mac-dependencies-{{ checksum "package.json" }}
 
       # run tests!
-      - run: node --version
-      - run: npm --version
       - run: npm test
 
 workflows:

package/.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# This Repo is an AOR of the Releases Working Group
+* @electron/wg-releases

package/README.md

@@ -39,3 +39,7 @@ ELECTRON_MIRROR="https://npm.taobao.org/mirrors/electron/"
 # Example of requested URL: http://localhost:8080/1.2.0/chromedriver-v2.21-darwin-x64.zip
 ELECTRON_MIRROR="http://localhost:8080/"
 ```
+
+## Overriding the version downloaded
+
+The version downloaded can be overriden by setting the `ELECTRON_CUSTOM_VERSION` environment variable.

package/download-chromedriver.js

@@ -1,38 +1,41 @@
-const fs = require('fs')
+const { promises: fs } = require('fs')
 const path = require('path')
-const electronDownload = require('electron-download')
+const { downloadArtifact } = require('@electron/get')
 const extractZip = require('extract-zip')
 const versionToDownload = require('./package').version
 
-function download (version, callback) {
-  electronDownload({
+function download (version) {
+  return downloadArtifact({
     version,
-    chromedriver: true,
+    artifactName: 'chromedriver',
     platform: process.env.npm_config_platform,
     arch: process.env.npm_config_arch,
-    strictSSL: process.env.npm_config_strict_ssl === 'true',
+    rejectUnauthorized: process.env.npm_config_strict_ssl === 'true',
     quiet: ['info', 'verbose', 'silly', 'http'].indexOf(process.env.npm_config_loglevel) === -1
-  }, callback)
-}
-
-function processDownload (err, zipPath) {
-  if (err != null) throw err
-  extractZip(zipPath, { dir: path.join(__dirname, 'bin') }, error => {
-    if (error != null) throw error
-    if (process.platform !== 'win32') {
-      fs.chmod(path.join(__dirname, 'bin', 'chromedriver'), '755', error => {
-        if (error != null) throw error
-      })
-    }
   })
 }
 
-download(versionToDownload, (err, zipPath) => {
-  if (err) {
-    const parts = versionToDownload.split('.')
+async function attemptDownload (version) {
+  try {
+    const targetFolder = path.join(__dirname, 'bin')
+    const zipPath = await download(version)
+    await extractZip(zipPath, { dir: targetFolder })
+    const platform = process.env.npm_config_platform || process.platform
+    if (platform !== 'win32') {
+      await fs.chmod(path.join(targetFolder, 'chromedriver'), 0o755)
+    }
+  } catch (err) {
+    // attempt to fall back to semver minor
+    const parts = version.split('.')
     const baseVersion = `${parts[0]}.${parts[1]}.0`
-    download(baseVersion, processDownload)
-  } else {
-    processDownload(err, zipPath)
+
+    // don't recurse infinitely
+    if (baseVersion === version) {
+      throw err
+    } else {
+      await attemptDownload(baseVersion)
+    }
   }
-})
+}
+
+attemptDownload(versionToDownload)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-chromedriver",
-  "version": "7.0.0-beta.5",
+  "version": "9.0.0",
   "description": "Electron ChromeDriver",
   "repository": "https://github.com/electron/chromedriver",
   "bin": {
@@ -8,16 +8,20 @@
   },
   "scripts": {
     "install": "node ./download-chromedriver.js",
+    "lint": "standard --fix",
     "test": "standard && mocha"
   },
+  "engines": {
+    "node": ">=10.12.0"
+  },
   "author": "Kevin Sawicki",
   "license": "MIT",
   "dependencies": {
-    "electron-download": "^4.1.1",
-    "extract-zip": "^1.6.7"
+    "@electron/get": "^1.12.2",
+    "extract-zip": "^2.0.0"
   },
   "devDependencies": {
-    "mocha": "^6.2.0",
+    "mocha": "^7.1.2",
     "standard": "^13.1.0"
   }
 }