diff --git a/.all-contributorsrc b/.all-contributorsrc index ea603f0e..37274ede 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -162,6 +162,24 @@ "contributions": [ "code" ] + }, + { + "login": "hammster", + "name": "Hans Koch", + "avatar_url": "https://avatars0.githubusercontent.com/u/1093709?v=4", + "profile": "https://hans-koch.me", + "contributions": [ + "code" + ] + }, + { + "login": "ThePuzzlemaker", + "name": "Dak Smyth", + "avatar_url": "https://avatars3.githubusercontent.com/u/12666617?v=4", + "profile": "http://thepuzzlemaker.info", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/.travis.yml b/.travis.yml index ab955e1a..5027252b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,22 +9,6 @@ stages: jobs: include: - - stage: 'Build' - if: branch = xxx - os: linux - before_install: - - set -e - - rm app/node_modules/.yarn-integrity || true - - yarn - script: - - set -e - - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # https://github.com/travis-ci/travis-ci/issues/8920 - - scripts/build-native.js - - yarn run build:typings - - yarn run build - - scripts/prepackage-plugins.js - - travis_wait scripts/build-linux.js - - stage: 'Build' os: osx before_install: @@ -43,6 +27,7 @@ jobs: os: linux if: branch = master script: + - '[ -z "${encrypted_4e2fb4889ef8_iv}" ] && exit 0 || true' - set -e - openssl aes-256-cbc -K $encrypted_4e2fb4889ef8_key -iv $encrypted_4e2fb4889ef8_iv -in .travis.ssh.key.enc -out .travis.ssh.key -d - eval "$(ssh-agent -s)" @@ -68,7 +53,5 @@ addons: cache: directories: - - 'terminus-*/node_modules' - - $HOME/.cache/yarn - $HOME/.cache/electron - $HOME/.cache/electron-builder diff --git a/README.md b/README.md index fefc0137..23f8afb1 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,33 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d -
Russell Myers
Russell Myers
πŸ’»		Austin Warren
Austin Warren
πŸ’»		Felicia Hummel
Felicia Hummel
πŸ’»		Mike MacCana
Mike MacCana
⚠️ 🎨		Yacine Kanzari
Yacine Kanzari
πŸ’»		BBJip
BBJip
πŸ’»		Futagirl
Futagirl
🎨
Levin Rickert
Levin Rickert
πŸ’»		OJ Kwon
OJ Kwon
πŸ’»		domain
domain
πŸ”Œ πŸ’»		James Brumond
James Brumond
πŸ”Œ		Daniel Imms
Daniel Imms
πŸ’» πŸ”Œ ⚠️		Florian Bachmann
Florian Bachmann
πŸ’»		Michael KΓΌhnel
Michael KΓΌhnel
πŸ’» 🎨
Tilmann Meyer
Tilmann Meyer
πŸ’»		PM Extra
PM Extra
πŸ›		Jonathan
Jonathan
πŸ’»
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Russell Myers
Russell Myers
πŸ’»		Austin Warren
Austin Warren
πŸ’»		Felicia Hummel
Felicia Hummel
πŸ’»		Mike MacCana
Mike MacCana
⚠️ 🎨		Yacine Kanzari
Yacine Kanzari
πŸ’»		BBJip
BBJip
πŸ’»		Futagirl
Futagirl
🎨
Levin Rickert
Levin Rickert
πŸ’»		OJ Kwon
OJ Kwon
πŸ’»		domain
domain
πŸ”Œ πŸ’»		James Brumond
James Brumond
πŸ”Œ		Daniel Imms
Daniel Imms
πŸ’» πŸ”Œ ⚠️		Florian Bachmann
Florian Bachmann
πŸ’»		Michael KΓΌhnel
Michael KΓΌhnel
πŸ’» 🎨
Tilmann Meyer
Tilmann Meyer
πŸ’»		PM Extra
PM Extra
πŸ›		Jonathan
Jonathan
πŸ’»		Hans Koch
Hans Koch
πŸ’»		Dak Smyth
Dak Smyth
πŸ’»
diff --git a/app/lib/app.ts b/app/lib/app.ts index b67cce41..334a308b 100644 --- a/app/lib/app.ts +++ b/app/lib/app.ts @@ -72,7 +72,7 @@ export class Application { this.tray = new Tray(`${app.getAppPath()}/assets/tray.png`) } - this.tray.on('click', () => this.focus()) + this.tray.on('click', () => setTimeout(() => this.focus())); const contextMenu = Menu.buildFromTemplate([{ label: 'Show', @@ -100,7 +100,6 @@ export class Application { focus () { for (let window of this.windows) { window.show() - window.focus() } } diff --git a/app/package.json b/app/package.json index e49ac8ca..6be531ec 100644 --- a/app/package.json +++ b/app/package.json @@ -28,7 +28,7 @@ "electron-is-dev": "1.1.0", "electron-updater": "^4.0.6", "js-yaml": "3.13.1", - "keytar": "^4.7.0", + "keytar": "^4.12.0", "mz": "^2.7.0", "ngx-toastr": "^10.0.4", "node-pty": "^0.9.0-beta19", diff --git a/app/src/global.scss b/app/src/global.scss index c6377fd9..6f316ea7 100644 --- a/app/src/global.scss +++ b/app/src/global.scss @@ -16,6 +16,12 @@ body { display: none; } +.btn { + & > svg { + pointer-events: none; + } +} + .form-line { display: flex; border-top: 1px solid rgba(0, 0, 0, 0.2); diff --git a/app/yarn.lock b/app/yarn.lock index 69a38fae..b2cc0a16 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -1474,10 +1474,10 @@ keyboardevents-areequal@^0.2.1: resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194" integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw== -keytar@^4.7.0: - version "4.11.0" - resolved "https://registry.yarnpkg.com/keytar/-/keytar-4.11.0.tgz#891569045b287a0dabe69320e2381e059b02363f" - integrity sha512-cGn2xd4NY0yCBrU5zQ/lwIagP1UBOhUEemi6iSJU2gshN1RHkxHekSdLUji9IWNo5B1Va/iwXXWzGD2p8ziqfQ== +keytar@^4.12.0: + version "4.12.0" + resolved "https://registry.yarnpkg.com/keytar/-/keytar-4.12.0.tgz#ea12f56b47fb2f719940385a4e7ea2ddfcb82191" + integrity sha512-V+MY1cD/QheiAY+FZcnEzp1f6vVjOZAZ5kqosZYfe5upROlmY0iDXtTMsLrYiGo1CD8KMujoivai7eB+pK2wew== dependencies: nan "2.14.0" prebuild-install "5.3.0" diff --git a/build/mac/entitlements.plist b/build/mac/entitlements.plist index 38c887b2..6bc22e91 100644 --- a/build/mac/entitlements.plist +++ b/build/mac/entitlements.plist @@ -8,5 +8,7 @@ com.apple.security.cs.allow-dyld-environment-variables + com.apple.security.cs.disable-library-validation + diff --git a/package.json b/package.json index ddd90edf..60e13c2b 100644 --- a/package.json +++ b/package.json @@ -7,26 +7,26 @@ "@types/js-yaml": "^3.12.1", "@types/node": "^12.6.2", "@types/webpack-env": "1.13.9", - "@typescript-eslint/eslint-plugin": "^1.12.0", - "@typescript-eslint/parser": "^1.12.0", + "@typescript-eslint/eslint-plugin": "^1.13.0", + "@typescript-eslint/parser": "^1.13.0", "app-builder-lib": "^21.0.8", "apply-loader": "2.0.0", "awesome-typescript-loader": "^5.0.0", "core-js": "^3.1.4", "cross-env": "5.2.0", - "css-loader": "3.0.0", - "electron": "^5.0.5", + "css-loader": "3.1.0", + "electron": "^5.0.7", "electron-builder": "^21.0.8", "electron-installer-snap": "^4.0.0", "electron-notarize": "^0.1.1", "electron-rebuild": "^1.8.5", "eslint": "^5.16.0", - "file-loader": "^4.0.0", + "file-loader": "^4.1.0", "graceful-fs": "^4.1.15", "html-loader": "0.5.5", "json-loader": "0.5.7", "node-abi": "^2.9.0", - "node-gyp": "^5.0.2", + "node-gyp": "^5.0.3", "node-sass": "^4.12.0", "npmlog": "4.1.2", "npx": "^10.2.0", @@ -36,7 +36,7 @@ "pug-loader": "^2.4.0", "pug-static-loader": "2.0.0", "raven-js": "3.27.2", - "raw-loader": "3.0.0", + "raw-loader": "3.1.0", "sass-loader": "^7.0.1", "shelljs": "0.8.3", "source-code-pro": "^2.30.1", @@ -47,7 +47,7 @@ "tslib": "^1.10.0", "typedoc": "^0.14.2", "typescript": "^3.5.3", - "url-loader": "^2.0.0", + "url-loader": "^2.1.0", "val-loader": "1.1.1", "webpack": "^4.35.2", "webpack-cli": "^3.3.6", @@ -98,6 +98,7 @@ "artifactName": "terminus-${version}-macos.${ext}", "hardenedRuntime": true, "entitlements": "./build/mac/entitlements.plist", + "entitlementsInherit": "./build/mac/entitlements.plist", "extendInfo": { "NSRequiresAquaSystemAppearance": false } @@ -141,6 +142,6 @@ }, "repository": "eugeny/terminus", "dependencies": { - "eslint-plugin-import": "^2.18.0" + "eslint-plugin-import": "^2.18.2" } } diff --git a/terminus-ssh/src/services/ssh.service.ts b/terminus-ssh/src/services/ssh.service.ts index e1adac5b..0e493e54 100644 --- a/terminus-ssh/src/services/ssh.service.ts +++ b/terminus-ssh/src/services/ssh.service.ts @@ -132,7 +132,7 @@ export class SSHService { }) ssh.on('banner', banner => { - log('Banner: ' + banner) + log('Banner: \n' + banner) }) let agent: string = null diff --git a/terminus-terminal/package.json b/terminus-terminal/package.json index b92c2ee1..b240eaa7 100644 --- a/terminus-terminal/package.json +++ b/terminus-terminal/package.json @@ -28,7 +28,7 @@ "runes": "^0.4.2", "slug": "^1.1.0", "uuid": "^3.3.2", - "xterm": "3.15.0-beta80", + "xterm": "3.15.0-beta81", "xterm-addon-fit": "^0.1.0-beta3", "xterm-addon-ligatures": "^0.1.0-beta-2", "xterm-addon-search": "^0.2.0-beta1", diff --git a/terminus-terminal/src/components/terminalTab.component.ts b/terminus-terminal/src/components/terminalTab.component.ts index 0caff623..669420d4 100644 --- a/terminus-terminal/src/components/terminalTab.component.ts +++ b/terminus-terminal/src/components/terminalTab.component.ts @@ -97,5 +97,6 @@ export class TerminalTabComponent extends BaseTerminalTabComponent { ngOnDestroy () { this.homeEndSubscription.unsubscribe() super.ngOnDestroy() + this.session.destroy() } } diff --git a/terminus-terminal/src/frontends/xtermFrontend.ts b/terminus-terminal/src/frontends/xtermFrontend.ts index a6cb2909..45e6ff17 100644 --- a/terminus-terminal/src/frontends/xtermFrontend.ts +++ b/terminus-terminal/src/frontends/xtermFrontend.ts @@ -85,7 +85,7 @@ export class XTermFrontend extends Frontend { this.resizeHandler = () => { try { - if (getComputedStyle(this.xtermCore.element).getPropertyValue('height') !== 'auto') { + if (this.xtermCore.element && getComputedStyle(this.xtermCore.element).getPropertyValue('height') !== 'auto') { this.fitAddon.fit() } } catch (e) { diff --git a/terminus-terminal/yarn.lock b/terminus-terminal/yarn.lock index edb46f7d..7d74bd08 100644 --- a/terminus-terminal/yarn.lock +++ b/terminus-terminal/yarn.lock @@ -188,10 +188,10 @@ xterm-addon-webgl@^0.2.0-beta1: resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.2.0-beta5.tgz#79d97c21bb09c34c6aca6f4e72afe8085f8a77dc" integrity sha512-TR6071ZWQ2l0E/P7KedDfsGCW21BWCfemiV/swBF+X/BiRzzsZlJXpZP62jR/XV0/J7r1SMVPSIP5j8TMCoDmw== -xterm@3.15.0-beta80: - version "3.15.0-beta80" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta80.tgz#6a17eea9c9d05667acdede641cfb76a7c0d0a3cd" - integrity sha512-nidVf1uDiOa5BsYR4/uK61qsVeo/gsuvgL6HeVthcLO3WkObGpsXNaZmIFmLmgsyA4RROpjSvKipTFD8mPt+Jg== +xterm@3.15.0-beta81: + version "3.15.0-beta81" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta81.tgz#1a4c01467776753d1cebee8bfafb6c4ee7f9d543" + integrity sha512-tyADfzVm55CAxCIXWJzHWMCRPYcJQp8hO/85KLxRuVjCdeuVgRn/9U9VKypNd9DJkZGsf1rONkQMnG6IDZ1DEQ== yallist@^2.1.2: version "2.1.2" diff --git a/yarn.lock b/yarn.lock index 4a1641f7..09839f84 100644 --- a/yarn.lock +++ b/yarn.lock @@ -114,6 +114,11 @@ resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.1.tgz#5c6f4a1eabca84792fbd916f0cb40847f123c656" integrity sha512-SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA== +"@types/json-schema@^7.0.3": + version "7.0.3" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636" + integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A== + "@types/lodash@^4.14.110": version "4.14.122" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.122.tgz#3e31394c38cf1e5949fb54c1192cbc406f152c6c" @@ -153,39 +158,40 @@ resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a" integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg== -"@typescript-eslint/eslint-plugin@^1.12.0": - version "1.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.12.0.tgz#96b4e08b5f998a198b8414508b1a289f9e8c549a" - integrity sha512-J/ZTZF+pLNqjXBGNfq5fahsoJ4vJOkYbitWPavA05IrZ7BXUaf4XWlhUB/ic1lpOGTRpLWF+PLAePjiHp6dz8g== +"@typescript-eslint/eslint-plugin@^1.13.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.13.0.tgz#22fed9b16ddfeb402fd7bcde56307820f6ebc49f" + integrity sha512-WQHCozMnuNADiqMtsNzp96FNox5sOVpU8Xt4meaT4em8lOG1SrOv92/mUbEHQVh90sldKSfcOc/I0FOb/14G1g== dependencies: - "@typescript-eslint/experimental-utils" "1.12.0" + "@typescript-eslint/experimental-utils" "1.13.0" eslint-utils "^1.3.1" functional-red-black-tree "^1.0.1" regexpp "^2.0.1" tsutils "^3.7.0" -"@typescript-eslint/experimental-utils@1.12.0": - version "1.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.12.0.tgz#98417ee2e0c6fe8d1e50d934a6535d9c0f4277b6" - integrity sha512-s0soOTMJloytr9GbPteMLNiO2HvJ+qgQkRNplABXiVw6vq7uQRvidkby64Gqt/nA7pys74HksHwRULaB/QRVyw== +"@typescript-eslint/experimental-utils@1.13.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz#b08c60d780c0067de2fb44b04b432f540138301e" + integrity sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg== dependencies: - "@typescript-eslint/typescript-estree" "1.12.0" + "@types/json-schema" "^7.0.3" + "@typescript-eslint/typescript-estree" "1.13.0" eslint-scope "^4.0.0" -"@typescript-eslint/parser@^1.12.0": - version "1.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-1.12.0.tgz#9965895ec4745578185965d63f21510f93a3f35a" - integrity sha512-0uzbaa9ZLCA5yMWJywnJJ7YVENKGWVUhJDV5UrMoldC5HoI54W5kkdPhTfmtFKpPFp93MIwmJj0/61ztvmz5Dw== +"@typescript-eslint/parser@^1.13.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-1.13.0.tgz#61ac7811ea52791c47dc9fd4dd4a184fae9ac355" + integrity sha512-ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "1.12.0" - "@typescript-eslint/typescript-estree" "1.12.0" + "@typescript-eslint/experimental-utils" "1.13.0" + "@typescript-eslint/typescript-estree" "1.13.0" eslint-visitor-keys "^1.0.0" -"@typescript-eslint/typescript-estree@1.12.0": - version "1.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.12.0.tgz#d8dd0a7cffb5e3c0c3e98714042d83e316dfc9a9" - integrity sha512-nwN6yy//XcVhFs0ZyU+teJHB8tbCm7AIA8mu6E2r5hu6MajwYBY3Uwop7+rPZWUN/IUOHpL8C+iUPMDVYUU3og== +"@typescript-eslint/typescript-estree@1.13.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz#8140f17d0f60c03619798f1d628b8434913dc32e" + integrity sha512-b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw== dependencies: lodash.unescape "4.0.1" semver "5.5.0" @@ -1566,10 +1572,10 @@ crypto-random-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" -css-loader@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.0.0.tgz#bdd48a4921eefedf1f0a55266585944d4e5efc63" - integrity sha512-WR6KZuCkFbnMhRrGPlkwAA7SSCtwqPwpyXJAPhotYkYsc0mKU9n/fu5wufy4jl2WhBw9Ia8gUQMIp/1w98DuPw== +css-loader@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.1.0.tgz#6f008b993b8ce812e6bab57f3cbfdc7a7cf28685" + integrity sha512-MuL8WsF/KSrHCBCYaozBKlx+r7vIfUaDTEreo7wR7Vv3J6N0z6fqWjRk3e/6wjneitXN1r/Y9FTK1psYNOBdJQ== dependencies: camelcase "^5.3.1" cssesc "^3.0.0" @@ -1582,7 +1588,7 @@ css-loader@3.0.0: postcss-modules-scope "^2.1.0" postcss-modules-values "^3.0.0" postcss-value-parser "^4.0.0" - schema-utils "^1.0.0" + schema-utils "^2.0.0" css-selector-parser@^1.1.0: version "1.3.0" @@ -1687,7 +1693,7 @@ defer-to-connect@^1.0.1: resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.0.2.tgz#4bae758a314b034ae33902b5aac25a8dd6a8633e" integrity sha512-k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw== -define-properties@^1.1.2: +define-properties@^1.1.2, define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" dependencies: @@ -1988,10 +1994,10 @@ electron-rebuild@^1.8.5: spawn-rx "^3.0.0" yargs "^13.2.2" -electron@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.5.tgz#2d04499064d3f6c89c4642e47cfe9ea151d794eb" - integrity sha512-GzVQhImBX3rSCFPyJ1u1KbxquoidAHzGeCH2FTs3lzAh1H8m4vd7xh6CNC111mT/I8pxFk5D8s3atJlJQLPAeg== +electron@^5.0.7: + version "5.0.7" + resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.7.tgz#a48fcbd13d30f16f7d7887908b68e52156e90259" + integrity sha512-OMMz8DhatxLuBFbnW7KYcAUjflGYFn0IQEtKR0iZhMAm89FgNOd9SVbxXWAGNxvRR6C0gORXwhTh6BCqqqcR6Q== dependencies: "@types/node" "^10.12.18" electron-download "^4.1.0" @@ -2057,7 +2063,7 @@ error-ex@^1.2.0: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.7.0: +es-abstract@^1.12.0, es-abstract@^1.7.0: version "1.13.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg== @@ -2139,10 +2145,10 @@ eslint-module-utils@^2.4.0: debug "^2.6.8" pkg-dir "^2.0.0" -eslint-plugin-import@^2.18.0: - version "2.18.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.0.tgz#7a5ba8d32622fb35eb9c8db195c2090bd18a3678" - integrity sha512-PZpAEC4gj/6DEMMoU2Df01C5c50r7zdGIN52Yfi7CvvWaYssG7Jt5R9nFG5gmqodxNOz9vQS87xk6Izdtpdrig== +eslint-plugin-import@^2.18.2: + version "2.18.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6" + integrity sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ== dependencies: array-includes "^3.0.3" contains-path "^0.1.0" @@ -2151,8 +2157,8 @@ eslint-plugin-import@^2.18.0: eslint-import-resolver-node "^0.3.2" eslint-module-utils "^2.4.0" has "^1.0.3" - lodash "^4.17.11" minimatch "^3.0.4" + object.values "^1.1.0" read-pkg-up "^2.0.0" resolve "^1.11.0" @@ -2404,13 +2410,13 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" -file-loader@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.0.0.tgz#c3570783fefb6e1bc0978a856f4bf5825b966c2a" - integrity sha512-roAbL6IdSGczwfXxhMi6Zq+jD4IfUpL0jWHD7fvmjdOVb7xBfdRUHe4LpBgO23VtVK5AW1OlWZo0p34Jvx3iWg== +file-loader@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.1.0.tgz#3a763391bc9502da7c59612fe348e38fc1980336" + integrity sha512-ajDk1nlByoalZAGR4b0H6oD+EGlWnyW1qbSxzaUc7RFiqmn+RbXQQRbTc72jsiUIlVusJ4Et58ltds8ZwTfnAw== dependencies: - loader-utils "^1.2.2" - schema-utils "^1.0.0" + loader-utils "^1.2.3" + schema-utils "^2.0.0" fill-range@^4.0.0: version "4.0.0" @@ -3689,7 +3695,7 @@ loader-runner@^2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979" -loader-utils@1.2.3, loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.1.0, loader-utils@^1.2.2, loader-utils@^1.2.3: +loader-utils@1.2.3, loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.1.0, loader-utils@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== @@ -3977,10 +3983,6 @@ mime-types@~2.1.7: dependencies: mime-db "~1.36.0" -mime@^2.0.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.3.tgz#229687331e86f68924e6cb59e1cdd937f18275fe" - mime@^2.4.4: version "2.4.4" resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" @@ -4237,10 +4239,10 @@ node-gyp@^4.0.0: tar "^4.4.8" which "1" -node-gyp@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.2.tgz#422f7b7550d2c37952ac184e2a5a2d9fe49a8b77" - integrity sha512-sNcb5O7eJ9XiNAhWZ/UE2bWsBJn3Jb7rayMqMP4wjenlr1DwzZxUmbtmIrl04EU0p5fN2rU9WIDV+u0EbsI8oQ== +node-gyp@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.3.tgz#80d64c23790244991b6d44532f0a351bedd3dd45" + integrity sha512-z/JdtkFGUm0QaQUusvloyYuGDub3nUbOo5de1Fz57cM++osBTvQatBUSTlF1k/w8vFHPxxXW6zxGvkxXSpaBkQ== dependencies: env-paths "^1.0.0" glob "^7.0.3" @@ -4629,6 +4631,16 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" +object.values@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9" + integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.12.0" + function-bind "^1.1.1" + has "^1.0.3" + once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0, once@~1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -5377,13 +5389,13 @@ raven-js@3.27.2: resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.27.2.tgz#6c33df952026cd73820aa999122b7b7737a66775" integrity sha512-mFWQcXnhRFEQe5HeFroPaEghlnqy7F5E2J3Fsab189ondqUzcjwSVi7el7F36cr6PvQYXoZ1P2F5CSF2/azeMQ== -raw-loader@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-3.0.0.tgz#9a660dc9cfbfb8324eede3ea3511454d2a5d0389" - integrity sha512-FsELYliOpX5HdPdxa7PzTmEc5OTchmLUs/r4f8oLDGCYE+xC2FjVbDXzdyLcBrdlDnvkx1x5wzphixcWpxJG5w== +raw-loader@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-3.1.0.tgz#5e9d399a5a222cc0de18f42c3bc5e49677532b3f" + integrity sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA== dependencies: loader-utils "^1.1.0" - schema-utils "^1.0.0" + schema-utils "^2.0.1" rc@^1.0.1, rc@^1.1.6, rc@^1.2.1, rc@^1.2.7, rc@^1.2.8: version "1.2.8" @@ -5836,6 +5848,14 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" +schema-utils@^2.0.0, schema-utils@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.0.1.tgz#1eec2e059556af841b7f3a83b61af13d7a3f9196" + integrity sha512-HJFKJ4JixDpRur06QHwi8uu2kZbng318ahWEKgBjc0ZklcE4FDvmm2wghb448q0IRaABxIESt8vqPFvwgMB80A== + dependencies: + ajv "^6.1.0" + ajv-keywords "^3.1.0" + scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" @@ -6805,14 +6825,14 @@ urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" -url-loader@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.0.0.tgz#600ef36f463e21bd673ad70156d850619d9cd092" - integrity sha512-RT3cz+Lw+kFMCKLabMyogFrc/aRoAMJHmY5os1VDBlav+4t5vxUxKDn47zCSFAYAl+hM8YLg4TZwG4TkJaafkg== +url-loader@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz#bcc1ecabbd197e913eca23f5e0378e24b4412961" + integrity sha512-kVrp/8VfEm5fUt+fl2E0FQyrpmOYgMEkBsv8+UDP1wFhszECq5JyGF33I7cajlVY90zRZ6MyfgKXngLvHYZX8A== dependencies: - loader-utils "^1.1.0" - mime "^2.0.3" - schema-utils "^1.0.0" + loader-utils "^1.2.3" + mime "^2.4.4" + schema-utils "^2.0.0" url-parse-lax@^1.0.0: version "1.0.0"