Skip to content

Commit 52e833e

Browse files
author
Phillip Clark
committed
removed es6 module weirdness
1 parent f681358 commit 52e833e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+5282
-2679
lines changed

.circleci/config.yml

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
version: 2
2+
jobs:
3+
build:
4+
working_directory: ~/repo
5+
docker:
6+
- image: circleci/node:8.9.4
7+
steps:
8+
- checkout
9+
- run:
10+
name: authorize npm
11+
command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
12+
- restore_cache:
13+
key: dependency-cache-{{ checksum "package.json" }}
14+
- run:
15+
name: run npm install
16+
command: npm install
17+
- save_cache:
18+
key: dependency-cache-{{ checksum "package.json" }}
19+
paths:
20+
- ./node_modules
21+
- run: mkdir ~/junit
22+
- run:
23+
name: build & test
24+
command: npm run ci
25+
when: always
26+
- run: cp test-results.xml ~/junit/test-results.xml
27+
- store_test_results:
28+
path: ~/junit
29+
- store_artifacts:
30+
path: ~/junit
31+
32+
build_deploy_npm:
33+
working_directory: ~/repo
34+
docker:
35+
- image: circleci/node:8.9.4
36+
steps:
37+
- checkout
38+
- run:
39+
name: authorize npm
40+
command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
41+
- restore_cache:
42+
key: dependency-cache-{{ checksum "package.json" }}
43+
- run:
44+
name: run npm install
45+
command: npm install
46+
- save_cache:
47+
key: dependency-cache-{{ checksum "package.json" }}
48+
paths:
49+
- ./node_modules
50+
- run: mkdir ~/junit
51+
- run:
52+
name: build & test
53+
command: npm run ci
54+
when: always
55+
- run: cp test-results.xml ~/junit/test-results.xml
56+
- store_test_results:
57+
path: ~/junit
58+
- store_artifacts:
59+
path: ~/junit
60+
- run:
61+
name: publish package to npm
62+
command: npm publish
63+
64+
workflows:
65+
version: 2
66+
build_deploy:
67+
jobs:
68+
- build:
69+
context: secrets
70+
- build_deploy_npm:
71+
context: secrets
72+
filters:
73+
tags:
74+
only: /.*/
75+
branches:
76+
ignore: /.*/

.editorconfig

-14
This file was deleted.

.eslintrc

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
{
2+
"parserOptions": {
3+
"sourceType": "module"
4+
},
5+
"env": {
6+
"node": true
7+
},
8+
"extends": "eslint:recommended",
9+
"rules": {
10+
"no-alert": 2,
11+
"no-array-constructor": 2,
12+
"no-caller": 2,
13+
"no-catch-shadow": 2,
14+
"no-eval": 2,
15+
"no-extend-native": 2,
16+
"no-extra-bind": 2,
17+
"no-implied-eval": 2,
18+
"no-iterator": 2,
19+
"no-label-var": 2,
20+
"no-labels": 2,
21+
"no-lone-blocks": 2,
22+
"no-loop-func": 2,
23+
"no-multi-spaces": 2,
24+
"no-multi-str": 2,
25+
"no-native-reassign": 2,
26+
"no-new": 2,
27+
"no-new-func": 2,
28+
"no-new-object": 2,
29+
"no-new-wrappers": 2,
30+
"no-octal-escape": 2,
31+
"no-process-exit": 2,
32+
"no-proto": 2,
33+
"no-return-assign": 2,
34+
"no-script-url": 2,
35+
"no-sequences": 2,
36+
"no-shadow": 2,
37+
"no-shadow-restricted-names": 2,
38+
"no-spaced-func": 2,
39+
"no-trailing-spaces": 2,
40+
"no-undef-init": 2,
41+
"no-underscore-dangle": 0,
42+
"no-unused-expressions": 2,
43+
"no-use-before-define": 2,
44+
"no-with": 2,
45+
"camelcase": 1,
46+
"comma-spacing": 2,
47+
"consistent-return": 2,
48+
"curly": [ 2, "all" ],
49+
"dot-notation": [ 2, { "allowKeywords": true } ],
50+
"eol-last": 2,
51+
"no-extra-parens": [ 2, "functions" ],
52+
"eqeqeq": 2,
53+
"keyword-spacing": [ 2, { "before": true, "after": true } ],
54+
"key-spacing": [ 2, { "beforeColon": false, "afterColon": true } ],
55+
"new-cap": 2,
56+
"new-parens": 2,
57+
"quotes": [ 2, "single" ],
58+
"semi": 2,
59+
"semi-spacing": [ 2, { "before": false, "after": true } ],
60+
"space-infix-ops": 2,
61+
"space-unary-ops": [ 2, { "words": true, "nonwords": false } ],
62+
"strict": [ 2, "global" ],
63+
"yoda": [ 2, "never" ]
64+
},
65+
"overrides": [
66+
{
67+
"files": [ "*.js", "test/*.js" ],
68+
"excludedFiles": "examples/*.js"
69+
}
70+
]
71+
}

