diff --git a/main.html b/main.html index f2aa5cce3..ef831c26d 100644 --- a/main.html +++ b/main.html @@ -11,6 +11,8 @@
+ +
diff --git a/package.json b/package.json index 11484ae12..1636363ad 100644 --- a/package.json +++ b/package.json @@ -49,17 +49,12 @@ "@types/jest": "^23.3.1", "@types/mathjs": "^4.4.1", "coveralls": "^3.0.2", - "css-loader": "^1.0.0", "electron": "^2.0.6", "electron-builder": "^20.26.1", - "extract-loader": "^2.0.1", "file-loader": "^1.1.11", "husky": "^1.0.0-rc.13", "jest": "^23.4.2", "mathjs": "^5.0.4", - "node-sass": "^4.9.2", - "sass-loader": "^7.1.0", - "style-loader": "^0.21.0", "ts-jest": "^23.0.1", "ts-loader": "^4.4.2", "ts-node": "^7.0.0", @@ -75,4 +70,4 @@ "fuse.js": "^3.2.1", "vue": "^2.5.17" } -} +} \ No newline at end of file diff --git a/src/scss/_app.scss b/src/scss/_app.scss deleted file mode 100644 index 7da225f2e..000000000 --- a/src/scss/_app.scss +++ /dev/null @@ -1,153 +0,0 @@ -$side-padding: 15px; -$scrollbar-size: 8px; -$icon-size: 55%; - -$font-family: "Segoe UI", "Helvetica"; -$font-family-mono: "Consolas", "Courier", monospace; - -@mixin transitions() { - transition: all 250ms ease-in-out; -} - -body { - margin: 0; - padding: 0; - background-color: $background-color; - color: $text-color; -} - -div.container { - display: flex; - flex-direction: column; -} - -div.user-input-container { - display: flex; - padding: 0 $side-padding; -} - -input.user-input { - font-family: $font-family; - font-weight: 200; - width: 100%; - box-sizing: border-box; - border: none; - background: transparent; - color: $text-color; - - &:focus { - outline: none; - } -} - -div.search-icon-container { - display: flex; - justify-content: center; - align-items: center; - - svg { - width: $icon-size; - fill: $text-color; - } -} - -div.output-container { - width: 100%; - overflow-y: auto; - overflow-x: hidden; -} - -div.command-line-output-container { - padding: $side-padding; - - pre { - font-family: $font-family-mono; - color: $mono-font-color; - margin: 0; - } -} - -div.search-results-container { - width: 100%; - height: 100%; -} - -div.search-result { - font-family: $font-family; - display: flex; - flex-direction: row; - cursor: pointer; - - &.active { - background: $accent-color; - color: $accent-text-color; - } -} - -div.search-result-icon { - display: flex; - justify-content: center; - align-items: center; -} - -div.search-result-icon-container { - display: flex; - justify-content: center; - align-items: center; - - svg { - width: $icon-size; - fill: $text-color; - } - - &.active { - svg { - fill: $accent-text-color; - } - } -} - -div.search-result-information { - display: flex; - flex-direction: column; - justify-content: center; -} - -div.hidden { - display: none; -} - -span { - display: block; - white-space: nowrap; - - &.search-result-name { - &.active { - font-family: $font-family; - font-weight: 600; - } - } - - &.search-result-execution-argument { - @include transitions(); - font-weight: 200; - display: none; - - &.active { - display: block; - } - } -} - -::-webkit-scrollbar { - width: $scrollbar-size; - height: $scrollbar-size; -} - -::-webkit-scrollbar-thumb { - background: $scrollbar-foreground-color; -} - -::-webkit-scrollbar-track { - background: $scrollbar-background-color; -} \ No newline at end of file diff --git a/src/scss/atom-one-dark.scss b/src/scss/atom-one-dark.scss deleted file mode 100644 index 95393ee89..000000000 --- a/src/scss/atom-one-dark.scss +++ /dev/null @@ -1,10 +0,0 @@ -$background-color: #21252b; -$text-color: #ccc; -$accent-color: #333842; -$accent-text-color: #fff; -$mono-font-color: #ccc; - -$scrollbar-foreground-color: lighten($background-color, 15); -$scrollbar-background-color: darken($background-color, 5); - -@import "app"; \ No newline at end of file diff --git a/src/scss/dark-mono.scss b/src/scss/dark-mono.scss deleted file mode 100644 index 290adf554..000000000 --- a/src/scss/dark-mono.scss +++ /dev/null @@ -1,10 +0,0 @@ -$background-color: #000; -$text-color: #ccc; -$accent-color: #222; -$accent-text-color: #fff; -$mono-font-color: #ccc; - -$scrollbar-foreground-color: #444; -$scrollbar-background-color: #222; - -@import "app"; \ No newline at end of file diff --git a/src/scss/dark.scss b/src/scss/dark.scss deleted file mode 100644 index cb992c06d..000000000 --- a/src/scss/dark.scss +++ /dev/null @@ -1,10 +0,0 @@ -$background-color: #000; -$text-color: #fff; -$accent-color: #0078d7; -$accent-text-color: #fff; -$mono-font-color: #ccc; - -$scrollbar-foreground-color: #444; -$scrollbar-background-color: #222; - -@import "app"; \ No newline at end of file diff --git a/src/scss/light-mono.scss b/src/scss/light-mono.scss deleted file mode 100644 index f9e2b0c58..000000000 --- a/src/scss/light-mono.scss +++ /dev/null @@ -1,10 +0,0 @@ -$background-color: #fff; -$text-color: #555; -$accent-color: #111; -$accent-text-color: #fff; -$mono-font-color: #666; - -$scrollbar-foreground-color: #858585; -$scrollbar-background-color: #ccc; - -@import "app"; \ No newline at end of file diff --git a/src/scss/light.scss b/src/scss/light.scss deleted file mode 100644 index 3750cf247..000000000 --- a/src/scss/light.scss +++ /dev/null @@ -1,10 +0,0 @@ -$background-color: #fff; -$text-color: #000; -$accent-color: #1976D2; -$accent-text-color: #fff; -$mono-font-color: #666; - -$scrollbar-foreground-color: #858585; -$scrollbar-background-color: #ccc; - -@import "app"; \ No newline at end of file diff --git a/src/tests/unit/builders/stylesheet-path-builder.test.ts b/src/tests/unit/builders/stylesheet-path-builder.test.ts deleted file mode 100644 index b0eb20c35..000000000 --- a/src/tests/unit/builders/stylesheet-path-builder.test.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { StylesheetPath } from "../../../ts/builders/stylesheet-path-builder"; - -describe("StylesheetPath", (): void => { - it("should return the path to the mac os stylesheet", (): void => { - const expected = "./build/css/mac.css"; - const actual = StylesheetPath.MacOs; - expect(actual).toBe(expected); - }); - - it("should return the path to the windows stylesheet", (): void => { - const expected = "./build/css/windows.css"; - const actual = StylesheetPath.Windows; - expect(actual).toBe(expected); - }); -}); diff --git a/src/tests/unit/injector.test.ts b/src/tests/unit/injector.test.ts index 5403b29b8..fc7f38375 100644 --- a/src/tests/unit/injector.test.ts +++ b/src/tests/unit/injector.test.ts @@ -1,6 +1,4 @@ import { Injector } from "../../ts/injector"; -import { platform } from "os"; -import { OperatingSystem } from "../../ts/operating-system"; import { WindowsIconSet } from "../../ts/icon-sets/windows-icon-set"; import { MacOsIconSet } from "../../ts/icon-sets/mac-os-icon-set"; import { Windows10SettingsSearchPlugin } from "../../ts/search-plugins/windows-10-settings-plugin"; @@ -11,10 +9,7 @@ import { FileExecutionCommandBuilder } from "../../ts/builders/file-execution-co import { FileLocationExecutionCommandBuilder } from "../../ts/builders/file-location-execution-command-builder"; import { FilePathRegex } from "../../ts/file-path-regex"; import { OpenUrlWithDefaultBrowserCommandBuilder } from "../../ts/builders/open-url-with-default-browser-command-builder"; -import { SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG } from "constants"; -import { StylesheetPath } from "../../ts/builders/stylesheet-path-builder"; import { TrayIconPathBuilder } from "../../ts/builders/tray-icon-path-builder"; -import { OperatingSystemNotSupportedError } from "../../ts/errors/operatingsystem-not-supported-error"; const win = "win32"; const mac = "darwin"; @@ -92,16 +87,6 @@ describe(Injector.name, () => { }); }); - describe(Injector.getStyleSheetPath.name, () => { - it("should return a stylesheet path", () => { - const actualWin = Injector.getStyleSheetPath(win); - const actualMac = Injector.getStyleSheetPath(mac); - - expect(actualWin).toBe(StylesheetPath.Windows); - expect(actualMac).toBe(StylesheetPath.MacOs); - }); - }); - describe(Injector.getTrayIconPath.name, () => { it("should return a tray icon path", () => { const actualWin = Injector.getTrayIconPath(win, testFilePath); diff --git a/src/ts/builders/stylesheet-path-builder.ts b/src/ts/builders/stylesheet-path-builder.ts deleted file mode 100644 index 284825304..000000000 --- a/src/ts/builders/stylesheet-path-builder.ts +++ /dev/null @@ -1,4 +0,0 @@ -export enum StylesheetPath { - Windows = "./build/css/windows.css", - MacOs = "./build/css/mac.css", -} diff --git a/src/ts/color-theme-loader.ts b/src/ts/color-theme-loader.ts deleted file mode 100644 index f55118b4d..000000000 --- a/src/ts/color-theme-loader.ts +++ /dev/null @@ -1,19 +0,0 @@ -import * as atomOneDark from "../scss/atom-one-dark.scss"; -import * as dark from "../scss/dark.scss"; -import * as darkMono from "../scss/dark-mono.scss"; -import * as light from "../scss/light.scss"; -import * as lightMono from "../scss/light-mono.scss"; - -export class ColorThemeLoader { - private colorThemes: any[]; - - constructor() { - this.colorThemes = [ - atomOneDark, - dark, - darkMono, - light, - lightMono, - ]; - } -} diff --git a/src/ts/injector.ts b/src/ts/injector.ts index 817c37bc0..a8fca3b1d 100644 --- a/src/ts/injector.ts +++ b/src/ts/injector.ts @@ -10,7 +10,6 @@ import { FileExecutionCommandBuilder } from "./builders/file-execution-command-b import { FileLocationExecutionCommandBuilder } from "./builders/file-location-execution-command-builder"; import { FilePathRegex } from "./file-path-regex"; import { OpenUrlWithDefaultBrowserCommandBuilder } from "./builders/open-url-with-default-browser-command-builder"; -import { StylesheetPath } from "./builders/stylesheet-path-builder"; import { TrayIconPathBuilder } from "./builders/tray-icon-path-builder"; import { OperatingSystemHelpers } from "./helpers/operating-system-helpers"; @@ -84,11 +83,4 @@ export class Injector { case OperatingSystem.macOS: return new MacOsSettingsPlugin(); } } - - public static getStyleSheetPath(platform: string): string { - switch (OperatingSystemHelpers.getOperatingSystemFromString(platform)) { - case OperatingSystem.Windows: return StylesheetPath.Windows; - case OperatingSystem.macOS: return StylesheetPath.MacOs; - } - } } diff --git a/src/ts/renderer.ts b/src/ts/renderer.ts index 4baafa0de..c0af4099e 100644 --- a/src/ts/renderer.ts +++ b/src/ts/renderer.ts @@ -2,17 +2,13 @@ import { SearchResultItemViewModel } from "./search-result-item-view-model"; import { IpcChannels } from "./ipc-channels"; import { platform } from "os"; import { ipcRenderer } from "electron"; -import * as macStyles from "../scss/mac.scss"; -import * as windowsStyles from "../scss/windows.scss"; import Vue from "vue"; import { ConfigFileRepository } from "./config-file-repository"; import { UeliHelpers } from "./helpers/ueli-helpers"; import { defaultConfig } from "./default-config"; -import { ColorThemeLoader } from "./color-theme-loader"; import { UserInputHistoryManager } from "./user-input-history-manager"; import { Injector } from "./injector"; -const colorThemeLoader = new ColorThemeLoader(); const config = new ConfigFileRepository(defaultConfig, UeliHelpers.configFilePath).getConfig(); const userInputHistoryManager = new UserInputHistoryManager(); const iconSet = Injector.getIconSet(platform()); @@ -25,7 +21,7 @@ const vue = new Vue({ commandLineOutput: [] as string[], searchIcon: iconSet.searchIcon, searchResults: [] as SearchResultItemViewModel[], - stylesheetPath: `./build/${config.colorTheme}.css`, + stylesheetPath: `./styles/${config.colorTheme}.css`, userInput: "", }, el: "#vue-root", diff --git a/styles/app.css b/styles/app.css new file mode 100644 index 000000000..69c819701 --- /dev/null +++ b/styles/app.css @@ -0,0 +1,147 @@ +:root { + --side-padding: 15px; + --scrollbar-size: 8px; + --icon-size: 55%; + + --font-family: "Segoe UI", "Helvetica"; + --font-family-mono: "Consolas", "Courier", monospace; +} + +body { + margin: 0; + padding: 0; + background-color: var(--background-color); + color: var(--text-color); +} + +div.container { + display: flex; + flex-direction: column; +} + +div.user-input-container { + display: flex; + padding: 0 var(--side-padding); +} + +input.user-input { + font-family: var(--font-family); + font-weight: 200; + width: 100%; + box-sizing: border-box; + border: none; + background: transparent; + color: var(--text-color); +} + +input.user-input:focus { + outline: none; +} + +div.search-icon-container { + display: flex; + justify-content: center; + align-items: center; +} + +div.search-icon-container > svg { + width: var(--icon-size); + fill: var(--text-color); +} + +div.output-container { + width: 100%; + overflow-y: auto; + overflow-x: hidden; +} + +div.command-line-output-container { + padding: var(--side-padding); +} + +div.command-line-output-container > pre { + font-family: var(--font-family-mono); + color: var(--mono-font-color); + margin: 0; +} + +div.search-results-container { + width: 100%; + height: 100%; +} + +div.search-result { + font-family: var(--font-family); + display: flex; + flex-direction: row; + cursor: pointer; +} + +div.search-result.active { + background: var(--accent-color); + color: var(--accent-text-color); +} + +div.search-result-icon { + display: flex; + justify-content: center; + align-items: center; +} + +div.search-result-icon-container { + display: flex; + justify-content: center; + align-items: center; +} + +div.search-result-icon-container > svg { + width: var(--icon-size); + fill: var(--text-color); +} + +div.search-result-icon-container.active > svg { + fill: var(--accent-text-color); +} + +div.search-result-information { + display: flex; + flex-direction: column; + justify-content: center; +} + +div.hidden { + display: none; +} + +span { + display: block; + white-space: nowrap; +} + +span.search-result-name.active { + font-family: var(--font-family); + font-weight: 600; +} + +span.search-result-execution-argument { + transition: all 250ms ease-in-out; + font-weight: 200; + display: none; +} + +span.search-result-execution-argument.active { + display: block; +} + +::-webkit-scrollbar { + width: var(--scrollbar-size); + height: var(--scrollbar-size); +} + +::-webkit-scrollbar-thumb { + background: var(--scrollbar-foreground-color); +} + +::-webkit-scrollbar-track { + background: var(--scrollbar-background-color); +} \ No newline at end of file diff --git a/styles/atom-one-dark.css b/styles/atom-one-dark.css new file mode 100644 index 000000000..e9848959d --- /dev/null +++ b/styles/atom-one-dark.css @@ -0,0 +1,9 @@ +:root { + --background-color: #21252b; + --text-color: #ccc; + --accent-color: #333842; + --accent-text-color: #fff; + --mono-font-color: #ccc; + --scrollbar-foreground-color: #3d444f; + --scrollbar-background-color: #1f2328; +} \ No newline at end of file diff --git a/styles/dark-mono.css b/styles/dark-mono.css new file mode 100644 index 000000000..93d15c945 --- /dev/null +++ b/styles/dark-mono.css @@ -0,0 +1,9 @@ +:root { + --background-color: #000; + --text-color: #ccc; + --accent-color: #222; + --accent-text-color: #fff; + --mono-font-color: #ccc; + --scrollbar-foreground-color: #444; + --scrollbar-background-color: #222; +} \ No newline at end of file diff --git a/styles/dark.css b/styles/dark.css new file mode 100644 index 000000000..4361fd6ef --- /dev/null +++ b/styles/dark.css @@ -0,0 +1,9 @@ +:root { + --background-color: #000; + --text-color: #fff; + --accent-color: #0078d7; + --accent-text-color: #fff; + --mono-font-color: #ccc; + --scrollbar-foreground-color: #444; + --scrollbar-background-color: #222; +} \ No newline at end of file diff --git a/styles/light-mono.css b/styles/light-mono.css new file mode 100644 index 000000000..c4f06e0c5 --- /dev/null +++ b/styles/light-mono.css @@ -0,0 +1,9 @@ +:root { + --background-color: #fff; + --text-color: #555; + --accent-color: #111; + --accent-text-color: #fff; + --mono-font-color: #666; + --scrollbar-foreground-color: #858585; + --scrollbar-background-color: #ccc; +} \ No newline at end of file diff --git a/styles/light.css b/styles/light.css new file mode 100644 index 000000000..a9a8c652f --- /dev/null +++ b/styles/light.css @@ -0,0 +1,9 @@ +:root { + --background-color: #fff; + --text-color: #000; + --accent-color: #1976D2; + --accent-text-color: #fff; + --mono-font-color: #666; + --scrollbar-foreground-color: #858585; + --scrollbar-background-color: #ccc; +} diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js index 700bee00e..d9559371a 100644 --- a/webpack/webpack.common.js +++ b/webpack/webpack.common.js @@ -24,26 +24,6 @@ module.exports = { loader: "file-loader" } ] - }, - { - test: /\.scss$/, - use: [ - { - loader: "file-loader", - options: { - name: "[name].css" - } - }, - { - loader: "extract-loader" - }, - { - loader: "css-loader" - }, - { - loader: "sass-loader" - } - ] } ] } diff --git a/yarn.lock b/yarn.lock index c24c4efa5..21942810d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -453,10 +453,6 @@ async-exit-hook@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" -async-foreach@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" - async-limiter@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" @@ -951,10 +947,6 @@ camelcase@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" -camelcase@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" - camelcase@^4.0.0, camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" @@ -974,7 +966,7 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chalk@^1.1.1, chalk@^1.1.3: +chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" dependencies: @@ -1000,14 +992,6 @@ chalk@^2.0.1, chalk@^2.3.0: escape-string-regexp "^1.0.5" supports-color "^4.0.0" -chalk@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - chalk@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" @@ -1109,14 +1093,6 @@ cliui@^2.1.0: right-align "^0.1.1" wordwrap "0.0.2" -cliui@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" - cliui@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc" @@ -1125,15 +1101,6 @@ cliui@^4.0.0: strip-ansi "^4.0.0" wrap-ansi "^2.0.0" -clone-deep@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713" - dependencies: - for-own "^1.0.0" - is-plain-object "^2.0.4" - kind-of "^6.0.0" - shallow-clone "^1.0.0" - co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -1341,13 +1308,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -cross-spawn@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" - dependencies: - lru-cache "^4.0.1" - which "^1.2.9" - cross-spawn@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -1398,35 +1358,6 @@ 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@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.0.tgz#9f46aaa5ca41dbe31860e3b62b8e23c42916bf56" - dependencies: - babel-code-frame "^6.26.0" - css-selector-tokenizer "^0.7.0" - icss-utils "^2.1.0" - loader-utils "^1.0.2" - lodash.camelcase "^4.3.0" - postcss "^6.0.23" - postcss-modules-extract-imports "^1.2.0" - postcss-modules-local-by-default "^1.2.0" - postcss-modules-scope "^1.1.0" - postcss-modules-values "^1.3.0" - postcss-value-parser "^3.3.0" - source-list-map "^2.0.0" - -css-selector-tokenizer@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86" - dependencies: - cssesc "^0.1.0" - fastparse "^1.1.1" - regexpu-core "^1.0.0" - -cssesc@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4" - cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": version "0.3.2" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b" @@ -1971,12 +1902,6 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extract-loader@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extract-loader/-/extract-loader-2.0.1.tgz#3dfa57d5922c0edbb6248490183ff8602e7cc92b" - dependencies: - loader-utils "^1.1.0" - extract-zip@^1.0.3: version "1.6.6" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c" @@ -2010,10 +1935,6 @@ fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" -fastparse@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8" - fb-watchman@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58" @@ -2107,10 +2028,6 @@ flush-write-stream@^1.0.0: inherits "^2.0.1" readable-stream "^2.0.4" -for-in@^0.1.3: - version "0.1.8" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" - for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -2121,12 +2038,6 @@ for-own@^0.1.4: dependencies: for-in "^1.0.1" -for-own@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" - dependencies: - for-in "^1.0.1" - foreach@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" @@ -2251,12 +2162,6 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" -gaze@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105" - dependencies: - globule "^1.0.0" - get-caller-file@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" @@ -2309,17 +2214,7 @@ glob2base@^0.0.12: dependencies: find-index "^0.1.1" -glob@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: +glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" dependencies: @@ -2344,14 +2239,6 @@ globals@^9.18.0: version "9.18.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" -globule@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09" - dependencies: - glob "~7.1.1" - lodash "~4.17.4" - minimatch "~3.0.2" - got@^6.7.1: version "6.7.1" resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" @@ -2591,16 +2478,6 @@ iconv-lite@^0.4.22, iconv-lite@^0.4.23: dependencies: safer-buffer ">= 2.1.2 < 3" -icss-replace-symbols@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" - -icss-utils@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962" - dependencies: - postcss "^6.0.1" - ieee754@^1.1.11: version "1.1.12" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b" @@ -2628,10 +2505,6 @@ imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" -in-publish@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" - indent-string@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" @@ -3318,10 +3191,6 @@ jest@^23.4.2: import-local "^1.0.0" jest-cli "^23.4.2" -js-base64@^2.1.8: - version "2.4.3" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582" - js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" @@ -3379,10 +3248,6 @@ jsesc@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -3533,7 +3398,7 @@ loader-runner@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" -loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0: +loader-utils@^1.0.2, loader-utils@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd" dependencies: @@ -3555,38 +3420,14 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" -lodash.assign@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - -lodash.camelcase@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" - -lodash.clonedeep@^4.3.2: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" -lodash.mergewith@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55" - lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" -lodash.tail@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664" - -lodash@^4.0.0, lodash@~4.17.4: - version "4.17.4" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" - lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0: version "4.17.5" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" @@ -3709,7 +3550,7 @@ memory-fs@^0.4.0, memory-fs@~0.4.1: errno "^0.1.3" readable-stream "^2.0.1" -meow@^3.1.0, meow@^3.7.0: +meow@^3.1.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" dependencies: @@ -3803,7 +3644,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" -"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: +minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: @@ -3843,20 +3684,13 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mixin-object@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e" - dependencies: - for-in "^0.1.3" - is-extendable "^0.1.1" - mkdirp@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12" dependencies: minimist "0.0.8" -"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0: +"mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@~0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: @@ -3881,10 +3715,6 @@ mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" - nan@^2.3.0: version "2.9.2" resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866" @@ -3918,24 +3748,6 @@ nice-try@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4" -node-gyp@^3.3.1: - version "3.6.2" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60" - dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - minimatch "^3.0.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request "2" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" - node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -3993,36 +3805,6 @@ node-pre-gyp@^0.6.39: tar "^2.2.1" tar-pack "^3.4.0" -node-sass@^4.9.2: - version "4.9.2" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.2.tgz#5e63fe6bd0f2ae3ac9d6c14ede8620e2b8bdb437" - dependencies: - async-foreach "^0.1.3" - chalk "^1.1.1" - cross-spawn "^3.0.0" - gaze "^1.0.0" - get-stdin "^4.0.1" - glob "^7.0.3" - in-publish "^2.0.0" - lodash.assign "^4.2.0" - lodash.clonedeep "^4.3.2" - lodash.mergewith "^4.6.0" - meow "^3.7.0" - mkdirp "^0.5.1" - nan "^2.10.0" - node-gyp "^3.3.1" - npmlog "^4.0.0" - request "2.87.0" - sass-graph "^2.2.4" - stdout-stream "^1.4.0" - "true-case-path" "^1.0.2" - -"nopt@2 || 3": - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - dependencies: - abbrev "1" - nopt@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" @@ -4051,7 +3833,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: +npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" dependencies: @@ -4168,12 +3950,6 @@ os-homedir@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - dependencies: - lcid "^1.0.0" - os-locale@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" @@ -4186,13 +3962,6 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" -osenv@0: - version "0.1.4" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - osenv@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" @@ -4427,53 +4196,6 @@ posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" -postcss-modules-extract-imports@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85" - dependencies: - postcss "^6.0.1" - -postcss-modules-local-by-default@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069" - dependencies: - css-selector-tokenizer "^0.7.0" - postcss "^6.0.1" - -postcss-modules-scope@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90" - dependencies: - css-selector-tokenizer "^0.7.0" - postcss "^6.0.1" - -postcss-modules-values@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20" - dependencies: - icss-replace-symbols "^1.1.0" - postcss "^6.0.1" - -postcss-value-parser@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15" - -postcss@^6.0.1: - version "6.0.20" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.20.tgz#686107e743a12d5530cb68438c590d5b2bf72c3c" - dependencies: - chalk "^2.3.2" - source-map "^0.6.1" - supports-color "^5.3.0" - -postcss@^6.0.23: - version "6.0.23" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" - dependencies: - chalk "^2.4.1" - source-map "^0.6.1" - supports-color "^5.4.0" - prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -4728,10 +4450,6 @@ redent@^1.0.0: indent-string "^2.1.0" strip-indent "^1.0.1" -regenerate@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f" - regenerator-runtime@^0.11.0: version "0.11.1" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" @@ -4748,14 +4466,6 @@ regex-not@^1.0.0: dependencies: extend-shallow "^2.0.1" -regexpu-core@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b" - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - registry-auth-token@^3.0.1: version "3.3.2" resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" @@ -4769,16 +4479,6 @@ registry-url@^3.0.3: dependencies: rc "^1.0.1" -regjsgen@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - dependencies: - jsesc "~0.5.0" - remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -4811,33 +4511,6 @@ request-promise-native@^1.0.5: stealthy-require "^1.1.0" tough-cookie ">=2.3.3" -request@2, request@^2.45.0, request@^2.83.0: - version "2.83.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.6.0" - caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.1" - forever-agent "~0.6.1" - form-data "~2.3.1" - har-validator "~5.0.3" - hawk "~6.0.2" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.17" - oauth-sign "~0.8.2" - performance-now "^2.1.0" - qs "~6.5.1" - safe-buffer "^5.1.1" - stringstream "~0.0.5" - tough-cookie "~2.3.3" - tunnel-agent "^0.6.0" - uuid "^3.1.0" - request@2.81.0: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" @@ -4865,7 +4538,34 @@ request@2.81.0: tunnel-agent "^0.6.0" uuid "^3.0.0" -request@2.87.0, request@^2.85.0: +request@^2.45.0, request@^2.83.0: + version "2.83.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.6.0" + caseless "~0.12.0" + combined-stream "~1.0.5" + extend "~3.0.1" + forever-agent "~0.6.1" + form-data "~2.3.1" + har-validator "~5.0.3" + hawk "~6.0.2" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.17" + oauth-sign "~0.8.2" + performance-now "^2.1.0" + qs "~6.5.1" + safe-buffer "^5.1.1" + stringstream "~0.0.5" + tough-cookie "~2.3.3" + tunnel-agent "^0.6.0" + uuid "^3.1.0" + +request@^2.85.0: version "2.87.0" resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e" dependencies: @@ -4998,26 +4698,6 @@ sanitize-filename@^1.6.1: dependencies: truncate-utf8-bytes "^1.0.0" -sass-graph@^2.2.4: - version "2.2.4" - resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" - dependencies: - glob "^7.0.0" - lodash "^4.0.0" - scss-tokenizer "^0.2.3" - yargs "^7.0.0" - -sass-loader@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d" - dependencies: - clone-deep "^2.0.1" - loader-utils "^1.0.1" - lodash.tail "^4.1.1" - neo-async "^2.5.0" - pify "^3.0.0" - semver "^5.5.0" - sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -5029,13 +4709,6 @@ schema-utils@^0.4.4, schema-utils@^0.4.5: 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" - dependencies: - js-base64 "^2.1.8" - source-map "^0.4.2" - seed-random@2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/seed-random/-/seed-random-2.2.0.tgz#2a9b19e250a817099231a5b99a4daf80b7fbed54" @@ -5054,10 +4727,6 @@ semver-diff@^2.0.0: version "5.5.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - serialize-javascript@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.4.0.tgz#7c958514db6ac2443a8abc062dc9f7886a7f6005" @@ -5105,14 +4774,6 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -shallow-clone@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571" - dependencies: - is-extendable "^0.1.1" - kind-of "^5.0.0" - mixin-object "^2.0.1" - shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -5228,7 +4889,7 @@ source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" -source-map@^0.4.2, source-map@^0.4.4: +source-map@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" dependencies: @@ -5305,12 +4966,6 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" -stdout-stream@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b" - dependencies: - readable-stream "^2.0.1" - stealthy-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" @@ -5421,13 +5076,6 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -style-loader@^0.21.0: - version "0.21.0" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852" - dependencies: - loader-utils "^1.1.0" - schema-utils "^0.4.5" - subarg@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2" @@ -5502,7 +5150,7 @@ tar-pack@^3.4.0: tar "^2.2.1" uid-number "^0.0.6" -tar@^2.0.0, tar@^2.2.1: +tar@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" dependencies: @@ -5634,12 +5282,6 @@ trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" -"true-case-path@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62" - dependencies: - glob "^6.0.4" - truncate-utf8-bytes@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" @@ -6032,15 +5674,11 @@ whatwg-url@^6.4.0: tr46 "^1.0.0" webidl-conversions "^4.0.1" -which-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" - which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" -which@1, which@^1.2.12, which@^1.2.9, which@^1.3.0: +which@^1.2.12, which@^1.2.9, which@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" dependencies: @@ -6158,12 +5796,6 @@ yargs-parser@^10.1.0: dependencies: camelcase "^4.1.0" -yargs-parser@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" - dependencies: - camelcase "^3.0.0" - yargs-parser@^9.0.2: version "9.0.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" @@ -6204,24 +5836,6 @@ yargs@^12.0.1: y18n "^3.2.1 || ^4.0.0" yargs-parser "^10.1.0" -yargs@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" - dependencies: - camelcase "^3.0.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^1.4.0" - read-pkg-up "^1.0.1" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^1.0.2" - which-module "^1.0.0" - y18n "^3.2.1" - yargs-parser "^5.0.0" - yargs@~3.10.0: version "3.10.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"