Merge pull request #2 from codepen/kpdecker-master

Update to latest JSDiff

Author: quezo

.npmignore

@@ -2,7 +2,6 @@
 .eslintrc
 .gitignore
 .npmignore
-.travis.yml
 .vscode
 components
 coverage
@@ -13,7 +12,6 @@ index.html
 karma.conf.js
 rollup.config.js
 src
-style.css
 tasks
 test
 yarn-error.log

.travis.yml

@@ -15,25 +15,26 @@ Generally we like to see pull requests that
 ## Building
 
 ```
-npm install
-npm test
+yarn
+yarn test
 ```
 
-The `npm test -- dev` implements watching for tests within Node and `karma start` may be used for manual testing in browsers.
+Running `yarn test -- dev` will watch for tests within Node and `karma start` may be used for manual testing in browsers.
 
 If you notice any problems, please report them to the GitHub issue tracker at
 [http://github.com/kpdecker/jsdiff/issues](http://github.com/kpdecker/jsdiff/issues).
 
 ## Releasing
 
-JsDiff utilizes the [release yeoman generator][generator-release] to perform most release tasks.
-
-A full release may be completed with the following:
+A full release may be completed by first updating the `"version"` property in package.json, then running the following:
 
 ```
-yo release
-npm publish
+yarn clean
+yarn grunt release
+yarn publish
 ```
 
-[generator-release]: https://github.com/walmartlabs/generator-release
-[pull-request]: https://github.com/kpdecker/jsdiff/pull/new/master
+After releasing, remember to:
+* commit the `package.json` change and push it to GitHub
+* create a new version tag on GitHub
+* update `diff.js` on the `gh-pages` branch to the latest built version from the `dist/` folder.

CONTRIBUTING.md

@@ -73,10 +73,6 @@ module.exports = function(grunt) {
       unit: {
         singleRun: true
       },
-      sauce: {
-        singleRun: true,
-        browsers: ['sl_chrome', 'sl_firefox', 'sl_ie_11']
-      }
     },
 
     uglify: {
@@ -143,13 +139,6 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-mocha-istanbul');
   grunt.loadNpmTasks('grunt-exec');
 
-  grunt.task.loadTasks('tasks');
-
-  grunt.registerTask('travis',
-    !process.env.KARMA && process.env.SAUCE_USERNAME
-      ? ['clean', 'build', 'karma:unit', 'karma:sauce', 'cover']
-      : ['clean', 'build', 'cover']);
-
   grunt.registerTask('dev', ['clean', 'watch']);
   grunt.registerTask('default', ['clean', 'build', 'cover']);
 };

Gruntfile.js

@@ -1,31 +1,29 @@
-Software License Agreement (BSD License)
+BSD 3-Clause License
 
 Copyright (c) 2009-2015, Kevin Decker <kpdecker@gmail.com>
-
 All rights reserved.
 
-Redistribution and use of this software in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-* Redistributions in binary form must reproduce the above
-  copyright notice, this list of conditions and the
-  following disclaimer in the documentation and/or other
-  materials provided with the distribution.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
-* Neither the name of Kevin Decker nor the names of its
-  contributors may be used to endorse or promote products
-  derived from this software without specific prior
-  written permission.
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.