Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Inline Styles Fix - commit to this repo #311

Merged
merged 15 commits into from
Jan 17, 2021
Merged

Inline Styles Fix - commit to this repo #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
677a50d
Inline SCSS styles
thomasjm Aug 29, 2020
2892e3f
Bump a bunch of packages
thomasjm Aug 29, 2020
b051983
Rebuild demo
thomasjm Aug 29, 2020
3960567
Put back loaders needed to build the demo
thomasjm Aug 29, 2020
80cbf34
Fix another CopyToClipboard hover
thomasjm Aug 29, 2020
98f029b
Rebuild demo
thomasjm Aug 29, 2020
8dd9409
Fix another window ReferenceError issue
thomasjm Aug 29, 2020
831b37f
Re-indent dev-server/dist/index.html
thomasjm Aug 31, 2020
b939ee4
merging-master
ava-macg Jan 16, 2021
3c9bdaa
updating coveralls version, ensuring node_env is test before sending …
ava-macg Jan 16, 2021
9c57b96
updating lint rules to fix tests
ava-macg Jan 17, 2021
b0b8914
went-down-a-rabbit-hole
ava-macg Jan 17, 2021
875a3f4
wrong git user
mac-s-g Jan 17, 2021
937d783
upgraded some dependencies, upgraded docker node image
mac-s-g Jan 17, 2021
e12f320
i think i got it
mac-s-g Jan 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"presets": ["react-app"],
"plugins": [
'transform-class-properties',
'react-html-attrs',
'transform-function-bind'
],
"presets": ["react", "es2015", "stage-0"]
"@babel/plugin-syntax-class-properties",
"@babel/plugin-syntax-jsx",
"react-html-attrs",
"istanbul"
]
}
2 changes: 1 addition & 1 deletion .coveralls.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
service-name: travis-ci
repo_token: vgY2Lq1R7eqlkcmpp4wU32xZI7JskTACs
repo_token: 5tBngUO90HTikmfFGI6ve2w7sVSau3N9K
41 changes: 0 additions & 41 deletions .eslintrc.js
View file
Open in desktop

This file was deleted.

20 changes: 20 additions & 0 deletions .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"plugins": ["react", "prettier"],
"rules": {
"prettier/prettier": "error",
"import/no-anonymous-default-export": "off",
"egegeg": "off"
},
"parser":"@babel/eslint-parser",
"parserOptions": {
"sourceType": "module",
"ecmaVersion": 6,
"ecmaFeatures": {
"experimentalObjectRestSpread": true
}
},
"env": {
"es6": true,
"node": true
}
}
2 changes: 1 addition & 1 deletion .nycrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"plugins": ["transform-decorators-legacy"],
"require": [
"babel-register",
"@babel/register",
"./test/testHelpers/requireSources.js"
]
}
15 changes: 15 additions & 0 deletions .prettierrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"tabWidth": 4,
"printWidth": 80,
"singleQuote": true,
"trailingComma": "none",
"bracketSpacing": true,
"jsxBracketSameLine": false,
"parser": "babel",
"semi": true,
"requirePragma": false,
"proseWrap": "preserve",
"arrowParens": "avoid",
"eslintIntegration": false,
"endOfLine": "auto"
}
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:8.4.0-slim
FROM node:14.15.4-buster-slim
MAINTAINER mac <mac.gainor@gmail.com>

# install the node modules at container build time
Expand Down
16,083 changes: 16,076 additions & 7 deletions demo/dist/main.js
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions dev-server/dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@
<title>react-json-view</title>
<meta charset="UTF-8">
<!--[if lt IE 9]>
<script>
(function(){
<script>
(function(){
var ef = function(){};
window.console = window.console || {log:ef,warn:ef,error:ef,dir:ef};
}());
</script>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv-printshiv.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/3.4.0/es5-shim.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/3.4.0/es5-sham.js"></script>
}());
</script>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv-printshiv.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/3.4.0/es5-shim.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/3.4.0/es5-sham.js"></script>
<![endif]-->
<script src="https://unpkg.com/react@15/dist/react.js"></script>
<script src="https://unpkg.com/react-dom@15/dist/react-dom.js"></script>
<script crossorigin src="https://unpkg.com/react@16/umd/react.production.min.js"></script>
<script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.production.min.js"></script>
<style>
.react-json-view {
padding: 4px 6px;
border-radius: 3px;
/*display: inline-block;*/
}
.react-json-view {
padding: 4px 6px;
border-radius: 3px;
/*display: inline-block;*/
}
</style>
</head>
<body>
<div id="app-container"></div>
<script type="text/javascript" src="./main.js"></script>
<div id="app-container"></div>
<script type="text/javascript" src="./main.js"></script>
</body>
</html>
</html>
Loading