Skip to content

Commit 3b2e96c

Browse files
authored
Merge branch 'master' into master
2 parents 1d4eee7 + f224c39 commit 3b2e96c

Some content is hidden

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

51 files changed

+20304
-12538
lines changed

.babelrc

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
{
2+
"presets": ["react-app"],
23
"plugins": [
3-
'transform-class-properties',
4-
'react-html-attrs',
5-
'transform-function-bind'
4+
"@babel/plugin-syntax-class-properties",
5+
"@babel/plugin-syntax-jsx",
6+
"react-html-attrs"
67
],
7-
"presets": ["react", "es2015", "stage-0"]
8+
"env": {
9+
"test": {
10+
"plugins": [
11+
"istanbul"
12+
]
13+
}
14+
}
815
}

.coveralls.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
service-name: travis-ci
2-
repo_token: vgY2Lq1R7eqlkcmpp4wU32xZI7JskTACs
2+
repo_token: 5tBngUO90HTikmfFGI6ve2w7sVSau3N9K

.eslintrc.js

Lines changed: 0 additions & 41 deletions
This file was deleted.

.eslintrc.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"plugins": ["react", "prettier"],
3+
"rules": {
4+
"prettier/prettier": "error",
5+
"import/no-anonymous-default-export": "off",
6+
"egegeg": "off"
7+
},
8+
"parser":"@babel/eslint-parser",
9+
"parserOptions": {
10+
"sourceType": "module",
11+
"ecmaVersion": 6,
12+
"ecmaFeatures": {
13+
"experimentalObjectRestSpread": true
14+
}
15+
},
16+
"env": {
17+
"es6": true,
18+
"node": true
19+
}
20+
}

.github/workflows/ci-tests.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: ci_tests
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
push:
8+
9+
jobs:
10+
test:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v1
14+
- uses: actions/setup-node@v1
15+
with:
16+
node-version: 12
17+
- name: Cache node modules
18+
uses: actions/cache@v1
19+
with:
20+
path: node_modules
21+
key: dependencies
22+
- run: npm i
23+
- run: npm run lint
24+
- run: npm run test
25+

.nycrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"plugins": ["transform-decorators-legacy"],
33
"require": [
4-
"babel-register",
4+
"@babel/register",
55
"./test/testHelpers/requireSources.js"
66
]
77
}

.prettierrc.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"tabWidth": 4,
3+
"printWidth": 80,
4+
"singleQuote": true,
5+
"trailingComma": "none",
6+
"bracketSpacing": true,
7+
"jsxBracketSameLine": false,
8+
"parser": "babel",
9+
"semi": true,
10+
"requirePragma": false,
11+
"proseWrap": "preserve",
12+
"arrowParens": "avoid",
13+
"eslintIntegration": false,
14+
"endOfLine": "auto"
15+
}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:8.4.0-slim
1+
FROM node:14.15.4-buster-slim
22
MAINTAINER mac <mac.gainor@gmail.com>
33

44
# install the node modules at container build time

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Name|Type|Default|Description
4949
`collapsed`|`boolean` or `integer`|`false`|When set to `true`, all nodes will be collapsed by default. Use an integer value to collapse at a particular depth.
5050
`collapseStringsAfterLength`|`integer`|`false`|When an integer value is assigned, strings will be cut off at that length. Collapsed strings are followed by an ellipsis. String content can be expanded and collapsed by clicking on the string value.
5151
`shouldCollapse`|`(field)=>{}`|`false`|Callback function to provide control over what objects and arrays should be collapsed by default. An object is passed to the callback containing `name`, `src`, `type` ("array" or "object") and `namespace`.
52-
`groupArraysAfterLength`|`integer`|`100`|When an integer value is assigned, arrays will be displayed in groups by count of the value. Groups are displayed with brakcet notation and can be expanded and collapsed by clickong on the brackets.
52+
`groupArraysAfterLength`|`integer`|`100`|When an integer value is assigned, arrays will be displayed in groups by count of the value. Groups are displayed with bracket notation and can be expanded and collapsed by clicking on the brackets.
5353
`enableClipboard`|`boolean` or `(copy)=>{}`|`true`|When prop is not `false`, the user can copy objects and arrays to clipboard by clicking on the clipboard icon. Copy callbacks are supported.
5454
`displayObjectSize`|`boolean`|`true`|When set to `true`, objects and arrays are labeled with size
5555
`displayDataTypes`|`boolean`|`true`|When set to `true`, data type labels prefix values
@@ -59,6 +59,7 @@ Name|Type|Default|Description
5959
`onDelete`|`(delete)=>{}`|`false`|When a callback function is passed in, `delete` functionality is enabled. The callback is invoked before deletions are completed. Returning `false` from `onDelete` will prevent the change from being made. [see: onDelete docs](#onedit-onadd-and-ondelete-interaction)
6060
`onSelect`|`(select)=>{}`|`false`|When a function is passed in, clicking a value triggers the `onSelect` method to be called.
6161
`sortKeys`|`boolean`|`false`|set to true to sort object keys
62+
`quotesOnKeys`|`boolean`|`true`|set to false to remove quotes from keys (eg. `"name":` vs. `name:`)
6263
`validationMessage`|`string`|"Validation Error"|Custom message for validation failures to `onEdit`, `onAdd`, or `onDelete` callbacks
6364
`displayArrayKey`|`boolean`|`true`|When set to `true`, the index of the elements prefix values
6465

demo/dist/main.js

Lines changed: 8 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)