.gitignore

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
node_modules
2-
build
3-
components
4-
.idea/
5-
*.iml
1+
node_modules/
2+
coverage/
3+
test-results.xml

.jsbeautifyrc

-6
This file was deleted.

.jscsrc

-15
This file was deleted.

.jshintignore

-1
This file was deleted.

.jshintrc

-9
This file was deleted.

.npmignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
test-results.xml

.travis.yml

-15
This file was deleted.

ChangeLog.md

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# deep-diff Change Log
2+
3+
**deep-diff** is a javascript/node.js module providing utility functions for determining the structural differences between objects and includes some utilities for applying differences across objects.
4+
5+
## Log
6+
7+
`1.0-pre` - 2018-02-25
8+
9+
* reverted to [UMD style module](https://github.com/umdjs/umd) rather than the ES6 style, which evidently, broke lots of people's previously working code.
10+
* fixed some bugs...
11+
12+
`0.3.8` - 2017-05-03
13+
14+
* reconciled recently introduced difference between `index.es.js` and `index.js`
15+
* improved npm commands for more reliable contributions
16+
* added a few notes to README regarding contributing.
17+
18+
`0.3.7` - 2017-05-01
19+
20+
* fixed issue #98 by merging @sberan's pull request #99 — better handling of property with `undefined` value existing on either operand. Unit tests supplied.
21+
22+
`0.3.6` - 2017-04-25 — Fixed, closed lingering issues:
23+
24+
* fixed #74 — comparing objects with longer cycles
25+
* fixed #70 — was not properly detecting a deletion when a property on the operand (lhs) had a value of `undefined` and was _undefined_ on the comparand (rhs). :o).
26+
* WARNING! [Still broken when importing in Typescript](https://github.com/flitbit/diff/issues/97).
27+
28+
`0.3.5` - 2017-04-23 — Rolled up recent fixes; patches:
29+
30+
* @stevemao — #79, #80: now testing latest version of node4
31+
* @mortonfox — #85: referencing mocha's new home
32+
* @tdebarochez — #90: fixed error when .toString not a function
33+
* @thiamsantos — #92, #93: changed module system for improved es2015 modules. WARNING! [This PR broke importing `deep-diff` in Typescript as reported by @kgentes in #97](https://github.com/flitbit/diff/issues/97)
34+
35+
`0.3.4` - Typescript users, reference this version until #97 is fixed!
36+
37+
`0.3.3` - Thanks @SimenB: enabled npm script for release (alternate to the Makefile). Also linting as part of `npm test`. Thanks @joeldenning: Fixed issue #35; diffs of top level arrays now working.
38+
39+
`0.3.3` - Thanks @SimenB: enabled npm script for release (alternate to the Makefile). Also linting as part of `npm test`. Thanks @joeldenning: Fixed issue #35; diffs of top level arrays now working.
40+
41+
`0.3.2` - Resolves #46; support more robust filters by including `lhs` and `rhs` in the filter callback. By @Orlando80
42+
43+
`0.3.1` - Better type checking by @Drinks, UMD wrapper by @SimenB. Now certifies against nodejs 12 and iojs (Thanks @SimenB).
44+
45+
`0.2.0` - [Fixes Bug #17](https://github.com/flitbit/diff/issues/17), [Fixes Bug #19](https://github.com/flitbit/diff/issues/19), [Enhancement #21](https://github.com/flitbit/diff/issues/21) Applying changes that are properly structured can now be applied as a change (no longer requires typeof Diff) - supports differences being applied after round-trip serialization to JSON format. Prefilter now reports the path of all changes - it was not showing a path for arrays and anything in the structure below (reported by @ravishvt).
46+
47+
*Breaking Change* – The structure of change records for differences below an array element has changed. Array indexes are now reported as numeric elements in the `path` if the changes is merely edited (an `E` kind). Changes of kind `A` (array) are only reported for changes in the terminal array itself and will have a nested `N` (new) item or a nested `D` (deleted) item.
48+
49+
`0.1.7` - [Enhancement #11](https://github.com/flitbit/diff/issues/11) Added the ability to filter properties that should not be analyzed while calculating differences. Makes `deep-diff` more usable with frameworks that attach housekeeping properties to existing objects. AngularJS does this, and the new filter ability should ease working with it.
50+
51+
`0.1.6` - Changed objects within nested arrays can now be applied. They were previously recording the changes appropriately but `applyDiff` would error. Comparison of `NaN` works more sanely - comparison to number shows difference, comparison to another `Nan` does not.

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2011-2013 Phillip Clark
1+
Copyright (c) 2011-2018 Phillip Clark
22

33
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:
44

Makefile

-18
This file was deleted.

0 commit comments

Comments
 (0)