Merge pull request #805 from alleyinteractive/feature/v2.1.0

Merge v2.1.0 into develop

.deployignore

@@ -0,0 +1,32 @@
+.DS_Store
+*.zip
+tags
+composer.lock
+vendor
+node_modules
+npm-debug.log
+
+# IDEs
+.idea
+.vscode
+
+# Directories and files that we do not want to be included with the built
+# version and deployed to WordPress.org.
+.babelrc
+.editorconfig
+.eslintignore
+.eslintrc.json
+.github
+.travis.yml
+assets/images
+assets/js/pluginsidebar
+assets/js/util
+bin
+composer.json
+package.json
+package-lock.json
+phpcs.xml.dist
+phpunit.xml.dist
+README.md
+tests
+webpack.config.js

.travis.yml

@@ -7,7 +7,6 @@ dist: xenial
 # Xenial does not start mysql by default
 services:
   - mysql
-  - memcached
 
 # Declare project language.
 # @link http://about.travis-ci.org/docs/user/languages/php/
@@ -17,16 +16,18 @@ language: php
 branches:
   only:
     - develop
+    - feature/v2.1.0
 
 cache:
   directories:
-    - $HOME/.composer/cache
-    - ./vendor
-    - node_modules
+    - $HOME/.config/composer/cache
+    - $HOME/.npm
+    - $HOME/.nvm
 
 # Git clone depth.
 git:
   depth: 1
+  quiet: true
 
 matrix:
   fast_finish: true
@@ -51,18 +52,18 @@ before_script:
   # Turn off Xdebug. See https://core.trac.wordpress.org/changeset/40138.
   - phpenv config-rm xdebug.ini || echo "Xdebug not available"
 
-  - export PATH="$HOME/.composer/vendor/bin:$PATH"
+  - export PATH="$HOME/.config/composer/vendor/bin:$PATH"
 
   # Couple the PHPUnit version to the PHP version.
   - |
     case "$TRAVIS_PHP_VERSION" in
       7.*)
-        echo "Using PHPUnit 6.1"
-        composer global require "phpunit/phpunit=6.1.*"
+        echo "Using PHPUnit 6.5"
+        composer global require "phpunit/phpunit=6.5.*"
         ;;
       *)
-        echo "Using PHPUnit 4.8"
-        composer global require "phpunit/phpunit=4.8.*"
+        echo "Using PHPUnit 5.7"
+        composer global require "phpunit/phpunit=5.7.*"
         ;;
     esac
 
@@ -75,16 +76,15 @@ before_script:
   # Set up phpcs.
   - |
     if [[ "$WP_PHPCS" == "1" ]] ; then
-      composer global require automattic/vipwpcs
-      phpcs --config-set installed_paths $HOME/.composer/vendor/wp-coding-standards/wpcs,$HOME/.composer/vendor/automattic/vipwpcs
+      composer g require --dev automattic/vipwpcs dealerdirect/phpcodesniffer-composer-installer
     fi
 
   # Set up jest.
   - |
     if [[ "$WP_JS" == "1" ]] ; then
-      nvm install 8
+      nvm install 12
       npm i -g npm@6
-      npm install
+      npm ci
     fi
 
 # Run test script commands.