fix: rollup minify selectors should retain spaces

microsoft · Jul 20, 2020 · b2ea909 · b2ea909
1 parent ea84cbd
commit b2ea909
Show file tree

Hide file tree

Showing 14 changed files with 109 additions and 51 deletions.
diff --git a/build/transform-html-fragment.js → build/transform-fragments.js b/build/transform-html-fragment.js → build/transform-fragments.js
@@ -4,7 +4,7 @@ const spaceBetweenTags = /(>)\s+(<)/g;
 const spaceBetweenAttrs = /(["'\w])(?!\s*>)\s+/g;
 const openEnded = /(?:[^="'\w])?(["'\w])\s*$/g;
 
-export default function transformHTMLFragment(data) {
+export function transformHTMLFragment(data) {
     // if the chunk is only space, collapse and return it
     if (data.match(onlySpace)) {
         return data.replace(onlySpace, " ");
@@ -25,3 +25,25 @@ export default function transformHTMLFragment(data) {
 
     return data.trim();
 }
+
+const newlines = /\n/g;
+const separators = /\s*([\{\};])\s*/g;
+const lastProp = /;\s*(\})/g;
+const extraSpaces = /\s\s+/g;
+const endingSpaces = / ?\s+$/g;
+
+export function transformCSSFragment(data) {
+    // newlines
+    data = data.replace(newlines, "");
+
+    // Remove extra space, but not too much
+    data = data.replace(separators, "$1");
+
+    // Remove semicolons followed by property list end
+    data = data.replace(lastProp, "$1");
+
+    // space might be between property values or between selectors
+    data = data.replace(endingSpaces, " ");
+
+    return data.replace(extraSpaces, " ");
+}
diff --git a/packages/web-components/fast-components-msft/package.json b/packages/web-components/fast-components-msft/package.json
@@ -77,7 +77,6 @@
     "rollup": "^2.7.6",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-filesize": "^8.0.2",
-    "rollup-plugin-minify-tagged-css-template": "^0.0.2",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-terser": "^5.3.0",
     "rollup-plugin-transform-tagged-template": "^0.0.3",

diff --git a/packages/web-components/fast-components-msft/rollup.config.js b/packages/web-components/fast-components-msft/rollup.config.js
@@ -1,13 +1,17 @@
 import commonJS from "rollup-plugin-commonjs";
 import filesize from "rollup-plugin-filesize";
-import minifyTaggedCSSTemplate from "rollup-plugin-minify-tagged-css-template";
-import transformTaggedTemplate from "rollup-plugin-transform-tagged-template";
 import resolve from "rollup-plugin-node-resolve";
 import { terser } from "rollup-plugin-terser";
+import transformTaggedTemplate from "rollup-plugin-transform-tagged-template";
 import typescript from "rollup-plugin-typescript2";
-import transformHTMLFragment from "../../../build/transform-html-fragment";
+import {
+    transformCSSFragment,
+    transformHTMLFragment,
+} from "../../../build/transform-fragments";
 
-const parserOptions = { sourceType: "module" };
+const parserOptions = {
+    sourceType: "module",
+};
 
 export default [
     {
@@ -33,14 +37,19 @@ export default [
                     },
                 },
             }),
-            minifyTaggedCSSTemplate({ parserOptions }),
+            transformTaggedTemplate({
+                tagsToProcess: ["css"],
+                transformer: transformCSSFragment,
+                parserOptions,
+            }),
             transformTaggedTemplate({
                 tagsToProcess: ["html"],
                 transformer: transformHTMLFragment,
                 parserOptions,
             }),
             filesize({
                 showMinifiedSize: false,
+                showBrotliSize: true,
             }),
         ],
     },

diff --git a/packages/web-components/fast-components-msft/src/progress/progress/progress.styles.ts b/packages/web-components/fast-components-msft/src/progress/progress/progress.styles.ts
@@ -48,7 +48,7 @@ export const ProgressStyles = css`
         height: 100%;
         background-color: ${accentForegroundRestBehavior.var};
         border-radius: calc(var(--design-unit) * 1px);
-        animation-timing-function: cubic-bezier(0.4, 0.0, 0.6, 1.0);
+        animation-timing-function: cubic-bezier(0.4, 0, 0.6, 1);
         width: 40%;
         animation: indeterminate-1 2s infinite;
     }
@@ -59,12 +59,13 @@ export const ProgressStyles = css`
         height: 100%;
         background-color: ${accentForegroundRestBehavior.var};
         border-radius: calc(var(--design-unit) * 1px);
-        animation-timing-function: cubic-bezier(0.4, 0.0, 0.6, 1.0);
+        animation-timing-function: cubic-bezier(0.4, 0, 0.6, 1);
         width: 60%;
         animation: indeterminate-2 2s infinite;
     }
 
-    :host(.paused) .indeterminate-indicator-1, :host(.paused) .indeterminate-indicator-2 {
+    :host(.paused) .indeterminate-indicator-1,
+    :host(.paused) .indeterminate-indicator-2 {
         animation-play-state: paused;
         background-color: ${neutralFillRestBehavior.var};
     }
@@ -88,7 +89,7 @@ export const ProgressStyles = css`
         100% {
             opacity: 0;
             transform: translateX(300%);
-        },
+        }
     }
 
     @keyframes indeterminate-2 {
@@ -106,8 +107,8 @@ export const ProgressStyles = css`
         100% {
             transform: translateX(166.66%);
             opacity: 1;
-        },
-    },
+        }
+    }
 `.withBehaviors(
     accentForegroundRestBehavior,
     neutralFillRestBehavior,

diff --git a/packages/web-components/fast-components-msft/src/slider/slider.styles.ts b/packages/web-components/fast-components-msft/src/slider/slider.styles.ts
@@ -17,10 +17,6 @@ import {
 } from "../styles";
 
 export const SliderStyles = css`
