From 0c4ebbffa80377464d62ad47f3ca057229900bd2 Mon Sep 17 00:00:00 2001 From: Griffithtp Date: Thu, 4 Jul 2019 23:40:50 +0100 Subject: [PATCH 1/9] refactor: remove sass from Login component --- src/App/App.tsx | 1 + src/components/Login/Login.tsx | 5 ++--- .../Login/__snapshots__/Login.test.tsx.snap | 4 ++-- src/components/Login/login.scss | 22 ------------------- src/components/Login/styles.ts | 22 +++++++++++++++++++ 5 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 src/components/Login/login.scss create mode 100644 src/components/Login/styles.ts diff --git a/src/App/App.tsx b/src/App/App.tsx index aee581a..db69b60 100644 --- a/src/App/App.tsx +++ b/src/App/App.tsx @@ -25,6 +25,7 @@ export interface AppStateInterface { logoUrl: string; user: { username?: string; + token?: string; }; scope: string; showLoginModal: boolean; diff --git a/src/components/Login/Login.tsx b/src/components/Login/Login.tsx index 0c3f8f4..31f8775 100644 --- a/src/components/Login/Login.tsx +++ b/src/components/Login/Login.tsx @@ -12,8 +12,7 @@ import FormControl from '@material-ui/core/FormControl'; import FormHelperText from '@material-ui/core/FormHelperText'; import { css } from 'emotion'; -// @ts-ignore -import classes from './login.scss'; +import * as classes from './styles'; interface FormFields { required: boolean; @@ -195,7 +194,7 @@ export default class LoginModal extends Component, Logi return ( should load the component in default state 1`] = `"

Login

"`; +exports[` should load the component in default state 1`] = `"

Login

"`; -exports[` should load the component with props 1`] = `"

Login

Error Title
Error Description
"`; +exports[` should load the component with props 1`] = `"

Login

Error Title
Error Description
"`; diff --git a/src/components/Login/login.scss b/src/components/Login/login.scss deleted file mode 100644 index 4749d77..0000000 --- a/src/components/Login/login.scss +++ /dev/null @@ -1,22 +0,0 @@ -@import '../../styles/variables'; - -.loginDialog { - min-width: 300px; -} - -.loginError { - background-color: $red !important; - min-width: inherit !important; - margin-bottom: 10px !important; -} - -.loginErrorMsg { - display: flex; - align-items: center; -} - -.loginIcon { - opacity: 0.9; - margin-right: 8px; -} - diff --git a/src/components/Login/styles.ts b/src/components/Login/styles.ts new file mode 100644 index 0000000..6029064 --- /dev/null +++ b/src/components/Login/styles.ts @@ -0,0 +1,22 @@ +import { css } from 'emotion'; +import colors from '../../utils/styles/colors'; + +export const loginDialog = css({ + minWidth: '300px', +}); + +export const loginError = css` + background-color: ${colors.red} !important; + min-width: inherit !important; + margin-bottom: 10px !important; +`; + +export const loginErrorMsg = css` + display: flex; + align-items: center; +`; + +export const loginIcon = css({ + opacity: 0.9, + marginRight: '8px', +}); From a49780f5f00d240cfc8b564c6f2c81526a3eaa65 Mon Sep 17 00:00:00 2001 From: Griffithtp Date: Fri, 5 Jul 2019 22:06:33 +0100 Subject: [PATCH 2/9] refactor: remove scss from PackageList component --- src/components/PackageList/PackageList.tsx | 3 +-- src/components/PackageList/packageList.scss | 12 ------------ src/components/PackageList/styles.ts | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 14 deletions(-) delete mode 100644 src/components/PackageList/packageList.scss create mode 100644 src/components/PackageList/styles.ts diff --git a/src/components/PackageList/PackageList.tsx b/src/components/PackageList/PackageList.tsx index ef281a4..835d10d 100644 --- a/src/components/PackageList/PackageList.tsx +++ b/src/components/PackageList/PackageList.tsx @@ -7,8 +7,7 @@ import Help from '../Help'; import { formatLicense } from '../../utils/package'; import { PackageInterface } from '../Package/Package'; -// @ts-ignore -import classes from './packageList.scss'; +import * as classes from './styles'; interface Props { packages: PackageInterface[]; diff --git a/src/components/PackageList/packageList.scss b/src/components/PackageList/packageList.scss deleted file mode 100644 index 26d77bf..0000000 --- a/src/components/PackageList/packageList.scss +++ /dev/null @@ -1,12 +0,0 @@ -@import '../../styles/mixins'; - -.pkgContainer { - margin: 0; - padding: 0; - - .listTitle { - font-weight: $font-weight-regular; - font-size: $font-size-xl; - margin: 0 0 10px 0; - } -} diff --git a/src/components/PackageList/styles.ts b/src/components/PackageList/styles.ts new file mode 100644 index 0000000..6eb05f5 --- /dev/null +++ b/src/components/PackageList/styles.ts @@ -0,0 +1,17 @@ +import { css } from 'emotion'; +import { fontWeight, fontSize } from '../../utils/styles/sizes'; + +export const listTitle = css({ + fontWeight: fontWeight.regular, + fontSize: fontSize.xl, + margin: `0 0 10px 0`, +}); + +export const pkgContainer = css` + margin: 0; + padding: 0; + + & .listTitle { + ${listTitle} + } +`; From 99e1bb3ea3ab9fe3d53a6dc0737cbf74f498f661 Mon Sep 17 00:00:00 2001 From: Griffithtp Date: Fri, 5 Jul 2019 23:58:18 +0100 Subject: [PATCH 3/9] refactor: update global styles using emotion --- src/App/App.tsx | 12 ++----- src/App/app.scss | 16 ---------- src/App/styles.ts | 17 ++++++++++ src/components/Header/Header.tsx | 2 +- src/pages/home/home.scss | 16 ---------- src/styles/typeface-roboto.css | 1 + src/utils/styles/global.ts | 54 +++++++++++++++++++++++++++++++- 7 files changed, 75 insertions(+), 43 deletions(-) delete mode 100644 src/App/app.scss create mode 100644 src/App/styles.ts delete mode 100644 src/pages/home/home.scss create mode 100644 src/styles/typeface-roboto.css diff --git a/src/App/App.tsx b/src/App/App.tsx index db69b60..f832313 100644 --- a/src/App/App.tsx +++ b/src/App/App.tsx @@ -10,8 +10,8 @@ import Header from '../components/Header'; import { Container, Content } from '../components/Layout'; import RouterApp from '../router'; import API from '../utils/api'; -import '../styles/typeface-roboto.scss'; -import '../styles/main.scss'; +import '../styles/typeface-roboto.css'; +import '../utils/styles/global'; import 'normalize.css'; import Footer from '../components/Footer'; import { FormError } from 'src/components/Login/Login'; @@ -67,13 +67,7 @@ export default class App extends Component<{}, AppStateInterface> { return ( // @ts-ignore - {isLoading ? ( - - ) : ( - <> - {this.renderContent()} - - )} + {isLoading ? : {this.renderContent()}} {this.renderLoginModal()} ); diff --git a/src/App/app.scss b/src/App/app.scss deleted file mode 100644 index 462f8b9..0000000 --- a/src/App/app.scss +++ /dev/null @@ -1,16 +0,0 @@ -@import './styles/variables'; - -.alertError { - background-color: $red !important; - min-width: inherit !important; -} - -.alertErrorMsg { - display: flex; - align-items: center; -} - -.alertIcon { - opacity: 0.9; - margin-right: 8px; -} \ No newline at end of file diff --git a/src/App/styles.ts b/src/App/styles.ts new file mode 100644 index 0000000..17af52b --- /dev/null +++ b/src/App/styles.ts @@ -0,0 +1,17 @@ +import { css } from 'emotion'; +import colors from '../utils/styles/colors'; + +export const alertError = css` + background-color: ${colors.red} !important; + min-width: inherit !important; +`; + +export const alertErrorMsg = css` + display: flex; + align-items: center; +`; + +export const alertIcon = css({ + opacity: 0.9, + marginRight: '8px', +}); diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index 7c8d5b8..b0c2ff7 100644 --- a/src/components/Header/Header.tsx +++ b/src/components/Header/Header.tsx @@ -144,7 +144,7 @@ class Header extends Component { {this.renderLogo()} diff --git a/src/pages/home/home.scss b/src/pages/home/home.scss deleted file mode 100644 index b3ba52a..0000000 --- a/src/pages/home/home.scss +++ /dev/null @@ -1,16 +0,0 @@ -@import '../../styles/variables'; - -.alertError { - background-color: $red !important; - min-width: inherit !important; -} - -.alertErrorMsg { - display: flex; - align-items: center; -} - -.alertIcon { - opacity: 0.9; - margin-right: 8px; -} diff --git a/src/styles/typeface-roboto.css b/src/styles/typeface-roboto.css new file mode 100644 index 0000000..f79f754 --- /dev/null +++ b/src/styles/typeface-roboto.css @@ -0,0 +1 @@ +@import '~typeface-roboto'; diff --git a/src/utils/styles/global.ts b/src/utils/styles/global.ts index ec77d7c..333ed62 100644 --- a/src/utils/styles/global.ts +++ b/src/utils/styles/global.ts @@ -1,5 +1,7 @@ -import { injectGlobal } from 'emotion'; +import { injectGlobal, css } from 'emotion'; import { fontSize, fontWeight } from './sizes'; +import colors from './colors'; +import mq, { breakpoints } from './media'; export default injectGlobal` html, @@ -9,6 +11,7 @@ export default injectGlobal` body { font-size: ${fontSize.base}; + color: ${colors.eclipse}; } ul { @@ -20,4 +23,53 @@ export default injectGlobal` strong { font-weight: ${fontWeight.semiBold}; } + + .container { + padding: 15px; + flex: 1; + + @media screen and (min-width: ${breakpoints.large}px) { + max-width: ${breakpoints.large}px; + width: 100%; + margin-left: auto; + margin-right: auto; + }; + + .el-loading-spinner { + margin-top: 0 !important; + } + } + + .content { + display: flex; + } + + .page-full-height { + display: flex; + flex-direction: column; + min-height: 100vh; + overflow: hidden; + } + + .el-button { + &:hover, &:focus { + color: ${colors.primary}; + border-color: ${colors.primary}; + } + } + + .el-input__inner { + &:hover, &:focus { + border-color: ${colors.primary}; + } + } + + .el-dialog__headerbtn:hover .el-dialog__close { + color: ${colors.eclipse}; + } + + .package-list-items { + width: 100%; + } + `; From b6717497aa24d06182d425ce3a1847c138abb1b3 Mon Sep 17 00:00:00 2001 From: Griffithtp Date: Sat, 6 Jul 2019 00:09:38 +0100 Subject: [PATCH 4/9] refactor: remove scss files --- .../Header/__snapshots__/Header.test.tsx.snap | 4 +- src/styles/core.scss | 22 ------- src/styles/global.scss | 47 -------------- src/styles/main.scss | 2 - src/styles/mixins.scss | 46 ------------- src/styles/typeface-roboto.scss | 1 - src/styles/variables.scss | 65 ------------------- src/utils/styles/global.ts | 4 +- tools/webpack.config.js | 6 -- 9 files changed, 4 insertions(+), 193 deletions(-) delete mode 100644 src/styles/core.scss delete mode 100644 src/styles/global.scss delete mode 100644 src/styles/main.scss delete mode 100644 src/styles/mixins.scss delete mode 100644 src/styles/typeface-roboto.scss delete mode 100644 src/styles/variables.scss diff --git a/src/components/Header/__snapshots__/Header.test.tsx.snap b/src/components/Header/__snapshots__/Header.test.tsx.snap index 91511b7..547a7a4 100644 --- a/src/components/Header/__snapshots__/Header.test.tsx.snap +++ b/src/components/Header/__snapshots__/Header.test.tsx.snap @@ -1,5 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`
component with logged in state should load the component in logged in state 1`] = `"
"`; +exports[`
component with logged in state should load the component in logged in state 1`] = `"
"`; -exports[`
component with logged out state should load the component in logged out state 1`] = `"
"`; +exports[`
component with logged out state should load the component in logged out state 1`] = `"
"`; diff --git a/src/styles/core.scss b/src/styles/core.scss deleted file mode 100644 index 4eddaac..0000000 --- a/src/styles/core.scss +++ /dev/null @@ -1,22 +0,0 @@ -@import "variables"; - -html, -body { - height: 100%; -} - -body { - font-family: $font-family-base; - font-size: $font-size-base; - color: $text-color; -} - -ul { - margin: 0; - padding: 0; - list-style: none; -} - -strong { - font-weight: $font-weight-semibold; -} diff --git a/src/styles/global.scss b/src/styles/global.scss deleted file mode 100644 index e337361..0000000 --- a/src/styles/global.scss +++ /dev/null @@ -1,47 +0,0 @@ -@import "variables"; -@import "mixins"; - -:global { - .container { - padding: 15px; - flex: 1; - - @include container-size; - - .el-loading-spinner { - margin-top: 0 !important; - } - } - - .content { - display: flex; - } - - .page-full-height { - display: flex; - flex-direction: column; - min-height: 100vh; - overflow: hidden; - } - - .el-button { - &:hover, &:focus { - color: $primary-color; - border-color: $primary-color; - } - } - - .el-input__inner { - &:hover, &:focus { - border-color: $primary-color; - } - } - - .el-dialog__headerbtn:hover .el-dialog__close { - color: $eclipse; - } - - .package-list-items { - width: 100%; - } -} diff --git a/src/styles/main.scss b/src/styles/main.scss deleted file mode 100644 index 555460d..0000000 --- a/src/styles/main.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import "core"; -@import "global"; diff --git a/src/styles/mixins.scss b/src/styles/mixins.scss deleted file mode 100644 index 2b2bc0e..0000000 --- a/src/styles/mixins.scss +++ /dev/null @@ -1,46 +0,0 @@ -@import "variables"; - -@mixin border($direction, $width, $style, $color) { - border-#{$direction}: $width $style $color; -} - -@mixin border-bottom-default($color) { - border-bottom: 1px solid $color; -} - -@mixin searchBox { - width: 100%; - font-size: $font-size-md; - line-height: $line-height-xl; - border: none; - @include border-bottom-default($grey-light); - outline: none; - - &:focus { - @include border-bottom-default($grey); - } -} - -@mixin ellipsis { - display: inline-block; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -@mixin fullSize { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; -} - -@mixin container-size { - @media screen and (min-width: $break-lg) { - max-width: $break-lg; - width: 100%; - margin-left: auto; - margin-right: auto; - } -} diff --git a/src/styles/typeface-roboto.scss b/src/styles/typeface-roboto.scss deleted file mode 100644 index f79f754..0000000 --- a/src/styles/typeface-roboto.scss +++ /dev/null @@ -1 +0,0 @@ -@import '~typeface-roboto'; diff --git a/src/styles/variables.scss b/src/styles/variables.scss deleted file mode 100644 index db5b32e..0000000 --- a/src/styles/variables.scss +++ /dev/null @@ -1,65 +0,0 @@ -// Verdaccio -// ------------------------- - -$black: #000; -$white: #fff; -$red: #d32f2f; -$grey: #808080; -$grey-light: #d3d3d3; -$grey-dark: #a9a9a9; - -$greyChateau: #95989a; -$greyGainsboro: #e3e3e3; -$greyAthens: #d3dddd; - -$eclipse: #3c3c3c; -$paleNavy: #e4e8f1; -$saltpan: #f7f8f6; -$snow: #f9f9f9; - -$nobel-01: #999999; -$nobel-02: #9f9f9f; - -// Main colors -// ------------------------- - -$primary-color: #4b5e40; -$seconday-color:#20232a; - -// Scaffolding -// ------------------------- - -$body-bg: $white; -$text-color: $eclipse; - -// Typography -// ------------------------- - - // Font Family from Bootstrap v4 Reboot.css -$font-family-reboot: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; -$font-family-base: $font-family-reboot; - -$font-size-xxl: 26px; -$font-size-xl: 24px; -$font-size-lg: 21px; -$font-size-md: 18px; -$font-size-base: 16px; -$font-size-sm: 14px; - -$line-height-xl: 30px; -$line-height-sm: 18px; -$line-height-xs: 2; -$line-height-xxs: 1.5; - -$font-weight-light: 400; -$font-weight-regular: 400; -$font-weight-semibold: 600; -$font-weight-bold: 700; - -$break-sm: 768px; -$break-lg: 1240px; - -// Spacing -// ------------------------- - -$space-lg: 30px; diff --git a/src/utils/styles/global.ts b/src/utils/styles/global.ts index 333ed62..a920d88 100644 --- a/src/utils/styles/global.ts +++ b/src/utils/styles/global.ts @@ -1,7 +1,7 @@ -import { injectGlobal, css } from 'emotion'; +import { injectGlobal } from 'emotion'; import { fontSize, fontWeight } from './sizes'; import colors from './colors'; -import mq, { breakpoints } from './media'; +import { breakpoints } from './media'; export default injectGlobal` html, diff --git a/tools/webpack.config.js b/tools/webpack.config.js index 25cd2ab..e13ed4f 100644 --- a/tools/webpack.config.js +++ b/tools/webpack.config.js @@ -71,12 +71,6 @@ module.exports = { limit: 50, }, }, - { - test: /\.scss$/, - exclude: /node_modules/, - loader: `style-loader!css-loader?module&sourceMap=false&localIdentName=[path][name]__[local]--[hash:base64:5] - !resolve-url-loader?keepQuery!sass-loader?sourceMap`, - }, { test: /\.css$/, use: [ From 0e14146c770d098ba5b08b6832ef52df50757f36 Mon Sep 17 00:00:00 2001 From: Griffithtp Date: Sat, 6 Jul 2019 07:15:19 +0100 Subject: [PATCH 5/9] refactor: remove node-sass packages --- package.json | 4 - yarn.lock | 312 +++------------------------------------------------ 2 files changed, 17 insertions(+), 299 deletions(-) diff --git a/package.json b/package.json index a915d7c..6a54fbb 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,6 @@ "localstorage-memory": "1.0.3", "mini-css-extract-plugin": "0.7.0", "node-mocks-http": "1.7.3", - "node-sass": "4.12.0", "normalize.css": "8.0.1", "optimize-css-assets-webpack-plugin": "5.0.1", "ora": "3.4.0", @@ -76,16 +75,13 @@ "react-router-dom": "4.3.1", "resolve-url-loader": "3.0.1", "rimraf": "2.6.3", - "sass-loader": "7.1.0", "source-map-loader": "0.2.4", "standard-version": "4.4.0", "style-loader": "0.23.1", "stylelint": "10.1.0", "stylelint-config-recommended": "2.2.0", - "stylelint-config-recommended-scss": "3.3.0", "stylelint-config-styled-components": "0.1.1", "stylelint-processor-styled-components": "1.8.0", - "stylelint-scss": "3.8.0", "stylelint-webpack-plugin": "0.10.5", "supertest": "4.0.2", "typeface-roboto": "0.0.54", diff --git a/yarn.lock b/yarn.lock index 29b460d..27f34c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2184,11 +2184,6 @@ alphanum-sort@^1.0.0, alphanum-sort@^1.0.1, alphanum-sort@^1.0.2: resolved "https://registry.verdaccio.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= -amdefine@>=0.0.4: - version "1.0.1" - resolved "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" - integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= - ansi-colors@^3.0.0: version "3.2.4" resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" @@ -2427,11 +2422,6 @@ async-each@^1.0.1: resolved "https://registry.npmjs.org/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735" integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg== -async-foreach@^0.1.3: - version "0.1.3" - resolved "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" - integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI= - async-limiter@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" @@ -2782,13 +2772,6 @@ bl@^1.0.0: readable-stream "^2.3.5" safe-buffer "^5.1.1" -block-stream@*: - version "0.0.9" - resolved "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= - dependencies: - inherits "~2.0.0" - bluebird@^3.5.1: version "3.5.4" resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714" @@ -3291,7 +3274,7 @@ chalk@2.3.1: escape-string-regexp "^1.0.5" supports-color "^5.2.0" -chalk@^1.1.1, chalk@^1.1.3: +chalk@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= @@ -3490,16 +3473,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.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713" - integrity sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ== - dependencies: - for-own "^1.0.0" - is-plain-object "^2.0.4" - kind-of "^6.0.0" - shallow-clone "^1.0.0" - clone-regexp@^2.1.0: version "2.2.0" resolved "https://registry.verdaccio.org/clone-regexp/-/clone-regexp-2.2.0.tgz#7d65e00885cd8796405c35a737e7a86b7429e36f" @@ -4090,14 +4063,6 @@ cross-env@5.2.0: cross-spawn "^6.0.5" is-windows "^1.0.0" -cross-spawn@^3.0.0: - version "3.0.1" - resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" - integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI= - dependencies: - lru-cache "^4.0.1" - which "^1.2.9" - cross-spawn@^5.0.1: version "5.1.0" resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -4260,11 +4225,6 @@ cssesc@^2.0.0: resolved "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703" integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg== -cssesc@^3.0.0: - version "3.0.0" - resolved "https://registry.verdaccio.org/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" - integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== - cssfilter@0.0.10: version "0.0.10" resolved "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae" @@ -5843,23 +5803,11 @@ follow-redirects@^1.0.0: dependencies: debug "^3.2.6" -for-in@^0.1.3: - version "0.1.8" - resolved "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" - integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE= - -for-in@^1.0.1, for-in@^1.0.2: +for-in@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= -for-own@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" - integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs= - dependencies: - for-in "^1.0.1" - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -5960,16 +5908,6 @@ fsevents@^1.2.7: nan "^2.9.2" node-pre-gyp "^0.10.0" -fstream@^1.0.0, fstream@^1.0.2: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" - integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - function-bind@^1.0.2, function-bind@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -6003,13 +5941,6 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" -gaze@^1.0.0: - version "1.1.3" - resolved "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" - integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g== - dependencies: - globule "^1.0.0" - get-caller-file@^1.0.1: version "1.0.3" resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" @@ -6140,7 +6071,7 @@ glob@^6.0.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: +glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2: version "7.1.3" resolved "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== @@ -6255,15 +6186,6 @@ globjoin@^0.1.4: resolved "https://registry.verdaccio.org/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM= -globule@^1.0.0: - version "1.2.1" - resolved "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d" - integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ== - dependencies: - glob "~7.1.1" - lodash "~4.17.10" - minimatch "~3.0.2" - gonzales-pe@^4.2.3: version "4.2.4" resolved "https://registry.verdaccio.org/gonzales-pe/-/gonzales-pe-4.2.4.tgz#356ae36a312c46fe0f1026dd6cb539039f8500d2" @@ -6775,7 +6697,7 @@ imurmurhash@^0.1.4: resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= -in-publish@2.0.0, in-publish@^2.0.0: +in-publish@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" integrity sha1-4g/146KvwmkDILbcVSaCqcf631E= @@ -6817,7 +6739,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= @@ -7711,7 +7633,7 @@ jest@24.8.0: import-local "^2.0.0" jest-cli "^24.8.0" -js-base64@^2.1.8, js-base64@^2.1.9: +js-base64@^2.1.9: version "2.5.1" resolved "https://registry.verdaccio.org/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw== @@ -8112,7 +8034,7 @@ loader-runner@^2.3.0: resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== -loader-utils@1.2.3, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0: +loader-utils@1.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0: version "1.2.3" resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== @@ -8251,11 +8173,6 @@ lodash.sortby@^4.7.0: resolved "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= -lodash.tail@^4.1.1: - version "4.1.1" - resolved "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664" - integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ= - lodash.template@^4.0.2: version "4.4.0" resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0" @@ -8281,7 +8198,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@4.17.11, lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@~4.17.10: +lodash@4.17.11, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1: version "4.17.11" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== @@ -8496,7 +8413,7 @@ meow@5.0.0, meow@^5.0.0: trim-newlines "^2.0.0" yargs-parser "^10.0.0" -meow@^3.3.0, meow@^3.7.0: +meow@^3.3.0: version "3.7.0" resolved "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= @@ -8675,7 +8592,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: resolved "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.4, minimatch@~3.0.2: +"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -8749,15 +8666,7 @@ 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.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e" - integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4= - dependencies: - for-in "^0.1.3" - is-extendable "^0.1.1" - -mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: +mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= @@ -8955,24 +8864,6 @@ node-forge@0.7.5: resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df" integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ== -node-gyp@^3.8.0: - version "3.8.0" - resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" - integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA== - dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request "^2.87.0" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" - node-int64@^0.4.0: version "0.4.0" resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -9076,41 +8967,11 @@ node-releases@^1.1.23: dependencies: semver "^5.3.0" -node-sass@4.12.0: - version "4.12.0" - resolved "https://registry.verdaccio.org/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017" - integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ== - 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 "^4.17.11" - meow "^3.7.0" - mkdirp "^0.5.1" - nan "^2.13.2" - node-gyp "^3.8.0" - npmlog "^4.0.0" - request "^2.88.0" - sass-graph "^2.2.4" - stdout-stream "^1.4.0" - "true-case-path" "^1.0.2" - noop-logger@^0.1.1: version "0.1.1" resolved "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= -"nopt@2 || 3": - version "3.0.6" - resolved "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= - dependencies: - abbrev "1" - nopt@^4.0.1: version "4.0.1" resolved "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" @@ -9203,7 +9064,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.1, npmlog@^4.0.2, npmlog@^4.1.2: +npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -9461,13 +9322,6 @@ os-homedir@^1.0.0, os-homedir@^1.0.1: resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= - dependencies: - lcid "^1.0.0" - os-locale@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" @@ -9499,7 +9353,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@0, osenv@^0.1.4: +osenv@^0.1.4: version "0.1.5" resolved "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -10441,15 +10295,6 @@ postcss-selector-parser@^5.0.0-rc.4: indexes-of "^1.0.1" uniq "^1.0.1" -postcss-selector-parser@^6.0.2: - version "6.0.2" - resolved "https://registry.verdaccio.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c" - integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg== - dependencies: - cssesc "^3.0.0" - indexes-of "^1.0.1" - uniq "^1.0.1" - postcss-svgo@^2.1.1: version "2.1.6" resolved "https://registry.verdaccio.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d" @@ -11599,7 +11444,7 @@ rgba-regex@^1.0.0: resolved "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@2, rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: +rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: version "2.6.3" resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== @@ -11704,28 +11549,6 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sass-graph@^2.2.4: - version "2.2.4" - resolved "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" - integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k= - 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.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d" - integrity sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w== - 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, sax@~1.2.1, sax@~1.2.4: version "1.2.4" resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -11763,14 +11586,6 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -scss-tokenizer@^0.2.3: - version "0.2.3" - resolved "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" - integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE= - dependencies: - js-base64 "^2.1.8" - source-map "^0.4.2" - section-iterator@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/section-iterator/-/section-iterator-2.0.0.tgz#bf444d7afeeb94ad43c39ad2fb26151627ccba2a" @@ -11813,11 +11628,6 @@ semver@6.1.1, semver@^6.1.1: resolved "https://registry.verdaccio.org/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b" integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ== -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= - send@0.16.2: version "0.16.2" resolved "https://registry.npmjs.org/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" @@ -11913,15 +11723,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.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571" - integrity sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA== - dependencies: - is-extendable "^0.1.1" - kind-of "^5.0.0" - mixin-object "^2.0.1" - shallow-equal@^1.0.0: version "1.1.0" resolved "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.1.0.tgz#cc022f030dcba0d1c198abf658a3c6c744e171ca" @@ -12098,13 +11899,6 @@ source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, sourc resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.4.2: - version "0.4.4" - resolved "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" - integrity sha1-66T12pwNyZneaAMti092FzZSA2s= - dependencies: - amdefine ">=0.0.4" - source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7: version "0.5.7" resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -12274,13 +12068,6 @@ statuses@~1.4.0: resolved "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew== -stdout-stream@^1.4.0: - version "1.4.1" - resolved "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de" - integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA== - dependencies: - readable-stream "^2.0.1" - stealthy-require@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" @@ -12331,7 +12118,7 @@ string-length@^2.0.0: astral-regex "^1.0.0" strip-ansi "^4.0.0" -string-width@^1.0.1, string-width@^1.0.2: +string-width@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= @@ -12476,14 +12263,7 @@ stylehacks@^4.0.0: postcss "^7.0.0" postcss-selector-parser "^3.0.0" -stylelint-config-recommended-scss@3.3.0: - version "3.3.0" - resolved "https://registry.verdaccio.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-3.3.0.tgz#190f5d08c2481656062b1166cbb5a4b170512c90" - integrity sha512-BvuuLYwoet8JutOP7K1a8YaiENN+0HQn390eDi0SWe1h7Uhx6O3GUQ6Ubgie9b/AmHX4Btmp+ZzVGbzriFTBcA== - dependencies: - stylelint-config-recommended "^2.2.0" - -stylelint-config-recommended@2.2.0, stylelint-config-recommended@^2.2.0: +stylelint-config-recommended@2.2.0: version "2.2.0" resolved "https://registry.verdaccio.org/stylelint-config-recommended/-/stylelint-config-recommended-2.2.0.tgz#46ab139db4a0e7151fd5f94af155512886c96d3f" integrity sha512-bZ+d4RiNEfmoR74KZtCKmsABdBJr4iXRiCso+6LtMJPw5rd/KnxUWTxht7TbafrTJK1YRjNgnN0iVZaJfc3xJA== @@ -12503,17 +12283,6 @@ stylelint-processor-styled-components@1.8.0: micromatch "^4.0.2" postcss "^7.0.0" -stylelint-scss@3.8.0: - version "3.8.0" - resolved "https://registry.verdaccio.org/stylelint-scss/-/stylelint-scss-3.8.0.tgz#fc372306c2105b461d0c162199e65f0c09fada2a" - integrity sha512-J55tNmxXEh/ymhz5BiscIiUcHgPmJ2Nv+0+zgnqTqdQBe1URQbrdjlAyK3xq+7i2nVpWr2wlRj25SjoonZFcHg== - dependencies: - lodash "^4.17.11" - postcss-media-query-parser "^0.2.3" - postcss-resolve-nested-selector "^0.1.1" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^3.3.1" - stylelint-webpack-plugin@0.10.5: version "0.10.5" resolved "https://registry.npmjs.org/stylelint-webpack-plugin/-/stylelint-webpack-plugin-0.10.5.tgz#0b6e0d373ff5e03baa8197ebe0f2625981bd266b" @@ -12738,15 +12507,6 @@ tar-stream@^1.1.2: to-buffer "^1.1.1" xtend "^4.0.0" -tar@^2.0.0: - version "2.2.1" - resolved "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE= - dependencies: - block-stream "*" - fstream "^1.0.2" - inherits "2" - tar@^4: version "4.4.8" resolved "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" @@ -12980,13 +12740,6 @@ trough@^1.0.0: resolved "https://registry.verdaccio.org/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e" integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q== -"true-case-path@^1.0.2": - version "1.0.3" - resolved "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d" - integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew== - dependencies: - glob "^7.1.2" - tryer@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" @@ -13768,11 +13521,6 @@ whet.extend@~0.9.9: resolved "https://registry.verdaccio.org/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1" integrity sha1-+HfVv2SMl+WqVC+twW1qJZucEaE= -which-module@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" - integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8= - which-module@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" @@ -13783,7 +13531,7 @@ which-pm-runs@^1.0.0: resolved "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= -which@1, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1: +which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1: version "1.3.1" resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -13932,13 +13680,6 @@ yargs-parser@^11.1.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" - integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo= - dependencies: - camelcase "^3.0.0" - yargs-parser@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9" @@ -13982,25 +13723,6 @@ yargs@^12.0.1, yargs@^12.0.2, yargs@^12.0.4: y18n "^3.2.1 || ^4.0.0" yargs-parser "^11.1.1" -yargs@^7.0.0: - version "7.1.0" - resolved "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" - integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg= - 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@^8.0.1: version "8.0.2" resolved "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360" From c57f9dde35941dcd9e9cae8d63ffb644b61f07d0 Mon Sep 17 00:00:00 2001 From: Griffithtp Date: Sun, 7 Jul 2019 13:33:16 +0100 Subject: [PATCH 6/9] fix: add missing global font-family --- src/utils/styles/global.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/utils/styles/global.ts b/src/utils/styles/global.ts index a920d88..d415ac4 100644 --- a/src/utils/styles/global.ts +++ b/src/utils/styles/global.ts @@ -3,6 +3,9 @@ import { fontSize, fontWeight } from './sizes'; import colors from './colors'; import { breakpoints } from './media'; +const fontFamily = `-apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", + Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"`; + export default injectGlobal` html, body { @@ -10,6 +13,7 @@ export default injectGlobal` } body { + font-family: ${fontFamily}; font-size: ${fontSize.base}; color: ${colors.eclipse}; } From 60b71611ca00b2636473cdf189309fc1c20838ac Mon Sep 17 00:00:00 2001 From: Griffithtp Date: Mon, 8 Jul 2019 08:02:47 +0100 Subject: [PATCH 7/9] fix: container breakpoint --- src/components/ActionBar/ActionBar.test.tsx | 2 +- src/utils/styles/global.ts | 4 ++-- src/utils/styles/media.ts | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/ActionBar/ActionBar.test.tsx b/src/components/ActionBar/ActionBar.test.tsx index 8c22f84..01c16d1 100644 --- a/src/components/ActionBar/ActionBar.test.tsx +++ b/src/components/ActionBar/ActionBar.test.tsx @@ -14,7 +14,7 @@ describe(' component', () => { url: 'https://verdaccio.tld/bugs', }, dist: { - tarball: 'https://verdaccio.tld/download' + tarball: 'https://verdaccio.tld/download', }, }, }; diff --git a/src/utils/styles/global.ts b/src/utils/styles/global.ts index d415ac4..6720235 100644 --- a/src/utils/styles/global.ts +++ b/src/utils/styles/global.ts @@ -32,8 +32,8 @@ export default injectGlobal` padding: 15px; flex: 1; - @media screen and (min-width: ${breakpoints.large}px) { - max-width: ${breakpoints.large}px; + @media screen and (min-width: ${breakpoints.container}px) { + max-width: ${breakpoints.container}px; width: 100%; margin-left: auto; margin-right: auto; diff --git a/src/utils/styles/media.ts b/src/utils/styles/media.ts index 2999778..7c3114e 100644 --- a/src/utils/styles/media.ts +++ b/src/utils/styles/media.ts @@ -4,6 +4,7 @@ export const breakpoints = { small: 576, medium: 768, large: 1024, + container: 1240, xlarge: 1275, }; From 78b4c3fac18b0a464b9dea45477f0d9ae7bf838a Mon Sep 17 00:00:00 2001 From: Griffithtp Date: Tue, 9 Jul 2019 21:00:59 +0100 Subject: [PATCH 8/9] fix: remove token from AppState --- src/App/App.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/App/App.tsx b/src/App/App.tsx index b1946a2..a8bd057 100644 --- a/src/App/App.tsx +++ b/src/App/App.tsx @@ -25,7 +25,6 @@ export interface AppStateInterface { logoUrl: string; user: { username?: string; - token?: string; }; scope: string; showLoginModal: boolean; @@ -133,7 +132,7 @@ export default class App extends Component<{}, AppStateInterface> { if (username && token) { storage.setItem('username', username); storage.setItem('token', token); - this.setLoggedUser(username, token); + this.setLoggedUser(username); } if (error) { @@ -144,7 +143,7 @@ export default class App extends Component<{}, AppStateInterface> { } }; - public setLoggedUser = (username, token) => { + public setLoggedUser = username => { this.setState({ user: { username, From 3ab350695859e576108236aa64c7362e940db1db Mon Sep 17 00:00:00 2001 From: Griffithtp Date: Tue, 9 Jul 2019 22:14:34 +0100 Subject: [PATCH 9/9] build: testing circle-ci with empty commit