Skip to content
This repository has been archived by the owner on Oct 2, 2022. It is now read-only.

Commit

Permalink
Merge pull request #23 from ryota-murakami/migrate-typescript
Browse files Browse the repository at this point in the history
migrate typescript fix #15
  • Loading branch information
ryota-murakami authored Oct 29, 2019
2 parents 21f7d76 + 68df1d6 commit dab117d
Show file tree
Hide file tree
Showing 34 changed files with 1,369 additions and 6,587 deletions.
18 changes: 4 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,32 @@ version: 2
jobs:
build:
docker:
- image: circleci/node:9.11.1
- image: circleci/node:10.15.3
working_directory: ~/repo
steps:
- checkout
- run: yarn install
- run: yarn build
test:
docker:
- image: circleci/node:9.11.1
- image: circleci/node:10.15.3
working_directory: ~/repo
steps:
- checkout
- run: yarn install
- run: yarn test
lint:
docker:
- image: circleci/node:9.11.1
- image: circleci/node:10.15.3
working_directory: ~/repo
steps:
- checkout
- run: yarn install
- run: yarn lint
flow:
docker:
- image: circleci/node:9.11.1
working_directory: ~/repo
steps:
- checkout
- run: yarn install
- run: yarn flow

workflows:
version: 2
myworkflow:
jobs:
- build
- test
- lint
- flow
- lint
51 changes: 44 additions & 7 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,15 +1,52 @@
{
"extends": "react-app",
"parser": "babel-eslint",
"env": {
"node": true,
"jest/globals": true
},
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 8,
"sourceType": "module",
"ecmaFeatures": {
"impliedStrict": true,
"experimentalObjectRestSpread": true,
"jsx": true
},
"allowImportExportEverywhere": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/eslint-recommended"
],
"settings": {
"react": {
"pragma": "React",
"version": "detect"
}
},
"plugins": [
"jest",
"prettier",
"react-hooks"
"react-hooks",
"@typescript-eslint"
],
"rules": {
"prettier/prettier": [ "warn", { "singleQuote": true, "semi": false, "parser": "flow" } ],
"jsx-a11y/href-no-hash": "off",
"no-unused-vars": [ "error" ],
"prettier/prettier": [
"warn",
{
"singleQuote": true,
"semi": false
}
],
"no-unused-vars": [
"error"
],
"react/prop-types": "off",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn"
"react-hooks/exhaustive-deps": "warn",
"@typescript-eslint/member-delimiter-style": "off",
"@typescript-eslint/explicit-function-return-type": "off"
}
}
13 changes: 0 additions & 13 deletions .flowconfig

This file was deleted.

4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
es
lib
dist
node_modules
yarn-error.log
8 changes: 3 additions & 5 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
.git
.idea
yarn-error.log
.eslintrc
.prettierrc
img
.all-contributorsrc
movie.gif
test
.eslintignore
example
node_modules
11 changes: 0 additions & 11 deletions babel.config.js

This file was deleted.

2 changes: 1 addition & 1 deletion example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@babel/core": "7.1.0",
"@emotion/core": "^10.0.2",
"@emotion/styled": "^10.0.2",
"@ryotamurakami/react-appstate": "^1.0.0",
"@ryotamurakami/react-appstate": "^1.1.0",
"@svgr/webpack": "2.4.1",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "9.0.0",
Expand Down
30 changes: 11 additions & 19 deletions example/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1117,12 +1117,12 @@
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==

"@ryotamurakami/react-appstate@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@ryotamurakami/react-appstate/-/react-appstate-1.0.0.tgz#3b1da74fdcaf80e1075f19227a7bf18ef5ce6d8f"
integrity sha512-KBEftjVxEfwU6RXS18lFkD28bhn7/6GdXFxiETQAaj5l7StyQRJeYRr3Zp9V0FUltpK2pl3rKM+Qepr9E49U0g==
"@ryotamurakami/react-appstate@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@ryotamurakami/react-appstate/-/react-appstate-1.1.0.tgz#7767f6805086847ec53ff736d327d3fc42ecfc52"
integrity sha512-wiVH+Jwn6jUy4OBPGtpRpJgi6fkAOlLz0ts4fd8ttvkLZ35Qzjwa5J3vu8NsZFMaBGzBCSB70EzV3uZoPZAFhg==
dependencies:
"@types/react" "^16.8.22"
typescript "^3.6.4"

"@svgr/core@^2.4.1":
version "2.4.1"
Expand All @@ -1149,24 +1149,11 @@
"@svgr/core" "^2.4.1"
loader-utils "^1.1.0"

"@types/prop-types@*":
version "15.7.3"
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==

"@types/q@^1.5.1":
version "1.5.2"
resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==

"@types/react@^16.8.22":
version "16.9.5"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.5.tgz#079dabd918b19b32118c25fd00a786bb6d0d5e51"
integrity sha512-jQ12VMiFOWYlp+j66dghOWcmDDwhca0bnlcTxS4Qz/fh5gi6wpaZDthPEu/Gc/YlAuO87vbiUXL8qKstFvuOaA==
dependencies:
"@types/prop-types" "*"
csstype "^2.2.0"

"@types/[email protected]":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
Expand Down Expand Up @@ -3076,7 +3063,7 @@ cssstyle@^1.0.0, cssstyle@^1.2.2:
dependencies:
cssom "0.3.x"

csstype@^2.2.0, csstype@^2.5.7:
csstype@^2.5.7:
version "2.6.7"
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.7.tgz#20b0024c20b6718f4eda3853a1f5a1cce7f5e4a5"
integrity sha512-9Mcn9sFbGBAdmimWb2gLVDtFJzeKtDGIr76TUqmjZrw9LFXBMSU70lcs+C0/7fyCd6iBDqmksUcCOUIkisPHsQ==
Expand Down Expand Up @@ -9709,6 +9696,11 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=

typescript@^3.6.4:
version "3.6.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.4.tgz#b18752bb3792bc1a0281335f7f6ebf1bbfc5b91d"
integrity sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg==

uglify-es@^3.3.4:
version "3.3.9"
resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
Expand Down
36 changes: 0 additions & 36 deletions flow-typed/UtilityTypes.js

This file was deleted.

87 changes: 0 additions & 87 deletions flow-typed/npm/@babel/cli_vx.x.x.js

This file was deleted.

Loading

0 comments on commit dab117d

Please sign in to comment.