-    :host([hidden]) {
-        display: none;
-    }
-
     ${display("inline-grid")} :host {
         --thumb-size: calc(${heightNumber} * 0.5);
         --thumb-translate: calc(var(--thumb-size) * 0.5);
@@ -57,7 +53,7 @@ export const SliderStyles = css`
         position: absolute;
         height: calc(var(--thumb-size) * 1px);
         width: calc(var(--thumb-size) * 1px);
-        transition: "all 0.2s ease";
+        transition: all 0.2s ease;
     }
     .thumb-cursor {
         border: none;

diff --git a/packages/web-components/fast-components-msft/src/styles/patterns/button.ts b/packages/web-components/fast-components-msft/src/styles/patterns/button.ts
@@ -88,9 +88,10 @@ export const BaseButtonStyles = css`
     .start,
     .end,
     ::slotted(svg) {
-        /* Glyph size and margin-left is temporary -
-        replace when adaptive typography is figured out */
-        width: 16px;
+        ${
+            /* Glyph size and margin-left is temporary -
+            replace when adaptive typography is figured out */ ""
+        } width: 16px;
         height: 16px;
     }
 

diff --git a/packages/web-components/fast-components/package.json b/packages/web-components/fast-components/package.json
@@ -81,7 +81,6 @@
     "rollup": "^2.7.6",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-filesize": "^8.0.2",
-    "rollup-plugin-minify-tagged-css-template": "^0.0.2",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-terser": "^5.3.0",
     "rollup-plugin-transform-tagged-template": "^0.0.3",

diff --git a/packages/web-components/fast-components/rollup.config.js b/packages/web-components/fast-components/rollup.config.js
@@ -1,13 +1,17 @@
 import commonJS from "rollup-plugin-commonjs";
 import filesize from "rollup-plugin-filesize";
-import minifyTaggedCSSTemplate from "rollup-plugin-minify-tagged-css-template";
 import resolve from "rollup-plugin-node-resolve";
 import { terser } from "rollup-plugin-terser";
 import transformTaggedTemplate from "rollup-plugin-transform-tagged-template";
 import typescript from "rollup-plugin-typescript2";
-import transformHTMLFragment from "../../../build/transform-html-fragment";
+import {
+    transformCSSFragment,
+    transformHTMLFragment,
+} from "../../../build/transform-fragments";
 
-const parserOptions = { sourceType: "module" };
+const parserOptions = {
+    sourceType: "module",
+};
 
 export default [
     {
@@ -33,13 +37,20 @@ export default [
                     },
                 },
             }),
