chore(masthead-alpha-v2): get latest from alpha dev into alpha releas…

…e branch (#11517) This gets the HTML template minifications cherry-picked in #11504 into the release branch.
carbon-design-system · Feb 13, 2024 · 24486f7 · 24486f7
1 parent 2c25f09
commit 24486f7
Show file tree

Hide file tree

Showing 15 changed files with 130 additions and 79 deletions.
diff --git a/.yarn/cache/@types-clean-css-npm-4.2.11-2b47418843-385337a881.zip b/.yarn/cache/@types-clean-css-npm-4.2.11-2b47418843-385337a881.zip
diff --git a/.yarn/cache/@types-html-minifier-npm-3.5.3-48bb59db10-bad3bece7e.zip b/.yarn/cache/@types-html-minifier-npm-3.5.3-48bb59db10-bad3bece7e.zip
diff --git a/.yarn/cache/@types-relateurl-npm-0.2.33-e8ef0a6da2-a4b7876cc2.zip b/.yarn/cache/@types-relateurl-npm-0.2.33-e8ef0a6da2-a4b7876cc2.zip
diff --git a/.yarn/cache/html-minifier-npm-4.0.0-2c414aaddf-a1a49ee78a.zip b/.yarn/cache/html-minifier-npm-4.0.0-2c414aaddf-a1a49ee78a.zip
diff --git a/.yarn/cache/minify-html-literals-npm-1.3.5-2818068cad-9f5b50055e.zip b/.yarn/cache/minify-html-literals-npm-1.3.5-2818068cad-9f5b50055e.zip
diff --git a/.yarn/cache/parse-literals-npm-1.2.1-2c41c00bff-8f1ad2ed47.zip b/.yarn/cache/parse-literals-npm-1.2.1-2c41c00bff-8f1ad2ed47.zip
diff --git a/.yarn/cache/rollup-plugin-minify-html-literals-npm-1.2.6-fbf338ecb6-07b9f321dc.zip b/.yarn/cache/rollup-plugin-minify-html-literals-npm-1.2.6-fbf338ecb6-07b9f321dc.zip
diff --git a/packages/carbon-web-components/gulp-tasks/build/modules/scripts.js b/packages/carbon-web-components/gulp-tasks/build/modules/scripts.js
@@ -1,7 +1,7 @@
 /**
  * @license
  *
- * Copyright IBM Corp. 2020, 2022
+ * Copyright IBM Corp. 2020, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -38,22 +38,6 @@ function scripts() {
           // `version` field ensures `@babel/plugin-transform-runtime` is applied to newer helpers like decorator
           plugins: [
             ['@babel/plugin-transform-runtime', { useESModules: true, version: '7.8.0' }],
-            [
-              'template-html-minifier',
-              {
-                modules: {
-                  'lit-html': ['html'],
-                  'lit-element': ['html'],
-                },
-                htmlMinifier: {
-                  collapseWhitespace: true,
-                  conservativeCollapse: true,
-                  removeComments: true,
-                  caseSensitive: true,
-                  minifyCSS: true,
-                },
-              },
-            ],
             babelPluginResourceJSPaths,
           ],
         })

diff --git a/packages/carbon-web-components/package.json b/packages/carbon-web-components/package.json
@@ -192,6 +192,7 @@
     "replace-ext": "^2.0.0",
     "resize-observer-polyfill": "^1.5.0",
     "rollup": "^2.55.1",
+    "rollup-plugin-minify-html-literals": "^1.2.6",
     "rollup-plugin-multi-input": "^1.3.1",
     "rtlcss": "^3.0.0",
     "sass": "~1.62.0",

diff --git a/packages/carbon-web-components/tools/get-rollup-config.js b/packages/carbon-web-components/tools/get-rollup-config.js
@@ -1,7 +1,7 @@
 /**
  * @license
  *
- * Copyright IBM Corp. 2020, 2022
+ * Copyright IBM Corp. 2020, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -20,6 +20,8 @@ const { nodeResolve } = require('@rollup/plugin-node-resolve');
 const rtlcss = require('rtlcss');
 const { promisify } = require('util');
 const { terser } = require('rollup-plugin-terser');
+const minifyHTMLLiterals =
+  require('rollup-plugin-minify-html-literals').default;
 
 const carbonIcons = require('./rollup-plugin-icons');
 const fixHostPseudo = require('./postcss-fix-host-pseudo');
@@ -129,6 +131,17 @@ function getRollupConfig({
         include: [/node_modules/],
         sourceMap: true,
       }),
+      minifyHTMLLiterals({
+        failOnError: true,
+        options: {
+          minifyOptions: {
+            caseSensitive: true,
+            collapseInlineTagWhitespace: true,
+            collapseWhitespace: true,
+            removeComments: true,
+          },
+        },
+      }),
       carbonIcons(),
       babel.babel({
         babelHelpers: 'runtime',
@@ -142,29 +155,9 @@ function getRollupConfig({
             '@babel/plugin-proposal-decorators',
             { decoratorsBeforeExport: true },
           ],
-          '@babel/plugin-proposal-nullish-coalescing-operator',
-          ['@babel/plugin-proposal-object-rest-spread', { useBuiltIns: true }],
-          '@babel/plugin-proposal-optional-chaining',
-          ...(mode === 'development'
-            ? []
-            : [
-                [
-                  'template-html-minifier',
-                  {
-                    modules: {
-                      'lit-html': ['html'],
-                      'lit-element': ['html'],
-                    },
-                    htmlMinifier: {
-                      collapseWhitespace: true,
-                      conservativeCollapse: true,
-                      removeComments: true,
-                      caseSensitive: true,
-                      minifyCSS: true,
-                    },
-                  },
-                ],
-              ]),
+          '@babel/plugin-transform-nullish-coalescing-operator',
+          ['@babel/plugin-transform-object-rest-spread', { useBuiltIns: true }],
+          '@babel/plugin-transform-optional-chaining',
         ],
       }),
       litSCSS({

diff --git a/packages/web-components/package.json b/packages/web-components/package.json
@@ -221,6 +221,7 @@
     "rollup": "^2.55.1",
     "rollup-plugin-analyzer": "^4.0.0",
     "rollup-plugin-inject-process-env": "^1.3.1",
+    "rollup-plugin-minify-html-literals": "^1.2.6",
     "rollup-plugin-multi-input": "^1.3.1",
     "rollup-plugin-sizes": "^1.0.4",
     "rtlcss": "^3.0.0",

diff --git a/packages/web-components/src/components/table-of-contents/table-of-contents.ts b/packages/web-components/src/components/table-of-contents/table-of-contents.ts
@@ -1,7 +1,7 @@
 /**
  * @license
  *
- * Copyright IBM Corp. 2020, 2023
+ * Copyright IBM Corp. 2020, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -858,9 +858,7 @@ class DDSTableOfContents extends HostListenerMixin(
             <div class="${prefix}--tableofcontents__desktop-container">
               <div
                 class="${prefix}--tableofcontents__desktop"
-                style="${pageIsRTL
-                  ? 'right'
-                  : 'left'}: -${currentScrollPosition}px">
+                style="inset-inline-start: -${currentScrollPosition}px">
                 ${pageIsRTL
                   ? html` <div class="${prefix}--sub-content-right"></div> `
                   : html` <div class="${prefix}--sub-content-left"></div> `}

diff --git a/packages/web-components/tests/snapshots/dds-table-of-contents.md b/packages/web-components/tests/snapshots/dds-table-of-contents.md
@@ -29,7 +29,7 @@
       <div class="bx--tableofcontents__desktop-container">
         <div
           class="bx--tableofcontents__desktop"
-          style="left: -0px"
+          style="inset-inline-start: -0px"
         >
           <div class="bx--sub-content-left">
           </div>
@@ -84,7 +84,7 @@
       <div class="bx--tableofcontents__desktop-container">
         <div
           class="bx--tableofcontents__desktop"
-          style="left: -0px"
+          style="inset-inline-start: -0px"
         >
           <div class="bx--sub-content-left">
           </div>
@@ -133,7 +133,7 @@
       <div class="bx--tableofcontents__desktop-container">
         <div
           class="bx--tableofcontents__desktop"
-          style="left: -0px"
+          style="inset-inline-start: -0px"
         >
           <div class="bx--sub-content-left">
           </div>

diff --git a/packages/web-components/tools/get-rollup-config.js b/packages/web-components/tools/get-rollup-config.js
@@ -1,7 +1,7 @@
 /**
  * @license
  *
- * Copyright IBM Corp. 2020, 2023
+ * Copyright IBM Corp. 2020, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -24,6 +24,8 @@ const replace = require('@rollup/plugin-replace');
 const { terser } = require('rollup-plugin-terser');
 const multiInput = require('rollup-plugin-multi-input').default;
 const injectProcessEnv = require('rollup-plugin-inject-process-env');
+const minifyHTMLLiterals =
+  require('rollup-plugin-minify-html-literals').default;
 
 const ibmdotcomIcon = require('./rollup-plugin-ibmdotcom-icon');
 const litSCSS = require('./rollup-plugin-lit-scss');
@@ -164,6 +166,17 @@ function getRollupConfig({
         include: [/node_modules/],
         sourceMap: true,
       }),
+      minifyHTMLLiterals({
+        failOnError: true,
+        options: {
+          minifyOptions: {
+            caseSensitive: true,
+            collapseInlineTagWhitespace: true,
+            collapseWhitespace: true,
+            removeComments: true,
+          },
+        },
+      }),
       ibmdotcomIcon(),
       injectProcessEnv(
         {
@@ -187,29 +200,9 @@ function getRollupConfig({
             '@babel/plugin-proposal-decorators',
             { decoratorsBeforeExport: true },
           ],
-          '@babel/plugin-proposal-nullish-coalescing-operator',
-          ['@babel/plugin-proposal-object-rest-spread', { useBuiltIns: true }],
-          '@babel/plugin-proposal-optional-chaining',
-          ...(mode === 'development'
-            ? []
-            : [
-                [
-                  'template-html-minifier',
-                  {
-                    modules: {
-                      'lit-html': ['html'],
-                      'lit-element': ['html'],
-                    },
-                    htmlMinifier: {
-                      collapseWhitespace: true,
-                      conservativeCollapse: true,
-                      removeComments: true,
-                      caseSensitive: true,
-                      minifyCSS: true,
-                    },
-                  },
-                ],
-              ]),
+          '@babel/plugin-transform-nullish-coalescing-operator',
+          ['@babel/plugin-transform-object-rest-spread', { useBuiltIns: true }],
+          '@babel/plugin-transform-optional-chaining',
         ],
       }),
       // We are using `carbon-web-components` code merely as the source of inheritance,