Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/dist
/node_modules
85 changes: 36 additions & 49 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,50 +1,37 @@
{
"parser": "@typescript-eslint/parser",
"env": {
"browser": true,
"node": true
},
"plugins": [
"prettier",
"@typescript-eslint",
"jest",
"import"
],
"extends": [
"prettier",
"plugin:prettier/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:import/typescript"
],
"parserOptions": {
"sourceType": "module",
"ecmaVersion": 2018
},
"rules": {
"import/namespace": "off",
"import/order": [
"error"
],
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": "error",
"@typescript-eslint/member-delimiter-style": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/no-extra-semi": "off",
"@typescript-eslint/no-explicit-any": "off"
},
"overrides": [
{
// enable the rule specifically for TypeScript files
"files": [
"*.ts",
"*.tsx"
],
"rules": {
"@typescript-eslint/explicit-function-return-type": [
"error"
]
}
}
]
}
"parser": "@typescript-eslint/parser",
"env": {
"browser": true,
"node": true
},
"plugins": ["@typescript-eslint", "jest", "import"],
"extends": [
"plugin:@typescript-eslint/recommended",
"plugin:import/typescript",
"plugin:prettier/recommended"
],
"parserOptions": {
"sourceType": "module",
"ecmaVersion": 2018
},
"rules": {
"import/namespace": "off",
"import/order": ["error"],
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": "error",
"@typescript-eslint/member-delimiter-style": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/no-extra-semi": "off",
"@typescript-eslint/no-explicit-any": "off"
},
"overrides": [
{
// enable the rule specifically for TypeScript files
"files": ["*.ts", "*.tsx"],
"rules": {
"@typescript-eslint/explicit-function-return-type": ["error"]
}
}
]
}
2 changes: 1 addition & 1 deletion jestconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
},
"testRegex": "(/__tests?__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
"moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json", "node"]
}
}
13 changes: 10 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"build": "tsc",
"clear": "rm -rf src/*",
"generate": "node generator.js",
"lint": "eslint --cache --ext js,ts,tsx src ./generator.js",
"lint": "eslint --cache --ext js,ts,tsx,json .",
"lint:fix": "npm run lint -- --cache --fix",
"typecheck": "tsc --noEmit",
"test": "jest --config jestconfig.json --passWithNoTests",
Expand All @@ -20,15 +20,22 @@
"version": "npm run test && npm run lint && git add -A src",
"postversion": "git push && git push --tags"
},
"keywords": ["material design", "icons", "react"],
"keywords": [
"material design",
"icons",
"react"
],
"private": false,
"author": "AboutBits",
"license": "MIT",
"repository": {
"type": "git",
"url": "git+https://github.com/aboutbits/react-material-icons"
},
"files": ["readme.md", "dist/**/*"],
"files": [
"readme.md",
"dist/**/*"
],
"publishConfig": {
"access": "public"
},
Expand Down
12 changes: 3 additions & 9 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
"strict": true,
"sourceMap": false
},
"include": [
"src"
],
"exclude": [
"node_modules",
"**/__test__/*",
"**/__tests__/*"
]
}
"include": ["src"],
"exclude": ["node_modules", "**/__test__/*", "**/__tests__/*"]
}