Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into typescript
Browse files Browse the repository at this point in the history
  • Loading branch information
setsun committed Apr 24, 2019
2 parents eb2f85b + 7e58f9c commit 56bf9a1
Show file tree
Hide file tree
Showing 3 changed files with 603 additions and 42 deletions.
41 changes: 41 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"env": {
"browser": true,
"es6": true,
"node": true
},
"parser": "babel-eslint",
"extends": [
"eslint:recommended",
"plugin:import/errors",
"plugin:import/warnings",
"prettier"
],
"plugins": [
"react-hooks"
],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"sourceType": "module"
},
"rules": {
"curly": [
"warn",
"multi-line",
"consistent"
],
"no-console": "off",
"no-dupe-class-members": "error",
"no-empty": "warn",
"no-undef": "error",
"no-unused-expressions": "error",
"no-unused-vars": "error",
"no-var": "warn",
"prefer-const": "warn",
"no-shadow": "warn",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn"
}
}
13 changes: 11 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"prebuild": "rimraf dist",
"build": "rollup -c",
"prepare": "npm run build",
"eslint": "eslint ./src",
"test": "echo \"Error: no test specified\" && exit 1",
"typecheck": "tsc --noEmit --jsx react src/*",
"typegen": "tsc --jsx react --emitDeclarationOnly -d --declarationDir types src/*"
Expand Down Expand Up @@ -77,18 +78,26 @@
"@babel/preset-typescript": "^7.3.3",
"@types/lodash-es": "^4.17.3",
"@types/react": "^16.8.14",
"babel-eslint": "^10.0.1",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"eslint": "^5.16.0",
"eslint-config-prettier": "^4.1.0",
"eslint-plugin-import": "^2.17.2",
"eslint-plugin-react-hooks": "^1.6.0",
"husky": "^1.3.1",
"lint-staged": "^8.1.5",
"prettier": "^1.17.0",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"rollup": "^1.10.1",
"prettier": "^1.17.0",
"react": ">=16.8",
"react-dom": ">=16.8",
"rollup": "^1.10.1",
"rollup-plugin-babel": "^4.3.2",
"rollup-plugin-commonjs": "^9.3.4",
"rollup-plugin-node-resolve": "^4.2.3",
"rollup-plugin-size-snapshot": "^0.8.0",
"three": "^0.103.0",
"typescript": "^3.4.4"
"typescript": "^3.4.5"
}
}

0 comments on commit 56bf9a1

Please sign in to comment.