Skip to content

Commit

Permalink
Merge pull request #26 from omgaz/release-bunde
Browse files Browse the repository at this point in the history
[patch] license and bundle
  • Loading branch information
omgaz authored Apr 30, 2020
2 parents 87db1db + 1a16a5e commit a7cb065
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 141 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020 Gary Chisholm

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
14 changes: 13 additions & 1 deletion dist/index.js
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
function diffler(f,e){var o={};for(var r in f)if(f.hasOwnProperty(r)&&"function"!=typeof f[r]){var n=f[r],t=e[r];if(r in e)if("object"==typeof n){var i=diffler(n,t);Object.keys(i).length>0&&i&&(o[r]=i)}else n!==t&&(o[r]={from:n,to:t});else o[r]={from:n,to:null}}for(r in e)if(e.hasOwnProperty(r)&&"function"!=typeof e[r]){n=f[r],t=e[r];r in f||(o||(o={}),o[r]={from:null,to:t})}return o}module.exports=diffler;
/**
* @license MIT https://github.com/omgaz/diffler
* Author: Gary Chisholm @omgaz
*/
/**
* @preserve
* Read in two objects. Iterate over them and return the differences.
*
* @param {object} obj1 First object to compare from.
* @param {object} obj2 Second object to compare against obj1.
* @returns {object} Nested json object of changed properties containing a from and to key.
*/
function diffler(f,e){var o={};for(var r in f)if(f.hasOwnProperty(r)&&"function"!=typeof f[r]){var n=f[r],t=e[r];if(r in e)if("object"==typeof n){var i=diffler(n,t);0<Object.keys(i).length&&i&&(o[r]=i)}else n!==t&&(o[r]={from:n,to:t});else o[r]={from:n,to:null}}for(r in e)if(e.hasOwnProperty(r)&&"function"!=typeof e[r]){n=f[r],t=e[r];r in f||((o=o||{})[r]={from:null,to:t})}return o}module.exports=diffler;
136 changes: 0 additions & 136 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-jsdoc": "^24.0.0",
"eslint-plugin-prettier": "^3.1.3",
"minify": "^5.1.1",
"mocha": "^7.1.2",
"prettier": "^2.0.5"
"prettier": "^2.0.5",
"uglify-js": "^3.9.1"
},
"scripts": {
"test": "echo \"Running Mocha Tests\" && mocha ./tests/index.js",
"lint": "eslint .",
"minify": "echo \"Running Minify\" && minify ./src/index.js > ./dist/index.js",
"build": "echo \"Running Build\" && uglifyjs ./src/index.js --comments --compress --mangle -o ./dist/index.js",
"bench": "echo \"Running Performance Benchmark\" && node ./tests/performance.js"
},
"repository": {
Expand All @@ -29,7 +29,8 @@
"comparison",
"compare",
"diff",
"js-diff"
"js-diff",
"deep-diff"
],
"author": "Gary Chisholm",
"license": "MIT",
Expand Down
6 changes: 6 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
/**
* @license MIT https://github.com/omgaz/diffler
* Author: Gary Chisholm @omgaz
*/

/**
* @preserve
* Read in two objects. Iterate over them and return the differences.
*
* @param {object} obj1 First object to compare from.
Expand Down

0 comments on commit a7cb065

Please sign in to comment.