Skip to content

Commit e58c4e0

Browse files
mac-s-gmac-s-g
authored
Merge pull request mac-s-g#311 from mac-s-g/thomasjm-inline-styles
Inline Styles Fix - commit to this repo
2 parents e5330e0 + e12f320 commit e58c4e0

Some content is hidden

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

44 files changed

+38100
-11644
lines changed

‎.babelrc

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

‎.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+
}

‎.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 <[email protected]>
33

44
# install the node modules at container build time

‎demo/dist/main.js

Lines changed: 16076 additions & 7 deletions
Large diffs are not rendered by default.

‎dev-server/dist/index.html

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@
44
<title>react-json-view</title>
55
<meta charset="UTF-8">
66
<!--[if lt IE 9]>
7-
<script>
8-
(function(){
7+
<script>
8+
(function(){
99
var ef = function(){};
1010
window.console = window.console || {log:ef,warn:ef,error:ef,dir:ef};
11-
}());
12-
</script>
13-
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"></script>
14-
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv-printshiv.min.js"></script>
15-
<script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/3.4.0/es5-shim.js"></script>
16-
<script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/3.4.0/es5-sham.js"></script>
11+
}());
12+
</script>
13+
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"></script>
14+
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv-printshiv.min.js"></script>
15+
<script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/3.4.0/es5-shim.js"></script>
16+
<script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/3.4.0/es5-sham.js"></script>
1717
<![endif]-->
18-
<script src="https://unpkg.com/react@15/dist/react.js"></script>
19-
<script src="https://unpkg.com/react-dom@15/dist/react-dom.js"></script>
18+
<script crossorigin src="https://unpkg.com/react@16/umd/react.production.min.js"></script>
19+
<script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.production.min.js"></script>
2020
<style>
21-
.react-json-view {
22-
padding: 4px 6px;
23-
border-radius: 3px;
24-
/*display: inline-block;*/
25-
}
21+
.react-json-view {
22+
padding: 4px 6px;
23+
border-radius: 3px;
24+
/*display: inline-block;*/
25+
}
2626
</style>
2727
</head>
2828
<body>
29-
<div id="app-container"></div>
30-
<script type="text/javascript" src="./main.js"></script>
29+
<div id="app-container"></div>
30+
<script type="text/javascript" src="./main.js"></script>
3131
</body>
32-
</html>
32+
</html>

0 commit comments

Comments
 (0)