-            minifyTaggedCSSTemplate({ parserOptions }),
+            transformTaggedTemplate({
+                tagsToProcess: ["css"],
+                transformer: transformCSSFragment,
+                parserOptions,
+            }),
             transformTaggedTemplate({
                 tagsToProcess: ["html"],
                 transformer: transformHTMLFragment,
                 parserOptions,
             }),
-            filesize({ showMinifiedSize: false }),
+            filesize({
+                showMinifiedSize: false,
+                showBrotliSize: true,
+            }),
         ],
     },
 ];
diff --git a/packages/web-components/fast-components/src/progress/progress/progress.styles.ts b/packages/web-components/fast-components/src/progress/progress/progress.styles.ts
@@ -48,7 +48,7 @@ export const ProgressStyles = css`
         height: 100%;
         background-color: ${accentForegroundRestBehavior.var};
         border-radius: calc(var(--design-unit) * 1px);
-        animation-timing-function: cubic-bezier(0.4, 0.0, 0.6, 1.0);
+        animation-timing-function: cubic-bezier(0.4, 0, 0.6, 1);
         width: 40%;
         animation: indeterminate-1 2s infinite;
     }
@@ -59,12 +59,13 @@ export const ProgressStyles = css`
         height: 100%;
         background-color: ${accentForegroundRestBehavior.var};
         border-radius: calc(var(--design-unit) * 1px);
-        animation-timing-function: cubic-bezier(0.4, 0.0, 0.6, 1.0);
+        animation-timing-function: cubic-bezier(0.4, 0, 0.6, 1);
         width: 60%;
         animation: indeterminate-2 2s infinite;
     }
 
