diff --git a/core/dist/css/decanter.css b/core/dist/css/decanter.css index d6e6474ee..4493923da 100644 --- a/core/dist/css/decanter.css +++ b/core/dist/css/decanter.css @@ -8357,6 +8357,27 @@ button, @media only screen and (min-width: 1200px) { .su-hero { min-height: 520px; } } + .su-hero .su-hero__card { + background: #ffffff; + position: relative; + z-index: 10; } + @media only screen and (min-width: 768px) { + .su-hero .su-hero__card { + margin-top: 45px; + margin-bottom: 45px; + left: 45px; + max-width: 400px; } } + @media only screen and (min-width: 992px) { + .su-hero .su-hero__card { + max-width: 450px; } } + @media only screen and (min-width: 1200px) { + .su-hero .su-hero__card { + margin-top: 96px; + margin-bottom: 0; + bottom: 48px; + left: 48px; + max-width: 450px; + top: auto; } } .su-hero__media { background: #2e2d29; @@ -8384,39 +8405,102 @@ button, object-position: 50% 50%; width: 100%; } -.su-hero__card { - background: #ffffff; - position: relative; - z-index: 10; } +.su-hero__content { + display: none; } + +.su-hero--caption .su-hero__card { + display: none; } + +@media only screen and (min-width: 768px) { + .su-hero--caption .su-hero__media { + max-height: 320px; + position: relative; } } + +@media only screen and (min-width: 992px) { + .su-hero--caption .su-hero__media { + max-height: 409px; + position: relative; } } + +@media only screen and (min-width: 1200px) { + .su-hero--caption .su-hero__media { + max-height: 520px; + position: relative; } } + +.su-hero--caption .su-hero__content { + margin: 0 auto; + text-align: right; + display: block; + clear: both; } + @media only screen and (min-width: 0) { + .su-hero--caption .su-hero__content { + max-width: calc(100% - 40px); + width: calc(100% - 40px); } } + @media only screen and (min-width: 576px) { + .su-hero--caption .su-hero__content { + max-width: calc(100% - 60px); + width: calc(100% - 60px); } } @media only screen and (min-width: 768px) { - .su-hero__card { - margin-top: 45px; - margin-bottom: 45px; - left: 45px; - max-width: 400px; } } + .su-hero--caption .su-hero__content { + max-width: calc(100% - 100px); + width: calc(100% - 100px); } } + @media only screen and (min-width: 992px) { + .su-hero--caption .su-hero__content { + max-width: calc(100% - 160px); + width: calc(100% - 160px); } } + @media only screen and (min-width: 1200px) { + .su-hero--caption .su-hero__content { + max-width: calc(100% - 200px); + width: calc(100% - 200px); } } + @media only screen and (min-width: 1500px) { + .su-hero--caption .su-hero__content { + max-width: 1500px; + width: calc(100% - 200px); } } + @media only screen and (min-width: 0) { + .su-hero--caption .su-hero__content { + padding-top: 1.6rem; } } + @media only screen and (min-width: 768px) { + .su-hero--caption .su-hero__content { + padding-top: 1.8rem; } } + @media only screen and (min-width: 1500px) { + .su-hero--caption .su-hero__content { + padding-top: 1.9rem; } } + @media only screen and (min-width: 0) { + .su-hero--caption .su-hero__content { + padding-bottom: 3.2rem; } } + @media only screen and (min-width: 768px) { + .su-hero--caption .su-hero__content { + padding-bottom: 3.6rem; } } + @media only screen and (min-width: 1500px) { + .su-hero--caption .su-hero__content { + padding-bottom: 3.8rem; } } + .su-hero--caption .su-hero__content p { + margin-top: 0; + font-size: 1em; + color: #4d4f53; } + +.su-hero--caption .su-hero__content-inner { + float: right; } @media only screen and (min-width: 992px) { - .su-hero__card { - max-width: 450px; } } + .su-hero--caption .su-hero__content-inner { + width: 596px; } } @media only screen and (min-width: 1200px) { - .su-hero__card { - margin-top: 96px; - margin-bottom: 0; - bottom: 48px; - left: 48px; - max-width: 450px; - top: auto; } } + .su-hero--caption .su-hero__content-inner { + width: 720px; } } + @media only screen and (min-width: 1500px) { + .su-hero--caption .su-hero__content-inner { + width: 900px; } } .su-hero--youtube { - min-height: 315px; } + min-height: 208px; } @media only screen and (min-width: 768px) { .su-hero--youtube { - min-height: 640px; } } + min-height: 320px; } } @media only screen and (min-width: 992px) { .su-hero--youtube { - min-height: 640px; } } + min-height: 409px; } } @media only screen and (min-width: 1200px) { .su-hero--youtube { - min-height: 728px; } } + min-height: 520px; } } .su-hero--youtube .su-hero__media iframe { width: 100%; } @media only screen and (min-width: 768px) { @@ -10111,6 +10195,9 @@ a { .su-site-search__input::-webkit-input-placeholder { color: #2e2d29; opacity: 1; } + .su-site-search__input::-moz-placeholder { + color: #2e2d29; + opacity: 1; } .su-site-search__input:-ms-input-placeholder { color: #2e2d29; opacity: 1; } diff --git a/core/src/scss/components/hero/_hero--caption.scss b/core/src/scss/components/hero/_hero--caption.scss new file mode 100644 index 000000000..82bd88f54 --- /dev/null +++ b/core/src/scss/components/hero/_hero--caption.scss @@ -0,0 +1,54 @@ +@charset "UTF-8"; + +.su-hero--caption { + + // Ensure no card shows up. + .su-hero__card { + display: none; + } + + // The media element shall not be absolute in this option. + .su-hero__media { + @include grid-media('md') { + max-height: map-get($_su-hero-height, 'md'); + position: relative; + } + + @include grid-media('lg') { + max-height: map-get($_su-hero-height, 'lg'); + position: relative; + } + + @include grid-media('xl') { + max-height: map-get($_su-hero-height, 'xl'); + position: relative; + } + } + + .su-hero__content { + @include centered-column; + @include modular-spacing(padding-top, 0); + @include modular-spacing(padding-bottom, 2); + text-align: right; + display: block; + clear: both; + + p { + @include credits; + } + } + + .su-hero__content-inner { + float: right; + + @include grid-media("lg") { + width: ceil($su-screen-lg * 0.6); + } + @include grid-media("xl") { + width: ceil($su-screen-xl * 0.6); + } + @include grid-media("2xl") { + width: ceil($su-screen-2xl * 0.6); + } + } +} diff --git a/core/src/scss/components/hero/_hero--youtube.scss b/core/src/scss/components/hero/_hero--youtube.scss index d6b602e52..0620a1f21 100644 --- a/core/src/scss/components/hero/_hero--youtube.scss +++ b/core/src/scss/components/hero/_hero--youtube.scss @@ -8,7 +8,7 @@ $_su-hero-height: ( 'lg': 640px, 'xl': 728px, '2xl': 728px -); +) !default; .su-hero--youtube { diff --git a/core/src/scss/components/hero/_hero.scss b/core/src/scss/components/hero/_hero.scss index 1a59d469f..7ed135a45 100644 --- a/core/src/scss/components/hero/_hero.scss +++ b/core/src/scss/components/hero/_hero.scss @@ -8,7 +8,7 @@ $_su-hero-height: ( 'lg': 409px, 'xl': 520px, '2xl': 520px -); +) !default; // // Hero @@ -17,6 +17,7 @@ $_su-hero-height: ( // // Experimental: The YouTube player has not been finished. // +// .su-hero--caption - An under banner caption option. // .su-hero--youtube - A YouTube video in the background. // // Markup: ../templates/components/hero/hero.twig @@ -40,6 +41,31 @@ $_su-hero-height: ( @include grid-media('xl') { min-height: map-get($_su-hero-height, 'xl'); } + + // The content + .su-hero__card { + background: $su-color-white; + position: relative; + z-index: 10; + + @include grid-media('md') { + @include margin(45px null); + left: 45px; + max-width: 400px; + } + + @include grid-media('lg') { + max-width: 450px; + } + + @include grid-media('xl') { + @include margin(96px null 0 null); + bottom: 48px; + left: 48px; + max-width: 450px; + top: auto; + } + } } // The media element. @@ -72,31 +98,9 @@ $_su-hero-height: ( object-position: 50% 50%; width: 100%; } - } -// The content -.su-hero__card { - background: $su-color-white; - position: relative; - z-index: 10; - - @include grid-media('md') { - @include margin(45px null); - left: 45px; - max-width: 400px; - } - - @include grid-media('lg') { - max-width: 450px; - } - - @include grid-media('xl') { - @include margin(96px null 0 null); - bottom: 48px; - left: 48px; - max-width: 450px; - top: auto; - } - +// Mostly for the demo. You really shouldn't put content in both the card and the content variables. +.su-hero__content { + display: none; } diff --git a/core/src/scss/components/hero/index.scss b/core/src/scss/components/hero/index.scss index d5af3fcd8..21522abfa 100644 --- a/core/src/scss/components/hero/index.scss +++ b/core/src/scss/components/hero/index.scss @@ -4,4 +4,5 @@ @import 'hero', +'hero--caption', 'hero--youtube'; diff --git a/core/src/templates/components/hero/hero.json b/core/src/templates/components/hero/hero.json index b8beac947..7cddc6720 100644 --- a/core/src/templates/components/hero/hero.json +++ b/core/src/templates/components/hero/hero.json @@ -10,5 +10,6 @@ "hero_cta_attributes": "", "hero_cta_label": "CTA Link Label", "hero_button_link": "https://stanford.edu", - "hero_button_label": "Button Label" + "hero_button_label": "Button Label", + "hero_content": "

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip (ex ea commodo consequat).

" } diff --git a/core/src/templates/components/hero/hero.twig b/core/src/templates/components/hero/hero.twig index 9d911eedb..5aa63785d 100644 --- a/core/src/templates/components/hero/hero.twig +++ b/core/src/templates/components/hero/hero.twig @@ -20,6 +20,8 @@ * - hero_cta_label: The clickable text for the CTA link * - hero_button_link: The href property of the button component. * - hero_button_label: The text label of the button component. + * - hero_content: An open area for content to go beneath the media when using + * the su-hero--caption variant. */ #} @@ -34,6 +36,8 @@ {# Hero Image or Video #} + {% block heromedia %} + {% if hero_media is not empty or hero_image is not empty %}
{% if 'su-hero--youtube' in modifier_class %} {# Support for: iframe #} @@ -43,7 +47,11 @@ {{ hero_image}} {% endif %}
+ {% endif %} + {% endblock %} + {# Only include the card template if there is content to render. #} + {%- block herocontent -%} {%- if hero_super_headline is not empty or hero_headline is not empty or @@ -67,4 +75,12 @@ only %} {%- endif -%} + {%- if hero_content is not empty -%} +
+
+ {{ hero_content }} +
+
+ {%- endif -%} + {%- endblock -%} diff --git a/package-lock.json b/package-lock.json index 9c8a1d962..5ca132e90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -750,9 +750,9 @@ "dev": true }, "@types/node": { - "version": "12.11.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.11.2.tgz", - "integrity": "sha512-dsfE4BHJkLQW+reOS6b17xhZ/6FB1rB8eRRvO08nn5o+voxf3i74tuyFWNH6djdfgX7Sm5s6LD8t6mJug4dpDw==", + "version": "12.11.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.11.5.tgz", + "integrity": "sha512-LC8ALj/24PhByn39nr5jnTvpE7MujK8y7LQmV74kHYF5iQ0odCPkMH4IZNZw+cobKfSXqaC8GgegcbIsQpffdA==", "dev": true }, "@types/q": { @@ -5089,24 +5089,28 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true }, "aproba": { "version": "1.2.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "optional": true, "requires": { @@ -5116,12 +5120,14 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true }, "brace-expansion": { "version": "1.1.11", - "bundled": true, + "resolved": false, + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { "balanced-match": "^1.0.0", @@ -5130,34 +5136,40 @@ }, "chownr": { "version": "1.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, "concat-map": { "version": "0.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true }, "core-util-is": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true }, "debug": { "version": "2.6.9", - "bundled": true, + "resolved": false, + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "optional": true, "requires": { @@ -5166,25 +5178,29 @@ }, "deep-extend": { "version": "0.6.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "bundled": true, + "resolved": false, + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true }, "fs-minipass": { "version": "1.2.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "dev": true, "optional": true, "requires": { @@ -5193,13 +5209,15 @@ }, "fs.realpath": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "bundled": true, + "resolved": false, + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, "requires": { @@ -5215,7 +5233,8 @@ }, "glob": { "version": "7.1.3", - "bundled": true, + "resolved": false, + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "optional": true, "requires": { @@ -5229,13 +5248,15 @@ }, "has-unicode": { "version": "2.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "bundled": true, + "resolved": false, + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "optional": true, "requires": { @@ -5244,7 +5265,8 @@ }, "ignore-walk": { "version": "3.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "optional": true, "requires": { @@ -5253,7 +5275,8 @@ }, "inflight": { "version": "1.0.6", - "bundled": true, + "resolved": false, + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, "requires": { @@ -5263,18 +5286,21 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, + "resolved": false, + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, "ini": { "version": "1.3.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { "number-is-nan": "^1.0.0" @@ -5282,13 +5308,15 @@ }, "isarray": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "bundled": true, + "resolved": false, + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { "brace-expansion": "^1.1.7" @@ -5296,12 +5324,14 @@ }, "minimist": { "version": "0.0.8", - "bundled": true, + "resolved": false, + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, "minipass": { "version": "2.3.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, "requires": { "safe-buffer": "^5.1.2", @@ -5310,7 +5340,8 @@ }, "minizlib": { "version": "1.2.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "dev": true, "optional": true, "requires": { @@ -5319,7 +5350,8 @@ }, "mkdirp": { "version": "0.5.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { "minimist": "0.0.8" @@ -5327,13 +5359,15 @@ }, "ms": { "version": "2.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true, "optional": true }, "needle": { "version": "2.2.4", - "bundled": true, + "resolved": false, + "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==", "dev": true, "optional": true, "requires": { @@ -5344,7 +5378,8 @@ }, "node-pre-gyp": { "version": "0.10.3", - "bundled": true, + "resolved": false, + "integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==", "dev": true, "optional": true, "requires": { @@ -5362,7 +5397,8 @@ }, "nopt": { "version": "4.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "dev": true, "optional": true, "requires": { @@ -5372,13 +5408,15 @@ }, "npm-bundled": { "version": "1.0.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.2.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==", "dev": true, "optional": true, "requires": { @@ -5388,7 +5426,8 @@ }, "npmlog": { "version": "4.1.2", - "bundled": true, + "resolved": false, + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, "requires": { @@ -5400,18 +5439,21 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, "object-assign": { "version": "4.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { "wrappy": "1" @@ -5419,19 +5461,22 @@ }, "os-homedir": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, "requires": { @@ -5441,19 +5486,22 @@ }, "path-is-absolute": { "version": "1.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true, "optional": true }, "rc": { "version": "1.2.8", - "bundled": true, + "resolved": false, + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "optional": true, "requires": { @@ -5465,7 +5513,8 @@ "dependencies": { "minimist": { "version": "1.2.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true, "optional": true } @@ -5473,7 +5522,8 @@ }, "readable-stream": { "version": "2.3.6", - "bundled": true, + "resolved": false, + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "optional": true, "requires": { @@ -5488,7 +5538,8 @@ }, "rimraf": { "version": "2.6.3", - "bundled": true, + "resolved": false, + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "optional": true, "requires": { @@ -5497,42 +5548,49 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, + "resolved": false, + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, "safer-buffer": { "version": "2.1.2", - "bundled": true, + "resolved": false, + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "bundled": true, + "resolved": false, + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true }, "semver": { "version": "5.6.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { "code-point-at": "^1.0.0", @@ -5542,7 +5600,8 @@ }, "string_decoder": { "version": "1.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, "requires": { @@ -5551,7 +5610,8 @@ }, "strip-ansi": { "version": "3.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { "ansi-regex": "^2.0.0" @@ -5559,13 +5619,15 @@ }, "strip-json-comments": { "version": "2.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true }, "tar": { "version": "4.4.8", - "bundled": true, + "resolved": false, + "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "dev": true, "optional": true, "requires": { @@ -5580,13 +5642,15 @@ }, "util-deprecate": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "bundled": true, + "resolved": false, + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "optional": true, "requires": { @@ -5595,12 +5659,14 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, "yallist": { "version": "3.0.3", - "bundled": true, + "resolved": false, + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", "dev": true } } @@ -14777,23 +14843,13 @@ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", "dev": true - }, - "webpack-log": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz", - "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", - "dev": true, - "requires": { - "ansi-colors": "^3.0.0", - "uuid": "^3.3.2" - } } } }, "webpack-dev-server": { - "version": "3.8.2", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.8.2.tgz", - "integrity": "sha512-0xxogS7n5jHDQWy0WST0q6Ykp7UGj4YvWh+HVN71JoE7BwPxMZrwgraBvmdEMbDVMBzF0u+mEzn8TQzBm5NYJQ==", + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.9.0.tgz", + "integrity": "sha512-E6uQ4kRrTX9URN9s/lIbqTAztwEPdvzVrcmHE8EQ9YnuT9J8Es5Wrd8n9BKg1a0oZ5EgEke/EQFgUsp18dSTBw==", "dev": true, "requires": { "ansi-html": "0.0.7", @@ -14814,7 +14870,7 @@ "loglevel": "^1.6.4", "opn": "^5.5.0", "p-retry": "^3.0.1", - "portfinder": "^1.0.24", + "portfinder": "^1.0.25", "schema-utils": "^1.0.0", "selfsigned": "^1.10.7", "semver": "^6.3.0", @@ -15281,16 +15337,6 @@ "has-flag": "^3.0.0" } }, - "webpack-log": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz", - "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", - "dev": true, - "requires": { - "ansi-colors": "^3.0.0", - "uuid": "^3.3.2" - } - }, "which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", @@ -15338,6 +15384,16 @@ } } }, + "webpack-log": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz", + "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", + "dev": true, + "requires": { + "ansi-colors": "^3.0.0", + "uuid": "^3.3.2" + } + }, "webpack-manifest-plugin": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-2.0.4.tgz", diff --git a/package.json b/package.json index 71750723e..e7bbb6ee8 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "webpack": "^4.29.6", "webpack-assets-manifest": "^3.1.1", "webpack-cli": "^3.3.0", - "webpack-dev-server": "^3.8.2", + "webpack-dev-server": "^3.9.0", "webpack-manifest-plugin": "^2.0.4" } }