diff --git a/docs-site/src/pages/pattern-lab/_patterns/01-visual-styles/05-spacing/00-spacing-overview.twig b/docs-site/src/pages/pattern-lab/_patterns/01-visual-styles/05-spacing/00-spacing-overview.twig index 26a6b93420..cd481fa89f 100644 --- a/docs-site/src/pages/pattern-lab/_patterns/01-visual-styles/05-spacing/00-spacing-overview.twig +++ b/docs-site/src/pages/pattern-lab/_patterns/01-visual-styles/05-spacing/00-spacing-overview.twig @@ -23,7 +23,7 @@ Vertical Spacing - The base value of vertical spacing is based on the leading of base body text (1.65rem). + The base value of vertical spacing is based on the leading of base body text. @@ -58,7 +58,7 @@ Horizontal Spacing - The base value of horizontal spacing is based on the gutter of the grid (2rem). + The base value of horizontal spacing is based on the gutter of the grid. diff --git a/docs-site/src/pages/pattern-lab/_patterns/01-visual-styles/10-typography/00-typography-overview.twig b/docs-site/src/pages/pattern-lab/_patterns/01-visual-styles/10-typography/00-typography-overview.twig index 55c7263223..37b9b46718 100644 --- a/docs-site/src/pages/pattern-lab/_patterns/01-visual-styles/10-typography/00-typography-overview.twig +++ b/docs-site/src/pages/pattern-lab/_patterns/01-visual-styles/10-typography/00-typography-overview.twig @@ -17,178 +17,93 @@ Fonts - - - Body: Open Sans - - - - - Characters - - - -
- - - - {{ characters_sample }} - - - - - Styles - - - -
- - - - - - Regular - - - - - Regular Italic + {% for fontFamilyToken, fontFamilyGroup, fontFamilyName in bolt.data.typography.fontFamilies["font-families"] %} + {% if fontFamilyToken != "bodySubset" %} + + + {{ fontFamilyToken|capitalize }}: + {% for fontName in fontFamilyGroup["custom-font"] %} + {% if loop.index == 1 %} + {{ fontName }}{% if fontFamilyToken == "code" %}*{% endif %} + {% endif %} + {% endfor %} - - - - Semi-Bold + + + + Characters - - - - Semi-Bold Italic + + +
+ + + + {{ characters_sample }} - - - - Bold - - - - - Bold Italic + + + + Styles - - - - - - - Heading: Open Sans - - - - - Characters - - - -
- - - - {{ characters_sample }} - - - - - Styles - - - -
- - - - - - Regular - - - - - Regular Italic - - - - - Semi-Bold - - - - - Semi-Bold Italic - - - - - Bold - - - - - Bold Italic - - - - - - - - Code: monospace* - - - - - Characters - - - -
- - - - {{ characters_sample }} - - - - - Styles - - - -
- - - - - - Regular - - - - - Regular Italic - - - - - Bold - - - - - Bold Italic - - - - + + +
+ + + + {% if fontFamilyToken != "heading" %} + + + Regular + + + + + Regular Italic + + + {% endif %} + {% if fontFamilyToken != "code" %} + + + Semi-Bold + + + + + Semi-Bold Italic + + + + + Bold + + + + + Bold Italic + + + {% endif %} + + + {% endif %} + {% endfor %} *Bolt prefers the system default for code text’s font-family which maximizes the readability across all platforms and browsers. @@ -368,7 +283,7 @@ - *xxxlarge size should only be used for display headlines. + *xxxlarge size should only be used for display text (hero headline). @@ -493,21 +408,25 @@ - - heading - @include bolt-font-family(heading) - Open Sans - - - body - @include bolt-font-family(body) - Open Sans - - - code - @include bolt-font-family(code) - monospace - + {% for fontFamilyToken, fontFamilyGroup, fontFamilyName in bolt.data.typography.fontFamilies["font-families"] %} + {% if fontFamilyToken != "bodySubset" %} + + + {{ fontFamilyToken }} + + + @include bolt-font-family({{ fontFamilyToken }}) + + + {% for fontName in fontFamilyGroup["custom-font"] %} + {% if loop.index == 1 %} + {{ fontName }} + {% endif %} + {% endfor %} + + + {% endif %} + {% endfor %} @@ -525,97 +444,79 @@ SCSS mixin - Font scale* - Font-size (at 1400px viewport)** + Font scale + Font-size (at 1400px viewport)* - - xxxlarge - @include bolt-font-size(xxxlarge) - 3.083rem (below 60 characters) - - - 49px - scales from 43px to 55px - - - - - 2.275rem (above 60 characters) - - - 36px - scales from 32px to 41px - - - - - xxlarge - @include bolt-font-size(xxlarge) - 1.781rem - - - 28px - scales from 25px to 32px - - - - - xlarge - @include bolt-font-size(xlarge) - 1.417rem - - - 23px - scales from 20px to 25px - - - - - large - @include bolt-font-size(large) - 1.111rem - - - 18px - scales from 16px to 20px - - - - - medium (base) - @include bolt-font-size(medium) - 1rem - - - 16px - scales from 14px to 18px - - - - - small - @include bolt-font-size(small) - 0.9rem - - - 14px - scales from 13px to 16px - - - - - xsmall - @include bolt-font-size(xsmall) - 0.8rem - - - 13px - scales from 11px to 14px - - - + {% for fontSizeName, fontSizeValue in bolt.data.typography.fontSizes["font-sizes"] %} + + + {{ fontSizeName }}{% if fontSizeName == "xxxlarge" %}**{% endif %} + + + @include bolt-font-size({{ fontSizeName }}) + + + {% if fontSizeValue["font-size"] is iterable %} + {% for bp, value in fontSizeValue["font-size"] %} + + {% if loop.index == 1 %} + min: + {% else %} + max: + {% endif %} + {{ value }} + + {% endfor %} + {% else %} + {{ fontSizeValue["font-size"] }} + {% endif %} + + + {% if fontSizeValue["font-size"] is iterable %} + {% for bp, value in fontSizeValue["font-size"] %} + + {% if loop.index == 1 %} + min: + {% else %} + max: + {% endif %} + + {% for baseBp, baseValue in bolt.data.typography.baseFontSizes %} + {% if baseBp == "1400px" %} + {{ (value|replace({"rem": ""}) * baseValue|replace({"px": ""}))|round(0, "ceil") ~ "px" }} + {% endif %} + {% endfor %} + + {% for baseBp, baseValue in bolt.data.typography.baseFontSizes %} + + {{ baseBp }} viewport: {{ (value|replace({"rem": ""}) * baseValue|replace({"px": ""}))|round(0, "ceil") ~ "px" }} + + {% endfor %} + + + + {% endfor %} + {% else %} + + {% for baseBp, baseValue in bolt.data.typography.baseFontSizes %} + {% if baseBp == "1400px" %} + {{ (fontSizeValue["font-size"]|replace({"rem": ""}) * baseValue|replace({"px": ""}))|round(0, "ceil") ~ "px" }} + {% endif %} + {% endfor %} + + {% for baseBp, baseValue in bolt.data.typography.baseFontSizes %} + + {{ baseBp }} viewport: {{ (fontSizeValue["font-size"]|replace({"rem": ""}) * baseValue|replace({"px": ""}))|round(0, "ceil") ~ "px" }} + + {% endfor %} + + + {% endif %} + + + {% endfor %} @@ -624,10 +525,10 @@ - *xxxlarge headline text has an additional scaling effect depending on the length of the text. + *Font-sizes in Bolt are responsive from 320px viewport to 1920px viewport. View Breakpoint System - **Font-sizes in Bolt are responsive from 320px viewport to 1920px viewport. View Breakpoint System + **xxxlarge size has an additional scaling effect because it's intended to be used as display text (hero headline). @@ -639,6 +540,7 @@ + {# @todo: generate this with a map when the font-weight debate settles with branding #} diff --git a/packages/build-tools/create-webpack-config.js b/packages/build-tools/create-webpack-config.js index b2d28116cb..8ab17a296d 100644 --- a/packages/build-tools/create-webpack-config.js +++ b/packages/build-tools/create-webpack-config.js @@ -591,6 +591,7 @@ async function createWebpackConfig(buildConfig) { mainFields: ['esnext', 'jsnext:main', 'browser', 'module', 'main'], }, output: { + futureEmitAssets: true, path: path.resolve(process.cwd(), config.buildDir), // @todo: switch this to output .client.js and .server.js file prefixes when we hit Bolt v3.0 filename: `[name]${langSuffix}${ diff --git a/packages/build-tools/package.json b/packages/build-tools/package.json index 8ef8b261db..8196002720 100644 --- a/packages/build-tools/package.json +++ b/packages/build-tools/package.json @@ -109,8 +109,8 @@ "typescript": "^3.7.5", "uppercamelcase": "^3.0.0", "url-loader": "^3.0.0", - "webpack": "^4.41.5", - "webpack-cli": "^3.3.10", + "webpack": "^4.42.1", + "webpack-cli": "^3.3.11", "webpack-dev-middleware": "^3.7.2", "webpack-hot-middleware": "^2.25.0", "webpack-manifest-plugin": "^2.2.0", diff --git a/packages/core-v3.x/styles/01-settings/settings-font-family/_settings-font-family.scss b/packages/core-v3.x/styles/01-settings/settings-font-family/_settings-font-family.scss index 80006ee1a3..0023b552a4 100644 --- a/packages/core-v3.x/styles/01-settings/settings-font-family/_settings-font-family.scss +++ b/packages/core-v3.x/styles/01-settings/settings-font-family/_settings-font-family.scss @@ -3,22 +3,20 @@ /// @author Mike Mai //// -@import "../settings-global/settings-global"; +@import '../settings-global/settings-global'; /* ------------------------------------ *\ Default Fallback + Custom Web Font Stacks \* ------------------------------------ */ - /* * Default Font Family Stacks */ /// Default sans-serif fallback font stack containing [1] maps to the system UI font and [2] known system UI fonts. Used within the $bolt-font-families map. /// @see $bolt-font-families -$bolt-font-family--sans-fallback: - -apple-system, BlinkMacSystemFont, /* [1] */ - 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', /* [2] */ - 'Helvetica Neue', sans-serif !default; +$bolt-font-family--sans-fallback: -apple-system, BlinkMacSystemFont, + /* [1] */ 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', + 'Droid Sans', /* [2] */ 'Helvetica Neue', sans-serif !default; /// Default serif font stack. Used within the $bolt-font-families map. /// @see $bolt-font-families @@ -28,14 +26,13 @@ $bolt-font-family--serif: 'Georgia', serif !default; /// @see $bolt-font-families $bolt-font-family--mono-fallback: monospace, monospace !default; - /* * Custom web font stacks */ /// Default sans-serif font stack. Used within the $bolt-font-families map. /// @see $bolt-font-families -$bolt-font-family--sans: 'Open Sans', 'Helvetica Neue', sans-serif !default; +$bolt-font-family--sans: 'Open Sans', 'Helvetica Neue', sans-serif !default; /// Default sans-serif subset font stack. Used within the $bolt-font-families map. /// @see $bolt-font-families @@ -44,8 +41,7 @@ $bolt-font-family--sans-subset: 'OpenSansSubset', 'Helvetica Neue', sans-serif ! /// Default monospace font stack. Used within the $bolt-font-families map. /// @see $bolt-font-families -$bolt-font-family--mono: monospace, monospace !default; - +$bolt-font-family--mono: monospace, monospace !default; /* * Map font stack categories to Bolt's body, heading, and code. @@ -58,25 +54,29 @@ $bolt-font-families: ( font-families: ( body: ( fallback-font: $bolt-font-family--sans-fallback, - custom-font: $bolt-font-family--sans, - loaded-class: $bolt-fonts--loaded-class + custom-font: $bolt-font-family--sans, + loaded-class: $bolt-fonts--loaded-class, ), bodySubset: ( fallback-font: $bolt-font-family--sans-fallback, - custom-font: $bolt-font-family--sans-subset, - loaded-class: $bolt-fonts--subset-loaded-class + custom-font: $bolt-font-family--sans-subset, + loaded-class: $bolt-fonts--subset-loaded-class, ), heading: ( fallback-font: $bolt-font-family--sans-fallback, - custom-font: $bolt-font-family--sans, - loaded-class: $bolt-fonts--loaded-class + custom-font: $bolt-font-family--sans, + loaded-class: $bolt-fonts--loaded-class, ), code: ( fallback-font: $bolt-font-family--mono-fallback, - custom-font: $bolt-font-family--mono, - loaded-class: $bolt-fonts--loaded-class - ) - ) + custom-font: $bolt-font-family--mono, + loaded-class: $bolt-fonts--loaded-class, + ), + ), ) !default; -@include export-data('typography/font-families.bolt.#{$bolt-lang}.json', $bolt-font-families); +@include export-data('typography/font-families.bolt.json', $bolt-font-families); +@include export-data( + 'typography/font-families.bolt.#{$bolt-lang}.json', + $bolt-font-families +); diff --git a/packages/core-v3.x/styles/01-settings/settings-font-size/_settings-font-size.scss b/packages/core-v3.x/styles/01-settings/settings-font-size/_settings-font-size.scss index 2c7bb5f401..49a1879963 100644 --- a/packages/core-v3.x/styles/01-settings/settings-font-size/_settings-font-size.scss +++ b/packages/core-v3.x/styles/01-settings/settings-font-size/_settings-font-size.scss @@ -135,3 +135,17 @@ $bolt-font-sizes: ( ) ) ) !default; + +// base font sizes used at different breakpoints +$bolt-base-font-sizes: ( + bolt-breakpoint(xxsmall): 14px, + bolt-breakpoint(xsmall): 15px, + bolt-breakpoint(xxlarge): 16px, + bolt-breakpoint(xxxxlarge): 18px +) !default; + +@include bolt-export-data('typography/font-sizes.bolt.json', $bolt-font-sizes); +@include bolt-export-data( + 'typography/base-font-sizes.bolt.json', + $bolt-base-font-sizes +); diff --git a/packages/global/styles/04-elements/_elements-page.scss b/packages/global/styles/04-elements/_elements-page.scss index af70877002..7c2a965b2d 100644 --- a/packages/global/styles/04-elements/_elements-page.scss +++ b/packages/global/styles/04-elements/_elements-page.scss @@ -2,13 +2,6 @@ Body and heading declaration \* ------------------------------------ */ -$bolt-base-font-sizes: ( - bolt-breakpoint(xxsmall): 14px, - bolt-breakpoint(xsmall): 15px, - bolt-breakpoint(xxlarge): 16px, - bolt-breakpoint(xxxxlarge): 18px, -); - html { @include bolt-poly-fluid-sizing('font-size', $bolt-base-font-sizes); @include bolt-font-family(body, true); diff --git a/yarn.lock b/yarn.lock index b01399b7c1..fea28e61ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3081,21 +3081,45 @@ "@webassemblyjs/helper-wasm-bytecode" "1.8.5" "@webassemblyjs/wast-parser" "1.8.5" +"@webassemblyjs/ast@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" + integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA== + dependencies: + "@webassemblyjs/helper-module-context" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/wast-parser" "1.9.0" + "@webassemblyjs/floating-point-hex-parser@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721" integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ== +"@webassemblyjs/floating-point-hex-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" + integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== + "@webassemblyjs/helper-api-error@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7" integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA== +"@webassemblyjs/helper-api-error@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" + integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== + "@webassemblyjs/helper-buffer@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204" integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q== +"@webassemblyjs/helper-buffer@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" + integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA== + "@webassemblyjs/helper-code-frame@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e" @@ -3103,11 +3127,23 @@ dependencies: "@webassemblyjs/wast-printer" "1.8.5" +"@webassemblyjs/helper-code-frame@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27" + integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA== + dependencies: + "@webassemblyjs/wast-printer" "1.9.0" + "@webassemblyjs/helper-fsm@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452" integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow== +"@webassemblyjs/helper-fsm@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8" + integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw== + "@webassemblyjs/helper-module-context@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245" @@ -3116,11 +3152,23 @@ "@webassemblyjs/ast" "1.8.5" mamacro "^0.0.3" +"@webassemblyjs/helper-module-context@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07" + integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61" integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ== +"@webassemblyjs/helper-wasm-bytecode@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" + integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== + "@webassemblyjs/helper-wasm-section@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf" @@ -3131,6 +3179,16 @@ "@webassemblyjs/helper-wasm-bytecode" "1.8.5" "@webassemblyjs/wasm-gen" "1.8.5" +"@webassemblyjs/helper-wasm-section@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" + integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + "@webassemblyjs/ieee754@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e" @@ -3138,6 +3196,13 @@ dependencies: "@xtuc/ieee754" "^1.2.0" +"@webassemblyjs/ieee754@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" + integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg== + dependencies: + "@xtuc/ieee754" "^1.2.0" + "@webassemblyjs/leb128@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10" @@ -3145,11 +3210,23 @@ dependencies: "@xtuc/long" "4.2.2" +"@webassemblyjs/leb128@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" + integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw== + dependencies: + "@xtuc/long" "4.2.2" + "@webassemblyjs/utf8@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc" integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw== +"@webassemblyjs/utf8@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" + integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== + "@webassemblyjs/wasm-edit@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a" @@ -3164,6 +3241,20 @@ "@webassemblyjs/wasm-parser" "1.8.5" "@webassemblyjs/wast-printer" "1.8.5" +"@webassemblyjs/wasm-edit@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" + integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/helper-wasm-section" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + "@webassemblyjs/wasm-opt" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + "@webassemblyjs/wast-printer" "1.9.0" + "@webassemblyjs/wasm-gen@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc" @@ -3175,6 +3266,17 @@ "@webassemblyjs/leb128" "1.8.5" "@webassemblyjs/utf8" "1.8.5" +"@webassemblyjs/wasm-gen@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" + integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/ieee754" "1.9.0" + "@webassemblyjs/leb128" "1.9.0" + "@webassemblyjs/utf8" "1.9.0" + "@webassemblyjs/wasm-opt@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264" @@ -3185,6 +3287,16 @@ "@webassemblyjs/wasm-gen" "1.8.5" "@webassemblyjs/wasm-parser" "1.8.5" +"@webassemblyjs/wasm-opt@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" + integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + "@webassemblyjs/wasm-parser@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d" @@ -3197,6 +3309,18 @@ "@webassemblyjs/leb128" "1.8.5" "@webassemblyjs/utf8" "1.8.5" +"@webassemblyjs/wasm-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" + integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-api-error" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/ieee754" "1.9.0" + "@webassemblyjs/leb128" "1.9.0" + "@webassemblyjs/utf8" "1.9.0" + "@webassemblyjs/wast-parser@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c" @@ -3209,6 +3333,18 @@ "@webassemblyjs/helper-fsm" "1.8.5" "@xtuc/long" "4.2.2" +"@webassemblyjs/wast-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914" + integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/floating-point-hex-parser" "1.9.0" + "@webassemblyjs/helper-api-error" "1.9.0" + "@webassemblyjs/helper-code-frame" "1.9.0" + "@webassemblyjs/helper-fsm" "1.9.0" + "@xtuc/long" "4.2.2" + "@webassemblyjs/wast-printer@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc" @@ -3218,6 +3354,15 @@ "@webassemblyjs/wast-parser" "1.8.5" "@xtuc/long" "4.2.2" +"@webassemblyjs/wast-printer@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" + integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/wast-parser" "1.9.0" + "@xtuc/long" "4.2.2" + "@webcomponents/custom-elements@^1.3.0", "@webcomponents/custom-elements@^1.3.2": version "1.3.2" resolved "https://registry.yarnpkg.com/@webcomponents/custom-elements/-/custom-elements-1.3.2.tgz#22187e3c1b0a18ff1552c489fef423d86972cba3" @@ -15245,6 +15390,11 @@ minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2 resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= +minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + minimist@~0.0.1: version "0.0.10" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" @@ -15362,6 +15512,13 @@ mkdirp@0.3.0: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e" integrity sha1-G79asbqCevI1dRQ0kEJkVfSB/h4= +mkdirp@^0.5.3: + version "0.5.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512" + integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw== + dependencies: + minimist "^1.2.5" + mkdirp@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz#4cf2e30ad45959dddea53ad97d518b6c8205e1ea" @@ -23579,6 +23736,23 @@ webpack-cli@^3.3.10: v8-compile-cache "2.0.3" yargs "13.2.4" +webpack-cli@^3.3.11: + version "3.3.11" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz#3bf21889bf597b5d82c38f215135a411edfdc631" + integrity sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g== + dependencies: + chalk "2.4.2" + cross-spawn "6.0.5" + enhanced-resolve "4.1.0" + findup-sync "3.0.0" + global-modules "2.0.0" + import-local "2.0.0" + interpret "1.2.0" + loader-utils "1.2.3" + supports-color "6.1.0" + v8-compile-cache "2.0.3" + yargs "13.2.4" + webpack-core@^0.6.8: version "0.6.9" resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2" @@ -23641,7 +23815,7 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack- source-list-map "^2.0.0" source-map "~0.6.1" -"webpack@^4.0.0 || ^5.0.0", webpack@^4.41.5: +"webpack@^4.0.0 || ^5.0.0": version "4.41.5" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.5.tgz#3210f1886bce5310e62bb97204d18c263341b77c" integrity sha512-wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw== @@ -23670,6 +23844,35 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack- watchpack "^1.6.0" webpack-sources "^1.4.1" +webpack@^4.42.1: + version "4.42.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.1.tgz#ae707baf091f5ca3ef9c38b884287cfe8f1983ef" + integrity sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-module-context" "1.9.0" + "@webassemblyjs/wasm-edit" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + acorn "^6.2.1" + ajv "^6.10.2" + ajv-keywords "^3.4.1" + chrome-trace-event "^1.0.2" + enhanced-resolve "^4.1.0" + eslint-scope "^4.0.3" + json-parse-better-errors "^1.0.2" + loader-runner "^2.4.0" + loader-utils "^1.2.3" + memory-fs "^0.4.1" + micromatch "^3.1.10" + mkdirp "^0.5.3" + neo-async "^2.6.1" + node-libs-browser "^2.2.1" + schema-utils "^1.0.0" + tapable "^1.1.3" + terser-webpack-plugin "^1.4.3" + watchpack "^1.6.0" + webpack-sources "^1.4.1" + webpackbar@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/webpackbar/-/webpackbar-4.0.0.tgz#ee7a87f16077505b5720551af413c8ecd5b1f780"