From d216f8f723f8c722723c528c5abbaad1ee081608 Mon Sep 17 00:00:00 2001 From: Steve Kellock Date: Mon, 7 Aug 2017 21:45:49 -0400 Subject: [PATCH 1/2] Bumps deps. --- package-lock.json | 95 ++++++++++++++++++++++++++++------------------- package.json | 10 ++--- 2 files changed, 61 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7a8eade..bf216b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1373,9 +1373,9 @@ "dev": true }, "circular-json": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz", - "integrity": "sha1-vos2rvzN6LPKeqLWr8B6NyQsDS0=", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", + "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", "dev": true }, "classnames": { @@ -1803,7 +1803,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "0.10.24" + "es5-ext": "0.10.26" } }, "dashdash": { @@ -2704,9 +2704,9 @@ } }, "es5-ext": { - "version": "0.10.24", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.24.tgz", - "integrity": "sha1-pVh3yZJLwMjZvTwsvhdJWsFwmxQ=", + "version": "0.10.26", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.26.tgz", + "integrity": "sha1-UbISilMbcMT2dkCTpzy+u4IYY3I=", "dev": true, "requires": { "es6-iterator": "2.0.1", @@ -2726,7 +2726,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.24", + "es5-ext": "0.10.26", "es6-symbol": "3.1.1" } }, @@ -2737,7 +2737,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.24", + "es5-ext": "0.10.26", "es6-iterator": "2.0.1", "es6-set": "0.1.5", "es6-symbol": "3.1.1", @@ -2757,7 +2757,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.24", + "es5-ext": "0.10.26", "es6-iterator": "2.0.1", "es6-symbol": "3.1.1", "event-emitter": "0.3.5" @@ -2770,7 +2770,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.24" + "es5-ext": "0.10.26" } }, "es6-weak-map": { @@ -2780,7 +2780,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.24", + "es5-ext": "0.10.26", "es6-iterator": "2.0.1", "es6-symbol": "3.1.1" } @@ -2858,7 +2858,7 @@ "debug": "2.6.8", "doctrine": "2.0.0", "escope": "3.6.0", - "espree": "3.4.3", + "espree": "3.5.0", "esquery": "1.0.0", "estraverse": "4.2.0", "esutils": "2.0.2", @@ -3029,9 +3029,9 @@ "dev": true }, "eslint-config-standard-jsx": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-4.0.1.tgz", - "integrity": "sha1-zU5GPQJo4tnnB/YfQvc/WzMzxkI=", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-4.0.2.tgz", + "integrity": "sha512-F8fRh2WFnTek7dZH9ZaE0PCBwdVGkwVWZmizla/DDNOmg7Tx6B/IlK5+oYpiX29jpu73LszeJj5i1axEZv6VMw==", "dev": true }, "eslint-import-resolver-node": { @@ -3042,7 +3042,7 @@ "requires": { "debug": "2.6.8", "object-assign": "4.1.1", - "resolve": "1.3.3" + "resolve": "1.4.0" } }, "eslint-module-utils": { @@ -3182,7 +3182,7 @@ "ignore": "3.3.3", "minimatch": "3.0.4", "object-assign": "4.1.1", - "resolve": "1.3.3", + "resolve": "1.4.0", "semver": "5.3.0" } }, @@ -3236,9 +3236,9 @@ } }, "espree": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz", - "integrity": "sha1-KRC1zNSc6JPC//+qtP2LOjG4I3Q=", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.0.tgz", + "integrity": "sha1-mDWGJb3QVYYeon4oZ+pyn69GPY0=", "dev": true, "requires": { "acorn": "5.1.1", @@ -3330,7 +3330,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.24" + "es5-ext": "0.10.26" } }, "event-stream": { @@ -3680,7 +3680,7 @@ "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=", "dev": true, "requires": { - "circular-json": "0.3.1", + "circular-json": "0.3.3", "del": "2.2.2", "graceful-fs": "4.1.11", "write": "0.2.1" @@ -5741,20 +5741,37 @@ } }, "lint-staged": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-4.0.2.tgz", - "integrity": "sha1-joPhHp4WVsCbYRf22w1V/UlgocA=", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-4.0.3.tgz", + "integrity": "sha1-HOVVkbwsg6eBqQtpoKDIqg/GNws=", "dev": true, "requires": { "app-root-path": "2.0.1", "cosmiconfig": "1.1.0", - "execa": "0.7.0", + "execa": "0.8.0", "listr": "0.12.0", "lodash.chunk": "4.2.0", "minimatch": "3.0.4", "npm-which": "3.0.1", "p-map": "1.1.1", "staged-git-files": "0.0.4" + }, + "dependencies": { + "execa": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz", + "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=", + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + } + } } }, "listr": { @@ -7909,7 +7926,7 @@ "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { - "resolve": "1.3.3" + "resolve": "1.4.0" } }, "redent": { @@ -8109,9 +8126,9 @@ } }, "resolve": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz", - "integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU=", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", + "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", "dev": true, "requires": { "path-parse": "1.0.5" @@ -8531,14 +8548,14 @@ "dev": true }, "standard": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/standard/-/standard-10.0.2.tgz", - "integrity": "sha1-l0wcU8yGWwdaS1dueEQeFpXar3s=", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/standard/-/standard-10.0.3.tgz", + "integrity": "sha512-JURZ+85ExKLQULckDFijdX5WHzN6RC7fgiZNSV4jFQVo+3tPoQGHyBrGekye/yf0aOfb4210EM5qPNlc2cRh4w==", "dev": true, "requires": { "eslint": "3.19.0", "eslint-config-standard": "10.2.1", - "eslint-config-standard-jsx": "4.0.1", + "eslint-config-standard-jsx": "4.0.2", "eslint-plugin-import": "2.2.0", "eslint-plugin-node": "4.2.3", "eslint-plugin-promise": "3.5.0", @@ -9000,9 +9017,9 @@ "dev": true }, "tslint": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.5.0.tgz", - "integrity": "sha1-EOjas+MGH6YelELozuOYKs8gpqo=", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.6.0.tgz", + "integrity": "sha1-CIqmxgJmIzOGULKQCCirPt9Z9s8=", "dev": true, "requires": { "babel-code-frame": "6.22.0", @@ -9011,7 +9028,7 @@ "diff": "3.3.0", "glob": "7.1.2", "minimatch": "3.0.4", - "resolve": "1.3.3", + "resolve": "1.4.0", "semver": "5.3.0", "tslib": "1.7.1", "tsutils": "2.8.0" diff --git a/package.json b/package.json index 636e017..fe9d57e 100644 --- a/package.json +++ b/package.json @@ -46,11 +46,11 @@ "mobx": "3.2.2", "mobx-react": "4.2.2", "mousetrap": "1.6.1", - "popmotion-react": "^1.1.0", + "popmotion-react": "1.1.0", "ramda": "0.24.1", "react": "15.6.1", "react-dom": "15.6.1", - "react-transition-group": "^2.2.0" + "react-transition-group": "2.2.0" }, "description": "An electron starter project.", "devDependencies": { @@ -66,14 +66,14 @@ "electron-builder": "19.19.1", "fuse-box": "2.2.1", "husky": "0.14.3", - "lint-staged": "4.0.2", + "lint-staged": "4.0.3", "npm-run-all": "4.0.2", "npm-scripts-info": "0.3.6", "prettier": "1.5.3", "react-test-renderer": "15.6.1", - "standard": "10.0.2", + "standard": "10.0.3", "ts-node": "3.3.0", - "tslint": "5.5.0", + "tslint": "5.6.0", "tslint-eslint-rules": "4.1.1", "tslint-react": "3.2.0", "tslint-react-recommended": "1.0.15", From 1cc61783ed219f0aa4207745186a05c5edc4e777 Mon Sep 17 00:00:00 2001 From: Steve Kellock Date: Mon, 7 Aug 2017 21:50:30 -0400 Subject: [PATCH 2/2] Turn off no-duplicate-imports lint rule. --- tslint.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tslint.json b/tslint.json index 1f67fb8..5e57e41 100644 --- a/tslint.json +++ b/tslint.json @@ -8,6 +8,7 @@ "member-ordering": [false], "trailing-comma": [true, { "singleline": "never", "multiline": "always" }], "no-empty": false, - "ter-indent": [true, 2, { "SwitchCase": 1 }] + "ter-indent": [true, 2, { "SwitchCase": 1 }], + "no-duplicate-imports": false } }