From 397c9c5aa6607b145f057753540e91d04e4e697a Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Wed, 5 Jul 2017 09:59:28 -0500 Subject: [PATCH] Update deps again. --- package.json | 10 ++--- src/tools/state_to_props.ts | 5 ++- tslint.json | 2 + yarn.lock | 85 ++++++++++++++++++++----------------- 4 files changed, 57 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index db748a444..23880e060 100644 --- a/package.json +++ b/package.json @@ -35,11 +35,11 @@ "@types/history": "^4.6.0", "@types/i18next": "^2.3.32", "@types/jest": "^20.0.2", - "@types/lodash": "^4.14.67", + "@types/lodash": "^4.14.68", "@types/markdown-it": "^0.0.2", "@types/mqtt": "^0.0.34", - "@types/node": "^8.0.6", - "@types/react": "^15.0.33", + "@types/node": "^8.0.7", + "@types/react": "^15.0.34", "@types/react-color": "^2.11.4", "@types/react-dom": "^15.5.1", "@types/react-redux": "^4.4.32", @@ -81,14 +81,14 @@ "sass-loader": "^6.0.6", "style-loader": "^0.18.2", "ts-jest": "^20.0.6", - "ts-loader": "^2.2.1", + "ts-loader": "^2.2.2", "tslint": "^5.4.3", "typescript": "^2.4.1", "url-loader": "^0.5.9", "webpack": "^3.0.0", "webpack-uglify-js-plugin": "^1.1.9", "weinre": "^2.0.0-pre-I0Z7U9OV", - "yarn": "^0.24.5" + "yarn": "^0.27.5" }, "devDependencies": { "jscpd": "^0.6.10", diff --git a/src/tools/state_to_props.ts b/src/tools/state_to_props.ts index fc1463716..fcf18eb5a 100644 --- a/src/tools/state_to_props.ts +++ b/src/tools/state_to_props.ts @@ -61,7 +61,7 @@ export function mapStateToProps(props: Everything): Props { // THIS IS IMPORTANT: // If you remove the `any`, the tool will be serialized wrong and // cause errors. - let tool_id = d.value ? d.value : (null as any); // Move "" to undefined; + let tool_id = d.value ? d.value : (null as any); dispatch(edit(t, { tool_id })); }; @@ -73,7 +73,8 @@ export function mapStateToProps(props: Everything): Props { getChosenToolOption, getToolByToolSlotUUID, changeToolSlot, - isActive + isActive, + dispatch: _.noop }; } diff --git a/tslint.json b/tslint.json index 346154a9d..2580a33df 100644 --- a/tslint.json +++ b/tslint.json @@ -31,6 +31,8 @@ "no-var-requires": false, "no-shadowed-variable": true, "no-unused-vars": true, + "no-consecutive-blank-lines": true, + "no-angle-bracket-type-assertion": true, "eofline": true, "one-line": [ true, diff --git a/yarn.lock b/yarn.lock index 9399e159b..c3b377262 100644 --- a/yarn.lock +++ b/yarn.lock @@ -98,9 +98,9 @@ version "20.0.2" resolved "https://registry.yarnpkg.com/@types/jest/-/jest-20.0.2.tgz#86c751121fb53dbd39bb1a08c45083da13f2dc67" -"@types/lodash@^4.14.67": - version "4.14.67" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.67.tgz#4714714434da110306b9862fbd36b30b55eb850a" +"@types/lodash@^4.14.68": + version "4.14.68" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.68.tgz#754fbab68bd2bbb69547dc8ce7574f7012eed7f6" "@types/markdown-it@^0.0.2": version "0.0.2" @@ -112,10 +112,14 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@^8.0.6": +"@types/node@*": version "8.0.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.6.tgz#ed2c3e011cb51ccd3cf874989130f1b9ffe06069" +"@types/node@^8.0.7": + version "8.0.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.7.tgz#fb0ad04b5b6f6eabe0372a32a8f1fbba5c130cae" + "@types/react-color@^2.11.4": version "2.11.4" resolved "https://registry.yarnpkg.com/@types/react-color/-/react-color-2.11.4.tgz#55d8a94bbb521837b2b2af404a3b86477a1a03af" @@ -142,10 +146,14 @@ "@types/history" "^3" "@types/react" "*" -"@types/react@*", "@types/react@^15.0.33": +"@types/react@*": version "15.0.33" resolved "https://registry.yarnpkg.com/@types/react/-/react-15.0.33.tgz#442b025b3ee7d65f25c5cf495b7bd773855c079b" +"@types/react@^15.0.34": + version "15.0.34" + resolved "https://registry.yarnpkg.com/@types/react/-/react-15.0.34.tgz#c4f7235f3d245216a706887b7d1ffedaf5b1dc06" + "@types/redux@^3.6.31": version "3.6.31" resolved "https://registry.yarnpkg.com/@types/redux/-/redux-3.6.31.tgz#40eafa7575db36b912ce0059b85de98c205b0708" @@ -4862,7 +4870,32 @@ request-capture-har@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/request-capture-har/-/request-capture-har-1.2.2.tgz#cd692cfb2cc744fd84a3358aac6ee51528cf720d" -request@2, request@^2.81.0: +request@2, request@2.79.0, request@^2.79.0: + version "2.79.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" + dependencies: + aws-sign2 "~0.6.0" + aws4 "^1.2.1" + caseless "~0.11.0" + combined-stream "~1.0.5" + extend "~3.0.0" + forever-agent "~0.6.1" + form-data "~2.1.1" + har-validator "~2.0.6" + hawk "~3.1.3" + http-signature "~1.1.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.7" + oauth-sign "~0.8.1" + qs "~6.3.0" + stringstream "~0.0.4" + tough-cookie "~2.3.0" + tunnel-agent "~0.4.1" + uuid "^3.0.0" + +request@^2.81.0: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" dependencies: @@ -4889,31 +4922,6 @@ request@2, request@^2.81.0: tunnel-agent "^0.6.0" uuid "^3.0.0" -request@2.79.0, request@^2.79.0: - version "2.79.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.11.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~2.0.6" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - qs "~6.3.0" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "~0.4.1" - uuid "^3.0.0" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -5534,9 +5542,9 @@ ts-jest@^20.0.6: tsconfig "^6.0.0" yargs "^8.0.1" -ts-loader@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-2.2.1.tgz#2ed6d2e1296335259562e3cb190a53832f7ec5a3" +ts-loader@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-2.2.2.tgz#6ea98ebe384ee9ba4c891fea6de6d4e7d8134730" dependencies: colors "^1.0.3" enhanced-resolve "^3.0.0" @@ -6138,9 +6146,9 @@ yargs@~3.10.0: decamelize "^1.0.0" window-size "0.1.0" -yarn@^0.24.5: - version "0.24.5" - resolved "https://registry.yarnpkg.com/yarn/-/yarn-0.24.5.tgz#92c72adf4de8dacccaf6b4259eb4990f6c4f8e3b" +yarn@^0.27.5: + version "0.27.5" + resolved "https://registry.yarnpkg.com/yarn/-/yarn-0.27.5.tgz#06fe67d8040802993f9f1e1923d671cbf9ead5d1" dependencies: babel-runtime "^6.0.0" bytes "^2.4.0" @@ -6151,6 +6159,7 @@ yarn@^0.24.5: death "^1.0.0" debug "^2.2.0" detect-indent "^5.0.0" + glob "^7.1.1" gunzip-maybe "^1.4.0" ini "^1.3.4" inquirer "^3.0.1" @@ -6159,7 +6168,7 @@ yarn@^0.24.5: is-ci "^1.0.10" leven "^2.0.0" loud-rejection "^1.2.0" - minimatch "^3.0.3" + micromatch "^2.3.11" mkdirp "^0.5.1" node-emoji "^1.0.4" object-path "^0.11.2"