From 9543aaa5b08d1ee06feb51c21a75ec9521acdd3d Mon Sep 17 00:00:00 2001 From: Jake Jarvis Date: Sat, 3 Oct 2020 19:24:27 -0400 Subject: [PATCH] process SCSS @import rules with postcss-import --- assets/sass/abstracts/_reset.scss | 2 +- assets/sass/abstracts/_themes.scss | 5 +- assets/sass/pages/_home.scss | 3 +- layouts/_default/single.amp.html | 2 +- layouts/index.atom | 2 +- layouts/partials/head/_head.html | 2 +- layouts/partials/head/canonical.html | 10 -- .../meta-scratch.html => head/init.html} | 14 +- layouts/partials/head/styles.html | 2 +- layouts/rss.xml | 2 +- package.json | 6 +- postcss.config.js | 36 +++- yarn.lock | 164 +++++++++++------- 13 files changed, 149 insertions(+), 101 deletions(-) rename layouts/partials/{functions/meta-scratch.html => head/init.html} (68%) diff --git a/assets/sass/abstracts/_reset.scss b/assets/sass/abstracts/_reset.scss index 7502bed6..fa9bbb0e 100644 --- a/assets/sass/abstracts/_reset.scss +++ b/assets/sass/abstracts/_reset.scss @@ -1,3 +1,3 @@ @charset "UTF-8"; -@import "node_modules/normalize.css/normalize.css"; +@import "normalize.css"; diff --git a/assets/sass/abstracts/_themes.scss b/assets/sass/abstracts/_themes.scss index 0ec67f4e..cf1bda78 100644 --- a/assets/sass/abstracts/_themes.scss +++ b/assets/sass/abstracts/_themes.scss @@ -165,5 +165,6 @@ $color-logo2: #ffb900; $color-logo3: #009cdf; // Icons (modified twemojis) -$icon-bulb-on: "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjIgMzUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbC1ydWxlPSJub256ZXJvIiBmaWxsPSJub25lIj48cGF0aCBkPSJNMjIgMTEuMDZjMCA2LjQ0LTUgNy40NC01IDEzLjQ0IDAgMy4xLTMuMTIgMy4zNi01LjUgMy4zNi0yLjA1IDAtNi41OS0uNzgtNi41OS0zLjM2IDAtNi00LjkxLTctNC45MS0xMy40NEMwIDUuMDMgNS4yOS4xNCAxMS4wOC4xNCAxNi44OC4xNCAyMiA1LjAzIDIyIDExLjA2eiIgZmlsbD0iI0ZGRDk4MyIvPjxwYXRoIGQ9Ik0xNS4xNyAzMi41YzAgLjgzLTIuMjQgMi41LTQuMTcgMi41LTEuOTMgMC00LjE3LTEuNjctNC4xNy0yLjUgMC0uODMgMi4yNC0uNSA0LjE3LS41IDEuOTMgMCA0LjE3LS4zMyA0LjE3LjV6IiBmaWxsPSIjQ0NENkREIi8+PHBhdGggZD0iTTE1LjcgMTAuM2ExIDEgMCAwMC0xLjQgMEwxMSAxMy41OGwtMy4zLTMuM2ExIDEgMCAxMC0xLjQgMS40MmwzLjcgMy43VjI2YTEgMSAwIDEwMiAwVjE1LjQxbDMuNy0zLjdhMSAxIDAgMDAwLTEuNDJ6IiBmaWxsPSIjRkZDQzREIi8+PHBhdGggZD0iTTE3IDMxYTIgMiAwIDAxLTIgMkg3YTIgMiAwIDAxLTItMnYtNmgxMnY2eiIgZmlsbD0iIzk5QUFCNSIvPjxwYXRoIGQ9Ik01IDMyYTEgMSAwIDAxLS4xNi0xLjk5bDEyLTJhMSAxIDAgMTEuMzMgMS45N2wtMTIgMkEuOTMuOTMgMCAwMTUgMzJ6bTAtNGExIDEgMCAwMS0uMTYtMS45OWwxMi0yYTEgMSAwIDExLjMzIDEuOTdsLTEyIDJBLjkzLjkzIDAgMDE1IDI4eiIgZmlsbD0iI0NDRDZERCIvPjwvZz48L3N2Zz4K"; -$icon-bulb-off: "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjIgMzUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbC1ydWxlPSJub256ZXJvIiBmaWxsPSJub25lIj48cGF0aCBkPSJNMjIgMTEuMDZjMCA2LjQ0LTUgNy40NC01IDEzLjQ0IDAgMy4xLTMuMTIgMy4zNi01LjUgMy4zNi0yLjA1IDAtNi41OS0uNzgtNi41OS0zLjM2IDAtNi00LjkxLTctNC45MS0xMy40NEMwIDUuMDMgNS4yOS4xNCAxMS4wOC4xNCAxNi44OC4xNCAyMiA1LjAzIDIyIDExLjA2eiIgZmlsbD0iI0NDQ0JDQiIvPjxwYXRoIGQ9Ik0xNS4xNyAzMi41YzAgLjgzLTIuMjQgMi41LTQuMTcgMi41LTEuOTMgMC00LjE3LTEuNjctNC4xNy0yLjUgMC0uODMgMi4yNC0uNSA0LjE3LS41IDEuOTMgMCA0LjE3LS4zMyA0LjE3LjV6IiBmaWxsPSIjQ0NENkREIi8+PHBhdGggZD0iTTE1LjcgMTAuM2ExIDEgMCAwMC0xLjQgMEwxMSAxMy41OGwtMy4zLTMuM2ExIDEgMCAxMC0xLjQgMS40MmwzLjcgMy43VjI2YTEgMSAwIDEwMiAwVjE1LjQxbDMuNy0zLjdhMSAxIDAgMDAwLTEuNDJ6IiBmaWxsPSIjN0Q3QTcyIi8+PHBhdGggZD0iTTE3IDMxYTIgMiAwIDAxLTIgMkg3YTIgMiAwIDAxLTItMnYtNmgxMnY2eiIgZmlsbD0iIzk5QUFCNSIvPjxwYXRoIGQ9Ik01IDMyYTEgMSAwIDAxLS4xNi0xLjk5bDEyLTJhMSAxIDAgMTEuMzMgMS45N2wtMTIgMkEuOTMuOTMgMCAwMTUgMzJ6bTAtNGExIDEgMCAwMS0uMTYtMS45OWwxMi0yYTEgMSAwIDExLjMzIDEuOTdsLTEyIDJBLjkzLjkzIDAgMDE1IDI4eiIgZmlsbD0iI0NDRDZERCIvPjwvZz48L3N2Zz4K"; +$icon-bulb-on: 'data:image/svg+xml;charset=utf-8,'; +$icon-bulb-off: 'data:image/svg+xml;charset=utf-8,'; +$icon-wand: 'data:image/svg+xml;charset=utf-8,'; diff --git a/assets/sass/pages/_home.scss b/assets/sass/pages/_home.scss index 8060cd37..6d391fd5 100644 --- a/assets/sass/pages/_home.scss +++ b/assets/sass/pages/_home.scss @@ -62,9 +62,8 @@ div.layout-home { // easter egg emoji cursor a#birthday { - // prettier-ignore &:hover { - cursor: url("data:image/svg+xml;utf8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyMCIgaGVpZ2h0PSIyMCIgdmlld0JveD0iMCAwIDM2IDM2Ij48ZyBmaWxsPSJub25lIj48cGF0aCBmaWxsPSIjMjkyRjMzIiBkPSJNMi42NTEgNi4wNzNsMjYuMjc1IDI2LjI3NmMuMzkxLjM5MSAyLjg4OC0yLjEwNyAyLjQ5Ny0yLjQ5N0w1LjE0OCAzLjU3NmMtLjM5LS4zOTEtMi44ODggMi4xMDctMi40OTcgMi40OTd6Ii8+PHBhdGggZmlsbD0iIzY2NzU3RiIgZD0iTTI5LjQ0MiAzMS4yM0wzLjE0NiA0LjkzNGwuODgzLS44ODMgMjYuMjk2IDI2LjI5NnoiLz48cGF0aCBmaWxsPSIjRTFFOEVEIiBkPSJNMzMuNTQ2IDMzLjQ4M2wtLjQxMi40MTItLjY3MS42NzFhLjk2Ny45NjcgMCAwMS0uMjU1LjE2OS45ODguOTg4IDAgMDEtMS4xNTktLjE2OWwtMi4xMDItMi4xMDIuNDk1LS40OTUuODgzLS44ODMgMS4xMTktMS4xMTkgMi4xMDIgMi4xMDJhLjk5OS45OTkgMCAwMTAgMS40MTR6TTQuMDI5IDQuNzlsLS44ODMuODgzLS40OTUuNDk1TC40NDIgMy45NmEuOTg4Ljk4OCAwIDAxLS4xNjktMS4xNTkuOTY3Ljk2NyAwIDAxLjE2OS0uMjU1bC42NzEtLjY3MS40MTItLjQxMmEuOTk5Ljk5OSAwIDAxMS40MTQgMGwyLjIwOCAyLjIwOEw0LjAyOSA0Ljc5eiIvPjxwYXRoIGZpbGw9IiNGNUY4RkEiIGQ9Ik0zMC4zMjUgMzAuNDk3bDIuODA5IDIuODA5LS42NzEuNjcxYS45NjcuOTY3IDAgMDEtLjI1NS4xNjlsLTIuNzY3LTIuNzY3Ljg4NC0uODgyek0zLjE0NiA1LjA4NEwuMjczIDIuMjExYS45NjcuOTY3IDAgMDEuMTY5LS4yNTVsLjY3MS0uNjcxIDIuOTE2IDIuOTE2LS44ODMuODgzeiIvPjxwYXRoIGZpbGw9IiNGRkFDMzMiIGQ9Ik0yNy44OTcgMTAuMjE5bDEuNTQyLjU3MS42IDIuMmEuNjY3LjY2NyAwIDAwMS4yODcgMGwuNi0yLjIgMS41NDItLjU3MWEuNjY1LjY2NSAwIDAwMC0xLjI1bC0xLjUzNC0uNTY4LS42MDUtMi40MTVhLjY2Ny42NjcgMCAwMC0xLjI5MyAwbC0uNjA1IDIuNDE1LTEuNTM0LjU2OGEuNjY1LjY2NSAwIDAwMCAxLjI1bS0xNi45MzYgOS42MjhsMi42MS45NjYuOTY2IDIuNjFhMS4xMDMgMS4xMDMgMCAwMDIuMDcgMGwuOTY2LTIuNjEgMi42MDktLjk2NmExLjEwMyAxLjEwMyAwIDAwMC0yLjA3bC0yLjYwOS0uOTY2LS45NjYtMi42MWExLjEwNSAxLjEwNSAwIDAwLTIuMDcgMGwtLjk2NiAyLjYxLTIuNjEuOTY2YTEuMTA0IDEuMTA0IDAgMDAwIDIuMDdNMjMuMTMgNC4zNmwxLjM4My41MTIuNTEyIDEuMzgyYS41ODUuNTg1IDAgMDAxLjA5NiAwbC41MTItMS4zODIgMS4zODItLjUxMmEuNTg0LjU4NCAwIDAwMC0xLjA5NmwtMS4zODItLjUxMi0uNTEyLTEuMzgyYS41ODUuNTg1IDAgMDAtMS4wOTYgMGwtLjUxMiAxLjM4Mi0xLjM4My41MTJhLjU4NS41ODUgMCAwMDAgMS4wOTYiLz48L2c+PC9zdmc+") 0 0, auto; + cursor: url($icon-wand) 0 0, auto; } } diff --git a/layouts/_default/single.amp.html b/layouts/_default/single.amp.html index 6338f15c..bbfc31db 100644 --- a/layouts/_default/single.amp.html +++ b/layouts/_default/single.amp.html @@ -1,7 +1,7 @@ - {{ partial "functions/meta-scratch" . }} + {{ partial "head/init" . }} {{ hugo.Generator }} diff --git a/layouts/index.atom b/layouts/index.atom index b6572594..e9ae0d81 100644 --- a/layouts/index.atom +++ b/layouts/index.atom @@ -1,4 +1,4 @@ -{{- $img := partial "functions/meta-scratch" . -}} +{{- $img := partial "head/init" . -}} {{ printf "" | safeHTML }} {{ .Site.Title }} diff --git a/layouts/partials/head/_head.html b/layouts/partials/head/_head.html index 0b9e255c..c0d455a0 100644 --- a/layouts/partials/head/_head.html +++ b/layouts/partials/head/_head.html @@ -1,4 +1,4 @@ -{{ partial "functions/meta-scratch" . -}} +{{ partial "head/init" . -}} {{ partial "head/meta" . -}} {{ partial "head/open-graph" . -}} {{ partialCached "head/mobile" . -}} diff --git a/layouts/partials/head/canonical.html b/layouts/partials/head/canonical.html index 7f98a8aa..003c1c0c 100644 --- a/layouts/partials/head/canonical.html +++ b/layouts/partials/head/canonical.html @@ -7,13 +7,3 @@ {{- end }} - -{{/* if this is a page/post, link View Source to specific file on GitHub. otherwise, just link to repo homepage. */}} -{{- with .Site.Params.social.githubRepo }} - {{- $githubURL := printf "https://github.com/%s" . }} - {{- if not $.IsPage }} - {{- $.Scratch.Set "sourceURL" $githubURL }} - {{- else }} - {{- $.Scratch.Set "sourceURL" (printf "%s/blob/main/content/%s" $githubURL $.File.Path) }} - {{- end }} -{{- end }} diff --git a/layouts/partials/functions/meta-scratch.html b/layouts/partials/head/init.html similarity index 68% rename from layouts/partials/functions/meta-scratch.html rename to layouts/partials/head/init.html index 282991d1..bca3e141 100644 --- a/layouts/partials/functions/meta-scratch.html +++ b/layouts/partials/head/init.html @@ -1,18 +1,25 @@ {{/* Strip any markdown styling from page title for use in meta tags */}} - {{- with .Title -}} {{- $.Scratch.Set "plainTitle" (. | markdownify | htmlUnescape | plainify) -}} {{- end -}} -{{/* Chooses and initializes various images for use by JSON schema & open graph tags */}} +{{/* If this is a page/post, link View Source to specific file on GitHub; otherwise, just link to repo homepage */}} +{{- with .Site.Params.social.githubRepo }} + {{- $githubURL := printf "https://github.com/%s" . }} + {{- if not $.IsPage }} + {{- $.Scratch.Set "sourceURL" $githubURL }} + {{- else }} + {{- $.Scratch.Set "sourceURL" (printf "%s/blob/main/content/%s" $githubURL $.File.Path) }} + {{- end }} +{{- end }} +{{/* Chooses and initializes various images for use by JSON schema & open graph tags */}} {{/* Author image (default) */}} {{- with .Site.Author.image -}} {{- with resources.Get . -}} {{- $.Scratch.Set "authorImage" . -}} {{- end -}} {{- end -}} - {{/* Page image (via frontmatter) */}} {{- with .Params.image -}} {{- with $.Page.Resources.GetMatch . -}} @@ -24,7 +31,6 @@ {{- $.Scratch.Set "pageImage" . -}} {{- end -}} {{- end -}} - {{/* Site logo */}} {{- with .Site.Params.image -}} {{- with resources.Get . -}} diff --git a/layouts/partials/head/styles.html b/layouts/partials/head/styles.html index c0799895..a2607344 100644 --- a/layouts/partials/head/styles.html +++ b/layouts/partials/head/styles.html @@ -1,4 +1,4 @@ -{{ $style := resources.Get "sass/main.scss" | resources.ExecuteAsTemplate "sass/main.scss" . | resources.ToCSS (dict "targetPath" "css/main.css" "includePaths" (slice "node_modules/")) | resources.PostCSS (dict "config" "postcss.config.js") }} +{{ $style := resources.Get "sass/main.scss" | resources.ExecuteAsTemplate "sass/main.scss" . | resources.ToCSS (dict "targetPath" "css/main.css") | resources.PostCSS (dict "config" "postcss.config.js") }} {{/* Page-specific styles set via front matter, piped through PostCSS and inlined */}} diff --git a/layouts/rss.xml b/layouts/rss.xml index 7bf05345..d94141d6 100644 --- a/layouts/rss.xml +++ b/layouts/rss.xml @@ -1,4 +1,4 @@ -{{- $img := partial "functions/meta-scratch" . -}} +{{- $img := partial "head/init" . -}} {{ .Site.Title }} diff --git a/package.json b/package.json index a8c3b6da..f4699000 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "hugo-extended": "0.75.1", "husky": "^4.3.0", "lint-staged": "^10.4.0", - "markdownlint-cli": "~0.23.2", + "markdownlint-cli": "~0.24.0", "netlify-lambda": "^2.0.1", "netlify-plugin-cache": "*", "netlify-plugin-debug-cache": "*", @@ -60,7 +60,9 @@ "postcss-cli": "^8.0.0", "postcss-color-rgba-fallback": "^4.0.0", "postcss-focus": "^5.0.1", + "postcss-import": "^12.0.1", "postcss-reporter": "^7.0.1", + "postcss-svgo": "^4.0.2", "prettier": "^2.1.2", "rimraf": "^3.0.2", "stylelint": "~13.7.2", @@ -69,7 +71,7 @@ "stylelint-no-unsupported-browser-features": "~4.0.0", "stylelint-prettier": "~1.1.2", "stylelint-scss": "~3.18.0", - "terser": "^5.3.3" + "terser": "^5.3.4" }, "optionalDependencies": { "imagemin-cli": "^6.0.0", diff --git a/postcss.config.js b/postcss.config.js index 799f2c24..e4e6c03f 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,18 +1,36 @@ module.exports = { options: { - map: false + map: false, }, plugins: [ + require("postcss-import"), require("autoprefixer")(), + require("postcss-svgo")({ + encode: true, + plugins: [ + { + sortAttrs: true, + }, + { + mergePaths: true, + }, + { + cleanupNumericValues: { + floatPrecision: 2, + }, + }, + ], + }), require("postcss-focus")(), require("postcss-color-rgba-fallback")({ properties: [ "background-image" - ] + ], }), require("postcss-clean")({ compatibility: "*", level: 1, + processImport: false, format: { breaks: { afterAtRule: true, @@ -20,16 +38,16 @@ module.exports = { afterBlockEnds: true, afterComment: true, afterRuleEnds: true, - beforeBlockEnds: true + beforeBlockEnds: true, }, spaces: { - beforeBlockBegins: true + beforeBlockBegins: true, }, - semicolonAfterLastProperty: true - } + semicolonAfterLastProperty: true, + }, }), require("postcss-reporter")({ - clearReportedMessages: true - }) - ] + clearReportedMessages: true, + }), + ], }; diff --git a/yarn.lock b/yarn.lock index 3d54b32c..801f24ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1834,14 +1834,14 @@ camelcase@^5.0.0, camelcase@^5.3.1: integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== caniuse-db@^1.0.30001090: - version "1.0.30001137" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001137.tgz#f47612eda1e8e838debb5102c0c7959b2a6a6b72" - integrity sha512-xliKp0zBItuub/jm+xT7go3lK7P92YgI9H2CTxHfk2aHE0Kzalxp+CubID2bSzNTQ9R7Ucr3KVxyDINYkUY6zw== + version "1.0.30001143" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001143.tgz#2e06b0361d4f3e03c7cc06bf4c80f440a072bac0" + integrity sha512-daz/e6P7IFzVUnlyRXkbw4LehPxXgZrkgnfuBYemllV8bscI/KqQpOYUA0s7Q0m6nq5oAkwJtw9ewYxK82Q0fg== caniuse-lite@^1.0.30000887, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001135, caniuse-lite@^1.0.30001137: - version "1.0.30001137" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz#6f0127b1d3788742561a25af3607a17fc778b803" - integrity sha512-54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw== + version "1.0.30001143" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001143.tgz#560f2cfb9f313d1d7e52eb8dac0e4e36c8821c0d" + integrity sha512-p/PO5YbwmCpBJPxjOiKBvAlUPgF8dExhfEpnsH+ys4N/791WHrYrGg0cyHiAURl5hSbx5vIcjKmQAP6sHDYH3w== caw@^2.0.0, caw@^2.0.1: version "2.0.1" @@ -2402,9 +2402,9 @@ css-tree@1.0.0-alpha.39: source-map "^0.6.1" css-what@^3.2.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.3.0.tgz#10fec696a9ece2e591ac772d759aacabac38cd39" - integrity sha512-pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg== + version "3.4.1" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.1.tgz#81cb70b609e4b1351b1e54cbc90fd9c54af86e2e" + integrity sha512-wHOppVDKl4vTAOWzJt5Ek37Sgd9qq1Bmj/T1OjvicWbU5W7ru7Pqbn0Jdqii3Drx/h+dixHKXNhZYx7blthL7g== cssesc@^3.0.0: version "3.0.0" @@ -2862,37 +2862,37 @@ error-ex@^1.2.0, error-ex@^1.3.1: is-arrayish "^0.2.1" es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5: - version "1.17.6" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a" - integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw== + version "1.17.7" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" + integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" has "^1.0.3" has-symbols "^1.0.1" - is-callable "^1.2.0" - is-regex "^1.1.0" - object-inspect "^1.7.0" + is-callable "^1.2.2" + is-regex "^1.1.1" + object-inspect "^1.8.0" object-keys "^1.1.1" - object.assign "^4.1.0" + object.assign "^4.1.1" string.prototype.trimend "^1.0.1" string.prototype.trimstart "^1.0.1" es-abstract@^1.18.0-next.0: - version "1.18.0-next.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.0.tgz#b302834927e624d8e5837ed48224291f2c66e6fc" - integrity sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ== + version "1.18.0-next.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68" + integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" has "^1.0.3" has-symbols "^1.0.1" - is-callable "^1.2.0" + is-callable "^1.2.2" is-negative-zero "^2.0.0" is-regex "^1.1.1" object-inspect "^1.8.0" object-keys "^1.1.1" - object.assign "^4.1.0" + object.assign "^4.1.1" string.prototype.trimend "^1.0.1" string.prototype.trimstart "^1.0.1" @@ -3919,7 +3919,7 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== -html-comment-regex@^1.1.2: +html-comment-regex@^1.1.0, html-comment-regex@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7" integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ== @@ -4322,7 +4322,7 @@ is-buffer@^2.0.0: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623" integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A== -is-callable@^1.1.4, is-callable@^1.2.0: +is-callable@^1.1.4, is-callable@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== @@ -4513,7 +4513,7 @@ is-png@^2.0.0: resolved "https://registry.yarnpkg.com/is-png/-/is-png-2.0.0.tgz#ee8cbc9e9b050425cedeeb4a6fb74a649b0a4a8d" integrity sha512-4KPGizaVGj2LK7xwJIz8o5B2ubu1D/vcQsgOGFEDlpcvgZHto4gBnyd0ig7Ws+67ixmwKoNmu0hYnpo6AaKb5g== -is-regex@^1.1.0, is-regex@^1.1.1: +is-regex@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== @@ -4545,6 +4545,13 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== +is-svg@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75" + integrity sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ== + dependencies: + html-comment-regex "^1.1.0" + is-svg@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-4.2.1.tgz#095b496e345fec9211c2a7d5d021003e040d6f81" @@ -4851,10 +4858,10 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= -linkify-it@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf" - integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw== +linkify-it@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz#f55eeb8bc1d3ae754049e124ab3bb56d97797fb8" + integrity sha512-gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ== dependencies: uc.micro "^1.0.1" @@ -5172,14 +5179,14 @@ markdown-escapes@^1.0.0: resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg== -markdown-it@10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc" - integrity sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg== +markdown-it@11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-11.0.0.tgz#dbfc30363e43d756ebc52c38586b91b90046b876" + integrity sha512-+CvOnmbSubmQFSA9dKz1BRiaSMV7rhexl3sngKqFyXSagoA3fBdJQ8oZWtRy2knXdpDXaBw44euz37DeJQ9asg== dependencies: argparse "^1.0.7" entities "~2.0.0" - linkify-it "^2.0.0" + linkify-it "^3.0.1" mdurl "^1.0.1" uc.micro "^1.0.5" @@ -5190,10 +5197,10 @@ markdown-table@^2.0.0: dependencies: repeat-string "^1.0.0" -markdownlint-cli@~0.23.2: - version "0.23.2" - resolved "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.23.2.tgz#43f0a96e2699542b74fb5e6188c025e4934357fc" - integrity sha512-OSl5OZ8xzGN6z355cqRkiq67zPi3reJimklaF72p0554q85Dng5ToOjjSB9tDKZebSt85jX8cp+ruoQlPqOsPA== +markdownlint-cli@~0.24.0: + version "0.24.0" + resolved "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.24.0.tgz#d1c1d43cd53b87aaec93035b3234eef7097139a8" + integrity sha512-AusUxaX4sFayUBFTCKeHc8+fq73KFqIUW+ZZZYyQ/BvY0MoGAnE2C/3xiawSE7WXmpmguaWzhrXRuY6IrOLX7A== dependencies: commander "~2.9.0" deep-extend "~0.5.1" @@ -5204,23 +5211,23 @@ markdownlint-cli@~0.23.2: jsonc-parser "~2.2.0" lodash.differencewith "~4.5.0" lodash.flatten "~4.4.0" - markdownlint "~0.20.4" - markdownlint-rule-helpers "~0.11.0" + markdownlint "~0.21.0" + markdownlint-rule-helpers "~0.12.0" minimatch "~3.0.4" minimist "~1.2.5" rc "~1.2.7" -markdownlint-rule-helpers@~0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.11.0.tgz#faaaae4337771c7d88ca38ef6265afb4fbe0fb3f" - integrity sha512-PhGii9dOiDJDXxiRMpK8N0FM9powprvRPsXALgkjlSPTwLh6ymH+iF3iUe3nq8KGu26tclFBlLL5xAGy/zb7FA== +markdownlint-rule-helpers@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.12.0.tgz#c41d9b990c50911572e8eb2fba3e6975a5514b7e" + integrity sha512-Q7qfAk+AJvx82ZY52OByC4yjoQYryOZt6D8TKrZJIwCfhZvcj8vCQNuwDqILushtDBTvGFmUPq+uhOb1KIMi6A== -markdownlint@~0.20.4: - version "0.20.4" - resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.20.4.tgz#3b34681494cdad174e14a27182b5cdefaa537823" - integrity sha512-jpfaPgjT0OpeBbemjYNZbzGG3hCLcAIvrm/pEY3+q/szDScG6ZonDacqySVRJAv9glbo8y4wBPJ0wgW17+9GGA== +markdownlint@~0.21.0: + version "0.21.0" + resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.21.0.tgz#411a6937315c7562042e478cd91f52194ff88da4" + integrity sha512-rTxr0fbCFmS65oxXBD0HNy3/+PSukLS+b7Z6rGDWbjdRJp/e2dKj538r3KTn8oXrusx+ZtuYOozV2Knpnn0pkQ== dependencies: - markdown-it "10.0.0" + markdown-it "11.0.0" mathml-tag-names@^2.1.3: version "2.1.3" @@ -5244,9 +5251,9 @@ mdast-util-compact@^2.0.0: unist-util-visit "^2.0.0" mdn-browser-compat-data@^1.0.28: - version "1.0.39" - resolved "https://registry.yarnpkg.com/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.39.tgz#d06353cb60f210f9c3a7506727e1943c77b96a2c" - integrity sha512-1U5Lt+pjYxJ1mosBIdK5fr3guzV4v81f8yy0rLAj/cu7ki3ciCe85LVJJ0RLK0lP6VwFtjpXSOESfwAEpz0FyQ== + version "1.0.40" + resolved "https://registry.yarnpkg.com/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.40.tgz#6e8f6e1dd2d8cf880ebea94cf66cfe000a16603b" + integrity sha512-yjM/OG0krZIgi+XrhJWS3CJ9UQuGM4FfjIUIt2f65er6qczkM+WjtNEv/9ZF9DxDs/2GR3SO6hDaZLplTRrrfw== dependencies: extend "3.0.2" @@ -5781,7 +5788,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.7.0, object-inspect@^1.8.0: +object-inspect@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA== @@ -5798,7 +5805,7 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0: +object.assign@^4.1.0, object.assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd" integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA== @@ -6343,6 +6350,16 @@ postcss-html@^0.36.0: dependencies: htmlparser2 "^3.10.0" +postcss-import@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153" + integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw== + dependencies: + postcss "^7.0.1" + postcss-value-parser "^3.2.3" + read-cache "^1.0.0" + resolve "^1.1.7" + postcss-less@^3.1.4: version "3.1.4" resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.4.tgz#369f58642b5928ef898ffbc1a6e93c958304c5ad" @@ -6421,11 +6438,26 @@ postcss-sorting@^5.0.1: lodash "^4.17.14" postcss "^7.0.17" +postcss-svgo@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258" + integrity sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw== + dependencies: + is-svg "^3.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + svgo "^1.0.0" + postcss-syntax@^0.36.2: version "0.36.2" resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c" integrity sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w== +postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3: + version "3.3.1" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" + integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== + postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" @@ -6441,7 +6473,7 @@ postcss@^6.x, postcss@^8.x: nanoid "^3.1.12" source-map "^0.6.1" -postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.31, postcss@^7.0.32, postcss@^7.0.4, postcss@^7.0.6: +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.31, postcss@^7.0.32, postcss@^7.0.4, postcss@^7.0.6: version "7.0.35" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24" integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg== @@ -6956,7 +6988,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.10.0, resolve@^1.3.2: +resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2: version "1.17.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== @@ -7831,7 +7863,7 @@ svg-tags@^1.0.0: resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q= -svgo@^1.3.2: +svgo@^1.0.0, svgo@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw== @@ -7925,10 +7957,10 @@ terser@^4.1.2: source-map "~0.6.1" source-map-support "~0.5.12" -terser@^5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.3.tgz#2592a1cf079df55101fe2b2cb2330f951863860b" - integrity sha512-vRQDIlD+2Pg8YMwVK9kMM3yGylG95EIwzBai1Bw7Ot4OBfn3VP1TZn3EWx4ep2jERN/AmnVaTiGuelZSN7ds/A== +terser@^5.3.4: + version "5.3.4" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.4.tgz#e510e05f86e0bd87f01835c3238839193f77a60c" + integrity sha512-dxuB8KQo8Gt6OVOeLg/rxfcxdNZI/V1G6ze1czFUzPeCFWZRtvZMgSzlZZ5OYBZ4HoG607F6pFPNLekJyV+yVw== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -8618,9 +8650,9 @@ write@1.0.3: integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== y18n@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.1.tgz#1ad2a7eddfa8bce7caa2e1f6b5da96c39d99d571" - integrity sha512-/jJ831jEs4vGDbYPQp4yGKDYPSCCEQ45uZWJHE1AoYBzqdZi8+LDWas0z4HrmJXmKdpFsTiowSHXdxyFhpmdMg== + version "5.0.2" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.2.tgz#48218df5da2731b4403115c39a1af709c873f829" + integrity sha512-CkwaeZw6dQgqgPGeTWKMXCRmMcBgETFlTml1+ZOO+q7kGst8NREJ+eWwFNPVUQ4QGdAaklbqCZHH6Zuep1RjiA== yallist@^2.1.2: version "2.1.2" @@ -8654,9 +8686,9 @@ yargs-parser@^18.1.3: decamelize "^1.2.0" yargs-parser@^20.0.0: - version "20.2.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.0.tgz#944791ca2be2e08ddadd3d87e9de4c6484338605" - integrity sha512-2agPoRFPoIcFzOIp6656gcvsg2ohtscpw2OINr/q46+Sq41xz2OYLqx5HRHabmFU1OARIPAYH5uteICE7mn/5A== + version "20.2.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.1.tgz#28f3773c546cdd8a69ddae68116b48a5da328e77" + integrity sha512-yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA== yargs@^12.0.2: version "12.0.5"