Skip to content

Commit

Permalink
Merge pull request #3139 from placintaalexandru/fix/Config-for-eslint
Browse files Browse the repository at this point in the history
Lint command works
  • Loading branch information
howardchung committed Jan 8, 2024
2 parents b520b2a + 40e5e08 commit 38142e8
Show file tree
Hide file tree
Showing 14 changed files with 4,886 additions and 1,931 deletions.
13 changes: 13 additions & 0 deletions .babelrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"presets": [
"@babel/preset-env",
"@babel/preset-react"
],
"plugins": [
"@babel/plugin-proposal-class-properties",
"@babel/plugin-transform-runtime"
],
"ignore": [
"/node_modules/"
]
}
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const commonRules = {
};

module.exports = {
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
env: {
browser: true,
jest: true,
Expand Down
6,480 changes: 4,698 additions & 1,782 deletions package-lock.json

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,12 @@
"wordcloud": "^1.1.1"
},
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/core": "^7.23.7",
"@babel/eslint-parser": "^7.23.3",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-transform-runtime": "^7.23.7",
"@babel/preset-env": "^7.23.7",
"@babel/preset-react": "^7.23.3",
"@types/core-js": "^2.5.2",
"@types/eslint": "^6.1.3",
"@types/heatmap.js": "^2.0.36",
Expand All @@ -93,12 +98,16 @@
"@types/seamless-immutable": "^7.1.11",
"@types/styled-components": "4.0.3",
"@types/wordcloud": "^1.1.1",
"@typescript-eslint/eslint-plugin": "^6.18.0",
"@typescript-eslint/parser": "^4.33.0",
"babel-preset-es2015": "^6.24.1",
"cross-env": "^6.0.3",
"eslint": "^7.32.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^7.2.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-react": "^7.33.2",
"hoist-non-react-statics": "^3.3.1",
"husky": "^3.1.0",
"isomorphic-fetch": "^2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion src/components/App/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ const App = (props) => {
<div id="back2TopTxt">{strings.back2Top}</div>
</button>
</StyledDiv>
</Suspense>
</Suspense>
</MuiThemeProvider>
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/components/Explorer/fields.js
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ ${props.player && props.player.value ? '' : 'AND player_matches.account_id < pla
},
]
.concat(Object.keys(items).filter(itemKey => items[itemKey].cd).map(usesSelect))
//.concat(Object.keys(items).filter(itemKey => items[itemKey].cost > 2000).map(timingSelect))
// .concat(Object.keys(items).filter(itemKey => items[itemKey].cost > 2000).map(timingSelect))
.concat(singleFields)
.sort((a, b) => a.text && a.text.localeCompare(b.text)),
group: [{
Expand Down
34 changes: 26 additions & 8 deletions src/components/Icons/AttrUniversal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,39 @@ import React from 'react';
export default props => (
// Generated with vectorizer.ai
<svg viewBox='0.00 0.00 46.00 46.00' {...props}>
<g stroke-width='2.00' fill='none' stroke-linecap='butt'>
<path stroke='#898f1b' vector-effect='non-scaling-stroke' d='
<g strokeWidth='2.00' fill='none' strokeLinecap='butt'>
<path
stroke='#898f1b'
vectorEffect='non-scaling-stroke'
d='
M 43.94 24.25
L 40.55 21.73'
/>
<path stroke='#898f1b' vector-effect='non-scaling-stroke' d='
<path
stroke='#898f1b'
vectorEffect='non-scaling-stroke'
d='
M 23.35 22.02
L 23.27 22.55'
/>
<path stroke='#13dd8e' vector-effect='non-scaling-stroke' d='
<path
stroke='#13dd8e'
vectorEffect='non-scaling-stroke'
d='
M 13.16 8.28
Q 13.58 5.86 12.88 4.62'
/>
<path stroke='#768b79' vector-effect='non-scaling-stroke' d='
<path
stroke='#768b79'
vectorEffect='non-scaling-stroke'
d='
M 15.31 38.70
L 11.52 40.56'
/>
</g>
<path fill='#26e030' d='
<path
fill='#26e030'
d='
M 43.94 24.25
L 40.55 21.73
Q 39.61 13.59 33.10 8.64
Expand Down Expand Up @@ -58,7 +72,9 @@ L 11.52 40.56'
A 21.00 20.99 29.1 0 1 43.94 24.25
Z'
/>
<path fill='#00d9ec' d='
<path
fill='#00d9ec'
d='
M 12.88 4.62
Q 13.58 5.86 13.16 8.28
C 8.81 12.28 6.26 15.31 5.58 21.08
Expand Down Expand Up @@ -94,7 +110,9 @@ L 11.52 40.56'
A 20.98 20.96 -2.3 0 1 12.88 4.62
Z'
/>
<path fill='#ec3d06' d='
<path
fill='#ec3d06'
d='
M 40.55 21.73
L 43.94 24.25
A 20.98 20.98 0.0 0 1 27.95 43.39
Expand Down
2 changes: 1 addition & 1 deletion src/components/Match/MatchLog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ function EntryMessage({ entry, strings }) {
if (entry.alt_key === 'building_kill') {
return (
<>
{/*#e5cf11*/}
{/* #e5cf11 */}
<img src={lightning} className="icon" style={{ filter: 'invert(87%) sepia(98%) saturate(4073%) hue-rotate(341deg) brightness(90%) contrast(100%)'}} />
<span className="smallMutedText">{strings.destroyed}&nbsp;</span>
<span className="smallBoldText">
Expand Down
8 changes: 3 additions & 5 deletions src/components/Match/TargetsBreakdown.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,10 @@ const TargetsBreakdown = ({ field, abilityUses = null }) => {
const valueOverall = f[inflictor].totalCasts ? f[inflictor].totalCasts : sumValues(f[inflictor]);
r.push((
<div style={{ display: 'flex' }}>
{
<StyledDmgTargetInflictor id="target">
<StyledDmgTargetInflictor id="target">
{inflictorWithValue(inflictor, abbreviateNumber(valueOverall))}
</StyledDmgTargetInflictor>
}
{<NavigationArrowForward style={arrowStyle} />}
</StyledDmgTargetInflictor>
<NavigationArrowForward style={arrowStyle} />
{!f[inflictor].null ?
damageTargetIcons(f[inflictor]) : <Dummy />
}
Expand Down
Loading

0 comments on commit 38142e8

Please sign in to comment.