Release 1.9.2-beta.3

.gitignore

@@ -2,7 +2,6 @@
 *.swp
 .DS_Store
 node_modules
-package-lock.json
 *.trace
 xcuserdata
 *.sublime-*
@@ -52,3 +51,4 @@ sample-code/csharp/test/obj
 sample-code/csharp/test/bin
 sample-code/csharp/packages
 appium.zip
+npm-shrinkwrap.json

.travis.yml

@@ -11,18 +11,35 @@ env:
 node_js: "10"
 jobs:
   include:
+    # Run the tests and generate/update npm-shrinkwrap.json
+    - stage: Lockfile
+      os:
+        - linux
+        - sudo: false
+      node_js: "10"
+      before_install:
+        - bash ./bin/has-code-changes.sh || travis_terminate 0 # If only .md files were changed, exit the build altogether
+        - npm install -g greenkeeper-lockfile
+      before_script: greenkeeper-lockfile-update
+      script: npm run test
+      after_script: greenkeeper-lockfile-update
+
+    # Run the tests and generate/update npm-shrinkwrap.json
     - stage: Tests
       os:
         - linux
         - sudo: false
-      script: npm run test && npm run e2e-test
       node_js: "10"
+      script: npm run test && npm run e2e-test
+
+    # Run tests in Node versions
     - stage:
       os:
         - linux
         - sudo: false
       script: npm run test && npm run e2e-test
       node_js: "8"
+
     - stage:
       os:
         - linux
@@ -31,29 +48,50 @@ jobs:
         # this is just to indicate in the Travis job list that this is generating docs
         - GENERATE_DOCS=true
       script: npm run generate-docs
-    - stage: BinTray Bundle Build and Upload
+
+    - stage: Tag beta
+      # if: branch = master AND type != pull_request
+      os:
+        - linux
+        - sudo: false
+      install:
+        - npm install -g release-it
+      script:
+        - git checkout $TRAVIS_BRANCH
+        - git branch --set-upstream-to origin/$TRAVIS_BRANCH
+
+        # If it's not just a 'package.json' commit, 
+        - node ./build/test/scripts/is-package-json-commit.js || release-it --preRelease=beta --no-npm.publish
+    
+    - stage: Bundle zip and publish beta
       # only want to run this on the main master branch
-      if: branch = master AND type != pull_request
+      if: tag
       os:
         - osx
         - osx_image: xcode9.4
       env:
-        - NODE_ENV=production
         - CC=gcc
         - CXX=g++
       before_install:
         - gcc --version
       install:
-        # Install prod dependencies
+        # Installs dependencies specified in package-lock.json
+        - npm ci
+      before_script:
+        # Strip out devDependencies and shrinkwrap it
+        - rimraf package-lock.json
+        - npm prune --production
+        - npm shrinkwrap --production
+
+        # Backup the npm-shrinkwrap.json file
+        - mv npm-shrinkwrap.json npm-shrinkwrap-no-dev-deps.json
+
+        # Re-install so that we get the dev dependencies back
         - npm install
 
-        # Install only the dev dependencies that we need
-        - npm install --only=dev gulp
-        - npm install --only=dev appium-gulp-plugins
-      before_script:
-        # Build the assets
-        - npm run build
-
-        # Remove the dev depenedencies
-        - npm prune
-      script: npm run zip-and-upload
+        # Restore npm-shrinkwrap.json to what it was before (with no dev dependencies)
+        - rimraf package-lock.json
+        - mv npm-shrinkwrap-no-dev-deps.json npm-shrinkwrap.json
+      script:
+        - npm run zip-and-upload
+        - npm publish --tag beta

bin/has-code-changes.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+
+# Check if this TRAVIS_COMMIT only contains README file changes
+set -e
+
+CHANGED_FILES=`git diff --name-only master...${TRAVIS_COMMIT}`
+ONLY_READMES=True
+MD=".md"
+
+for CHANGED_FILE in $CHANGED_FILES; do
+  if ! [[ $CHANGED_FILE =~ $MD ]]; then
+    ONLY_READMES=False
+    break
+  fi
+done
+
+if [[ $ONLY_READMES == True ]]; then
+  echo "Non-.md files found, proceeding with build."
+  exit 0
+else
+  echo "Only .md files found, no need to run build."
+  exit 1
+fi

package.json

@@ -11,7 +11,7 @@
     "firefoxos",
     "testing"
   ],
-  "version": "1.9.2-beta.2",
+  "version": "1.9.2-beta.3",
   "author": "https://github.com/appium",
   "license": "Apache-2.0",
   "repository": {
@@ -72,7 +72,7 @@
   },
   "scripts": {
     "prepare": "gulp prepublish",
-    "publish": "gulp prepublish",
+    "publish": "gulp prepublish && npm prune --production",
     "test": "gulp once",
     "e2e-test": "gulp e2e-test",
     "watch": "gulp watch",
@@ -109,9 +109,12 @@
     "gulp": "^4.0.0",
     "handlebars": "^4.0.10",
     "mocha": "5.x",
+    "ncp": "^2.0.0",
     "pre-commit": "1.x",
     "release": "^4.0.2",
+    "release-it": "^7.6.2",
     "replace-ext": "^1.0.0",
+    "rimraf": "^2.6.2",
     "sinon": "^6.0.0",
     "validate.js": "^0.12.0",
     "wd": "^1.10.0",

sample-code/javascript-wd/.npmrc

@@ -0,0 +1,2 @@
+# Do not disable package-lock. Disabling package-lock also disables npm-shrinkwrap
+package-lock=false

sample-code/javascript-webdriverio/.npmrc

@@ -0,0 +1 @@
+package-lock=false

test/scripts/is-package-json-commit.js

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+// transpile:main
+
+import { asyncify } from 'asyncbox';
+import { exec } from 'teen_process';
+
+async function main () {
+  let {stdout: filesChanged} = await exec("git", ["diff", "--name-only", process.env.TRAVIS_COMMIT_RANGE]);
+  filesChanged = filesChanged.trim().split("\n");
+  if (filesChanged.length === 1 && filesChanged[0] === 'package.json') {
+    return process.exit(0);
+  }
+  process.exit(1);
+}
+
+if (require.main === module) {
+  asyncify(main);
+}
+
+export { main };