Merge pull request #83 from MarkHerhold/modernize

Modernize & cleanup (#72)

.eslintrc

@@ -1,37 +1,8 @@
 {
-  "parser": "babel-eslint",
-
   "env": {
     "browser": true,
-    "node": true,
-    "es6": true
+    "node": true
   },
-
-  "ecmaFeatures": {
-    "arrowFunctions": true,
-    "binaryLiterals": true,
-    "blockBindings": true,
-    "classes": false,
-    "defaultParams": true,
-    "destructuring": true,
-    "forOf": true,
-    "generators": true,
-    "modules": true,
-    "objectLiteralComputedProperties": true,
-    "objectLiteralDuplicateProperties": true,
-    "objectLiteralShorthandMethods": true,
-    "objectLiteralShorthandProperties": true,
-    "octalLiterals": true,
-    "regexUFlag": true,
-    "regexYFlag": true,
-    "spread": true,
-    "superInFunctions": false,
-    "templateStrings": true,
-    "unicodeCodePointEscapes": true,
-    "globalReturn": true,
-    "jsx": true
-  },
-
   "rules": {
     "block-scoped-var": [0],
     "brace-style": [2, "1tbs", {"allowSingleLine": true}],
@@ -81,7 +52,7 @@
     "no-else-return": [0],
     "no-empty": [2],
     "no-empty-character-class": [2],
-    "no-empty-label": [2],
+    "no-labels": [2],
     "no-eq-null": [0],
     "no-eval": [2],
     "no-ex-assign": [2],
@@ -99,7 +70,6 @@
     "no-irregular-whitespace": [2],
     "no-iterator": [2],
     "no-label-var": [2],
-    "no-labels": [2],
     "no-lone-blocks": [2],
     "no-lonely-if": [2],
     "no-loop-func": [2],
@@ -162,7 +132,7 @@
     "semi": [2],
     "semi-spacing": [2, {"before": false, "after": true}],
     "sort-vars": [0],
-    "space-after-keywords": [2, "always"],
+    "keyword-spacing": [2, {"after": true}],
     "space-before-function-paren": [2, {"anonymous": "always", "named": "always"}],
     "space-before-blocks": [0, "always"],
     "space-in-brackets": [
@@ -177,7 +147,6 @@
     ],
     "space-in-parens": [2, "never"],
     "space-infix-ops": [2],
-    "space-return-throw-case": [2],
     "space-unary-ops": [2, {"words": true, "nonwords": false}],
     "spaced-line-comment": [0, "always"],
     "strict": [2, "never"],

.gitignore

@@ -1,4 +1,4 @@
 node_modules
-bin/env.sh
+dist
 npm-debug.log
-test-cuid.js
+.zuulrc

.travis.yml

@@ -1,15 +1,15 @@
+dist: trusty
 language: node_js
 node_js:
-  - "0.12"
-  - "iojs"
   - "4"
   - "6"
-  - "7"
-install:
-  - npm install
-script:
-  - npm run validate
+  - "8"
+addons:
+  apt:
+    packages:
+      - google-chrome-stable
 env:
   global:
     - secure: ZaVxQhRv9HYXTCqeS9T4XXGO1cGayL11os8jDZ6wqNkQAwkOw3QSL70iloN5DMzg4WXv8Pwp5I4EUDIcUwiu4UCbDgfn1vYoTfVEmDMBDni4xw3CRG7IT8gEijJItCaOdEzC+IBmpAFuVI8xcuic7WBYPKRnShWkZ1xwmHDSenc=
     - secure: lh7gaH4G4RUvdjrocupakeFbx4JtF7AyLGXGfsJl+/PJFjvrB+Ahatb8sTcb5hDHTr+Ucunzawx1HBNE+k+7CyykKBQpsQNWT/q6vlL/PAjRpt501O46NEdfTm/RSTqHgIo9WINYIa/ZpCh2L0vAevduaT0GGFCaP9W7fpJaVhM=
+    - CHROME_BIN=/usr/bin/google-chrome-stable

CONTRIBUTING.md

@@ -1,33 +1,17 @@
 # Contributing to cuid
 
-## Saucelabs setup
-
-To run unit tests on Saucelabs, first create a Saucelabs account (if you don't
-already have one) [here](https://saucelabs.com/opensource).
-
-Copy the `bin/env.sh.example` to `bin/env.sh`
-
-```sh
-cp bin/env.sh{.example,}
-```
-
-Edit your copy of `bin/env.sh` to enter your Saucelabs username and access key.
-
-```
-export SAUCE_USERNAME=username
-export SAUCE_ACCESS_KEY=key
-```
+To properly perform browser testing, Chrome 60 or higher needs to be installed locally to run the tests in headless mode.
 
 ## Testing
 
-To unit test the server implementation, run
+To unit test the server version locally, run
 
 ```sh
 npm run test:server
 ```
 
-To unit test the client implementation, run
+To unit test cuid in the browser version locally, run
 
 ```sh
-npm run test:client
+npm run test:browser
 ```