Skip to content

Commit

Permalink
Merge pull request #54 from AtomicJon/main
Browse files Browse the repository at this point in the history
Update to dependencies including React to version 18
  • Loading branch information
AtomicJon authored Oct 1, 2023
2 parents 9387ec5 + df7e0f0 commit 85f130d
Show file tree
Hide file tree
Showing 8 changed files with 6,122 additions and 6,215 deletions.
5 changes: 1 addition & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:react/recommended",
"plugin:css-modules/recommended",
"plugin:jsx-a11y/recommended"
],
Expand All @@ -25,7 +24,6 @@
},
"plugins": [
"@typescript-eslint",
"react",
"css-modules"
],
"rules": {
Expand All @@ -39,9 +37,8 @@
"@typescript-eslint/no-unused-vars": ["error"],
"no-use-before-define": "off",
"object-curly-newline": ["error", { "ImportDeclaration": { "minProperties": 6, "consistent": true } }],
"react/jsx-indent": ["error", 2],
"react/react-in-jsx-scope": "off",
"react/display-name": "off",
"react/jsx-filename-extension": ["error", { "extensions": [".js", ".jsx", ".ts", ".tsx"] }],
"react/jsx-props-no-spreading": "off"
},
"settings": {
Expand Down
2 changes: 1 addition & 1 deletion babel.config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"presets": ["@babel/preset-env", "@babel/preset-react", "@babel/preset-typescript"],
"plugins": [
"@babel/plugin-proposal-class-properties"
"@babel/plugin-transform-class-properties"
]
}
61 changes: 0 additions & 61 deletions example/.eslintrc.json

This file was deleted.

4 changes: 2 additions & 2 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"eject": "node ./node_modules/react-scripts/bin/react-scripts.js eject"
},
"dependencies": {
"@super-effective/colorutils": "^2.1.1",
"@super-effective/colorutils": "^2.1.2",
"@super-effective/react-color-picker": "link:..",
"react": "link:../node_modules/react",
"react-dom": "link:../node_modules/react-dom",
Expand All @@ -29,7 +29,7 @@
]
},
"devDependencies": {
"@babel/core": "^7.18.2",
"@babel/core": "^7.23.0",
"@babel/plugin-syntax-object-rest-spread": "^7.8.3"
}
}
7 changes: 4 additions & 3 deletions example/src/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';
import App from './App';

ReactDOM.render(<App />, document.getElementById('root'));
const container = document.getElementById('root');
const root = createRoot(container);
root.render(<App />);
Loading

0 comments on commit 85f130d

Please sign in to comment.