Merge pull request #48 from tbolis/develop

Develop -> Master

.babelrc

@@ -1,18 +1,22 @@
 {
   "presets": [
-    [
-      "env",
-      {
-        "modules": false
-      }
-    ],
-    "react",
-    "stage-0"
+    "@babel/preset-env", "@babel/preset-react"
   ],
   "plugins": [
+    "@babel/plugin-transform-runtime",
     "react-hot-loader/babel",
-    "transform-object-assign",
-    "transform-react-display-name",
-    "transform-runtime"
+
+    // Stage 2 https://github.com/babel/babel/tree/master/packages/babel-preset-stage-2
+    ["@babel/plugin-proposal-decorators", { "legacy": true }],
+    "@babel/plugin-proposal-function-sent",
+    "@babel/plugin-proposal-export-namespace-from",
+    "@babel/plugin-proposal-numeric-separator",
+    "@babel/plugin-proposal-throw-expressions",
+
+    // Stage 3
+    "@babel/plugin-syntax-dynamic-import",
+    "@babel/plugin-syntax-import-meta",
+    ["@babel/plugin-proposal-class-properties", { "loose": true }],
+    "@babel/plugin-proposal-json-strings"
   ]
 }

.eslintrc

@@ -2,36 +2,25 @@
   "parser": "babel-eslint",
   "plugins": [
     "react",
+    "jest",
     "eslint-plugin-react"
   ],
   "env": {
-    "browser": true,
-    "amd": true,
     "es6": true,
-    "node": false
+    "jest": true,
+    "amd": true,
+    "browser": true,
+    "node": true
   },
-  "rules": {
-    "comma-dangle": 1,
-    "quotes": [
-      1,
-      "single"
-    ],
-    "no-undef": 1,
-    "global-strict": 0,
-    "no-extra-semi": 1,
-    "no-underscore-dangle": 0,
-    "no-extra-parens": 0,
-    "no-console": 1,
-    "no-unused-vars": 1,
-    "no-trailing-spaces": [
-      1,
-      {
-        "skipBlankLines": true
-      }
-    ],
-    "no-alert": 0,
-    "no-unreachable": 1,
-    "react/jsx-uses-react": 1,
-    "react/jsx-uses-vars": 1
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended"
+  ],
+  "globals": {
+    "React": true,
+    "document": true,
+    "require": true,
+    "window": true,
+    "localStorage": true
   }
 }

.gitignore

@@ -158,6 +158,7 @@ node_modules
 
 lib/
 build/
+dist/
 
 ### Windows template
 # Windows image file caches

.travis.yml

@@ -1,9 +1,8 @@
 language: node_js
 node_js:
+  - "10"
   - "9"
   - "8"
-  - "7"
-  - "6"
 cache:
   yarn: true
   directories:
@@ -18,5 +17,5 @@ addons:
       - g++-4.8
 before_install:
   - sudo apt-get update -qq
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.9.4
   - sudo apt-get install -y -qq libgif-dev libpng-dev libjpeg8-dev libpango1.0-dev libcairo2-dev
-script: 'npm run build && npm run test'

examples/base.html

@@ -23,7 +23,7 @@
     };
     (function () {
         var wf = document.createElement('script');
-        wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
+        wf.src = ('https:' === document.location.protocol ? 'https' : 'http') +
                 '://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
         wf.type = 'text/javascript';
         wf.async = 'true';

examples/main.css

@@ -15,7 +15,7 @@ body, html {
     min-height: 100%;
     width: 100%;
     height: 100%;
-    background-color: #eeffd3;
+    background-color: #607d8b;
     color: #000000;
 }