From 0333b486861e11fa81f7a77cef6709c0ffb7c3cb Mon Sep 17 00:00:00 2001 From: username Date: Tue, 19 Feb 2019 00:37:37 +0900 Subject: [PATCH 1/2] fix: modify connect syntax --- components/molecules/PageHeader.tsx | 10 ++++++---- components/organisms/ResponsiveDrawer.tsx | 10 ++++++---- pages/about.tsx | 10 ++++++---- pages/redux.tsx | 10 ++++++---- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/components/molecules/PageHeader.tsx b/components/molecules/PageHeader.tsx index ba530df..8a73ff0 100644 --- a/components/molecules/PageHeader.tsx +++ b/components/molecules/PageHeader.tsx @@ -62,7 +62,9 @@ const mapStateToProps = (state: IInitialState) => ({ selectedPage: state.page.selectedPage, }) -export const PageHeader = connect( - mapStateToProps, - undefined -)(withStyles(styles)(PageHeaderComponent as any)) +export const PageHeader = withStyles(styles)( + connect( + mapStateToProps, + undefined + )(PageHeaderComponent as any) +) diff --git a/components/organisms/ResponsiveDrawer.tsx b/components/organisms/ResponsiveDrawer.tsx index 7020ccf..ec72f57 100644 --- a/components/organisms/ResponsiveDrawer.tsx +++ b/components/organisms/ResponsiveDrawer.tsx @@ -148,7 +148,9 @@ const mapStateToProps = (state: IInitialState) => ({ selectedPage: state.page.selectedPage, }) -export const ResponsiveDrawer = connect( - mapStateToProps, - undefined -)(withStyles(styles)(ResponsiveDrawerComponent as any)) +export const ResponsiveDrawer = withStyles(styles)( + connect( + mapStateToProps, + undefined + )(ResponsiveDrawerComponent as any) +) diff --git a/pages/about.tsx b/pages/about.tsx index 63349ab..994e07c 100644 --- a/pages/about.tsx +++ b/pages/about.tsx @@ -63,7 +63,9 @@ class About extends React.Component { const mapDispatchToProps = (dispatch: Dispatch>) => bindActionCreators(PageActions, dispatch) -export default connect( - undefined, - mapDispatchToProps -)(withStyles(styles)(About as any)) +export default withStyles(styles)( + connect( + undefined, + mapDispatchToProps + )(About as any) +) diff --git a/pages/redux.tsx b/pages/redux.tsx index db45d82..177cc34 100644 --- a/pages/redux.tsx +++ b/pages/redux.tsx @@ -174,7 +174,9 @@ const mapStateToProps = (state: IInitialState) => ({ const mapDispatchToProps = (dispatch: Dispatch>) => bindActionCreators(CounterActions, dispatch) -export default connect( - mapStateToProps, - mapDispatchToProps -)(withStyles(styles)(Redux as any)) +export default withStyles(styles)( + connect( + mapStateToProps, + mapDispatchToProps + )(Redux as any) +) From a4392e0936546b1c10340f5a0caa262e906b1895 Mon Sep 17 00:00:00 2001 From: username Date: Tue, 19 Feb 2019 00:37:50 +0900 Subject: [PATCH 2/2] refactor: update dependencies --- package.json | 6 +-- yarn.lock | 135 ++++++++++++++++++++++++--------------------------- 2 files changed, 67 insertions(+), 74 deletions(-) diff --git a/package.json b/package.json index 9d1b269..41d744b 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,8 @@ "compression": "^1.7.3", "express": "^4.16.4", "immer": "^2.0.0", - "next": "^8.0.0", - "next-redux-wrapper": "^3.0.0-alpha.0", + "next": "^8.0.1", + "next-redux-wrapper": "^3.0.0-alpha.1", "normalize.css": "^8.0.1", "react": "^16.8.1", "react-dom": "^16.8.1", @@ -35,7 +35,7 @@ }, "devDependencies": { "@babel/plugin-proposal-decorators": "^7.3.0", - "@types/next": "^7.0.9", + "@types/next": "^8.0.1", "@types/next-redux-wrapper": "^2.0.2", "@types/react": "^16.8.2", "@types/react-dom": "^16.8.0", diff --git a/yarn.lock b/yarn.lock index 4625553..f7c2fd4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -27,17 +27,17 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.0.0": - version "7.1.2" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.2.tgz#fde75c072575ce7abbd97322e8fef5bae67e4630" +"@babel/generator@^7.1.2": + version "7.3.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.3.tgz#185962ade59a52e00ca2bdfcfd1d58e528d4e39e" dependencies: - "@babel/types" "^7.1.2" + "@babel/types" "^7.3.3" jsesc "^2.5.1" - lodash "^4.17.10" + lodash "^4.17.11" source-map "^0.5.0" trim-right "^1.0.1" -"@babel/generator@^7.1.2", "@babel/generator@^7.2.2": +"@babel/generator@^7.2.2": version "7.3.2" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.2.tgz#fff31a7b2f2f3dad23ef8e01be45b0d5c2fc0132" dependencies: @@ -169,16 +169,7 @@ "@babel/traverse" "^7.1.0" "@babel/types" "^7.0.0" -"@babel/helper-replace-supers@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.1.0.tgz#5fc31de522ec0ef0899dc9b3e7cf6a5dd655f362" - dependencies: - "@babel/helper-member-expression-to-functions" "^7.0.0" - "@babel/helper-optimise-call-expression" "^7.0.0" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.0.0" - -"@babel/helper-replace-supers@^7.2.3": +"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.2.3": version "7.2.3" resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.2.3.tgz#19970020cf22677d62b3a689561dbd9644d8c5e5" dependencies: @@ -225,11 +216,15 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.1.2": +"@babel/parser@^7.1.2": version "7.1.2" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.2.tgz#85c5c47af6d244fab77bce6b9bd830e38c978409" -"@babel/parser@^7.2.2", "@babel/parser@^7.2.3": +"@babel/parser@^7.2.2": + version "7.3.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.3.tgz#092d450db02bdb6ccb1ca8ffd47d8774a91aef87" + +"@babel/parser@^7.2.3": version "7.3.2" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.2.tgz#95cdeddfc3992a6ca2a1315191c1679ca32c55cd" @@ -378,8 +373,8 @@ lodash "^4.17.10" "@babel/plugin-transform-classes@^7.1.0": - version "7.2.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.2.2.tgz#6c90542f210ee975aa2aa8c8b5af7fa73a126953" + version "7.3.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.3.3.tgz#a0532d6889c534d095e8f604e9257f91386c4b51" dependencies: "@babel/helper-annotate-as-pure" "^7.0.0" "@babel/helper-define-map" "^7.1.0" @@ -493,8 +488,8 @@ "@babel/helper-replace-supers" "^7.1.0" "@babel/plugin-transform-parameters@^7.1.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.2.0.tgz#0d5ad15dc805e2ea866df4dd6682bfe76d1408c2" + version "7.3.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.3.3.tgz#3a873e07114e1a5bee17d04815662c8317f10e30" dependencies: "@babel/helper-call-delegate" "^7.1.0" "@babel/helper-get-function-arity" "^7.0.0" @@ -688,21 +683,7 @@ "@babel/parser" "^7.2.2" "@babel/types" "^7.2.2" -"@babel/traverse@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.0.tgz#503ec6669387efd182c3888c4eec07bcc45d91b2" - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.0.0" - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.0.0" - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - debug "^3.1.0" - globals "^11.1.0" - lodash "^4.17.10" - -"@babel/traverse@^7.1.5", "@babel/traverse@^7.2.3": +"@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.2.3": version "7.2.3" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8" dependencies: @@ -724,7 +705,15 @@ lodash "^4.17.10" to-fast-properties "^2.0.0" -"@babel/types@^7.2.0", "@babel/types@^7.2.2", "@babel/types@^7.3.0", "@babel/types@^7.3.2": +"@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.3.3" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.3.tgz#6c44d1cdac2a7625b624216657d5bc6c107ab436" + dependencies: + esutils "^2.0.2" + lodash "^4.17.11" + to-fast-properties "^2.0.0" + +"@babel/types@^7.2.2", "@babel/types@^7.3.2": version "7.3.2" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.2.tgz#424f5be4be633fff33fb83ab8d67e4a8290f5a2f" dependencies: @@ -789,8 +778,8 @@ react-is "^16.6.3" "@types/anymatch@*": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.0.tgz#d1d55958d1fccc5527d4aba29fc9c4b942f563ff" + version "1.3.1" + resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" "@types/jss@*", "@types/jss@^9.5.6": version "9.5.7" @@ -809,16 +798,16 @@ redux "^3.6.0" "@types/next-server@*": - version "7.0.3" - resolved "https://registry.yarnpkg.com/@types/next-server/-/next-server-7.0.3.tgz#a86f49045bc00e00bad8f6754f540acef33ef08f" + version "7.0.4" + resolved "https://registry.yarnpkg.com/@types/next-server/-/next-server-7.0.4.tgz#69b5e340a923bc7e8ad9228cf4e057eaed955a98" dependencies: "@types/node" "*" "@types/react" "*" "@types/react-loadable" "*" -"@types/next@^7.0.9": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/next/-/next-7.0.9.tgz#8e48dbba85c9ba7866f870483df314f956074108" +"@types/next@^8.0.1": + version "8.0.1" + resolved "https://registry.yarnpkg.com/@types/next/-/next-8.0.1.tgz#d19731594215e09a8db1ca0b8862d5308707d46a" dependencies: "@types/next-server" "*" "@types/node" "*" @@ -1538,8 +1527,8 @@ cache-base@^1.0.1: unset-value "^1.0.0" caniuse-lite@^1.0.30000929: - version "1.0.30000936" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000936.tgz#5d33b118763988bf721b9b8ad436d0400e4a116b" + version "1.0.30000938" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000938.tgz#b64bf1427438df40183fce910fe24e34feda7a3f" case-sensitive-paths-webpack-plugin@2.1.2: version "2.1.2" @@ -1576,8 +1565,8 @@ change-emitter@^0.1.2: resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515" chokidar@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.0.tgz#5fcb70d0b28ebe0867eb0f09d5f6a08f29a1efa0" + version "2.1.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.1.tgz#adc39ad55a2adf26548bd2afa048f611091f9184" dependencies: anymatch "^2.0.0" async-each "^1.0.1" @@ -1696,8 +1685,8 @@ concat-stream@^1.5.0: typedarray "^0.0.6" consola@^2.3.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/consola/-/consola-2.4.0.tgz#d13c711cd0648a600ca68b399b739cf8f5058097" + version "2.4.1" + resolved "https://registry.yarnpkg.com/consola/-/consola-2.4.1.tgz#ad7209c306a2b6fa955b776f88f87bf92f491aa8" dependencies: chalk "^2.4.2" dayjs "^1.8.3" @@ -1761,8 +1750,8 @@ core-js@^1.0.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" core-js@^2.4.0, core-js@^2.5.7: - version "2.6.4" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.4.tgz#b8897c062c4d769dd30a0ac5c73976c47f92ea0d" + version "2.6.5" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895" core-util-is@~1.0.0: version "1.0.2" @@ -1881,8 +1870,8 @@ date-now@^0.1.4: resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" dayjs@^1.8.3: - version "1.8.5" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.5.tgz#0b066770f89a20022218544989f3d23e5e8db29a" + version "1.8.6" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.6.tgz#b7a8ccfef173dae03e83a05a58788c9dbe948a35" debounce@^1.1.0: version "1.2.0" @@ -1895,8 +1884,8 @@ debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3: ms "2.0.0" debug@^3.1.0: - version "3.2.5" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407" + version "3.2.6" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" dependencies: ms "^2.1.1" @@ -3114,7 +3103,7 @@ lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" -lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1: +lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" @@ -3373,13 +3362,13 @@ neo-async@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835" -next-redux-wrapper@^3.0.0-alpha.0: - version "3.0.0-alpha.0" - resolved "https://registry.yarnpkg.com/next-redux-wrapper/-/next-redux-wrapper-3.0.0-alpha.0.tgz#7bbf86c9826f7289c314d8e7bc06dd9ec4ead324" +next-redux-wrapper@^3.0.0-alpha.1: + version "3.0.0-alpha.1" + resolved "https://registry.yarnpkg.com/next-redux-wrapper/-/next-redux-wrapper-3.0.0-alpha.1.tgz#79d56457f874e94804f735163b7a52f3b4ddf41c" -next-server@8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/next-server/-/next-server-8.0.0.tgz#2ad17f505b042a4fb47cc2ae0967f7f195e78b6a" +next-server@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/next-server/-/next-server-8.0.1.tgz#39c48570366016e86ba600891f60bf6e5e2652a3" dependencies: etag "1.8.1" find-up "3.0.0" @@ -3389,9 +3378,9 @@ next-server@8.0.0: send "0.16.1" url "0.11.0" -next@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/next/-/next-8.0.0.tgz#b09e8b4254fa6d22ceff5759c13682161a2c359d" +next@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/next/-/next-8.0.1.tgz#6147fbb22d8e55b2562b4ea2df868977d15ae9a0" dependencies: "@babel/core" "7.1.2" "@babel/plugin-proposal-class-properties" "7.1.0" @@ -3428,7 +3417,7 @@ next@^8.0.0: loader-utils "1.1.0" mkdirp-then "1.2.0" nanoid "1.2.1" - next-server "8.0.0" + next-server "8.0.1" prop-types "15.6.2" prop-types-exact "1.2.0" react-error-overlay "4.0.0" @@ -3694,8 +3683,8 @@ parallel-transform@^1.1.0: readable-stream "^2.1.5" parse-asn1@^5.0.0: - version "5.1.3" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.3.tgz#1600c6cc0727365d68b97f3aa78939e735a75204" + version "5.1.4" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz#37f6628f823fbdeb2273b4d540434a22f3ef1fcc" dependencies: asn1.js "^4.0.0" browserify-aes "^1.0.0" @@ -4062,7 +4051,11 @@ react-is@16.6.3: version "16.6.3" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.6.3.tgz#d2d7462fcfcbe6ec0da56ad69047e47e56e7eac0" -react-is@^16.3.2, react-is@^16.6.3, react-is@^16.7.0, react-is@^16.8.1: +react-is@^16.3.2: + version "16.8.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.2.tgz#09891d324cad1cb0c1f2d91f70a71a4bee34df0f" + +react-is@^16.6.3, react-is@^16.7.0, react-is@^16.8.1: version "16.8.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.1.tgz#a80141e246eb894824fb4f2901c0c50ef31d4cdb"