From db3b9f01efa2d8c7d465c9d0340d3c3c7a42a8b3 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Thu, 22 Sep 2022 08:18:47 -0400
Subject: [PATCH 01/22] Enhancement/issue 971 refactor bundling and
 optimizations (#974)

* add cloud IDE caveat to puppeteer renderer plugin readme (#967)

* init commit of refactoring for script tags with a src

* initial CSS optimizing

* sync optimized link tags in final output

* refactored for shared reources

* handle inline script bundling

* support serving custom resources using Greenwood plugins in Rollup configuration without needing extra rollup plugin

* non resource related Rollup plugins supported

* custom resource plugins and rollup plugins working together

* handle empty input for Rollup

* updated lock file

* handle inline style tag bundling and optimizing

* default optimization spec passing

* refactor merging app and page templates

* clarifying corrections in spec files

* inline optimization config working

* none optimization support

* none optimization support

* none and static optimization overrides

* refactor html rendering and optimizing

* refactoring and more CLI specs passing

* add missing variable

* SSR specs and optimizing resource bundling

* minor refactoring and logging

* resolving some plugin specs

* restore develop command related GraphQL specs

* custom graphql query spec

* all specs passing

* drop rollup plugin deps from import typescript plugin

* all Greenwood commands and specs passing

* restore static router with custom prerender

* restore postcss-import

* refactor shared resources to a Map and handle dupes

* restore local packages workaround for local Rollup bundling

* better monorepo Rollup facade modules detection

* switch console log

* remove console logging

* update plugin related docs

* local solution for windows support

* refactor errant object assign

* full cross platform URL support

* fix lint

* fix extra bundles when custom prerendering

* clean up stale or already tracked TODOs

* add nested head tag smoke tests

* check for app template validation for HUD display

* misc refactoring and TODOs cleanup

* restore static router (again)

* standardize passing correct reference for prerender scripts

* clean up data-gwd-opt markers from final HTML
---
 packages/cli/src/lifecycles/bundle.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/cli/src/lifecycles/bundle.js b/packages/cli/src/lifecycles/bundle.js
index ab71a0b96..dc9f6d946 100644
--- a/packages/cli/src/lifecycles/bundle.js
+++ b/packages/cli/src/lifecycles/bundle.js
@@ -65,11 +65,18 @@ async function bundleStyleResources(compilation, optimizationPlugins) {
       if (src) {
         const basename = path.basename(srcPath);
         const basenamePieces = path.basename(srcPath).split('.');
+<<<<<<< HEAD
         const fileNamePieces = srcPath.split('/').filter(piece => piece !== ''); // normalize by removing any leading /'s  
 
         optimizedFileName = srcPath.indexOf('/node_modules') >= 0
           ? `${basenamePieces[0]}.${hashString(contents)}.css`
           : fileNamePieces.join('/').replace(basename, `${basenamePieces[0]}.${hashString(contents)}.css`);
+=======
+
+        optimizedFileName = srcPath.indexOf('/node_modules') >= 0
+          ? `${basenamePieces[0]}.${hashString(contents)}.css`
+          : srcPath.replace(basename, `${basenamePieces[0]}.${hashString(contents)}.css`);
+>>>>>>> 700a3d9f (Enhancement/issue 971 refactor bundling and optimizations (#974))
       } else {
         optimizedFileName = `${hashString(contents)}.css`;
       }

From 4370ff588ebee2cce2f0e2463977b760c9a8ae41 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Sat, 1 Oct 2022 12:32:35 -0400
Subject: [PATCH 02/22] v0.27.0-alpha.0

---
 packages/cli/src/lifecycles/bundle.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/cli/src/lifecycles/bundle.js b/packages/cli/src/lifecycles/bundle.js
index dc9f6d946..ab71a0b96 100644
--- a/packages/cli/src/lifecycles/bundle.js
+++ b/packages/cli/src/lifecycles/bundle.js
@@ -65,18 +65,11 @@ async function bundleStyleResources(compilation, optimizationPlugins) {
       if (src) {
         const basename = path.basename(srcPath);
         const basenamePieces = path.basename(srcPath).split('.');
-<<<<<<< HEAD
         const fileNamePieces = srcPath.split('/').filter(piece => piece !== ''); // normalize by removing any leading /'s  
 
         optimizedFileName = srcPath.indexOf('/node_modules') >= 0
           ? `${basenamePieces[0]}.${hashString(contents)}.css`
           : fileNamePieces.join('/').replace(basename, `${basenamePieces[0]}.${hashString(contents)}.css`);
-=======
-
-        optimizedFileName = srcPath.indexOf('/node_modules') >= 0
-          ? `${basenamePieces[0]}.${hashString(contents)}.css`
-          : srcPath.replace(basename, `${basenamePieces[0]}.${hashString(contents)}.css`);
->>>>>>> 700a3d9f (Enhancement/issue 971 refactor bundling and optimizations (#974))
       } else {
         optimizedFileName = `${hashString(contents)}.css`;
       }

From 03713bd9b1041b0a182b99f7879ef6b46a99e44a Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Sat, 1 Oct 2022 10:12:24 -0400
Subject: [PATCH 03/22] (WIP) swap PostCSS in CLI with custom AST solution

---
 packages/cli/package.json                     |   4 +-
 packages/cli/src/lifecycles/bundle.js         |   9 +-
 .../plugins/resource/plugin-standard-css.js   |  26 +-
 packages/plugin-postcss/README.md             |   1 -
 packages/plugin-postcss/package.json          |   6 +-
 packages/plugin-postcss/src/index.js          |  20 -
 yarn.lock                                     | 510 +-----------------
 7 files changed, 52 insertions(+), 524 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index e0b78ca52..10e74844c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -29,7 +29,7 @@
     "acorn": "^8.0.1",
     "acorn-walk": "^8.0.0",
     "commander": "^2.20.0",
-    "cssnano": "^5.0.11",
+    "css-tree": "^2.2.1",
     "es-module-shims": "^1.2.0",
     "front-matter": "^4.0.2",
     "koa": "^2.13.0",
@@ -37,8 +37,6 @@
     "markdown-toc": "^1.2.0",
     "node-fetch": "^2.6.1",
     "node-html-parser": "^1.2.21",
-    "postcss": "^8.3.11",
-    "postcss-import": "^13.0.0",
     "rehype-raw": "^5.0.0",
     "rehype-stringify": "^8.0.0",
     "remark-frontmatter": "^2.0.0",
diff --git a/packages/cli/src/lifecycles/bundle.js b/packages/cli/src/lifecycles/bundle.js
index ab71a0b96..39d4de559 100644
--- a/packages/cli/src/lifecycles/bundle.js
+++ b/packages/cli/src/lifecycles/bundle.js
@@ -88,6 +88,12 @@ async function bundleStyleResources(compilation, optimizationPlugins) {
         const url = resource.sourcePathURL.pathname;
         let optimizedStyles = await fs.promises.readFile(url, 'utf-8');
 
+        for (const plugin of optimizationPlugins) {
+          optimizedStyles = await plugin.shouldIntercept(url, optimizedStyles)
+            ? (await plugin.intercept(url, optimizedStyles)).body
+            : optimizedStyles;
+        }
+
         for (const plugin of optimizationPlugins) {
           optimizedStyles = await plugin.shouldOptimize(url, optimizedStyles)
             ? await plugin.optimize(url, optimizedStyles)
@@ -127,7 +133,8 @@ const bundleCompilation = async (compilation) => {
       }).map((plugin) => {
         return plugin.provider(compilation);
       }).filter((provider) => {
-        return provider.shouldOptimize && provider.optimize;
+        return provider.shouldIntercept && provider.intercept
+          || provider.shouldOptimize && provider.optimize;
       });
       // centrally register all static resources
       compilation.graph.map((page) => {
diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index a6f53c9f9..a5dc21f72 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -5,10 +5,8 @@
  *
  */
 import fs from 'fs';
+import { parse, walk } from 'css-tree';
 import path from 'path';
-import cssnano from 'cssnano';
-import postcss from 'postcss';
-import postcssImport from 'postcss-import';
 import { ResourceInterface } from '../../lib/resource-interface.js';
 
 class StandardCssResource extends ResourceInterface {
@@ -41,15 +39,21 @@ class StandardCssResource extends ResourceInterface {
 
   async optimize(url, body) {
     return new Promise(async (resolve, reject) => {
-      try {  
-        const { outputDir, userWorkspace } = this.compilation.context;
-        const workspaceUrl = url.replace(outputDir, userWorkspace);
-        const contents = body || await fs.promises.readFile(url, 'utf-8');
-        const css = (await postcss([cssnano])
-          .use(postcssImport())
-          .process(contents, { from: workspaceUrl })).css;
+      try {
+        const ast = parse(body, { positions: true });
+        let optimizedCss = '';
+
+        walk(ast, function(node, item, list) { // eslint-disable-line
+          const { type, loc } = node;
+
+          if (type === 'Atrule') {
+            optimizedCss += `${body.slice(loc.start.offset, loc.end.offset)} \n`;
+          } else if (type === 'Rule' && !this.atrule) {
+            optimizedCss += `${body.slice(loc.start.offset, loc.end.offset)} \n`;
+          }
+        });
 
-        resolve(css);
+        resolve(optimizedCss);
       } catch (e) {
         reject(e);
       }
diff --git a/packages/plugin-postcss/README.md b/packages/plugin-postcss/README.md
index 15bad3c95..1a2e2a8a3 100644
--- a/packages/plugin-postcss/README.md
+++ b/packages/plugin-postcss/README.md
@@ -79,7 +79,6 @@ By default, the configuration provided by this plugin is:
 ```javascript
 export default {
   plugins: [
-    (await import('cssnano')).default, // just for production builds
     (await import('postcss-preset-env')).default
   ]
 };
diff --git a/packages/plugin-postcss/package.json b/packages/plugin-postcss/package.json
index 222496bd2..6db672c8c 100644
--- a/packages/plugin-postcss/package.json
+++ b/packages/plugin-postcss/package.json
@@ -7,7 +7,6 @@
   "license": "MIT",
   "keywords": [
     "Greenwood",
-    "CommonJS",
     "Static Site Generator",
     "NodeJS",
     "PostCSS"
@@ -21,11 +20,10 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@greenwood/cli": "^0.4.0",
-    "postcss": "^8.3.11"
+    "@greenwood/cli": "^0.4.0"
   },
   "dependencies": {
-    "cssnano": "^5.0.11",
+    "postcss": "^8.3.11",
     "postcss-preset-env": "^7.0.1"
   },
   "devDependencies": {
diff --git a/packages/plugin-postcss/src/index.js b/packages/plugin-postcss/src/index.js
index 080a2dbc3..41bffa49e 100644
--- a/packages/plugin-postcss/src/index.js
+++ b/packages/plugin-postcss/src/index.js
@@ -63,26 +63,6 @@ class PostCssResource extends ResourceInterface {
       }
     });
   }
-
-  async shouldOptimize(url) {
-    return Promise.resolve(this.isCssFile(url));
-  }
-  
-  async optimize(url, body) {
-    const contents = body || await fs.promises.readFile(url, 'utf-8');
-    const config = await getConfig(this.compilation, this.options.extendConfig);
-    const plugins = config.plugins && config.plugins.length ? [...config.plugins] : [];
-    
-    plugins.push(
-      (await import('cssnano')).default
-    );
-
-    const css = plugins.length > 0
-      ? (await postcss(plugins).process(contents, { from: url })).css
-      : body;
-    
-    return Promise.resolve(css);
-  }
 }
 
 const greenwoodPluginPostCss = (options = {}) => {
diff --git a/yarn.lock b/yarn.lock
index 5ffb3fa79..98bdeb895 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2486,11 +2486,6 @@
     remark "^13.0.0"
     unist-util-find-all-after "^3.0.2"
 
-"@trysound/sax@0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
-  integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
-
 "@types/accepts@*", "@types/accepts@^1.3.5":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575"
@@ -3008,11 +3003,6 @@ ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-alphanum-sort@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
-  integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
-
 ansi-colors@4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
@@ -3597,11 +3587,6 @@ body-parser@1.19.0, body-parser@^1.18.3:
     raw-body "2.4.0"
     type-is "~1.6.17"
 
-boolbase@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -3643,16 +3628,6 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
 
-browserslist@^4.0.0:
-  version "4.14.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.2.tgz#1b3cec458a1ba87588cc5e9be62f19b6d48813ce"
-  integrity sha512-HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==
-  dependencies:
-    caniuse-lite "^1.0.30001125"
-    electron-to-chromium "^1.3.564"
-    escalade "^3.0.2"
-    node-releases "^1.1.61"
-
 browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.3:
   version "4.16.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717"
@@ -3664,7 +3639,7 @@ browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.3:
     escalade "^3.1.1"
     node-releases "^1.1.70"
 
-browserslist@^4.16.0, browserslist@^4.16.6, browserslist@^4.17.5:
+browserslist@^4.17.5:
   version "4.18.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f"
   integrity sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==
@@ -3875,21 +3850,6 @@ camelcase@^6.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e"
   integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==
 
-caniuse-api@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
-  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
-  dependencies:
-    browserslist "^4.0.0"
-    caniuse-lite "^1.0.0"
-    lodash.memoize "^4.1.2"
-    lodash.uniq "^4.5.0"
-
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001125:
-  version "1.0.30001131"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001131.tgz#afad8a28fc2b7a0d3ae9407e71085a0ead905d54"
-  integrity sha512-4QYi6Mal4MMfQMSqGIRPGbKIbZygeN83QsWq1ixpUwvtfgAZot5BrCKzGygvZaV+CnELdTwD0S4cqUNozq7/Cw==
-
 caniuse-lite@^1.0.30001109:
   version "1.0.30001196"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001196.tgz#00518a2044b1abf3e0df31fadbe5ed90b63f4e64"
@@ -4166,11 +4126,6 @@ color-name@^1.1.4, color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-colord@^2.9.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.1.tgz#c961ea0efeb57c9f0f4834458f26cb9cc4a3f90e"
-  integrity sha512-4LBMSt09vR0uLnPVkOUBnmxgoaeN4ewRbx801wY/bXcltXfpR/G46OdWn96XpYmCWuYvO46aBZP4NgX8HpNAcw==
-
 colorette@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
@@ -4201,11 +4156,6 @@ commander@^2.20.0, commander@^2.20.3:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
-  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
-
 commander@^8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.2.0.tgz#37fe2bde301d87d47a53adeff8b5915db1381ca8"
@@ -4502,13 +4452,6 @@ css-blank-pseudo@^2.0.0:
   resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-2.0.0.tgz#10667f9c5f91e4fbde76c4efac55e8eaa6ed9967"
   integrity sha512-n7fxEOyuvAVPLPb9kL4XTIK/gnp2fKQ7KFQ+9lj60W9pDn/jTr5LjS/kHHm+rES/YJ3m0S6+uJgYSuAJg9zOyA==
 
-css-declaration-sorter@^6.0.3:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2"
-  integrity sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA==
-  dependencies:
-    timsort "^0.3.0"
-
 css-has-pseudo@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-2.0.0.tgz#43ae03a990cf3d9e7356837c6b500e04037606b5"
@@ -4521,29 +4464,13 @@ css-prefers-color-scheme@^5.0.0:
   resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-5.0.0.tgz#a89bc1abfe946e77a1a1e12dbc25a1439705933f"
   integrity sha512-XpzVrdwbppHm+Nnrzcb/hQb8eq1aKv4U8Oh59LsLfTsbIZZ6Fvn9razb66ihH2aTJ0VhO9n9sVm8piyKXJAZMA==
 
-css-select@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067"
-  integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^5.0.0"
-    domhandler "^4.2.0"
-    domutils "^2.6.0"
-    nth-check "^2.0.0"
-
-css-tree@^1.1.2, css-tree@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
-  integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
+css-tree@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032"
+  integrity sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==
   dependencies:
-    mdn-data "2.0.14"
-    source-map "^0.6.1"
-
-css-what@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe"
-  integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==
+    mdn-data "2.0.28"
+    source-map-js "^1.0.1"
 
 cssdb@^5.0.0:
   version "5.0.0"
@@ -4560,63 +4487,6 @@ cssfilter@0.0.10:
   resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae"
   integrity sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4=
 
-cssnano-preset-default@^5.1.7:
-  version "5.1.7"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.7.tgz#68c3ad1ec6a810482ec7d06b2d70fc34b6b0d70c"
-  integrity sha512-bWDjtTY+BOqrqBtsSQIbN0RLGD2Yr2CnecpP0ydHNafh9ZUEre8c8VYTaH9FEbyOt0eIfEUAYYk5zj92ioO8LA==
-  dependencies:
-    css-declaration-sorter "^6.0.3"
-    cssnano-utils "^2.0.1"
-    postcss-calc "^8.0.0"
-    postcss-colormin "^5.2.1"
-    postcss-convert-values "^5.0.2"
-    postcss-discard-comments "^5.0.1"
-    postcss-discard-duplicates "^5.0.1"
-    postcss-discard-empty "^5.0.1"
-    postcss-discard-overridden "^5.0.1"
-    postcss-merge-longhand "^5.0.4"
-    postcss-merge-rules "^5.0.3"
-    postcss-minify-font-values "^5.0.1"
-    postcss-minify-gradients "^5.0.3"
-    postcss-minify-params "^5.0.2"
-    postcss-minify-selectors "^5.1.0"
-    postcss-normalize-charset "^5.0.1"
-    postcss-normalize-display-values "^5.0.1"
-    postcss-normalize-positions "^5.0.1"
-    postcss-normalize-repeat-style "^5.0.1"
-    postcss-normalize-string "^5.0.1"
-    postcss-normalize-timing-functions "^5.0.1"
-    postcss-normalize-unicode "^5.0.1"
-    postcss-normalize-url "^5.0.3"
-    postcss-normalize-whitespace "^5.0.1"
-    postcss-ordered-values "^5.0.2"
-    postcss-reduce-initial "^5.0.1"
-    postcss-reduce-transforms "^5.0.1"
-    postcss-svgo "^5.0.3"
-    postcss-unique-selectors "^5.0.2"
-
-cssnano-utils@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz#8660aa2b37ed869d2e2f22918196a9a8b6498ce2"
-  integrity sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==
-
-cssnano@^5.0.11:
-  version "5.0.11"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.11.tgz#743397a05e04cb87e9df44b7659850adfafc3646"
-  integrity sha512-5SHM31NAAe29jvy0MJqK40zZ/8dGlnlzcfHKw00bWMVFp8LWqtuyPSFwbaoIoxvt71KWJOfg8HMRGrBR3PExCg==
-  dependencies:
-    cssnano-preset-default "^5.1.7"
-    is-resolvable "^1.1.0"
-    lilconfig "^2.0.3"
-    yaml "^1.10.2"
-
-csso@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
-  integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
-  dependencies:
-    css-tree "^1.1.2"
-
 cssom@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
@@ -4930,15 +4800,6 @@ dom-serializer@0:
     domelementtype "^2.0.1"
     entities "^2.0.0"
 
-dom-serializer@^1.0.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
-  integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.2.0"
-    entities "^2.0.0"
-
 domelementtype@1, domelementtype@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
@@ -4949,11 +4810,6 @@ domelementtype@^2.0.1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971"
   integrity sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==
 
-domelementtype@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
-  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
-
 domexception@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
@@ -4968,13 +4824,6 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-domhandler@^4.2.0:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f"
-  integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==
-  dependencies:
-    domelementtype "^2.2.0"
-
 domutils@^1.5.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
@@ -4983,15 +4832,6 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^2.6.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
-  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
-  dependencies:
-    dom-serializer "^1.0.1"
-    domelementtype "^2.2.0"
-    domhandler "^4.2.0"
-
 dot-prop@^4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"
@@ -5034,11 +4874,6 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.564:
-  version "1.3.570"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.570.tgz#3f5141cc39b4e3892a276b4889980dabf1d29c7f"
-  integrity sha512-Y6OCoVQgFQBP5py6A/06+yWxUZHDlNr/gNDGatjH8AZqXl8X0tE4LfjLJsXGz/JmWJz8a6K7bR1k+QzZ+k//fg==
-
 electron-to-chromium@^1.3.649:
   version "1.3.674"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.674.tgz#d97feefdf1d9411fdc9d56d17e1b9d67b818e710"
@@ -5200,11 +5035,6 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
-escalade@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz#e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e"
-  integrity sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==
-
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -6818,11 +6648,6 @@ ipaddr.js@1.9.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
-is-absolute-url@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698"
-  integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==
-
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -7138,11 +6963,6 @@ is-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d"
   integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==
 
-is-resolvable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
-  integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
-
 is-ssh@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.2.tgz#a4b82ab63d73976fd8263cceee27f99a88bdae2b"
@@ -7522,11 +7342,6 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-lilconfig@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082"
-  integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==
-
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -7687,11 +7502,6 @@ lodash.ismatch@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
   integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
 
-lodash.memoize@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
-
 lodash.set@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
@@ -7964,10 +7774,10 @@ mdast-util-to-string@^2.0.0:
   resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b"
   integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==
 
-mdn-data@2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
-  integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
+mdn-data@2.0.28:
+  version "2.0.28"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba"
+  integrity sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==
 
 mdurl@^1.0.0:
   version "1.0.1"
@@ -8406,11 +8216,6 @@ node-html-parser@^1.2.21:
   dependencies:
     he "1.2.0"
 
-node-releases@^1.1.61:
-  version "1.1.61"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e"
-  integrity sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==
-
 node-releases@^1.1.70:
   version "1.1.71"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
@@ -8469,11 +8274,6 @@ normalize-url@^3.3.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-normalize-url@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
-  integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
-
 npm-bundled@^1.0.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
@@ -8545,13 +8345,6 @@ npmlog@^4.1.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-nth-check@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
-  integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
-  dependencies:
-    boolbase "^1.0.0"
-
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
@@ -9103,14 +8896,6 @@ postcss-attribute-case-insensitive@^5.0.0:
   dependencies:
     postcss-selector-parser "^6.0.2"
 
-postcss-calc@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a"
-  integrity sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g==
-  dependencies:
-    postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.0.2"
-
 postcss-color-functional-notation@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.0.1.tgz#2fd769959e7fe658b4c0e7d40b0ab245fc8664f1"
@@ -9132,23 +8917,6 @@ postcss-color-rebeccapurple@^7.0.0:
   dependencies:
     postcss-values-parser "^6"
 
-postcss-colormin@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.1.tgz#6e444a806fd3c578827dbad022762df19334414d"
-  integrity sha512-VVwMrEYLcHYePUYV99Ymuoi7WhKrMGy/V9/kTS0DkCoJYmmjdOMneyhzYUxcNgteKDVbrewOkSM7Wje/MFwxzA==
-  dependencies:
-    browserslist "^4.16.6"
-    caniuse-api "^3.0.0"
-    colord "^2.9.1"
-    postcss-value-parser "^4.1.0"
-
-postcss-convert-values@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.2.tgz#879b849dc3677c7d6bc94b6a2c1a3f0808798059"
-  integrity sha512-KQ04E2yadmfa1LqXm7UIDwW1ftxU/QWZmz6NKnHnUvJ3LEYbbcX6i329f/ig+WnEByHegulocXrECaZGLpL8Zg==
-  dependencies:
-    postcss-value-parser "^4.1.0"
-
 postcss-custom-media@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz#1be6aff8be7dc9bf1fe014bde3b71b92bb4552f1"
@@ -9175,26 +8943,6 @@ postcss-dir-pseudo-class@^6.0.0:
   dependencies:
     postcss-selector-parser "6.0.6"
 
-postcss-discard-comments@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe"
-  integrity sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==
-
-postcss-discard-duplicates@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d"
-  integrity sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==
-
-postcss-discard-empty@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8"
-  integrity sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==
-
-postcss-discard-overridden@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6"
-  integrity sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q==
-
 postcss-double-position-gradients@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.0.1.tgz#3c21ad52b6f13d81caf2563b0010a2c5872272af"
@@ -9243,15 +8991,6 @@ postcss-image-set-function@^4.0.2:
   dependencies:
     postcss-values-parser "6.0.1"
 
-postcss-import@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-13.0.0.tgz#d6960cd9e3de5464743b04dd8cd9d870662f8b8c"
-  integrity sha512-LPUbm3ytpYopwQQjqgUH4S3EM/Gb9QsaSPP/5vnoi+oKVy3/mIk2sc0Paqw7RL57GpScm9MdIMUypw2znWiBpg==
-  dependencies:
-    postcss-value-parser "^4.0.0"
-    read-cache "^1.0.0"
-    resolve "^1.1.7"
-
 postcss-initial@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-4.0.1.tgz#529f735f72c5724a0fb30527df6fb7ac54d7de42"
@@ -9287,58 +9026,6 @@ postcss-media-query-parser@^0.2.3:
   resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
   integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=
 
-postcss-merge-longhand@^5.0.4:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.4.tgz#41f4f3270282ea1a145ece078b7679f0cef21c32"
-  integrity sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw==
-  dependencies:
-    postcss-value-parser "^4.1.0"
-    stylehacks "^5.0.1"
-
-postcss-merge-rules@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db"
-  integrity sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg==
-  dependencies:
-    browserslist "^4.16.6"
-    caniuse-api "^3.0.0"
-    cssnano-utils "^2.0.1"
-    postcss-selector-parser "^6.0.5"
-
-postcss-minify-font-values@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf"
-  integrity sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA==
-  dependencies:
-    postcss-value-parser "^4.1.0"
-
-postcss-minify-gradients@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.3.tgz#f970a11cc71e08e9095e78ec3a6b34b91c19550e"
-  integrity sha512-Z91Ol22nB6XJW+5oe31+YxRsYooxOdFKcbOqY/V8Fxse1Y3vqlNRpi1cxCqoACZTQEhl+xvt4hsbWiV5R+XI9Q==
-  dependencies:
-    colord "^2.9.1"
-    cssnano-utils "^2.0.1"
-    postcss-value-parser "^4.1.0"
-
-postcss-minify-params@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.2.tgz#1b644da903473fbbb18fbe07b8e239883684b85c"
-  integrity sha512-qJAPuBzxO1yhLad7h2Dzk/F7n1vPyfHfCCh5grjGfjhi1ttCnq4ZXGIW77GSrEbh9Hus9Lc/e/+tB4vh3/GpDg==
-  dependencies:
-    alphanum-sort "^1.0.2"
-    browserslist "^4.16.6"
-    cssnano-utils "^2.0.1"
-    postcss-value-parser "^4.1.0"
-
-postcss-minify-selectors@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54"
-  integrity sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og==
-  dependencies:
-    alphanum-sort "^1.0.2"
-    postcss-selector-parser "^6.0.5"
-
 postcss-nested@^4.1.2:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.2.3.tgz#c6f255b0a720549776d220d00c4b70cd244136f6"
@@ -9354,81 +9041,6 @@ postcss-nesting@^10.0.2:
   dependencies:
     postcss-selector-parser "6.0.6"
 
-postcss-normalize-charset@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0"
-  integrity sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==
-
-postcss-normalize-display-values@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd"
-  integrity sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ==
-  dependencies:
-    cssnano-utils "^2.0.1"
-    postcss-value-parser "^4.1.0"
-
-postcss-normalize-positions@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz#868f6af1795fdfa86fbbe960dceb47e5f9492fe5"
-  integrity sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg==
-  dependencies:
-    postcss-value-parser "^4.1.0"
-
-postcss-normalize-repeat-style@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5"
-  integrity sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w==
-  dependencies:
-    cssnano-utils "^2.0.1"
-    postcss-value-parser "^4.1.0"
-
-postcss-normalize-string@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0"
-  integrity sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA==
-  dependencies:
-    postcss-value-parser "^4.1.0"
-
-postcss-normalize-timing-functions@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c"
-  integrity sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q==
-  dependencies:
-    cssnano-utils "^2.0.1"
-    postcss-value-parser "^4.1.0"
-
-postcss-normalize-unicode@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37"
-  integrity sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA==
-  dependencies:
-    browserslist "^4.16.0"
-    postcss-value-parser "^4.1.0"
-
-postcss-normalize-url@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.3.tgz#42eca6ede57fe69075fab0f88ac8e48916ef931c"
-  integrity sha512-qWiUMbvkRx3kc1Dp5opzUwc7MBWZcSDK2yofCmdvFBCpx+zFPkxBC1FASQ59Pt+flYfj/nTZSkmF56+XG5elSg==
-  dependencies:
-    is-absolute-url "^3.0.3"
-    normalize-url "^6.0.1"
-    postcss-value-parser "^4.1.0"
-
-postcss-normalize-whitespace@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a"
-  integrity sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA==
-  dependencies:
-    postcss-value-parser "^4.1.0"
-
-postcss-ordered-values@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044"
-  integrity sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ==
-  dependencies:
-    cssnano-utils "^2.0.1"
-    postcss-value-parser "^4.1.0"
-
 postcss-overflow-shorthand@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.0.tgz#f57631672333b302ffdcfc0735b8b7d0244c2a25"
@@ -9493,22 +9105,6 @@ postcss-pseudo-class-any-link@^7.0.0:
   dependencies:
     postcss-selector-parser "^6"
 
-postcss-reduce-initial@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz#9d6369865b0f6f6f6b165a0ef5dc1a4856c7e946"
-  integrity sha512-zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw==
-  dependencies:
-    browserslist "^4.16.0"
-    caniuse-api "^3.0.0"
-
-postcss-reduce-transforms@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640"
-  integrity sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA==
-  dependencies:
-    cssnano-utils "^2.0.1"
-    postcss-value-parser "^4.1.0"
-
 postcss-replace-overflow-wrap@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319"
@@ -9548,7 +9144,7 @@ postcss-selector-not@^5.0.0:
   dependencies:
     balanced-match "^1.0.0"
 
-postcss-selector-parser@6.0.6, postcss-selector-parser@^6, postcss-selector-parser@^6.0.5:
+postcss-selector-parser@6.0.6, postcss-selector-parser@^6:
   version "6.0.6"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
   integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
@@ -9575,28 +9171,12 @@ postcss-selector-parser@^6.0.4:
     uniq "^1.0.1"
     util-deprecate "^1.0.2"
 
-postcss-svgo@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30"
-  integrity sha512-41XZUA1wNDAZrQ3XgWREL/M2zSw8LJPvb5ZWivljBsUQAGoEKMYm6okHsTjJxKYI4M75RQEH4KYlEM52VwdXVA==
-  dependencies:
-    postcss-value-parser "^4.1.0"
-    svgo "^2.7.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-unique-selectors@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.2.tgz#5d6893daf534ae52626708e0d62250890108c0c1"
-  integrity sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA==
-  dependencies:
-    alphanum-sort "^1.0.2"
-    postcss-selector-parser "^6.0.5"
-
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
+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"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
@@ -9857,13 +9437,6 @@ react-is@^16.7.0, react-is@^16.8.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-read-cache@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
-  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
-  dependencies:
-    pify "^2.3.0"
-
 read-cmd-shim@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16"
@@ -10325,14 +9898,6 @@ 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.1.7, resolve@^1.17.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
-  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
-  dependencies:
-    is-core-module "^2.1.0"
-    path-parse "^1.0.6"
-
 resolve@^1.10.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
@@ -10357,6 +9922,14 @@ resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.3.2:
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
+resolve@^1.17.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+  dependencies:
+    is-core-module "^2.1.0"
+    path-parse "^1.0.6"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -10764,6 +10337,11 @@ source-map-js@^0.6.2:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"
   integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==
 
+source-map-js@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -10892,11 +10470,6 @@ ssri@^6.0.0, ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-stable@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
-  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
-
 state-toggle@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe"
@@ -11130,14 +10703,6 @@ style-to-object@^0.3.0:
   dependencies:
     inline-style-parser "0.1.1"
 
-stylehacks@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb"
-  integrity sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==
-  dependencies:
-    browserslist "^4.16.0"
-    postcss-selector-parser "^6.0.4"
-
 stylelint-a11y@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/stylelint-a11y/-/stylelint-a11y-1.2.3.tgz#e8db461fd493cdb9106da0c8040e0576ef96b8fd"
@@ -11265,19 +10830,6 @@ svg-tags@^1.0.0:
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
   integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=
 
-svgo@^2.7.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24"
-  integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==
-  dependencies:
-    "@trysound/sax" "0.2.0"
-    commander "^7.2.0"
-    css-select "^4.1.3"
-    css-tree "^1.1.3"
-    csso "^4.2.0"
-    picocolors "^1.0.0"
-    stable "^0.1.8"
-
 symbol-observable@^1.0.4, symbol-observable@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
@@ -11427,11 +10979,6 @@ through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8:
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
-timsort@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
-  integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
-
 tiny-emitter@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
@@ -12314,11 +11861,6 @@ yaml@^1.10.0:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
   integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
 
-yaml@^1.10.2:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
-
 yargs-parser@20.2.4, yargs-parser@^20.2.3:
   version "20.2.4"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"

From 25492bb113a17fbafba497dda76884561aee2aa8 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Sat, 1 Oct 2022 10:12:45 -0400
Subject: [PATCH 04/22] refactor website CSS

---
 www/styles/home.css    | 4 ----
 www/templates/app.html | 6 ++----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/www/styles/home.css b/www/styles/home.css
index bb526d0f7..4a0e280a9 100644
--- a/www/styles/home.css
+++ b/www/styles/home.css
@@ -18,10 +18,6 @@ h3 {
   }
 }
 
-/* .cards {
-  margin: 0 -15%;
-} */
-
 .message {
   padding: 2rem;
   text-align: center;
diff --git a/www/templates/app.html b/www/templates/app.html
index 273261c9f..54d30f740 100644
--- a/www/templates/app.html
+++ b/www/templates/app.html
@@ -17,14 +17,12 @@
 
     <link rel="shortcut icon" href="/favicon.ico"/>
     <link rel="icon" href="/favicon.ico"/>
-
-    <link rel="stylesheet" href="../assets/fonts/source-sans-pro.css"></link>
     <link rel="stylesheet" href="../styles/theme.css"></link>
 
     <style>
       .gwd-content-outlet {
-        min-height: 100vh
-      };
+        min-height: 100vh;
+      }
     </style>
 
     <script type="module">

From 2b13887555883f0f2c39226bf1dede7d8eaa04d0 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Thu, 6 Oct 2022 09:26:48 -0400
Subject: [PATCH 05/22] basic implementation of minified CSS from AST

---
 .../plugins/resource/plugin-standard-css.js   | 55 +++++++++++++++++--
 .../build.config-optimization-default.spec.js | 16 +++++-
 .../src/pages/index.html                      |  2 +-
 .../src/styles/main.css                       |  4 ++
 .../src/styles/{theme.css => page.css}        |  8 +++
 .../build.config-optimization-inline.spec.js  |  4 +-
 ...lt.workspace-template-page-and-app.spec.js |  2 +-
 .../test/cases/default/default.spec.js        |  2 +-
 .../options.extend-config.spec.js             |  2 +-
 9 files changed, 82 insertions(+), 13 deletions(-)
 create mode 100644 packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
 rename packages/cli/test/cases/build.config.optimization-default/src/styles/{theme.css => page.css} (53%)

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index a5dc21f72..85544b30c 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -43,16 +43,61 @@ class StandardCssResource extends ResourceInterface {
         const ast = parse(body, { positions: true });
         let optimizedCss = '';
 
-        walk(ast, function(node, item, list) { // eslint-disable-line
-          const { type, loc } = node;
+        walk(ast, function(node, item) {
+          const { type } = node;
 
           if (type === 'Atrule') {
-            optimizedCss += `${body.slice(loc.start.offset, loc.end.offset)} \n`;
-          } else if (type === 'Rule' && !this.atrule) {
-            optimizedCss += `${body.slice(loc.start.offset, loc.end.offset)} \n`;
+            // TODO
+          } else if (type === 'Rule') {
+            if (item.prev) {
+              optimizedCss += '}';
+            }
+          } if (type === 'TypeSelector') {
+            optimizedCss += `${node.name}`;
+          } else if (type === 'Declaration') {
+            if (!item.prev) {
+              optimizedCss += '{';
+            }
+            
+            optimizedCss += `${node.property}:`;
+          } else if (type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || type === 'String' || type === 'Operator') {
+            if (item.prev && type !== 'Operator' && item.prev.data.type !== 'Operator') {
+              optimizedCss += ' ';
+            }
+
+            switch (type) {
+
+              case 'Dimension':
+                optimizedCss += `${node.value}${node.unit}`;
+                break;
+              case 'Hash':
+                optimizedCss += `#${node.value}`;
+                break;
+              case 'Identifier':
+                optimizedCss += `${node.name}`;
+                break;
+              case 'Number':
+                optimizedCss += `${node.value}`;
+                break;
+              case 'Operator':
+                optimizedCss += `${node.value}`;
+                break;
+              case 'String':
+                optimizedCss += `'${node.value}'`;
+                break;
+              default:
+                break;
+            
+            }
+
+            if (!item.next) {
+              optimizedCss += ';';
+            }
           }
         });
 
+        optimizedCss += '}';
+
         resolve(optimizedCss);
       } catch (e) {
         reject(e);
diff --git a/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js b/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
index fb9a381e4..225b7cd94 100644
--- a/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
+++ b/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
@@ -20,6 +20,7 @@
  *     theme.css
  */
 import chai from 'chai';
+import fs from 'fs';
 import glob from 'glob-promise';
 import { JSDOM } from 'jsdom';
 import path from 'path';
@@ -79,7 +80,7 @@ describe('Build Greenwood With: ', function() {
 
       describe('<link> tag and preloading', function() {
         it('should contain one style.css in the output directory', async function() {
-          expect(await glob.promise(`${path.join(this.context.publicDir, 'styles')}/theme.*.css`)).to.have.lengthOf(1);
+          expect(await glob.promise(`${path.join(this.context.publicDir, 'styles')}/main.*.css`)).to.have.lengthOf(1);
         });
 
         it('should have the expected <link> tag in the <head>', function() {
@@ -96,9 +97,20 @@ describe('Build Greenwood With: ', function() {
             .filter(link => link.getAttribute('as') === 'style');
 
           expect(preloadLinkTags.length).to.be.equal(1);
-          expect(preloadLinkTags[0].href).to.match(/\/styles\/theme.*.css/);
+          expect(preloadLinkTags[0].href).to.match(/\/styles\/main.*.css/);
           expect(preloadLinkTags[0].getAttribute('crossorigin')).to.equal('anonymous');
         });
+
+        // test custom CSS bundling
+        it('should have the expect preload CSS content in the file', async function() {
+          const cssFiles = await glob.promise(path.join(this.context.publicDir, 'styles/*.css'));
+          const customCss = await fs.promises.readFile(cssFiles[0], 'utf-8'); // .to.have.lengthOf(1);
+          
+          expect(cssFiles.length).to.be.equal(1);
+          expect(customCss).to.be.equal(
+            '*{margin:0;padding:0;font-family:\'Comic Sans\',sans-serif;}body{color:red;}h1{border:0.5px solid #dddde1;}'
+          );
+        });
       });
     });
   });
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/pages/index.html b/packages/cli/test/cases/build.config.optimization-default/src/pages/index.html
index 57ef25887..8944d68ba 100644
--- a/packages/cli/test/cases/build.config.optimization-default/src/pages/index.html
+++ b/packages/cli/test/cases/build.config.optimization-default/src/pages/index.html
@@ -3,7 +3,7 @@
 
   <head>
     <script type="module" src="/components/header.js"></script>
-    <link rel="stylesheet" href="/styles/theme.css"></link>  
+    <link rel="stylesheet" href="/styles/main.css"></link>  
   </head>
 
   <body>
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
new file mode 100644
index 000000000..f5f0f99f6
--- /dev/null
+++ b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
@@ -0,0 +1,4 @@
+/* TODO */
+:root, :host {
+
+}
\ No newline at end of file
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/styles/theme.css b/packages/cli/test/cases/build.config.optimization-default/src/styles/page.css
similarity index 53%
rename from packages/cli/test/cases/build.config.optimization-default/src/styles/theme.css
rename to packages/cli/test/cases/build.config.optimization-default/src/styles/page.css
index 2f3a9deff..3e7399663 100644
--- a/packages/cli/test/cases/build.config.optimization-default/src/styles/theme.css
+++ b/packages/cli/test/cases/build.config.optimization-default/src/styles/page.css
@@ -2,4 +2,12 @@
   margin: 0;
   padding: 0;
   font-family: 'Comic Sans', sans-serif;
+}
+
+body {
+  color: red;
+}
+
+h1 {
+  border: 0.5px solid #dddde1;
 }
\ No newline at end of file
diff --git a/packages/cli/test/cases/build.config.optimization-inline/build.config-optimization-inline.spec.js b/packages/cli/test/cases/build.config.optimization-inline/build.config-optimization-inline.spec.js
index a882c1418..e5fc05f75 100644
--- a/packages/cli/test/cases/build.config.optimization-inline/build.config-optimization-inline.spec.js
+++ b/packages/cli/test/cases/build.config.optimization-inline/build.config-optimization-inline.spec.js
@@ -138,13 +138,13 @@ describe('Build Greenwood With: ', function() {
         it('should contain the expected CSS content inlined for theme.css', function() {
           const styleTags = dom.window.document.querySelectorAll('head style');
 
-          expect(styleTags[0].textContent).to.contain('*{font-family:Comic Sans,sans-serif;margin:0;padding:0}');
+          expect(styleTags[0].textContent).to.contain('*{margin:0;padding:0;font-family:\'Comic Sans\',sans-serif;}');
         });
 
         it('should contain the expected CSS content inlined for page.css', function() {
           const styleTags = dom.window.document.querySelectorAll('head style');
 
-          expect(styleTags[1].textContent).to.contain('body{color:red}');
+          expect(styleTags[1].textContent).to.contain('body{color:red;}');
         });
       });
     });
diff --git a/packages/cli/test/cases/build.default.workspace-template-page-and-app/build.default.workspace-template-page-and-app.spec.js b/packages/cli/test/cases/build.default.workspace-template-page-and-app/build.default.workspace-template-page-and-app.spec.js
index 074c04c8d..e76b32da1 100644
--- a/packages/cli/test/cases/build.default.workspace-template-page-and-app/build.default.workspace-template-page-and-app.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-template-page-and-app/build.default.workspace-template-page-and-app.spec.js
@@ -118,7 +118,7 @@ describe('Build Greenwood With: ', function() {
         });
 
         it('should merge page template <style> tags after app template <style> tags', function() {
-          expect(styleTags[0].textContent).to.equal('span{text-align:center}');
+          expect(styleTags[0].textContent).to.equal('span{text-align:center;}');
           expect(styleTags[1].textContent).to.equal('p{margin:0 auto}');
           expect(styleTags[2].textContent).to.equal('ol{list-style:none}');
           expect(styleTags[3].textContent).to.equal('h3{text-decoration:underline}');
diff --git a/packages/plugin-postcss/test/cases/default/default.spec.js b/packages/plugin-postcss/test/cases/default/default.spec.js
index d13da4ade..ef3124770 100644
--- a/packages/plugin-postcss/test/cases/default/default.spec.js
+++ b/packages/plugin-postcss/test/cases/default/default.spec.js
@@ -59,7 +59,7 @@ describe('Build Greenwood With: ', function() {
 
     describe('Page referencing external nested CSS file', function() {
       it('should output correctly processed nested CSS as non nested', function() {
-        const expectedCss = 'body{color:red}h1{color:blue}';
+        const expectedCss = 'body{color:red;}h1{color:blue;}';
         const cssFiles = glob.sync(path.join(this.context.publicDir, 'styles', '*.css'));
         const css = fs.readFileSync(cssFiles[0], 'utf-8');
 
diff --git a/packages/plugin-postcss/test/cases/options.extend-config/options.extend-config.spec.js b/packages/plugin-postcss/test/cases/options.extend-config/options.extend-config.spec.js
index 0934e1af5..9bf4b1659 100644
--- a/packages/plugin-postcss/test/cases/options.extend-config/options.extend-config.spec.js
+++ b/packages/plugin-postcss/test/cases/options.extend-config/options.extend-config.spec.js
@@ -66,7 +66,7 @@ describe('Build Greenwood With: ', function() {
 
     describe('Page referencing external nested CSS file', function() {
       it('should output correctly processed nested CSS as non nested', function() {
-        const expectedCss = 'body{color:red}body h1{color:blue}';
+        const expectedCss = 'body{color:red;}body h1{color:blue;}';
         const cssFiles = glob.sync(path.join(this.context.publicDir, 'styles', '*.css'));
         const css = fs.readFileSync(cssFiles[0], 'utf-8');
 

From 8876502815ede7d6b35ce67d8164ea61e44a55ca Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Thu, 6 Oct 2022 21:13:16 -0400
Subject: [PATCH 06/22] support relative @import statements

---
 .../plugins/resource/plugin-standard-css.js   | 98 +++++++++++++++++--
 .../build.config-optimization-default.spec.js |  2 +-
 .../src/styles/main.css                       | 15 ++-
 .../src/styles/page.css                       | 13 ---
 .../src/styles/theme.css                      |  3 +
 5 files changed, 107 insertions(+), 24 deletions(-)
 delete mode 100644 packages/cli/test/cases/build.config.optimization-default/src/styles/page.css
 create mode 100644 packages/cli/test/cases/build.config.optimization-default/src/styles/theme.css

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index 85544b30c..c118b9e35 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -9,6 +9,77 @@ import { parse, walk } from 'css-tree';
 import path from 'path';
 import { ResourceInterface } from '../../lib/resource-interface.js';
 
+function optimizeCss(css) {
+  const ast = parse(css);
+  let optimizedCss = '';
+
+  walk(ast, function(node, item, list) { // eslint-disable-line
+    const { type } = node;
+
+    if (type === 'String' && this.atrulePrelude) {
+      const { value } = item.data;
+
+      if (value.indexOf('.') === 0) {
+        const importContents = fs.readFileSync(path.resolve(path.dirname(url), value), 'utf-8');
+
+        optimizedCss += optimizeCss(importContents);
+      }
+    } else if (type === 'Rule' && item.prev && item.prev.data.type !== 'Atrule') {
+      optimizedCss += '}';
+    } if (type === 'TypeSelector') {
+      optimizedCss += `${node.name}`;
+    } if (type === 'PseudoClassSelector') {
+      optimizedCss += `:${node.name}`;
+    } if (type === 'Selector') {
+      if (item.prev) {
+        optimizedCss += ',';
+      }
+    } else if (type === 'Declaration') {
+      if (!item.prev) {
+        optimizedCss += '{';
+      }
+
+      optimizedCss += `${node.property}:`;
+    } else if ((type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || (type === 'String' && !this.atrule) || type === 'Operator')) {
+      if (item.prev && type !== 'Operator' && item.prev.data.type !== 'Operator') {
+        optimizedCss += ' ';
+      }
+
+      switch (type) {
+
+        case 'Dimension':
+          optimizedCss += `${node.value}${node.unit}`;
+          break;
+        case 'Hash':
+          optimizedCss += `#${node.value}`;
+          break;
+        case 'Identifier':
+          optimizedCss += `${node.name}`;
+          break;
+        case 'Number':
+          optimizedCss += `${node.value}`;
+          break;
+        case 'Operator':
+          optimizedCss += `${node.value}`;
+          break;
+        case 'String':
+          optimizedCss += `'${node.value}'`;
+          break;
+        default:
+          break;
+
+      }
+
+      if (!item.next) {
+        optimizedCss += ';';
+      }
+    }
+  });
+
+  optimizedCss += '}';
+
+  return optimizedCss;
+}
 class StandardCssResource extends ResourceInterface {
   constructor(compilation, options) {
     super(compilation, options);
@@ -40,27 +111,38 @@ class StandardCssResource extends ResourceInterface {
   async optimize(url, body) {
     return new Promise(async (resolve, reject) => {
       try {
-        const ast = parse(body, { positions: true });
+        const ast = parse(body);
         let optimizedCss = '';
 
-        walk(ast, function(node, item) {
+        walk(ast, function(node, item, list) { // eslint-disable-line
           const { type } = node;
 
-          if (type === 'Atrule') {
-            // TODO
-          } else if (type === 'Rule') {
-            if (item.prev) {
-              optimizedCss += '}';
+          console.debug({type});
+          if (type === 'String' && this.atrulePrelude) {
+            const { value } = item.data;
+
+            if (value.indexOf('.') === 0) {
+              const importContents = fs.readFileSync(path.resolve(path.dirname(url), value), 'utf-8');
+
+              optimizedCss += optimizeCss(importContents);
             }
+          } else if (type === 'Rule' && item.prev && item.prev.data.type !== 'Atrule') {
+            optimizedCss += '}';
           } if (type === 'TypeSelector') {
             optimizedCss += `${node.name}`;
+          } if (type === 'PseudoClassSelector') {
+            optimizedCss += `:${node.name}`;
+          } if (type === 'Selector') {
+            if (item.prev) {
+              optimizedCss += ',';
+            }
           } else if (type === 'Declaration') {
             if (!item.prev) {
               optimizedCss += '{';
             }
             
             optimizedCss += `${node.property}:`;
-          } else if (type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || type === 'String' || type === 'Operator') {
+          } else if ((type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || (type === 'String' && !this.atrule) || type === 'Operator')) {
             if (item.prev && type !== 'Operator' && item.prev.data.type !== 'Operator') {
               optimizedCss += ' ';
             }
diff --git a/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js b/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
index 225b7cd94..dc5e176e9 100644
--- a/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
+++ b/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
@@ -108,7 +108,7 @@ describe('Build Greenwood With: ', function() {
           
           expect(cssFiles.length).to.be.equal(1);
           expect(customCss).to.be.equal(
-            '*{margin:0;padding:0;font-family:\'Comic Sans\',sans-serif;}body{color:red;}h1{border:0.5px solid #dddde1;}'
+            ':root,:host{color:blue;}*{margin:0;padding:0;font-family:\'Comic Sans\',sans-serif;}body{color:red;}h1,h2{border:0.5px solid #dddde1;}'
           );
         });
       });
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
index f5f0f99f6..b1ca0359d 100644
--- a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
+++ b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
@@ -1,4 +1,15 @@
-/* TODO */
-:root, :host {
+@import './theme.css';
 
+* {
+  margin: 0;
+  padding: 0;
+  font-family: 'Comic Sans', sans-serif;
+}
+
+body {
+  color: red;
+}
+
+h1, h2 {
+  border: 0.5px solid #dddde1;
 }
\ No newline at end of file
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/styles/page.css b/packages/cli/test/cases/build.config.optimization-default/src/styles/page.css
deleted file mode 100644
index 3e7399663..000000000
--- a/packages/cli/test/cases/build.config.optimization-default/src/styles/page.css
+++ /dev/null
@@ -1,13 +0,0 @@
-* {
-  margin: 0;
-  padding: 0;
-  font-family: 'Comic Sans', sans-serif;
-}
-
-body {
-  color: red;
-}
-
-h1 {
-  border: 0.5px solid #dddde1;
-}
\ No newline at end of file
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/styles/theme.css b/packages/cli/test/cases/build.config.optimization-default/src/styles/theme.css
new file mode 100644
index 000000000..44598d6e0
--- /dev/null
+++ b/packages/cli/test/cases/build.config.optimization-default/src/styles/theme.css
@@ -0,0 +1,3 @@
+:root, :host {
+  color: blue;
+}
\ No newline at end of file

From 7d1f5ca00f361d8df4d2c7d49f41e718f3983311 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Thu, 6 Oct 2022 21:19:44 -0400
Subject: [PATCH 07/22] refactor AST parsing to recursive function

---
 .../plugins/resource/plugin-standard-css.js   | 77 +------------------
 1 file changed, 4 insertions(+), 73 deletions(-)

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index c118b9e35..c4ed60c5f 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -9,8 +9,8 @@ import { parse, walk } from 'css-tree';
 import path from 'path';
 import { ResourceInterface } from '../../lib/resource-interface.js';
 
-function optimizeCss(css) {
-  const ast = parse(css);
+function bundleCss(body, url) {
+  const ast = parse(body);
   let optimizedCss = '';
 
   walk(ast, function(node, item, list) { // eslint-disable-line
@@ -22,7 +22,7 @@ function optimizeCss(css) {
       if (value.indexOf('.') === 0) {
         const importContents = fs.readFileSync(path.resolve(path.dirname(url), value), 'utf-8');
 
-        optimizedCss += optimizeCss(importContents);
+        optimizedCss += bundleCss(importContents, url);
       }
     } else if (type === 'Rule' && item.prev && item.prev.data.type !== 'Atrule') {
       optimizedCss += '}';
@@ -111,76 +111,7 @@ class StandardCssResource extends ResourceInterface {
   async optimize(url, body) {
     return new Promise(async (resolve, reject) => {
       try {
-        const ast = parse(body);
-        let optimizedCss = '';
-
-        walk(ast, function(node, item, list) { // eslint-disable-line
-          const { type } = node;
-
-          console.debug({type});
-          if (type === 'String' && this.atrulePrelude) {
-            const { value } = item.data;
-
-            if (value.indexOf('.') === 0) {
-              const importContents = fs.readFileSync(path.resolve(path.dirname(url), value), 'utf-8');
-
-              optimizedCss += optimizeCss(importContents);
-            }
-          } else if (type === 'Rule' && item.prev && item.prev.data.type !== 'Atrule') {
-            optimizedCss += '}';
-          } if (type === 'TypeSelector') {
-            optimizedCss += `${node.name}`;
-          } if (type === 'PseudoClassSelector') {
-            optimizedCss += `:${node.name}`;
-          } if (type === 'Selector') {
-            if (item.prev) {
-              optimizedCss += ',';
-            }
-          } else if (type === 'Declaration') {
-            if (!item.prev) {
-              optimizedCss += '{';
-            }
-            
-            optimizedCss += `${node.property}:`;
-          } else if ((type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || (type === 'String' && !this.atrule) || type === 'Operator')) {
-            if (item.prev && type !== 'Operator' && item.prev.data.type !== 'Operator') {
-              optimizedCss += ' ';
-            }
-
-            switch (type) {
-
-              case 'Dimension':
-                optimizedCss += `${node.value}${node.unit}`;
-                break;
-              case 'Hash':
-                optimizedCss += `#${node.value}`;
-                break;
-              case 'Identifier':
-                optimizedCss += `${node.name}`;
-                break;
-              case 'Number':
-                optimizedCss += `${node.value}`;
-                break;
-              case 'Operator':
-                optimizedCss += `${node.value}`;
-                break;
-              case 'String':
-                optimizedCss += `'${node.value}'`;
-                break;
-              default:
-                break;
-            
-            }
-
-            if (!item.next) {
-              optimizedCss += ';';
-            }
-          }
-        });
-
-        optimizedCss += '}';
-
-        resolve(optimizedCss);
+        resolve(bundleCss(body, url));
       } catch (e) {
         reject(e);
       }

From 85d9d8262f6753956e997f292e055723db5342ac Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Thu, 6 Oct 2022 21:48:24 -0400
Subject: [PATCH 08/22] support deeply nested @import and CSS custom properties

---
 .../src/plugins/resource/plugin-standard-css.js   | 15 ++++++++++++++-
 .../src/styles/main.css                           |  7 ++++++-
 .../src/styles/theme.css                          |  4 +---
 .../src/system/variables.css                      |  4 ++++
 4 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 packages/cli/test/cases/build.config.optimization-default/src/system/variables.css

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index c4ed60c5f..a55b19e05 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -34,13 +34,23 @@ function bundleCss(body, url) {
       if (item.prev) {
         optimizedCss += ',';
       }
+    } if (type === 'Function') {
+      optimizedCss += `${node.name}(`;
     } else if (type === 'Declaration') {
       if (!item.prev) {
         optimizedCss += '{';
       }
 
       optimizedCss += `${node.property}:`;
-    } else if ((type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || (type === 'String' && !this.atrule) || type === 'Operator')) {
+
+      if (node.value.type === 'Raw') {
+        optimizedCss += node.value.value.trim();
+
+        if (item.next) {
+          optimizedCss += ';';
+        }
+      }
+    } else if (type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || (type === 'String' && !this.atrule) || type === 'Operator') {
       if (item.prev && type !== 'Operator' && item.prev.data.type !== 'Operator') {
         optimizedCss += ' ';
       }
@@ -55,6 +65,9 @@ function bundleCss(body, url) {
           break;
         case 'Identifier':
           optimizedCss += `${node.name}`;
+          if (this.function) {
+            optimizedCss += ')';
+          }
           break;
         case 'Number':
           optimizedCss += `${node.value}`;
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
index b1ca0359d..5e0280af1 100644
--- a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
+++ b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
@@ -7,9 +7,14 @@
 }
 
 body {
-  color: red;
+  background-color: green;
 }
 
 h1, h2 {
+  color: var(--primary-color);
   border: 0.5px solid #dddde1;
+}
+
+p {
+  color: var(--secondary-color);
 }
\ No newline at end of file
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/styles/theme.css b/packages/cli/test/cases/build.config.optimization-default/src/styles/theme.css
index 44598d6e0..48e9cdc6d 100644
--- a/packages/cli/test/cases/build.config.optimization-default/src/styles/theme.css
+++ b/packages/cli/test/cases/build.config.optimization-default/src/styles/theme.css
@@ -1,3 +1 @@
-:root, :host {
-  color: blue;
-}
\ No newline at end of file
+@import '../system/variables.css';
\ No newline at end of file
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/system/variables.css b/packages/cli/test/cases/build.config.optimization-default/src/system/variables.css
new file mode 100644
index 000000000..eeb43dc2a
--- /dev/null
+++ b/packages/cli/test/cases/build.config.optimization-default/src/system/variables.css
@@ -0,0 +1,4 @@
+:root, :host {
+  --primary-color: #16f;
+  --secondary-color: #ff7;
+}
\ No newline at end of file

From e9c51d1a8e86ea0d9237c41031e7c5cac1a4641c Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Fri, 7 Oct 2022 09:10:44 -0400
Subject: [PATCH 09/22] fix  missing declaration semicolon

---
 packages/cli/src/plugins/resource/plugin-standard-css.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index a55b19e05..497a7adbb 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -44,11 +44,7 @@ function bundleCss(body, url) {
       optimizedCss += `${node.property}:`;
 
       if (node.value.type === 'Raw') {
-        optimizedCss += node.value.value.trim();
-
-        if (item.next) {
-          optimizedCss += ';';
-        }
+        optimizedCss += `${node.value.value.trim()};`;
       }
     } else if (type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || (type === 'String' && !this.atrule) || type === 'Operator') {
       if (item.prev && type !== 'Operator' && item.prev.data.type !== 'Operator') {
@@ -93,6 +89,7 @@ function bundleCss(body, url) {
 
   return optimizedCss;
 }
+
 class StandardCssResource extends ResourceInterface {
   constructor(compilation, options) {
     super(compilation, options);

From 6b73c01adb6d070a15f3f0ad0108349537ca6e53 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Fri, 7 Oct 2022 20:30:14 -0400
Subject: [PATCH 10/22] correctly close Rule brackets

---
 .../plugins/resource/plugin-standard-css.js   | 140 +++++++++---------
 .../build.config-optimization-default.spec.js |   4 +-
 2 files changed, 73 insertions(+), 71 deletions(-)

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index 497a7adbb..3ddbf22d3 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -13,80 +13,82 @@ function bundleCss(body, url) {
   const ast = parse(body);
   let optimizedCss = '';
 
-  walk(ast, function(node, item, list) { // eslint-disable-line
-    const { type } = node;
-
-    if (type === 'String' && this.atrulePrelude) {
-      const { value } = item.data;
-
-      if (value.indexOf('.') === 0) {
-        const importContents = fs.readFileSync(path.resolve(path.dirname(url), value), 'utf-8');
-
-        optimizedCss += bundleCss(importContents, url);
-      }
-    } else if (type === 'Rule' && item.prev && item.prev.data.type !== 'Atrule') {
-      optimizedCss += '}';
-    } if (type === 'TypeSelector') {
-      optimizedCss += `${node.name}`;
-    } if (type === 'PseudoClassSelector') {
-      optimizedCss += `:${node.name}`;
-    } if (type === 'Selector') {
-      if (item.prev) {
-        optimizedCss += ',';
-      }
-    } if (type === 'Function') {
-      optimizedCss += `${node.name}(`;
-    } else if (type === 'Declaration') {
-      if (!item.prev) {
-        optimizedCss += '{';
-      }
-
-      optimizedCss += `${node.property}:`;
-
-      if (node.value.type === 'Raw') {
-        optimizedCss += `${node.value.value.trim()};`;
-      }
-    } else if (type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || (type === 'String' && !this.atrule) || type === 'Operator') {
-      if (item.prev && type !== 'Operator' && item.prev.data.type !== 'Operator') {
-        optimizedCss += ' ';
+  walk(ast, {
+    enter: function (node, item) { // eslint-disable-line
+      const { type } = node;
+
+      if (type === 'String' && this.atrulePrelude) {
+        const { value } = item.data;
+
+        if (value.indexOf('.') === 0) {
+          const importContents = fs.readFileSync(path.resolve(path.dirname(url), value), 'utf-8');
+
+          optimizedCss += bundleCss(importContents, url);
+        }
+      } if (type === 'TypeSelector') {
+        optimizedCss += `${node.name}`;
+      } if (type === 'PseudoClassSelector') {
+        optimizedCss += `:${node.name}`;
+      } if (type === 'Selector') {
+        if (item.prev) {
+          optimizedCss += ',';
+        }
+      } if (type === 'Function') {
+        optimizedCss += `${node.name}(`;
+      } else if (type === 'Declaration') {
+        if (!item.prev) {
+          optimizedCss += '{';
+        }
+
+        optimizedCss += `${node.property}:`;
+      } else if (type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || (type === 'String' && !this.atrule) || type === 'Operator' || type === 'Raw') {
+        if (item && item.prev && type !== 'Operator' && item.prev.data.type !== 'Operator') {
+          optimizedCss += ' ';
+        }
+
+        switch (type) {
+
+          case 'Dimension':
+            optimizedCss += `${node.value}${node.unit}`;
+            break;
+          case 'Hash':
+            optimizedCss += `#${node.value}`;
+            break;
+          case 'Identifier':
+            optimizedCss += `${node.name}`;
+            if (this.function) {
+              optimizedCss += ')';
+            }
+            break;
+          case 'Number':
+            optimizedCss += `${node.value}`;
+            break;
+          case 'Operator':
+            optimizedCss += `${node.value}`;
+            break;
+          case 'String':
+            optimizedCss += `'${node.value}'`;
+            break;
+          case 'Raw':
+            optimizedCss += `${node.value.trim()};`;
+            break;
+          default:
+            break;
+
+        }
+
+        if (item && !item.next) {
+          optimizedCss += ';';
+        }
       }
-
-      switch (type) {
-
-        case 'Dimension':
-          optimizedCss += `${node.value}${node.unit}`;
-          break;
-        case 'Hash':
-          optimizedCss += `#${node.value}`;
-          break;
-        case 'Identifier':
-          optimizedCss += `${node.name}`;
-          if (this.function) {
-            optimizedCss += ')';
-          }
-          break;
-        case 'Number':
-          optimizedCss += `${node.value}`;
-          break;
-        case 'Operator':
-          optimizedCss += `${node.value}`;
-          break;
-        case 'String':
-          optimizedCss += `'${node.value}'`;
-          break;
-        default:
-          break;
-
-      }
-
-      if (!item.next) {
-        optimizedCss += ';';
+    },
+    leave: function(node) {
+      if (node.type === 'Rule') {
+        optimizedCss += '}';
       }
     }
   });
 
-  optimizedCss += '}';
-
   return optimizedCss;
 }
 
diff --git a/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js b/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
index dc5e176e9..c52dc16ab 100644
--- a/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
+++ b/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
@@ -104,11 +104,11 @@ describe('Build Greenwood With: ', function() {
         // test custom CSS bundling
         it('should have the expect preload CSS content in the file', async function() {
           const cssFiles = await glob.promise(path.join(this.context.publicDir, 'styles/*.css'));
-          const customCss = await fs.promises.readFile(cssFiles[0], 'utf-8'); // .to.have.lengthOf(1);
+          const customCss = await fs.promises.readFile(cssFiles[0], 'utf-8');
           
           expect(cssFiles.length).to.be.equal(1);
           expect(customCss).to.be.equal(
-            ':root,:host{color:blue;}*{margin:0;padding:0;font-family:\'Comic Sans\',sans-serif;}body{color:red;}h1,h2{border:0.5px solid #dddde1;}'
+            ':root,:host{--primary-color:#16f;--secondary-color:#ff7;}*{margin:0;padding:0;font-family:\'Comic Sans\',sans-serif;}body{background-color:green;}h1,h2{color:var(--primary-color);border:0.5px solid #dddde1;}p{color:var(--secondary-color);}' // eslint-disable-line max-len
           );
         });
       });

From ff356b244d358a2fc60d1d5b697180466fdfca9e Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Fri, 7 Oct 2022 20:42:48 -0400
Subject: [PATCH 11/22] general on leave refactoring

---
 .../plugins/resource/plugin-standard-css.js   | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index 3ddbf22d3..e2ccd1b58 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -29,17 +29,11 @@ function bundleCss(body, url) {
         optimizedCss += `${node.name}`;
       } if (type === 'PseudoClassSelector') {
         optimizedCss += `:${node.name}`;
-      } if (type === 'Selector') {
-        if (item.prev) {
-          optimizedCss += ',';
-        }
       } if (type === 'Function') {
         optimizedCss += `${node.name}(`;
+      } if (type === 'Block') {
+        optimizedCss += '{';
       } else if (type === 'Declaration') {
-        if (!item.prev) {
-          optimizedCss += '{';
-        }
-
         optimizedCss += `${node.property}:`;
       } else if (type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || (type === 'String' && !this.atrule) || type === 'Operator' || type === 'Raw') {
         if (item && item.prev && type !== 'Operator' && item.prev.data.type !== 'Operator') {
@@ -56,9 +50,6 @@ function bundleCss(body, url) {
             break;
           case 'Identifier':
             optimizedCss += `${node.name}`;
-            if (this.function) {
-              optimizedCss += ')';
-            }
             break;
           case 'Number':
             optimizedCss += `${node.value}`;
@@ -70,21 +61,34 @@ function bundleCss(body, url) {
             optimizedCss += `'${node.value}'`;
             break;
           case 'Raw':
-            optimizedCss += `${node.value.trim()};`;
+            optimizedCss += `${node.value.trim()}`;
             break;
           default:
             break;
 
         }
-
-        if (item && !item.next) {
-          optimizedCss += ';';
-        }
       }
     },
-    leave: function(node) {
-      if (node.type === 'Rule') {
-        optimizedCss += '}';
+    leave: function(node, item) {
+      switch (node.type) {
+
+        case 'Rule':
+          optimizedCss += '}';
+          break;
+        case 'Function':
+          optimizedCss += ')';
+          break;
+        case 'Declaration':
+          optimizedCss += ';';
+          break;
+        case 'Selector':
+          if (item.next) {
+            optimizedCss += ',';  
+          }
+          break;
+        default:
+          break;
+
       }
     }
   });

From 8e7639e723882fd362ed8507897916efc8755d26 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Fri, 7 Oct 2022 21:19:12 -0400
Subject: [PATCH 12/22] more selector support

---
 .../plugins/resource/plugin-standard-css.js   | 53 +++++++++++++------
 .../build.config-optimization-default.spec.js |  2 +-
 .../src/styles/main.css                       | 21 +++++++-
 3 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index e2ccd1b58..2e2ae837c 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -15,7 +15,7 @@ function bundleCss(body, url) {
 
   walk(ast, {
     enter: function (node, item) { // eslint-disable-line
-      const { type } = node;
+      const { type, name, value } = node;
 
       if (type === 'String' && this.atrulePrelude) {
         const { value } = item.data;
@@ -25,14 +25,28 @@ function bundleCss(body, url) {
 
           optimizedCss += bundleCss(importContents, url);
         }
-      } if (type === 'TypeSelector') {
-        optimizedCss += `${node.name}`;
-      } if (type === 'PseudoClassSelector') {
-        optimizedCss += `:${node.name}`;
-      } if (type === 'Function') {
-        optimizedCss += `${node.name}(`;
-      } if (type === 'Block') {
+      } else if (type === 'Atrule' && name !== 'import') {
+        optimizedCss += `@${name} `;
+      } else if (type === 'TypeSelector') {
+        optimizedCss += name;
+      } else if (type === 'IdSelector') {
+        optimizedCss += `#${name}`;
+      } else if (type === 'ClassSelector') {
+        optimizedCss += `.${name}`;
+      } else if (type === 'PseudoClassSelector') {
+        optimizedCss += `:${name}`;
+      } else if (type === 'Function') {
+        optimizedCss += `${name}(`;
+      } else if (type === 'MediaFeature') {
+        optimizedCss += ` (${name}:`;
+      } else if (type === 'PseudoElementSelector') {
+        optimizedCss += `::${name}`;
+      } else if (type === 'Block') {
         optimizedCss += '{';
+      } else if (type === 'AttributeSelector') {
+        optimizedCss += '[';
+      } else if (type === 'Combinator') {
+        optimizedCss += name;
       } else if (type === 'Declaration') {
         optimizedCss += `${node.property}:`;
       } else if (type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || (type === 'String' && !this.atrule) || type === 'Operator' || type === 'Raw') {
@@ -43,25 +57,25 @@ function bundleCss(body, url) {
         switch (type) {
 
           case 'Dimension':
-            optimizedCss += `${node.value}${node.unit}`;
+            optimizedCss += `${value}${node.unit}`;
             break;
           case 'Hash':
-            optimizedCss += `#${node.value}`;
+            optimizedCss += `#${value}`;
             break;
           case 'Identifier':
-            optimizedCss += `${node.name}`;
+            optimizedCss += name;
             break;
           case 'Number':
-            optimizedCss += `${node.value}`;
+            optimizedCss += value;
             break;
           case 'Operator':
-            optimizedCss += `${node.value}`;
+            optimizedCss += value;
             break;
           case 'String':
-            optimizedCss += `'${node.value}'`;
+            optimizedCss += `'${value}'`;
             break;
           case 'Raw':
-            optimizedCss += `${node.value.trim()}`;
+            optimizedCss += `${value.trim()}`;
             break;
           default:
             break;
@@ -72,10 +86,16 @@ function bundleCss(body, url) {
     leave: function(node, item) {
       switch (node.type) {
 
+        case 'Atrule':
+          if (node.name !== 'import') {
+            optimizedCss += '}';
+          }
+          break;
         case 'Rule':
           optimizedCss += '}';
           break;
         case 'Function':
+        case 'MediaFeature':
           optimizedCss += ')';
           break;
         case 'Declaration':
@@ -86,6 +106,9 @@ function bundleCss(body, url) {
             optimizedCss += ',';  
           }
           break;
+        case 'AttributeSelector':
+          optimizedCss += ']';
+          break;
         default:
           break;
 
diff --git a/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js b/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
index c52dc16ab..3c747164a 100644
--- a/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
+++ b/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
@@ -108,7 +108,7 @@ describe('Build Greenwood With: ', function() {
           
           expect(cssFiles.length).to.be.equal(1);
           expect(customCss).to.be.equal(
-            ':root,:host{--primary-color:#16f;--secondary-color:#ff7;}*{margin:0;padding:0;font-family:\'Comic Sans\',sans-serif;}body{background-color:green;}h1,h2{color:var(--primary-color);border:0.5px solid #dddde1;}p{color:var(--secondary-color);}' // eslint-disable-line max-len
+            ':root,:host{--primary-color:#16f;--secondary-color:#ff7;}*{margin:0;padding:0;font-family:\'Comic Sans\',sans-serif;}body{background-color:green;}h1,h2{color:var(--primary-color);border:0.5px solid #dddde1;}#foo,.bar{color:var(--secondary-color);}div>p{display:none;}a[title]{color:purple;}@media screen and (max-width:992px){body{background-color:blue;}}p::first-line{color:blue;text-transform:uppercase;}' // eslint-disable-line max-len
           );
         });
       });
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
index 5e0280af1..cdd90dabb 100644
--- a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
+++ b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
@@ -15,6 +15,25 @@ h1, h2 {
   border: 0.5px solid #dddde1;
 }
 
-p {
+#foo, .bar {
   color: var(--secondary-color);
+}
+
+div > p {
+  display: none;
+}
+
+a[title] {
+  color: purple;
+}
+
+@media screen and (max-width: 992px) {
+  body {
+    background-color: blue;
+  }
+}
+
+p::first-line {
+  color: blue;
+  text-transform: uppercase;
 }
\ No newline at end of file

From a143fd305d72646326bc2dc69dbb143a0f410c9e Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Fri, 7 Oct 2022 21:50:17 -0400
Subject: [PATCH 13/22] all specs passing

---
 .../src/plugins/resource/plugin-standard-css.js |  2 +-
 .../build.config-optimization-default.spec.js   |  5 ++---
 .../fixtures/expected.css                       | 17 +++++++++++++++++
 .../build.config-optimization-overrides.spec.js |  2 +-
 ...ild.default.workspace-javascript-css.spec.js |  4 ++--
 ...ault.workspace-template-page-and-app.spec.js |  6 +++---
 6 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index 2e2ae837c..ef752483b 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -14,7 +14,7 @@ function bundleCss(body, url) {
   let optimizedCss = '';
 
   walk(ast, {
-    enter: function (node, item) { // eslint-disable-line
+    enter: function (node, item) { // eslint-disable-line complexity
       const { type, name, value } = node;
 
       if (type === 'String' && this.atrulePrelude) {
diff --git a/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js b/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
index 3c747164a..713bde998 100644
--- a/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
+++ b/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
@@ -34,6 +34,7 @@ describe('Build Greenwood With: ', function() {
   const LABEL = 'Default Optimization Configuration';
   const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js');
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
+  const expectedCss = fs.readFileSync(path.join(outputPath, './fixtures/expected.css'), 'utf-8').replace(/\n/g, '');
   let runner;
 
   before(function() {
@@ -107,9 +108,7 @@ describe('Build Greenwood With: ', function() {
           const customCss = await fs.promises.readFile(cssFiles[0], 'utf-8');
           
           expect(cssFiles.length).to.be.equal(1);
-          expect(customCss).to.be.equal(
-            ':root,:host{--primary-color:#16f;--secondary-color:#ff7;}*{margin:0;padding:0;font-family:\'Comic Sans\',sans-serif;}body{background-color:green;}h1,h2{color:var(--primary-color);border:0.5px solid #dddde1;}#foo,.bar{color:var(--secondary-color);}div>p{display:none;}a[title]{color:purple;}@media screen and (max-width:992px){body{background-color:blue;}}p::first-line{color:blue;text-transform:uppercase;}' // eslint-disable-line max-len
-          );
+          expect(customCss).to.be.equal(expectedCss);
         });
       });
     });
diff --git a/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
new file mode 100644
index 000000000..791323d3a
--- /dev/null
+++ b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
@@ -0,0 +1,17 @@
+:root,:host{--primary-color:#16f;--secondary-color:#ff7;}
+
+*{margin:0;padding:0;font-family:'Comic Sans',sans-serif;}
+
+body{background-color:green;}
+
+h1,h2{color:var(--primary-color);border:0.5px solid #dddde1;}
+
+#foo,.bar{color:var(--secondary-color);}
+
+div>p{display:none;}
+
+a[title]{color:purple;}
+
+@media screen and (max-width:992px){body{background-color:blue;}}
+
+p::first-line{color:blue;text-transform:uppercase;}
\ No newline at end of file
diff --git a/packages/cli/test/cases/build.config.optimization-overrides/build.config-optimization-overrides.spec.js b/packages/cli/test/cases/build.config.optimization-overrides/build.config-optimization-overrides.spec.js
index 22067cd67..253f89e62 100644
--- a/packages/cli/test/cases/build.config.optimization-overrides/build.config-optimization-overrides.spec.js
+++ b/packages/cli/test/cases/build.config.optimization-overrides/build.config-optimization-overrides.spec.js
@@ -153,7 +153,7 @@ describe('Build Greenwood With: ', function() {
       
       it('should have an inline <style> tag in the <head>', function() {
         const themeStyleTags = Array.from(dom.window.document.querySelectorAll('head style'))
-          .filter(style => style.textContent.indexOf('*{color:blue}') >= 0);
+          .filter(style => style.textContent.trim() === '*{color:blue;}');
 
         expect(themeStyleTags.length).to.be.equal(1);
       });
diff --git a/packages/cli/test/cases/build.default.workspace-javascript-css/build.default.workspace-javascript-css.spec.js b/packages/cli/test/cases/build.default.workspace-javascript-css/build.default.workspace-javascript-css.spec.js
index 74385df55..5c59e4a9a 100644
--- a/packages/cli/test/cases/build.default.workspace-javascript-css/build.default.workspace-javascript-css.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-javascript-css/build.default.workspace-javascript-css.spec.js
@@ -145,13 +145,13 @@ describe('Build Greenwood With: ', function() {
       it('should have the expected output from the first inline <style> tag in index.html', async function() {
         const styleTags = dom.window.document.querySelectorAll('head > style');
 
-        expect(styleTags[0].textContent.replace(/\n/g, '').trim().replace(' ', '')).to.contain('p.output-style{color:green}');
+        expect(styleTags[0].textContent.replace(/\n/g, '').trim()).to.equal('p.output-style{color:green;}');
       });
 
       it('should have the expected output from the second inline <style> tag in index.html', async function() {
         const styleTags = dom.window.document.querySelectorAll('head > style');
 
-        expect(styleTags[1].textContent.replace(/\n/g, '').replace(/ /g, '')).to.contain('span.output-style{color:red}');
+        expect(styleTags[1].textContent.replace(/\n/g, '').replace(/ /g, '')).to.equal('span.output-style{color:red;}');
       });
 
       it('should have the color style for the output element', function() {
diff --git a/packages/cli/test/cases/build.default.workspace-template-page-and-app/build.default.workspace-template-page-and-app.spec.js b/packages/cli/test/cases/build.default.workspace-template-page-and-app/build.default.workspace-template-page-and-app.spec.js
index e76b32da1..f236b2afb 100644
--- a/packages/cli/test/cases/build.default.workspace-template-page-and-app/build.default.workspace-template-page-and-app.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-template-page-and-app/build.default.workspace-template-page-and-app.spec.js
@@ -119,9 +119,9 @@ describe('Build Greenwood With: ', function() {
 
         it('should merge page template <style> tags after app template <style> tags', function() {
           expect(styleTags[0].textContent).to.equal('span{text-align:center;}');
-          expect(styleTags[1].textContent).to.equal('p{margin:0 auto}');
-          expect(styleTags[2].textContent).to.equal('ol{list-style:none}');
-          expect(styleTags[3].textContent).to.equal('h3{text-decoration:underline}');
+          expect(styleTags[1].textContent).to.equal('p{margin:0 auto;}');
+          expect(styleTags[2].textContent).to.equal('ol{list-style:none;}');
+          expect(styleTags[3].textContent).to.equal('h3{text-decoration:underline;}');
         });
       });
 

From 081ba52e46f7bb777f7d15cdda3f40e3034878c0 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Thu, 13 Oct 2022 21:11:34 -0400
Subject: [PATCH 14/22] support percentage

---
 packages/cli/src/plugins/resource/plugin-standard-css.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index ef752483b..44e2b1609 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -49,7 +49,7 @@ function bundleCss(body, url) {
         optimizedCss += name;
       } else if (type === 'Declaration') {
         optimizedCss += `${node.property}:`;
-      } else if (type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || (type === 'String' && !this.atrule) || type === 'Operator' || type === 'Raw') {
+      } else if (type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || (type === 'String' && !this.atrule) || type === 'Operator' || type === 'Raw' || type === 'Percentage') { // eslint-disable-line max-len
         if (item && item.prev && type !== 'Operator' && item.prev.data.type !== 'Operator') {
           optimizedCss += ' ';
         }
@@ -59,6 +59,9 @@ function bundleCss(body, url) {
           case 'Dimension':
             optimizedCss += `${value}${node.unit}`;
             break;
+          case 'Percentage':
+            optimizedCss += `${value}%`;
+            break;
           case 'Hash':
             optimizedCss += `#${value}`;
             break;

From 08c6c8ee11146270fc92df92be27867c3cdf8211 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Thu, 13 Oct 2022 21:17:34 -0400
Subject: [PATCH 15/22] test for percentage

---
 .../build.config.optimization-default/fixtures/expected.css     | 2 +-
 .../cases/build.config.optimization-default/src/styles/main.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
index 791323d3a..3c09ccaae 100644
--- a/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
+++ b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
@@ -14,4 +14,4 @@ a[title]{color:purple;}
 
 @media screen and (max-width:992px){body{background-color:blue;}}
 
-p::first-line{color:blue;text-transform:uppercase;}
\ No newline at end of file
+p::first-line{color:blue;width:100%;}
\ No newline at end of file
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
index cdd90dabb..6b2fdfad5 100644
--- a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
+++ b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
@@ -35,5 +35,5 @@ a[title] {
 
 p::first-line {
   color: blue;
-  text-transform: uppercase;
+  width: 100%;
 }
\ No newline at end of file

From add9751894b8c7a9507a8deb017d6d0c02c77812 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Thu, 13 Oct 2022 22:10:40 -0400
Subject: [PATCH 16/22] support url and @import url

---
 .../cli/src/plugins/resource/plugin-standard-css.js  |  8 +++++---
 .../fixtures/expected.css                            |  2 ++
 .../src/styles/theme.css                             |  2 +-
 .../src/system/variables.css                         | 12 ++++++++++++
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index 44e2b1609..0ccb3d609 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -17,8 +17,8 @@ function bundleCss(body, url) {
     enter: function (node, item) { // eslint-disable-line complexity
       const { type, name, value } = node;
 
-      if (type === 'String' && this.atrulePrelude) {
-        const { value } = item.data;
+      if ((type === 'String' || type === 'Url') && this.atrulePrelude && this.atrule.name === 'import') {
+        const { value } = node;
 
         if (value.indexOf('.') === 0) {
           const importContents = fs.readFileSync(path.resolve(path.dirname(url), value), 'utf-8');
@@ -49,7 +49,9 @@ function bundleCss(body, url) {
         optimizedCss += name;
       } else if (type === 'Declaration') {
         optimizedCss += `${node.property}:`;
-      } else if (type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || (type === 'String' && !this.atrule) || type === 'Operator' || type === 'Raw' || type === 'Percentage') { // eslint-disable-line max-len
+      } else if (type === 'Url' && this.atrule?.name !== 'import') {
+        optimizedCss += `url('${node.value}')`;
+      } else if (type === 'Identifier' || type === 'Hash' || type === 'Dimension' || type === 'Number' || (type === 'String' && (this.atrule?.type !== 'import')) || type === 'Operator' || type === 'Raw' || type === 'Percentage') { // eslint-disable-line max-len
         if (item && item.prev && type !== 'Operator' && item.prev.data.type !== 'Operator') {
           optimizedCss += ' ';
         }
diff --git a/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
index 3c09ccaae..a495ec146 100644
--- a/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
+++ b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
@@ -1,5 +1,7 @@
 :root,:host{--primary-color:#16f;--secondary-color:#ff7;}
 
+@font-face {font-family:'Source Sans Pro';font-style:normal;font-weight:400;font-display:swap;src:local('Source Sans Pro Regular'),local('SourceSansPro-Regular'),url('/assets/fonts/source-sans-pro-v13-latin-regular.woff2')format('woff2'),url('/assets/fonts/source-sans-pro-v13-latin-regular.woff')format('woff'),url('/assets/fonts/source-sans-pro-v13-latin-regular.ttf')format('truetype');}
+
 *{margin:0;padding:0;font-family:'Comic Sans',sans-serif;}
 
 body{background-color:green;}
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/styles/theme.css b/packages/cli/test/cases/build.config.optimization-default/src/styles/theme.css
index 48e9cdc6d..36b39ca02 100644
--- a/packages/cli/test/cases/build.config.optimization-default/src/styles/theme.css
+++ b/packages/cli/test/cases/build.config.optimization-default/src/styles/theme.css
@@ -1 +1 @@
-@import '../system/variables.css';
\ No newline at end of file
+@import url('../system/variables.css');
\ No newline at end of file
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/system/variables.css b/packages/cli/test/cases/build.config.optimization-default/src/system/variables.css
index eeb43dc2a..f010eba84 100644
--- a/packages/cli/test/cases/build.config.optimization-default/src/system/variables.css
+++ b/packages/cli/test/cases/build.config.optimization-default/src/system/variables.css
@@ -1,4 +1,16 @@
 :root, :host {
   --primary-color: #16f;
   --secondary-color: #ff7;
+}
+
+/* source-sans-pro-regular - latin */
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'),
+    url('/assets/fonts/source-sans-pro-v13-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+    url('/assets/fonts/source-sans-pro-v13-latin-regular.woff') format('woff'), /* Modern Browsers */
+    url('/assets/fonts/source-sans-pro-v13-latin-regular.ttf') format('truetype'); /* Safari, Android, iOS */
 }
\ No newline at end of file

From 8484c15c1ca3a4996767dbdcc12cf6f0aa1b6b12 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Tue, 18 Oct 2022 21:35:12 -0400
Subject: [PATCH 17/22] add important support

---
 packages/cli/src/plugins/resource/plugin-standard-css.js      | 4 ++++
 .../build.config.optimization-default/fixtures/expected.css   | 2 +-
 .../build.config.optimization-default/src/styles/main.css     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index 0ccb3d609..fcbfecf17 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -104,6 +104,10 @@ function bundleCss(body, url) {
           optimizedCss += ')';
           break;
         case 'Declaration':
+          if (node.important) {
+            optimizedCss += '!important';
+          }
+
           optimizedCss += ';';
           break;
         case 'Selector':
diff --git a/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
index a495ec146..772bb5bda 100644
--- a/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
+++ b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
@@ -16,4 +16,4 @@ a[title]{color:purple;}
 
 @media screen and (max-width:992px){body{background-color:blue;}}
 
-p::first-line{color:blue;width:100%;}
\ No newline at end of file
+p::first-line{color:blue;width:100%!important;}
\ No newline at end of file
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
index 6b2fdfad5..a36d3ff8e 100644
--- a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
+++ b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
@@ -35,5 +35,5 @@ a[title] {
 
 p::first-line {
   color: blue;
-  width: 100%;
+  width: 100%!important;
 }
\ No newline at end of file

From 5cd3a53c15a6ad1a3a2d11f18747b78bc229ba58 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Wed, 19 Oct 2022 21:33:09 -0400
Subject: [PATCH 18/22] custom implementation for handling matchers in
 attribute selectors

---
 packages/cli/src/plugins/resource/plugin-standard-css.js     | 5 +++++
 .../build.config.optimization-default/fixtures/expected.css  | 4 +++-
 .../build.config.optimization-default/src/styles/main.css    | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index fcbfecf17..b222a925f 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -116,6 +116,11 @@ function bundleCss(body, url) {
           }
           break;
         case 'AttributeSelector':
+          if (node.matcher) {
+            // TODO better way to do this?
+            // https://github.com/csstree/csstree/issues/207
+            optimizedCss = optimizedCss.replace(`${node.name.name}'${node.value.value}'`, `${node.name.name}${node.matcher}'${node.value.value}'`);
+          }
           optimizedCss += ']';
           break;
         default:
diff --git a/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
index 772bb5bda..c13ef0d92 100644
--- a/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
+++ b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
@@ -16,4 +16,6 @@ a[title]{color:purple;}
 
 @media screen and (max-width:992px){body{background-color:blue;}}
 
-p::first-line{color:blue;width:100%!important;}
\ No newline at end of file
+p::first-line{color:blue;width:100%!important;}
+
+pre[class*='language-']{color:#ccc;background:none;}
\ No newline at end of file
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
index a36d3ff8e..3d82b26d5 100644
--- a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
+++ b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
@@ -36,4 +36,9 @@ a[title] {
 p::first-line {
   color: blue;
   width: 100%!important;
+}
+
+pre[class*="language-"] {
+  color: #ccc;
+  background: none;
 }
\ No newline at end of file

From a176ef6c7ff5851f8b76d56047b53acf981f21f4 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Fri, 21 Oct 2022 20:08:33 -0400
Subject: [PATCH 19/22] restore website prism styles

---
 .../plugins/resource/plugin-standard-css.js   | 21 +++++++++++++++++++
 .../fixtures/expected.css                     |  4 +++-
 .../src/styles/main.css                       |  4 ++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index b222a925f..a6ceee074 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -35,6 +35,16 @@ function bundleCss(body, url) {
         optimizedCss += `.${name}`;
       } else if (type === 'PseudoClassSelector') {
         optimizedCss += `:${name}`;
+
+        switch (name) {
+
+          case 'not':
+            optimizedCss += '(';
+            break;
+          default:
+            break;
+
+        }
       } else if (type === 'Function') {
         optimizedCss += `${name}(`;
       } else if (type === 'MediaFeature') {
@@ -103,6 +113,17 @@ function bundleCss(body, url) {
         case 'MediaFeature':
           optimizedCss += ')';
           break;
+        case 'PseudoClassSelector':
+          switch (node.name) {
+
+            case 'not':
+              optimizedCss += ')';
+              break;
+            default:
+              break;
+
+          }
+          break;
         case 'Declaration':
           if (node.important) {
             optimizedCss += '!important';
diff --git a/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
index c13ef0d92..85ddbbc08 100644
--- a/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
+++ b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
@@ -18,4 +18,6 @@ a[title]{color:purple;}
 
 p::first-line{color:blue;width:100%!important;}
 
-pre[class*='language-']{color:#ccc;background:none;}
\ No newline at end of file
+pre[class*='language-']{color:#ccc;background:none;}
+
+:not(pre)>code[class*='language-']{background:#2d2d2d;}
\ No newline at end of file
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
index 3d82b26d5..5ed81134d 100644
--- a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
+++ b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
@@ -41,4 +41,8 @@ p::first-line {
 pre[class*="language-"] {
   color: #ccc;
   background: none;
+}
+
+:not(pre) > code[class*="language-"] {
+	background: #2d2d2d;
 }
\ No newline at end of file

From 62fe77369561ee84bd2535f09f1aec67fce0ce08 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Fri, 21 Oct 2022 20:52:01 -0400
Subject: [PATCH 20/22] nth and lang selectors support

---
 .../plugins/resource/plugin-standard-css.js   | 27 ++++++++++++++++
 .../fixtures/expected.css                     | 16 +++++++++-
 .../src/styles/main.css                       | 32 ++++++++++++++++++-
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index a6ceee074..4ea2b45f2 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -38,7 +38,12 @@ function bundleCss(body, url) {
 
         switch (name) {
 
+          case 'lang':
           case 'not':
+          case 'nth-child':
+          case 'nth-last-child':
+          case 'nth-of-type':
+          case 'nth-last-of-type':
             optimizedCss += '(';
             break;
           default:
@@ -57,6 +62,23 @@ function bundleCss(body, url) {
         optimizedCss += '[';
       } else if (type === 'Combinator') {
         optimizedCss += name;
+      } else if (type === 'Nth') {
+        const { nth } = node;
+
+        switch (nth.type) {
+
+          case 'AnPlusB':
+            if (nth.a) {
+              optimizedCss += nth.a === '-1' ? '-n' : `${nth.a}n`;
+            }
+            if (nth.b) {
+              optimizedCss += nth.a ? `+${nth.b}` : nth.b;
+            }
+            break;
+          default:
+            break;
+
+        }
       } else if (type === 'Declaration') {
         optimizedCss += `${node.property}:`;
       } else if (type === 'Url' && this.atrule?.name !== 'import') {
@@ -116,7 +138,12 @@ function bundleCss(body, url) {
         case 'PseudoClassSelector':
           switch (node.name) {
 
+            case 'lang':
             case 'not':
+            case 'nth-child':
+            case 'nth-last-child':
+            case 'nth-last-of-type':
+            case 'nth-of-type':
               optimizedCss += ')';
               break;
             default:
diff --git a/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
index 85ddbbc08..b362787af 100644
--- a/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
+++ b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
@@ -20,4 +20,18 @@ p::first-line{color:blue;width:100%!important;}
 
 pre[class*='language-']{color:#ccc;background:none;}
 
-:not(pre)>code[class*='language-']{background:#2d2d2d;}
\ No newline at end of file
+dd:only-of-type{background-color:bisque;}
+
+:not(pre)>code[class*='language-']{background:#2d2d2d;}
+
+li:nth-child(-n+3){border:2px solid orange;margin-bottom:1px;}
+
+li:nth-child(even){background-color:lightyellow;}
+
+li:nth-last-child(5n){border:2px solid orange;margin-top:1px;}
+
+dd:nth-last-of-type(odd){border:2px solid orange;}
+
+p:nth-of-type(2n+1){color:red;}
+
+*:lang(en-US){outline:2px solid deeppink;}
\ No newline at end of file
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
index 5ed81134d..8ab09dd06 100644
--- a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
+++ b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
@@ -43,6 +43,36 @@ pre[class*="language-"] {
   background: none;
 }
 
+dd:only-of-type {
+  background-color: bisque;
+}
+
 :not(pre) > code[class*="language-"] {
-	background: #2d2d2d;
+  background: #2d2d2d;
+}
+
+li:nth-child(-n+3) {
+  border: 2px solid orange;
+  margin-bottom: 1px;
+}
+
+li:nth-child(even) {
+  background-color: lightyellow;
+}
+
+li:nth-last-child(5n) {
+  border: 2px solid orange;
+  margin-top: 1px;
+}
+
+dd:nth-last-of-type(odd) {
+  border: 2px solid orange;
+}
+
+p:nth-of-type(2n + 1) {
+  color: red;
+}
+
+*:lang(en-US) {
+  outline: 2px solid deeppink;
 }
\ No newline at end of file

From c758342e31e8a1689553eda831066923315b4490 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Fri, 11 Nov 2022 10:15:29 -0500
Subject: [PATCH 21/22] improve support for matching selector types

---
 .../cli/src/plugins/resource/plugin-standard-css.js  |  5 ++++-
 .../fixtures/expected.css                            |  8 +++++++-
 .../src/styles/main.css                              | 12 ++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index 4ea2b45f2..709c1e598 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -167,7 +167,10 @@ function bundleCss(body, url) {
           if (node.matcher) {
             // TODO better way to do this?
             // https://github.com/csstree/csstree/issues/207
-            optimizedCss = optimizedCss.replace(`${node.name.name}'${node.value.value}'`, `${node.name.name}${node.matcher}'${node.value.value}'`);
+            const name = node.name.name;
+            const value = node.value.type === 'Identifier' ? node.value.name : `'${node.value.value}'`;
+
+            optimizedCss = optimizedCss.replace(`${name}${value}`, `${name}${node.matcher}${value}`);
           }
           optimizedCss += ']';
           break;
diff --git a/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
index b362787af..c99671ff2 100644
--- a/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
+++ b/packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
@@ -34,4 +34,10 @@ dd:nth-last-of-type(odd){border:2px solid orange;}
 
 p:nth-of-type(2n+1){color:red;}
 
-*:lang(en-US){outline:2px solid deeppink;}
\ No newline at end of file
+*:lang(en-US){outline:2px solid deeppink;}
+
+p~ul{font-weight:bold;}
+
+a[href*='greenwood'],a[href$='.pdf']{color:orange;}
+
+[title~=flower],a[href^='https'],[lang|=en]{text-decoration:underline;}
\ No newline at end of file
diff --git a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
index 8ab09dd06..3dbae9c37 100644
--- a/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
+++ b/packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
@@ -75,4 +75,16 @@ p:nth-of-type(2n + 1) {
 
 *:lang(en-US) {
   outline: 2px solid deeppink;
+}
+
+p ~ ul {
+  font-weight: bold;
+}
+
+a[href*="greenwood"], a[href$=".pdf"] {
+  color: orange;
+}
+
+[title~=flower], a[href^="https"], [lang|=en] {
+  text-decoration: underline;
 }
\ No newline at end of file

From 0e54ed94f8c801ded5dca52c6700b7a63946dec2 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Fri, 11 Nov 2022 10:37:08 -0500
Subject: [PATCH 22/22] add error logging for CSS parsing

---
 packages/cli/src/plugins/resource/plugin-standard-css.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
index 709c1e598..262263b68 100644
--- a/packages/cli/src/plugins/resource/plugin-standard-css.js
+++ b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -10,7 +10,11 @@ import path from 'path';
 import { ResourceInterface } from '../../lib/resource-interface.js';
 
 function bundleCss(body, url) {
-  const ast = parse(body);
+  const ast = parse(body, {
+    onParseError(error) {
+      console.log(error.formattedMessage);
+    }
+  });
   let optimizedCss = '';
 
   walk(ast, {