Merge branch 'master' into greenkeeper/tap-10.7.0

package.json

@@ -78,7 +78,7 @@
   },
   "devDependencies": {
     "@types/jest": "20.0.2",
-    "@types/node": "8.0.2",
+    "@types/node": "8.0.4",
     "commitizen": "2.9.6",
     "conventional-changelog-lint": "1.1.9",
     "coveralls": "2.13.1",
@@ -88,11 +88,11 @@
     "gitbook-cli": "2.3.0",
     "jest": "20.0.4",
     "markdownlint": "0.5.0",
-    "prettier": "1.4.4",
-    "standard-version": "4.0.0",
-    "ts-config": "9.3.0",
+    "prettier": "1.5.0",
+    "standard-version": "4.2.0",
+    "ts-config": "9.4.0",
     "ts-jest": "20.0.6",
     "tslint": "5.4.3",
-    "typescript": "2.3.4"
+    "typescript": "2.4.1"
   }
 }

scripts/lib/cybernaut-xvfb.sh

@@ -2,13 +2,13 @@
 
 set -e
 
-if [ -z "$1" ];
+if [ -z "$1" ]
 then
   echo 'Missing argument: screen size'
   exit 1
 fi
 
-if [ -z "$2" ];
+if [ -z "$2" ]
 then
   echo 'Missing argument: reporter'
   exit 1

scripts/make/targets/dist.sh

@@ -62,23 +62,23 @@ echo '# Cleaning the Docker artifacts #########################################'
 
 EXITED_CONTAINERS=$(docker ps -a -q -f status=exited)
 
-if [ -n "$EXITED_CONTAINERS" ];
+if [ -n "$EXITED_CONTAINERS" ]
 then
   # shellcheck disable=SC2086
   docker rm -v $EXITED_CONTAINERS
 fi
 
 DANGLING_IMAGES=$(docker images -f "dangling=true" -q)
 
-if [ -n "$DANGLING_IMAGES" ];
+if [ -n "$DANGLING_IMAGES" ]
 then
   # shellcheck disable=SC2086
   docker rmi $DANGLING_IMAGES
 fi
 
 DANGLING_VOLUMES=$(docker volume ls -qf dangling=true)
 
-if [ -n "$DANGLING_VOLUMES" ];
+if [ -n "$DANGLING_VOLUMES" ]
 then
   # shellcheck disable=SC2086
   docker volume rm $DANGLING_VOLUMES

scripts/make/targets/e2e-tests.sh

@@ -36,7 +36,7 @@ docker run -it --rm \
   -v /dev/shm:/dev/shm \
   clebert/cybernaut-chrome | tee e2e-tests/dist/chrome.log
 
-if [ "${PIPESTATUS[0]}" != 0 ];
+if [ "${PIPESTATUS[0]}" != 0 ]
 then
   exit "${PIPESTATUS[0]}"
 fi
@@ -55,7 +55,7 @@ docker run -it --rm \
   -v "$(pwd)"/e2e-tests/static:/opt/static \
   clebert/cybernaut-firefox | tee e2e-tests/dist/firefox.log
 
-if [ "${PIPESTATUS[0]}" != 0 ];
+if [ "${PIPESTATUS[0]}" != 0 ]
 then
   exit "${PIPESTATUS[0]}"
 fi

scripts/make/targets/examples.sh

@@ -35,7 +35,7 @@ docker run -it --rm \
   -v /dev/shm:/dev/shm \
   clebert/cybernaut-chrome | tee examples/dist/chrome.log
 
-if [ "${PIPESTATUS[0]}" != 0 ];
+if [ "${PIPESTATUS[0]}" != 0 ]
 then
   exit "${PIPESTATUS[0]}"
 fi

scripts/make/targets/scripts.sh

@@ -29,8 +29,12 @@ echo '# Checking the formatting of the TS scripts #############################'
 
 echo '# Checking the shell scripts ############################################'
 
+SHELL_SCRIPTS=$(find scripts -type f -name '*.sh')
+
+# shellcheck disable=SC2086
+
 docker run -it --rm \
   -v "$(pwd)"/scripts:/scripts \
-  --entrypoint /bin/sh \
+  -w / \
   koalaman/shellcheck \
-  /scripts/lib/shellcheck.sh
+  $SHELL_SCRIPTS

scripts/npm/push.sh

@@ -2,13 +2,13 @@
 
 set -e
 
-if [ -z "$DOCKER_USERNAME" ];
+if [ -z "$DOCKER_USERNAME" ]
 then
   echo 'Missing environment variable: DOCKER_USERNAME'
   exit 1
 fi
 
-if [ -z "$DOCKER_PASSWORD" ];
+if [ -z "$DOCKER_PASSWORD" ]
 then
   echo 'Missing environment variable: DOCKER_PASSWORD'
   exit 1
@@ -18,7 +18,7 @@ GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 GIT_TAG=$("$(npm bin)"/git-latest-semver-tag)
 VERSION="${GIT_TAG:1}"
 
-if [ "$GIT_BRANCH" != master ];
+if [ "$GIT_BRANCH" != master ]
 then
   echo 'Please checkout the master branch'
   exit 1
@@ -31,7 +31,7 @@ make clean && make
 
 echo '# Checking the Git status ###############################################'
 
-if [ -n "$(git status --porcelain)" ];
+if [ -n "$(git status --porcelain)" ]
 then
   echo 'Dirty Git working tree'
   exit 1

src/selenium/browser.ts

@@ -84,7 +84,7 @@ export function scriptResult<T>(
 ): SeleniumAccessor<T> {
   return {
     description: `The result of the ${scriptName} script`,
-    get: async driver => driver.executeAsyncScript(script)
+    get: async driver => driver.executeAsyncScript<T>(script)
   };
 }