-    :host(.paused) .indeterminate-indicator-1, :host(.paused) .indeterminate-indicator-2 {
+    :host(.paused) .indeterminate-indicator-1,
+    :host(.paused) .indeterminate-indicator-2 {
         animation-play-state: paused;
         background-color: ${neutralFillRestBehavior.var};
     }
@@ -88,7 +89,7 @@ export const ProgressStyles = css`
         100% {
             opacity: 0;
             transform: translateX(300%);
-        },
+        }
     }
 
     @keyframes indeterminate-2 {
@@ -106,8 +107,8 @@ export const ProgressStyles = css`
         100% {
             transform: translateX(166.66%);
             opacity: 1;
-        },
-    },
+        }
+    }
 `.withBehaviors(
     accentForegroundRestBehavior,
     neutralFillRestBehavior,

diff --git a/packages/web-components/fast-element/package.json b/packages/web-components/fast-element/package.json
@@ -69,8 +69,8 @@
     "prettier": "2.0.2",
     "rollup": "^2.7.6",
     "rollup-plugin-filesize": "^8.0.2",
-    "rollup-plugin-minify-tagged-css-template": "^0.0.2",
     "rollup-plugin-terser": "^5.3.0",
+    "rollup-plugin-transform-tagged-template": "^0.0.3",
     "rollup-plugin-typescript2": "^0.27.0",
     "source-map": "^0.7.3",
     "source-map-loader": "^0.2.4",

diff --git a/packages/web-components/fast-element/rollup.config.js b/packages/web-components/fast-element/rollup.config.js
@@ -1,7 +1,17 @@
+import commonJS from "rollup-plugin-commonjs";
 import filesize from "rollup-plugin-filesize";
-import minifyTaggedCSSTemplate from "rollup-plugin-minify-tagged-css-template";
+import resolve from "rollup-plugin-node-resolve";
 import { terser } from "rollup-plugin-terser";
+import transformTaggedTemplate from "rollup-plugin-transform-tagged-template";
 import typescript from "rollup-plugin-typescript2";
+import {
+    transformCSSFragment,
+    transformHTMLFragment,
+} from "../../../build/transform-fragments";
+
+const parserOptions = {
+    sourceType: "module",
+};
 
 export default [
     {
@@ -18,20 +28,28 @@ export default [
             },
         ],
         plugins: [
+            resolve(),
+            commonJS(),
             typescript({
                 tsconfigOverride: {
                     compilerOptions: {
                         declaration: false,
                     },
                 },
             }),
-            minifyTaggedCSSTemplate({
-                parserOptions: {
-                    sourceType: "module",
-                },
+            transformTaggedTemplate({
+                tagsToProcess: ["css"],
+                transformer: transformCSSFragment,
+                parserOptions,
+            }),
+            transformTaggedTemplate({
+                tagsToProcess: ["html"],
+                transformer: transformHTMLFragment,
+                parserOptions,
             }),
             filesize({
                 showMinifiedSize: false,
+                showBrotliSize: true,
             }),
         ],
     },

diff --git a/packages/web-components/fast-foundation/package.json b/packages/web-components/fast-foundation/package.json
@@ -70,7 +70,6 @@
     "rollup": "^2.7.6",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-filesize": "^8.0.2",
-    "rollup-plugin-minify-tagged-css-template": "^0.0.2",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-terser": "^5.3.0",
     "rollup-plugin-transform-tagged-template": "^0.0.3",

diff --git a/packages/web-components/fast-foundation/rollup.config.js b/packages/web-components/fast-foundation/rollup.config.js
@@ -1,13 +1,17 @@
 import commonJS from "rollup-plugin-commonjs";
 import filesize from "rollup-plugin-filesize";
-import minifyTaggedCSSTemplate from "rollup-plugin-minify-tagged-css-template";
 import resolve from "rollup-plugin-node-resolve";
 import { terser } from "rollup-plugin-terser";
 import transformTaggedTemplate from "rollup-plugin-transform-tagged-template";
 import typescript from "rollup-plugin-typescript2";
-import transformHTMLFragment from "../../../build/transform-html-fragment";
+import {
+    transformCSSFragment,
+    transformHTMLFragment,
+} from "../../../build/transform-fragments";
 
-const parserOptions = { sourceType: "module" };
+const parserOptions = {
+    sourceType: "module",
+};
 
 export default [
     {
@@ -33,14 +37,19 @@ export default [
                     },
                 },
             }),
-            minifyTaggedCSSTemplate({ parserOptions }),
+            transformTaggedTemplate({
+                tagsToProcess: ["css"],
+                transformer: transformCSSFragment,
+                parserOptions,
+            }),
             transformTaggedTemplate({
                 tagsToProcess: ["html"],
                 transformer: transformHTMLFragment,
                 parserOptions,
             }),
             filesize({
                 showMinifiedSize: false,
+                showBrotliSize: true,
             }),
         ],
     },

diff --git a/yarn.lock b/yarn.lock
@@ -20496,13 +20496,6 @@ rollup-plugin-filesize@^8.0.2:
     pacote "^11.1.6"
     terser "^4.6.12"
 
-rollup-plugin-minify-tagged-css-template@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-minify-tagged-css-template/-/rollup-plugin-minify-tagged-css-template-0.0.2.tgz#72d0890c1d97c0022ad4b1e10f41526e1cecdff5"
-  integrity sha512-0RgsTGTV83AWcDHoRsdAOydtOXkZOoF5XqcixvcxzIgjRmTD19htplR241C7Q1fBnK7aVtJXAWqkRAsdXpCxcQ==
-  dependencies:
-    rollup-plugin-transform-tagged-template "^0.0.3"
-
 rollup-plugin-node-resolve@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523"