Merge branch 'master' of https://github.com/APIDevTools/json-schema-ref-parser

# Conflicts:
#	.travis.yml

Author: JamesMessinger

.gitattributes

@@ -0,0 +1,25 @@
+# Git attributes
+# https://git-scm.com/docs/gitattributes
+# https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes
+
+# Normalize line endings for all files that git determines to be text.
+# https://git-scm.com/docs/gitattributes#gitattributes-Settostringvalueauto
+* text=auto
+
+# Normalize line endings to LF on checkin, and do NOT convert to CRLF when checking-out on Windows.
+# https://git-scm.com/docs/gitattributes#gitattributes-Settostringvaluelf
+*.txt text eol=lf
+*.html text eol=lf
+*.md text eol=lf
+*.css text eol=lf
+*.scss text eol=lf
+*.map text eol=lf
+*.js text eol=lf
+*.jsx text eol=lf
+*.ts text eol=lf
+*.tsx text eol=lf
+*.json text eol=lf
+*.yml text eol=lf
+*.yaml text eol=lf
+*.xml text eol=lf
+*.svg text eol=lf

.travis.yml

@@ -3,41 +3,64 @@
 # https://docs.travis-ci.com/user/customizing-the-build/
 # https://docs.travis-ci.com/user/migrating-from-legacy/
 
-dist: trusty
-sudo: required  # Required for headless Chrome
+filter_secrets: false
 language: node_js
 
-addons:
-  firefox: latest
-  chrome: stable
+node_js:
+  - 10
+  - 8
+  - 6
 
-matrix:
-  include:
-    # Node 10 + Browser tests
-    - node_js: 10
-      env: KARMA=true
-
-    # Node 8 + SauceLabs tests
-    - node_js: 8
-      env: KARMA=true SAUCE=true
-
-    # Node 6 tests
-    - node_js: 6
+os:
+  - linux
+  - osx
+  - windows
 
 before_script:
-  # Setup a virtual display for browser testing
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+  - npm run lint
 
-script: npm run lint && npm run test:typescript && npm run coverage
+script:
+  - npm run test:typescript
+  - npm run coverage:node
 
 after_success:
   # concatenate all code-coverage data into a single file
   - ls -Rlh coverage/*/lcov.info
   - cat coverage/*/lcov.info > ./coverage/lcov.info
 
-  # send code-coverage data to Codacy
-  - cat ./coverage/lcov.info | node_modules/.bin/codacy-coverage -p .
-
   # send code-coverage data to Coveralls
   - cat ./coverage/lcov.info | coveralls
+
+jobs:
+  include:
+    - name: Browser tests (Linux)
+      os: linux
+      script: npm run coverage:browser
+      addons:
+        firefox: latest
+        chrome: stable
+
+    - name: Browser tests (Mac)
+      os: osx
+      script: npm run coverage:browser
+      addons:
+        firefox: latest
+        chrome: stable
+
+    - name: Browser tests (Windows via SauceLabs)
+      os: linux
+      script: npm run coverage:browser
+      env: WINDOWS=true
+
+    - stage: Deploy
+      name: Publish to npm
+      script: npm run build
+      after_success: true
+      deploy:
+        provider: npm
+        email: $NPM_EMAIL
+        api_key: $NPM_API_KEY
+        skip_cleanup: true
+        on:
+          tags: true
+          branch: master

README.md

@@ -2,16 +2,15 @@ JSON Schema $Ref Parser
 ============================
 #### Parse, Resolve, and Dereference JSON Schema $ref pointers
 
-[![Build Status](https://api.travis-ci.org/APIDevTools/json-schema-ref-parser.svg?branch=master)](https://travis-ci.org/APIDevTools/json-schema-ref-parser)
-[![Dependencies](https://david-dm.org/APIDevTools/json-schema-ref-parser.svg)](https://david-dm.org/APIDevTools/json-schema-ref-parser)
+[![Build Status](https://api.travis-ci.com/APIDevTools/json-schema-ref-parser.svg?branch=master)](https://travis-ci.com/APIDevTools/json-schema-ref-parser)
 [![Coverage Status](https://coveralls.io/repos/github/APIDevTools/json-schema-ref-parser/badge.svg?branch=master)](https://coveralls.io/github/APIDevTools/json-schema-ref-parser)
-[![Codacy Score](https://api.codacy.com/project/badge/d8abfe5e9a4044b89bd9f4b999d4a574)](https://www.codacy.com/public/JamesMessinger/json-schema-ref-parser)
-[![Inline docs](https://inch-ci.org/github/APIDevTools/json-schema-ref-parser.svg?branch=master&style=shields)](https://inch-ci.org/github/APIDevTools/json-schema-ref-parser)
 
 [![npm](https://img.shields.io/npm/v/json-schema-ref-parser.svg)](https://www.npmjs.com/package/json-schema-ref-parser)
+[![Dependencies](https://david-dm.org/APIDevTools/json-schema-ref-parser.svg)](https://david-dm.org/APIDevTools/json-schema-ref-parser)
 [![License](https://img.shields.io/npm/l/json-schema-ref-parser.svg)](LICENSE)
 
-[![Browser Compatibility](https://saucelabs.com/browser-matrix/json-schema-parser.svg)](https://saucelabs.com/u/json-schema-parser)
+
+[![OS and Browser Compatibility](https://apidevtools.org/img/badges/ci-badges-with-ie.svg)](https://travis-ci.com/APIDevTools/json-schema-ref-parser)
 
 
 The Problem:
@@ -105,7 +104,7 @@ var $RefParser = require('json-schema-ref-parser');
 Reference [`ref-parser.js`](dist/ref-parser.js) or [`ref-parser.min.js`](dist/ref-parser.min.js) in your HTML:
 
 ```html
-<script src="https://cdn.rawgit.com/JS-DevTools/json-schema-ref-parser/dist/ref-parser.js"></script>
+<script src="https://unpkg.com/json-schema-ref-parser/dist/ref-parser.min.js"></script>
 <script>
   $RefParser.dereference(mySchema)
     .then(function(schema) {
@@ -149,3 +148,11 @@ To build/test the project locally on your computer:
 License
 --------------------------
 JSON Schema $Ref Parser is 100% free and open-source, under the [MIT license](LICENSE). Use it however you want.
+
+Big Thanks To
+--------------------------
+Thanks to these awesome companies for their support of Open Source developers ❤
+
+[![Travis CI](https://jsdevtools.org/img/badges/travis-ci.svg)](https://travis-ci.com)
+[![SauceLabs](https://jsdevtools.org/img/badges/sauce-labs.svg)](https://saucelabs.com)
+[![Coveralls](https://jsdevtools.org/img/badges/coveralls.svg)](https://coveralls.io)