Skip to content

Commit

Permalink
Bump eslint and plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
oblador committed Aug 20, 2019
1 parent 07b156b commit 196369c
Show file tree
Hide file tree
Showing 4 changed files with 461 additions and 289 deletions.
8 changes: 4 additions & 4 deletions .eslintrc
Expand Up @@ -17,6 +17,9 @@
"rules": {
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
"react/require-default-props": [0],
"react/static-property-placement": [0],
"react/jsx-props-no-spreading": [0],
"react/state-in-constructor": [0],
"import/no-extraneous-dependencies": [0],
"import/no-unresolved": [2, { ignore: ['^react(-native)?$'] }],
"import/extensions": [2, { "js": "never", "json": "always" }],
Expand All @@ -28,9 +31,6 @@
"exports": "always-multiline",
"functions": "ignore",
}],
"prettier/prettier": ["error", {
"trailingComma": "es5",
"singleQuote": true
}]
"prettier/prettier": ["error"]
}
}
2 changes: 1 addition & 1 deletion lib/generate-icon-set-from-css.js
Expand Up @@ -52,7 +52,7 @@ function generateIconSetFromCss(cssFiles, selectorPrefix, template, data = {}) {
);
const content = JSON.stringify(glyphMap, null, ' ');
if (template) {
return _.template(template)(Object.assign({ glyphMap: content }, data));
return _.template(template)({ glyphMap: content, ...data });
}
return content;
}
Expand Down
11 changes: 6 additions & 5 deletions package.json
Expand Up @@ -75,13 +75,14 @@
"@babel/core": "^7.1.2",
"@mdi/font": "^4.0.96",
"babel-eslint": "^10.0.1",
"eslint": "^5.13.0",
"eslint-config-airbnb": "17.1.0",
"eslint": "^6.2.1",
"eslint-config-airbnb": "18.0.1",
"eslint-config-prettier": "^6.1.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jsx-a11y": "^6.1.1",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.0",
"eslint-plugin-react": "^7.11.0",
"eslint-plugin-react": "^7.14.3",
"eslint-plugin-react-hooks": "^1.7.0",
"evil-icons": "^1.10.1",
"feather-icons": "^4.21.0",
"font-awesome": "^4.6.3",
Expand Down

0 comments on commit 196369c

Please sign in to comment.