From 5aeaa644d9aae636369583234ec746d25d616221 Mon Sep 17 00:00:00 2001 From: butlerx Date: Fri, 4 Aug 2017 09:52:33 +0100 Subject: [PATCH] use airbnb for linting --- .eslintrc | 73 ----------------------- .eslintrc.js | 36 ++++++++++++ gulpfile.js | 58 ++++++++++--------- package.json | 13 +++-- src/.eslintrc | 67 --------------------- src/.eslintrc.js | 37 ++++++++++++ src/wetty.js | 10 ++-- wetty.js | 16 ++---- yarn.lock | 147 ++++++++++++++++++++++++++++++++++------------- 9 files changed, 228 insertions(+), 229 deletions(-) delete mode 100644 .eslintrc create mode 100644 .eslintrc.js delete mode 100644 src/.eslintrc create mode 100644 src/.eslintrc.js diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index c7843fd..0000000 --- a/.eslintrc +++ /dev/null @@ -1,73 +0,0 @@ -{ - 'env': { - 'es6' : true, - 'node' : true, - }, - "extends": [ - 'eslint:recommended' - ], - 'rules' : { - 'indent': [ - 'error', - 2, - ], - 'linebreak-style': [ - 'error', - 'unix', - ], - 'quotes': [ - 'error', - 'single', - ], - 'semi': [ - 'error', - 'always', - ], - 'comma-dangle': [ - 'error', - 'always-multiline', - ], - 'key-spacing': [ - 'error', - { - 'multiLine': { - 'beforeColon': false, - 'afterColon' : true, - }, - 'align': { - 'beforeColon': false, - 'afterColon' : true, - 'on' : 'colon', - 'mode' : 'strict', - }, - }, - ], - 'no-var': [ - 'error', - ], - 'no-console': [ - 'error', - { - 'allow': [ - 'warn', - 'trace', - 'log', - 'error' - ] - } - ], - 'prefer-arrow-callback': [ - 'error', - { - 'allowNamedFunctions': true - } - ], - 'prefer-const': [ - 'error', - { - 'destructuring' : 'any', - 'ignoreReadBeforeAssign': false, - }, - ], - }, -} diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..91a8f51 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,36 @@ +module.exports = { + env: { + es6 : true, + node: true, + }, + extends: ['airbnb'], + rules : { + 'linebreak-style' : ['error', 'unix'], + 'arrow-parens' : ['error', 'as-needed'], + 'no-param-reassign' : ['error', { props: false }], + 'func-style' : ['error', 'declaration', { allowArrowFunctions: true }], + 'no-use-before-define': ['error', { functions: false }], + 'no-shadow' : [ + 'error', + { + builtinGlobals: true, + hoist : 'functions', + allow : ['resolve', 'reject', 'err'], + }, + ], + 'no-console': [ + 'error', + { + allow: ['warn', 'trace', 'log', 'error'], + }, + ], + 'consistent-return': 0, + 'key-spacing' : [ + 'error', + { + multiLine: { beforeColon: false, afterColon: true }, + align : { beforeColon: false, afterColon: true, on: 'colon', mode: 'strict' }, + }, + ], + }, +}; diff --git a/gulpfile.js b/gulpfile.js index 00267f8..dfc74c6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -5,33 +5,35 @@ const babel = require('gulp-babel'); const shell = require('gulp-shell'); const del = require('del'); -gulp.task('compress', ['hterm'], () => gulp - .src([ - './libapps/hterm_all.js', - './src/wetty.js', - ]) - .pipe(concat('wetty.js')) - .pipe(babel()) - .pipe( - minify({ - ext: { - min: '.min.js', - }, - exclude : ['tasks'], - noSource : true, - ignoreFiles: ['.combo.js', '*.min.js'], - }) - ) - .pipe(gulp.dest('./public/wetty'))); +gulp.task('compress', ['hterm'], () => + gulp + .src(['./libapps/hterm_all.js', './src/wetty.js']) + .pipe(concat('wetty.js')) + .pipe(babel()) + .pipe( + minify({ + ext: { + min: '.min.js', + }, + exclude : ['tasks'], + noSource : true, + ignoreFiles: ['.combo.js', '*.min.js'], + }), + ) + .pipe(gulp.dest('./public/wetty')), +); -gulp.task('hterm', - shell.task([ - 'git clone https://chromium.googlesource.com/apps/libapps', - 'LIBDOT_SEARCH_PATH=$(pwd)/libapps ./libapps/libdot/bin/concat.sh -i ./libapps/hterm/concat/hterm_all.concat -o ./libapps/hterm_all.js', - ], { - verbose: true, - })); +gulp.task( + 'hterm', + shell.task( + [ + 'git clone https://chromium.googlesource.com/apps/libapps', + 'LIBDOT_SEARCH_PATH=$(pwd)/libapps ./libapps/libdot/bin/concat.sh -i ./libapps/hterm/concat/hterm_all.concat -o ./libapps/hterm_all.js', + ], + { + verbose: true, + }, + ), +); -gulp.task('default', ['compress'], () => { - return del(['./libapps']); -}); +gulp.task('default', ['compress'], () => del(['./libapps'])); diff --git a/package.json b/package.json index 017511c..d6e0fcf 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "version": "0.3.0", "dependencies": { "express": "^4.15.3", + "fs-extra": "^4.0.1", "optimist": "^0.6", "pre-commit": "^1.2.2", "pty.js": "^0.3.1", @@ -23,11 +24,13 @@ "es6-promise": "^4.1.1", "eslint": "3.19.0", "eslint-config-standard": "10.2.1", - "eslint-plugin-import": "^2.2.0", - "eslint-plugin-node": "^4.2.2", - "eslint-plugin-promise": "3.5.0", - "eslint-plugin-react": "6.10.3", - "eslint-plugin-standard": "3.0.1", + "eslint-config-airbnb": "^15.1.0", + "eslint-plugin-jsx-a11y": "^5.1.1", + "eslint-plugin-import": "^2.7.0", + "eslint-plugin-node": "^5.1.1", + "eslint-plugin-promise": "^3.5.0", + "eslint-plugin-react": "^7.1.0", + "eslint-plugin-standard": "^3.0.1", "gulp": "^3.9.1", "gulp-babel": "^6.1.2", "gulp-concat": "^2.6.1", diff --git a/src/.eslintrc b/src/.eslintrc deleted file mode 100644 index 4300338..0000000 --- a/src/.eslintrc +++ /dev/null @@ -1,67 +0,0 @@ -{ - 'env': { - 'es6' : true, - 'browser': true, - }, - 'globals': { - 'hterm': true, - 'lib': true, - 'io': true - }, - "extends": [ - 'eslint:recommended' - ], - 'rules' : { - 'indent': [ - 'error', - 2, - ], - 'linebreak-style': [ - 'error', - 'unix', - ], - 'quotes': [ - 'error', - 'single', - ], - 'semi': [ - 'error', - 'always', - ], - 'comma-dangle': [ - 'error', - 'always-multiline', - ], - 'key-spacing': [ - 'error', - { - 'multiLine': { - 'beforeColon': false, - 'afterColon' : true, - }, - 'align': { - 'beforeColon': false, - 'afterColon' : true, - 'on' : 'colon', - 'mode' : 'strict', - }, - }, - ], - 'no-var': [ - 'error', - ], - 'prefer-arrow-callback': [ - 'error', - { - 'allowNamedFunctions': true - } - ], - 'prefer-const': [ - 'error', - { - 'destructuring' : 'any', - 'ignoreReadBeforeAssign': false, - }, - ], - }, -} diff --git a/src/.eslintrc.js b/src/.eslintrc.js new file mode 100644 index 0000000..be1ea4f --- /dev/null +++ b/src/.eslintrc.js @@ -0,0 +1,37 @@ +module.exports = { + env: { + es6 : true, + browser: true, + }, + globals: { + hterm: true, + lib : true, + io : true, + }, + extends: ['airbnb'], + rules : { + 'no-underscore-dangle': 0, + 'class-methods-use-this': 0, + 'linebreak-style' : ['error', 'unix'], + 'arrow-parens' : ['error', 'as-needed'], + 'no-param-reassign' : ['error', { props: false }], + 'func-style' : ['error', 'declaration', { allowArrowFunctions: true }], + 'no-use-before-define': ['error', { functions: false }], + 'no-shadow' : [ + 'error', + { + builtinGlobals: true, + hoist : 'functions', + allow : ['resolve', 'reject', 'err'], + }, + ], + 'consistent-return': 0, + 'key-spacing' : [ + 'error', + { + multiLine: { beforeColon: false, afterColon: true }, + align : { beforeColon: false, afterColon: true, on: 'colon', mode: 'strict' }, + }, + ], + }, +}; diff --git a/src/wetty.js b/src/wetty.js index 84e0fac..e31bcac 100644 --- a/src/wetty.js +++ b/src/wetty.js @@ -1,4 +1,4 @@ -const socket = io(location.origin, {path: '/wetty/socket.io'}); +const socket = io(location.origin, { path: '/wetty/socket.io' }); let term; let buf = ''; @@ -59,7 +59,7 @@ socket.on('connect', () => { }); }); -socket.on('output', (data) => { +socket.on('output', data => { if (!term) { buf += data; return; @@ -77,7 +77,7 @@ socket.on('disconnect', () => { window.removeEventListener('beforeunload', handler, false); }); -function handler (event) { - event.returnValue = 'Are you sure?'; - return event.returnValue; +function handler(e) { + e.returnValue = 'Are you sure?'; + return e.returnValue; } diff --git a/wetty.js b/wetty.js index d1d010f..cce0993 100644 --- a/wetty.js +++ b/wetty.js @@ -42,19 +42,15 @@ exports.serve = (port, globalsshuser, sshhost, sshport, sshauth, sslopts) => { const events = new EventEmitter(); const io = server(httpserv, { path: '/wetty/socket.io' }); io.on('connection', socket => { - const request = socket.request; + const { request } = socket; console.log(`${new Date()} Connection accepted.`); const match = request.headers.referer.match('.+/ssh/.+$'); - const ssh = match - ? `${match[0].split('/ssh/').pop()}@${sshhost}` - : globalsshuser - ? `${globalsshuser}@${sshhost}` - : sshhost; + const sshAddress = globalsshuser ? `${globalsshuser}@${sshhost}` : sshhost; + const ssh = match ? `${match[0].split('/ssh/').pop()}@${sshhost}` : sshAddress; - const args = - process.getuid() === 0 && sshhost === 'localhost' - ? ['login'] - : [ssh, '-p', sshport, '-o', `PreferredAuthentications=${sshauth}`]; + const args = process.getuid() === 0 && sshhost === 'localhost' + ? ['login'] + : [ssh, '-p', sshport, '-o', `PreferredAuthentications=${sshauth}`]; const term = pty.spawn('/usr/bin/env', args, { name: 'xterm-256color', cols: 80, diff --git a/yarn.lock b/yarn.lock index 5293935..049af46 100644 --- a/yarn.lock +++ b/yarn.lock @@ -94,6 +94,12 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" +aria-query@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-0.7.0.tgz#4af10a1e61573ddea0cf3b99b51c52c05b424d24" + dependencies: + ast-types-flow "0.0.7" + arr-diff@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" @@ -120,6 +126,13 @@ array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" +array-includes@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" + dependencies: + define-properties "^1.1.2" + es-abstract "^1.7.0" + array-slice@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.0.0.tgz#e73034f00dcc1f40876008fd20feae77bd4b7c2f" @@ -138,13 +151,6 @@ array-unique@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" -array.prototype.find@^2.0.1: - version "2.0.4" - resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.4.tgz#556a5c5362c08648323ddaeb9de9d14bc1864c90" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.7.0" - arraybuffer.slice@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca" @@ -165,6 +171,10 @@ assert-plus@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" +ast-types-flow@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" + async-each@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" @@ -187,6 +197,12 @@ aws4@^1.2.1: version "1.6.0" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" +axobject-query@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-0.1.0.tgz#62f59dbc59c9f9242759ca349960e7a2fe3c36c0" + dependencies: + ast-types-flow "0.0.7" + babel-cli@6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.24.1.tgz#207cd705bba61489b2ea41b5312341cf6aca2283" @@ -983,6 +999,10 @@ d@1: dependencies: es5-ext "^0.10.9" +damerau-levenshtein@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514" + dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -1104,7 +1124,7 @@ detect-indent@^4.0.0: dependencies: repeating "^2.0.0" -doctrine@1.5.0, doctrine@^1.2.2: +doctrine@1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" dependencies: @@ -1134,6 +1154,10 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" +emoji-regex@^6.1.0: + version "6.5.1" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.5.1.tgz#9baea929b155565c11ea41c6626eaa65cef992c2" + encodeurl@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20" @@ -1279,6 +1303,18 @@ escope@^3.6.0: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-config-airbnb-base@^11.3.0: + version "11.3.1" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.3.1.tgz#c0ab108c9beed503cb999e4c60f4ef98eda0ed30" + dependencies: + eslint-restricted-globals "^0.1.1" + +eslint-config-airbnb@^15.1.0: + version "15.1.0" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-15.1.0.tgz#fd432965a906e30139001ba830f58f73aeddae8e" + dependencies: + eslint-config-airbnb-base "^11.3.0" + eslint-config-standard@10.2.1: version "10.2.1" resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz#c061e4d066f379dc17cd562c64e819b4dd454591" @@ -1290,56 +1326,69 @@ eslint-import-resolver-node@^0.3.1: debug "^2.6.8" resolve "^1.2.0" -eslint-module-utils@^2.0.0: +eslint-module-utils@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz#abaec824177613b8a95b299639e1b6facf473449" dependencies: debug "^2.6.8" pkg-dir "^1.0.0" -eslint-plugin-import@^2.2.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.6.1.tgz#f580be62bb809421d46e338372764afcc9f59bf6" +eslint-plugin-import@^2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.7.0.tgz#21de33380b9efb55f5ef6d2e210ec0e07e7fa69f" dependencies: builtin-modules "^1.1.1" contains-path "^0.1.0" debug "^2.6.8" doctrine "1.5.0" eslint-import-resolver-node "^0.3.1" - eslint-module-utils "^2.0.0" + eslint-module-utils "^2.1.1" has "^1.0.1" lodash.cond "^4.3.0" minimatch "^3.0.3" read-pkg-up "^2.0.0" -eslint-plugin-node@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-4.2.2.tgz#82959ca9aed79fcbd28bb1b188d05cac04fb3363" +eslint-plugin-jsx-a11y@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-5.1.1.tgz#5c96bb5186ca14e94db1095ff59b3e2bd94069b1" dependencies: - ignore "^3.0.11" - minimatch "^3.0.2" - object-assign "^4.0.1" - resolve "^1.1.7" + aria-query "^0.7.0" + array-includes "^3.0.3" + ast-types-flow "0.0.7" + axobject-query "^0.1.0" + damerau-levenshtein "^1.0.0" + emoji-regex "^6.1.0" + jsx-ast-utils "^1.4.0" + +eslint-plugin-node@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-5.1.1.tgz#a7ed956e780c22aef6afd1116005acd82f26eac6" + dependencies: + ignore "^3.3.3" + minimatch "^3.0.4" + resolve "^1.3.3" semver "5.3.0" -eslint-plugin-promise@3.5.0: +eslint-plugin-promise@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz#78fbb6ffe047201627569e85a6c5373af2a68fca" -eslint-plugin-react@6.10.3: - version "6.10.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz#c5435beb06774e12c7db2f6abaddcbf900cd3f78" +eslint-plugin-react@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.1.0.tgz#27770acf39f5fd49cd0af4083ce58104eb390d4c" dependencies: - array.prototype.find "^2.0.1" - doctrine "^1.2.2" + doctrine "^2.0.0" has "^1.0.1" - jsx-ast-utils "^1.3.4" - object.assign "^4.0.4" + jsx-ast-utils "^1.4.1" -eslint-plugin-standard@3.0.1: +eslint-plugin-standard@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz#34d0c915b45edc6f010393c7eef3823b08565cf2" +eslint-restricted-globals@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz#35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7" + eslint@3.19.0: version "3.19.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc" @@ -1650,6 +1699,14 @@ fs-exists-sync@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" +fs-extra@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.1.tgz#7fc0c6c8957f983f57f306a24e5b9ddd8d0dd880" + dependencies: + graceful-fs "^4.1.2" + jsonfile "^3.0.0" + universalify "^0.1.0" + fs-readdir-recursive@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560" @@ -1850,7 +1907,7 @@ graceful-fs@^3.0.0: dependencies: natives "^1.1.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.4: +graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -2055,7 +2112,7 @@ http-signature@~1.1.0: jsprim "^1.2.2" sshpk "^1.7.0" -ignore@^3.0.11, ignore@^3.2.0: +ignore@^3.2.0, ignore@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d" @@ -2369,6 +2426,12 @@ json5@^0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" +jsonfile@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" + optionalDependencies: + graceful-fs "^4.1.6" + jsonify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" @@ -2386,7 +2449,7 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.3.6" -jsx-ast-utils@^1.3.4: +jsx-ast-utils@^1.4.0, jsx-ast-utils@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1" @@ -2888,7 +2951,7 @@ object-component@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291" -object-keys@^1.0.10, object-keys@^1.0.8: +object-keys@^1.0.8: version "1.0.11" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d" @@ -2896,14 +2959,6 @@ object-keys@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336" -object.assign@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc" - dependencies: - define-properties "^1.1.2" - function-bind "^1.1.0" - object-keys "^1.0.10" - object.defaults@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" @@ -3452,6 +3507,12 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0: dependencies: path-parse "^1.0.5" +resolve@^1.3.3: + version "1.4.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86" + dependencies: + path-parse "^1.0.5" + restore-cursor@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" @@ -3925,6 +3986,10 @@ unique-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b" +universalify@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7" + unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"