diff --git a/modules/home/theme/GlobalStyleCss.js b/modules/home/theme/GlobalStyleCss.js index 02598304..29c13dcc 100644 --- a/modules/home/theme/GlobalStyleCss.js +++ b/modules/home/theme/GlobalStyleCss.js @@ -34,6 +34,258 @@ const GlobalStyleCss = ({ theme }) => { color: ${theme.colors.colorLight}; background-color: ${theme.colors.colorDarken}; } + + @font-face { + font-family: 'ip'; + src: url('/fonts/ip/font/ip.eot'); + src: url('/fonts/ip/font/ip.eot#iefix') format('embedded-opentype'), + url('/fonts/ip/font/ip.woff') format('woff'), + url('/fonts/ip/font/ip.ttf') format('truetype'), + url('/fonts/ip/font/ip.svg') format('svg'); + font-weight: normal; + font-style: normal; + } + + html, + body, + div, + span, + applet, + object, + iframe, + h1, + h2, + h3, + h4, + h5, + h6, + p, + blockquote, + pre, + a, + abbr, + acronym, + address, + big, + cite, + code, + del, + dfn, + em, + img, + ins, + kbd, + q, + s, + samp, + small, + strike, + strong, + sub, + sup, + tt, + var, + b, + u, + i, + center, + dl, + dt, + dd, + ol, + ul, + li, + fieldset, + form, + input, + label, + legend, + table, + caption, + tbody, + tfoot, + thead, + tr, + th, + td, + article, + aside, + canvas, + details, + embed, + figure, + figcaption, + footer, + header, + hgroup, + menu, + nav, + output, + ruby, + section, + summary, + time, + mark, + audio, + video { + margin: 0; + padding: 0; + border: 0; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + } + + article, + aside, + details, + figcaption, + figure, + footer, + header, + hgroup, + menu, + nav, + section { + display: block; + } + + nav ol, + nav ul { + list-style: none; + } + + blockquote, + q { + quotes: none; + } + + blockquote cite { + font-style: normal; + } + + blockquote:before, + blockquote:after, + q:before, + q:after { + content: ''; + content: none; + } + + table { + border-collapse: collapse; + border-spacing: 0; + } + + button, + input[type='submit'] { + cursor: pointer; + } + + html, + body { + width: 100%; + height: 100%; + font-family: 'open sans', Tahoma, Verdana, Arial, sans-serif; + line-height: 1.2; + scroll-behavior: smooth; + } + + h1, + h2, + h3, + h4, + h5, + h6 { + font-weight: normal; + } + + h1 { + font-size: 60px; + font-family: Georgia, Times, 'Times New Roman', serif; + } + @media screen and (max-width: 1200px) { + h1 { + font-size: 55px; + } + } + @media screen and (max-width: 800px) { + h1 { + font-size: 50px; + } + } + + h2 { + font-family: Georgia, Times, 'Times New Roman', serif; + font-size: 40px; + } + @media screen and (max-width: 1200px) { + h2 { + font-size: 35px; + } + } + @media screen and (max-width: 800px) { + h2 { + font-size: 30px; + } + } + + h3 { + font-size: 30px; + } + @media screen and (max-width: 1200px) { + h3 { + font-size: 25px; + } + } + @media screen and (max-width: 800px) { + h3 { + font-size: 20px; + } + } + + h4 { + font-size: 20px; + } + @media screen and (max-width: 1200px) { + h4 { + font-size: 18px; + } + } + + h5 { + font-size: 18px; + } + @media screen and (max-width: 800px) { + h5 { + font-size: 16px; + } + } + + p { + font-size: 16px; + line-height: 1.5; + } + @media screen and (max-width: 800px) { + p { + font-size: 15px; + } + } + + li p { + font-family: Georgia, Times, 'Times New Roman', serif; + font-style: italic; + } + + a { + font-family: 'open sans', Tahoma, Verdana, Arial, sans-serif; + font-size: 16px; + text-decoration: none; + outline-style: none; + } + a:hover { + border-bottom: none; + } `} ) } diff --git a/modules/home/theme/__tests__/__snapshots__/GlobalStyleCss.spec.tsx.snap b/modules/home/theme/__tests__/__snapshots__/GlobalStyleCss.spec.tsx.snap index ecedfb7c..d522db90 100644 --- a/modules/home/theme/__tests__/__snapshots__/GlobalStyleCss.spec.tsx.snap +++ b/modules/home/theme/__tests__/__snapshots__/GlobalStyleCss.spec.tsx.snap @@ -106,6 +106,258 @@ exports[`GlobalStyleCss should render defaultTheme without throwing an error 1`] color: #ecf0f1; background-color: #bdc3c7; } + + @font-face { + font-family: 'ip'; + src: url('/fonts/ip/font/ip.eot'); + src: url('/fonts/ip/font/ip.eot#iefix') format('embedded-opentype'), + url('/fonts/ip/font/ip.woff') format('woff'), + url('/fonts/ip/font/ip.ttf') format('truetype'), + url('/fonts/ip/font/ip.svg') format('svg'); + font-weight: normal; + font-style: normal; + } + + html, + body, + div, + span, + applet, + object, + iframe, + h1, + h2, + h3, + h4, + h5, + h6, + p, + blockquote, + pre, + a, + abbr, + acronym, + address, + big, + cite, + code, + del, + dfn, + em, + img, + ins, + kbd, + q, + s, + samp, + small, + strike, + strong, + sub, + sup, + tt, + var, + b, + u, + i, + center, + dl, + dt, + dd, + ol, + ul, + li, + fieldset, + form, + input, + label, + legend, + table, + caption, + tbody, + tfoot, + thead, + tr, + th, + td, + article, + aside, + canvas, + details, + embed, + figure, + figcaption, + footer, + header, + hgroup, + menu, + nav, + output, + ruby, + section, + summary, + time, + mark, + audio, + video { + margin: 0; + padding: 0; + border: 0; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + } + + article, + aside, + details, + figcaption, + figure, + footer, + header, + hgroup, + menu, + nav, + section { + display: block; + } + + nav ol, + nav ul { + list-style: none; + } + + blockquote, + q { + quotes: none; + } + + blockquote cite { + font-style: normal; + } + + blockquote:before, + blockquote:after, + q:before, + q:after { + content: ''; + content: none; + } + + table { + border-collapse: collapse; + border-spacing: 0; + } + + button, + input[type='submit'] { + cursor: pointer; + } + + html, + body { + width: 100%; + height: 100%; + font-family: 'open sans', Tahoma, Verdana, Arial, sans-serif; + line-height: 1.2; + scroll-behavior: smooth; + } + + h1, + h2, + h3, + h4, + h5, + h6 { + font-weight: normal; + } + + h1 { + font-size: 60px; + font-family: Georgia, Times, 'Times New Roman', serif; + } + @media screen and (max-width: 1200px) { + h1 { + font-size: 55px; + } + } + @media screen and (max-width: 800px) { + h1 { + font-size: 50px; + } + } + + h2 { + font-family: Georgia, Times, 'Times New Roman', serif; + font-size: 40px; + } + @media screen and (max-width: 1200px) { + h2 { + font-size: 35px; + } + } + @media screen and (max-width: 800px) { + h2 { + font-size: 30px; + } + } + + h3 { + font-size: 30px; + } + @media screen and (max-width: 1200px) { + h3 { + font-size: 25px; + } + } + @media screen and (max-width: 800px) { + h3 { + font-size: 20px; + } + } + + h4 { + font-size: 20px; + } + @media screen and (max-width: 1200px) { + h4 { + font-size: 18px; + } + } + + h5 { + font-size: 18px; + } + @media screen and (max-width: 800px) { + h5 { + font-size: 16px; + } + } + + p { + font-size: 16px; + line-height: 1.5; + } + @media screen and (max-width: 800px) { + p { + font-size: 15px; + } + } + + li p { + font-family: Georgia, Times, 'Times New Roman', serif; + font-style: italic; + } + + a { + font-family: 'open sans', Tahoma, Verdana, Arial, sans-serif; + font-size: 16px; + text-decoration: none; + outline-style: none; + } + a:hover { + border-bottom: none; + } @@ -218,6 +470,258 @@ exports[`GlobalStyleCss should render newyearTheme without throwing an error 1`] color: #ecf0f1; background-color: #bdc3c7; } + + @font-face { + font-family: 'ip'; + src: url('/fonts/ip/font/ip.eot'); + src: url('/fonts/ip/font/ip.eot#iefix') format('embedded-opentype'), + url('/fonts/ip/font/ip.woff') format('woff'), + url('/fonts/ip/font/ip.ttf') format('truetype'), + url('/fonts/ip/font/ip.svg') format('svg'); + font-weight: normal; + font-style: normal; + } + + html, + body, + div, + span, + applet, + object, + iframe, + h1, + h2, + h3, + h4, + h5, + h6, + p, + blockquote, + pre, + a, + abbr, + acronym, + address, + big, + cite, + code, + del, + dfn, + em, + img, + ins, + kbd, + q, + s, + samp, + small, + strike, + strong, + sub, + sup, + tt, + var, + b, + u, + i, + center, + dl, + dt, + dd, + ol, + ul, + li, + fieldset, + form, + input, + label, + legend, + table, + caption, + tbody, + tfoot, + thead, + tr, + th, + td, + article, + aside, + canvas, + details, + embed, + figure, + figcaption, + footer, + header, + hgroup, + menu, + nav, + output, + ruby, + section, + summary, + time, + mark, + audio, + video { + margin: 0; + padding: 0; + border: 0; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + } + + article, + aside, + details, + figcaption, + figure, + footer, + header, + hgroup, + menu, + nav, + section { + display: block; + } + + nav ol, + nav ul { + list-style: none; + } + + blockquote, + q { + quotes: none; + } + + blockquote cite { + font-style: normal; + } + + blockquote:before, + blockquote:after, + q:before, + q:after { + content: ''; + content: none; + } + + table { + border-collapse: collapse; + border-spacing: 0; + } + + button, + input[type='submit'] { + cursor: pointer; + } + + html, + body { + width: 100%; + height: 100%; + font-family: 'open sans', Tahoma, Verdana, Arial, sans-serif; + line-height: 1.2; + scroll-behavior: smooth; + } + + h1, + h2, + h3, + h4, + h5, + h6 { + font-weight: normal; + } + + h1 { + font-size: 60px; + font-family: Georgia, Times, 'Times New Roman', serif; + } + @media screen and (max-width: 1200px) { + h1 { + font-size: 55px; + } + } + @media screen and (max-width: 800px) { + h1 { + font-size: 50px; + } + } + + h2 { + font-family: Georgia, Times, 'Times New Roman', serif; + font-size: 40px; + } + @media screen and (max-width: 1200px) { + h2 { + font-size: 35px; + } + } + @media screen and (max-width: 800px) { + h2 { + font-size: 30px; + } + } + + h3 { + font-size: 30px; + } + @media screen and (max-width: 1200px) { + h3 { + font-size: 25px; + } + } + @media screen and (max-width: 800px) { + h3 { + font-size: 20px; + } + } + + h4 { + font-size: 20px; + } + @media screen and (max-width: 1200px) { + h4 { + font-size: 18px; + } + } + + h5 { + font-size: 18px; + } + @media screen and (max-width: 800px) { + h5 { + font-size: 16px; + } + } + + p { + font-size: 16px; + line-height: 1.5; + } + @media screen and (max-width: 800px) { + p { + font-size: 15px; + } + } + + li p { + font-family: Georgia, Times, 'Times New Roman', serif; + font-style: italic; + } + + a { + font-family: 'open sans', Tahoma, Verdana, Arial, sans-serif; + font-size: 16px; + text-decoration: none; + outline-style: none; + } + a:hover { + border-bottom: none; + } @@ -329,6 +833,258 @@ exports[`GlobalStyleCss should render xmasTheme without throwing an error 1`] = color: #ecf0f1; background-color: #bdc3c7; } + + @font-face { + font-family: 'ip'; + src: url('/fonts/ip/font/ip.eot'); + src: url('/fonts/ip/font/ip.eot#iefix') format('embedded-opentype'), + url('/fonts/ip/font/ip.woff') format('woff'), + url('/fonts/ip/font/ip.ttf') format('truetype'), + url('/fonts/ip/font/ip.svg') format('svg'); + font-weight: normal; + font-style: normal; + } + + html, + body, + div, + span, + applet, + object, + iframe, + h1, + h2, + h3, + h4, + h5, + h6, + p, + blockquote, + pre, + a, + abbr, + acronym, + address, + big, + cite, + code, + del, + dfn, + em, + img, + ins, + kbd, + q, + s, + samp, + small, + strike, + strong, + sub, + sup, + tt, + var, + b, + u, + i, + center, + dl, + dt, + dd, + ol, + ul, + li, + fieldset, + form, + input, + label, + legend, + table, + caption, + tbody, + tfoot, + thead, + tr, + th, + td, + article, + aside, + canvas, + details, + embed, + figure, + figcaption, + footer, + header, + hgroup, + menu, + nav, + output, + ruby, + section, + summary, + time, + mark, + audio, + video { + margin: 0; + padding: 0; + border: 0; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + } + + article, + aside, + details, + figcaption, + figure, + footer, + header, + hgroup, + menu, + nav, + section { + display: block; + } + + nav ol, + nav ul { + list-style: none; + } + + blockquote, + q { + quotes: none; + } + + blockquote cite { + font-style: normal; + } + + blockquote:before, + blockquote:after, + q:before, + q:after { + content: ''; + content: none; + } + + table { + border-collapse: collapse; + border-spacing: 0; + } + + button, + input[type='submit'] { + cursor: pointer; + } + + html, + body { + width: 100%; + height: 100%; + font-family: 'open sans', Tahoma, Verdana, Arial, sans-serif; + line-height: 1.2; + scroll-behavior: smooth; + } + + h1, + h2, + h3, + h4, + h5, + h6 { + font-weight: normal; + } + + h1 { + font-size: 60px; + font-family: Georgia, Times, 'Times New Roman', serif; + } + @media screen and (max-width: 1200px) { + h1 { + font-size: 55px; + } + } + @media screen and (max-width: 800px) { + h1 { + font-size: 50px; + } + } + + h2 { + font-family: Georgia, Times, 'Times New Roman', serif; + font-size: 40px; + } + @media screen and (max-width: 1200px) { + h2 { + font-size: 35px; + } + } + @media screen and (max-width: 800px) { + h2 { + font-size: 30px; + } + } + + h3 { + font-size: 30px; + } + @media screen and (max-width: 1200px) { + h3 { + font-size: 25px; + } + } + @media screen and (max-width: 800px) { + h3 { + font-size: 20px; + } + } + + h4 { + font-size: 20px; + } + @media screen and (max-width: 1200px) { + h4 { + font-size: 18px; + } + } + + h5 { + font-size: 18px; + } + @media screen and (max-width: 800px) { + h5 { + font-size: 16px; + } + } + + p { + font-size: 16px; + line-height: 1.5; + } + @media screen and (max-width: 800px) { + p { + font-size: 15px; + } + } + + li p { + font-family: Georgia, Times, 'Times New Roman', serif; + font-style: italic; + } + + a { + font-family: 'open sans', Tahoma, Verdana, Arial, sans-serif; + font-size: 16px; + text-decoration: none; + outline-style: none; + } + a:hover { + border-bottom: none; + } diff --git a/next.config.js b/next.config.js index e2f08d9e..c492c88e 100644 --- a/next.config.js +++ b/next.config.js @@ -1,13 +1,10 @@ -const withSass = require('@zeit/next-sass') const withCSS = require('@zeit/next-css') -module.exports = withCSS( - withSass({ - /* config options here */ - cssModules: true, - cssLoaderOptions: { - importLoaders: 1, - localIdentName: '[local]' - } - }) -) +module.exports = withCSS({ + /* config options here */ + cssModules: true, + cssLoaderOptions: { + importLoaders: 1, + localIdentName: '[local]' + } +}) diff --git a/package.json b/package.json index 1579d887..4750c79f 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ }, "dependencies": { "@zeit/next-css": "1.0.1", - "@zeit/next-sass": "1.0.1", "axios": "0.19.1", "bootstrap": "4.4.1", "jquery": "3.4.1", diff --git a/pages/_app.js b/pages/_app.js index b0ad340c..c4eb946d 100644 --- a/pages/_app.js +++ b/pages/_app.js @@ -6,6 +6,8 @@ import LocalizedComponent from '~/modules/core/localize/LocalizedComponent' import Loading from '~/modules/core/components/Loading' import ErrorBoundary from '~/modules/core/components/ErrorBoundary' import ThemeProviderSelector from '~/modules/core/theme/ThemeProviderSelector' +import Router from 'next/router' + import 'bootstrap/dist/css/bootstrap.min.css' export default class MyApp extends App { @@ -36,3 +38,11 @@ export default class MyApp extends App { ) } } + +Router.events.on('routeChangeComplete', () => { + const els = document.querySelectorAll( + 'link[href*="/_next/static/css/styles.chunk.css"]' + ) + const timestamp = new Date().valueOf() + els[0].href = '/_next/static/css/styles.chunk.css?v=' + timestamp +}) diff --git a/pages/index.js b/pages/index.js index 9b3ffda2..8888ab36 100644 --- a/pages/index.js +++ b/pages/index.js @@ -11,9 +11,6 @@ import Footer from '~/modules/home/components/Footer' import SlideIterator from '~/modules/core/components/SlideIterator' import Head from '~/modules/home/components/Head' -//Import Global style -import '~/public/styles/globalStyle.sass' - const HomePage = () => ( diff --git a/public/styles/globalStyle.sass b/public/styles/globalStyle.sass deleted file mode 100644 index 749525e4..00000000 --- a/public/styles/globalStyle.sass +++ /dev/null @@ -1,11 +0,0 @@ -// $Variables -@import helpers/variables - -// $Fonts -@import helpers/fonts - -// $Reset -@import helpers/reset - -// $General -@import helpers/base diff --git a/public/styles/helpers/base.sass b/public/styles/helpers/base.sass deleted file mode 100644 index 3e0e81b0..00000000 --- a/public/styles/helpers/base.sass +++ /dev/null @@ -1,68 +0,0 @@ -// Common layout elements -html, body - width: 100% - height: 100% - font-family: $font-sans - line-height: 1.2 - scroll-behavior: smooth - -h1, h2, h3, h4, h5, h6 - font-weight: normal -h1 - font-size: 60px - font-family: $font-serif - - @media screen and (max-width: 1200px) - font-size: 55px - - @media screen and (max-width: 800px) - font-size: 50px - -h2 - font-family: $font-serif - font-size: 40px - - @media screen and (max-width: 1200px) - font-size: 35px - - @media screen and (max-width: 800px) - font-size: 30px - -h3 - font-size: 30px - - @media screen and (max-width: 1200px) - font-size: 25px - - @media screen and (max-width: 800px) - font-size: 20px - -h4 - font-size: 20px - - @media screen and (max-width: 1200px) - font-size: 18px - -h5 - font-size: 18px - - @media screen and (max-width: 800px) - font-size: 16px - -p - font-size: 16px - line-height: 1.5 - @media screen and (max-width: 800px) - font-size: 15px - -li p - font-family: $font-serif - font-style: italic - -a - font-family: $font-sans - font-size: 16px - text-decoration: none - outline-style: none - &:hover - border-bottom: none \ No newline at end of file diff --git a/public/styles/helpers/fonts.sass b/public/styles/helpers/fonts.sass deleted file mode 100644 index 1fc61e86..00000000 --- a/public/styles/helpers/fonts.sass +++ /dev/null @@ -1,7 +0,0 @@ -// Page icons, custom set from fontello -@font-face - font-family: 'ip' - src: url("/fonts/ip/font/ip.eot") - src: url("/fonts/ip/font/ip.eot#iefix") format("embedded-opentype"), url("/fonts/ip/font/ip.woff") format("woff"), url("/fonts/ip/font/ip.ttf") format("truetype"), url("/fonts/ip/font/ip.svg") format("svg") - font-weight: normal - font-style: normal diff --git a/public/styles/helpers/reset.sass b/public/styles/helpers/reset.sass deleted file mode 100644 index 9659d29b..00000000 --- a/public/styles/helpers/reset.sass +++ /dev/null @@ -1,48 +0,0 @@ -// Modified reset css, original by http://meyerweb.com/eric/tools/css/reset/ - -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, input, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, -menu, nav, output, ruby, section, summary, -time, mark, audio, video - margin: 0 - padding: 0 - border: 0 - -moz-box-sizing: border-box - -webkit-box-sizing: border-box - box-sizing: border-box - -// HTML5 display-role reset for older browsers - -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section - display: block - -nav ol, nav ul - list-style: none - -blockquote, q - quotes: none - -blockquote cite - font-style: normal - -blockquote:before, blockquote:after, -q:before, q:after - content: '' - content: none - -table - border-collapse: collapse - border-spacing: 0 - -button, input[type=submit] - cursor: pointer diff --git a/public/styles/helpers/variables.sass b/public/styles/helpers/variables.sass deleted file mode 100644 index 3c66559e..00000000 --- a/public/styles/helpers/variables.sass +++ /dev/null @@ -1,12 +0,0 @@ -//Font variables -$font-sans: 'open sans', Tahoma, Verdana, Arial, sans-serif -$font-serif: Georgia, Times, "Times New Roman", serif -$font-condensed: 'Open Sans Condensed', Tahoma, Verdana, Arial, sans-serif - -// Color variables -$color-light: #ecf0f1 -$color-darken: #bdc3c7 -$color-dark: #2c3e50 -$color-accent: #FFA726 -$color-overlay_bg: rgba($color-dark, .3) - diff --git a/yarn.lock b/yarn.lock index 3c067427..becae85f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2506,14 +2506,6 @@ mini-css-extract-plugin "0.4.3" postcss-loader "3.0.0" -"@zeit/next-sass@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@zeit/next-sass/-/next-sass-1.0.1.tgz#18f7f36caa1975d7e090e81bde116a53f3202d8d" - integrity sha512-QVmrsLye85gtIYj+QSBuFadzd6NQgI5DZfqlV+ET1nXI3B+C91wAaJN71O98KMvNIc8R2QLosxugEyd2V5wE6w== - dependencies: - "@zeit/next-css" "1.0.1" - sass-loader "6.0.6" - "@zkochan/cmd-shim@^3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@zkochan/cmd-shim/-/cmd-shim-3.1.0.tgz#2ab8ed81f5bb5452a85f25758eb9b8681982fd2e" @@ -2939,13 +2931,6 @@ async-sema@3.0.0: resolved "https://registry.yarnpkg.com/async-sema/-/async-sema-3.0.0.tgz#9e22d6783f0ab66a1cf330e21a905e39b3b3a975" integrity sha512-zyCMBDl4m71feawrxYcVbHxv/UUkqm4nKJiLu3+l9lfiQha6jQ/9dxhrXLnzzBXVFqCTDwiUkZOz9XFbdEGQsg== -async@^2.1.5: - version "2.6.3" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" - integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== - dependencies: - lodash "^4.17.14" - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -4388,16 +4373,6 @@ cliui@^5.0.0: strip-ansi "^5.2.0" wrap-ansi "^5.1.0" -clone-deep@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8" - integrity sha1-NIxhrpzb4O3+BT2R/0zFIdeQ7eg= - dependencies: - for-own "^1.0.0" - is-plain-object "^2.0.1" - kind-of "^3.2.2" - shallow-clone "^0.1.2" - clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -6235,23 +6210,11 @@ follow-redirects@1.5.10: dependencies: debug "=3.1.0" -for-in@^0.1.3: - version "0.1.8" - resolved "https://registry.yarnpkg.com/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.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= -for-own@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/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.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -7277,7 +7240,7 @@ is-boolean-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e" integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ== -is-buffer@^1.0.2, is-buffer@^1.1.5, is-buffer@~1.1.2: +is-buffer@^1.1.5, is-buffer@~1.1.2: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== @@ -7472,7 +7435,7 @@ is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= -is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: +is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== @@ -8234,14 +8197,7 @@ keycode@^2.2.0: resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04" integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ= -kind-of@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5" - integrity sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU= - dependencies: - is-buffer "^1.0.2" - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^3.2.2: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= @@ -8296,11 +8252,6 @@ launch-editor@2.2.1: chalk "^2.3.0" shell-quote "^1.6.1" -lazy-cache@^0.2.3: - version "0.2.7" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65" - integrity sha1-f+3fLctu23fRHvHRF6tf/fCrG2U= - lcid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" @@ -8407,7 +8358,7 @@ loader-runner@^2.3.1, loader-runner@^2.4.0: resolved "https://registry.yarnpkg.com/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.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== @@ -8554,11 +8505,6 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= -lodash.tail@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664" - integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ= - lodash.template@^4.0.2, lodash.template@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" @@ -9039,14 +8985,6 @@ 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" - integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4= - dependencies: - for-in "^0.1.3" - is-extendable "^0.1.1" - mkdirp-promise@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz#e9b8f68e552c68a9c1713b84883f7a1dd039b8a1" @@ -11855,17 +11793,6 @@ sass-graph@^2.2.4: scss-tokenizer "^0.2.3" yargs "^7.0.0" -sass-loader@6.0.6: - version "6.0.6" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.6.tgz#e9d5e6c1f155faa32a4b26d7a9b7107c225e40f9" - integrity sha512-c3/Zc+iW+qqDip6kXPYLEgsAu2lf4xz0EZDplB7EmSUMda12U1sGJPetH55B/j9eu0bTtKzKlNPWWyYC7wFNyQ== - dependencies: - async "^2.1.5" - clone-deep "^0.3.0" - loader-utils "^1.0.1" - lodash.tail "^4.1.1" - pify "^3.0.0" - sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -11984,16 +11911,6 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -shallow-clone@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060" - integrity sha1-WQnodLp3EG1zrEFM/sH/yofZcGA= - dependencies: - is-extendable "^0.1.1" - kind-of "^2.0.1" - lazy-cache "^0.2.3" - mixin-object "^2.0.1" - shallow-clone@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"