Merge remote-tracking branch 'origin/master' into lgraubner-cleanup

.eslintrc.js

@@ -0,0 +1,19 @@
+module.exports = {
+  "env": {
+    "browser": true,
+    "es6": true,
+  },
+  "plugins": [
+    "react",
+  ],
+  "globals": {
+    "graphql": false,
+  },
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true,
+      "jsx": true,
+    },
+  }
+}

.travis.yml

@@ -1,39 +1,15 @@
-# back to language cpp to try to bypass osx node failure
-language: cpp
-sudo: false
-env:
-  - export NODE_VERSION="0.10"
-  - export NODE_VERSION="0.12"
-  - export NODE_VERSION="4"
-  - export NODE_VERSION="5"
+language: node_js
+
 os:
   - linux
   - osx
-# pre-install to bring in the correct version of node via nvm
-before_install:
-  - git submodule update --init --recursive
-  - git clone https://github.com/creationix/nvm.git ./.nvm
-  - source ./.nvm/nvm.sh
-  - nvm install $NODE_VERSION
-  - nvm use $NODE_VERSION
-  - npm config set python `which python`
-  - if [ $TRAVIS_OS_NAME == "linux" ]; then
-      export CC="gcc-4.8";
-      export CXX="g++-4.8";
-      export LINK="gcc-4.8";
-      export LINKXX="g++-4.8";
-    fi
-  - gcc --version
-  - g++ --version
-# node 4 depends on gcc 4.8
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - g++-4.8
-    - gcc-4.8
-# script needed to test, because defaults don't work on osx
+
+node_js:
+  - "node"
+  - "lts/*"
+  - "7"
+  - "8"
+
 script:
   - npm install
   - npm run lint

package.json

@@ -29,6 +29,8 @@
     "typography-theme-wordpress-2016": "^0.15.1"
   },
   "devDependencies": {
+    "eslint": "^4.9.0",
+    "eslint-plugin-react": "^7.4.0",
     "gh-pages": "^0.12.0",
     "prettier": "^1.7.4"
   },