Merge branch 'main' into chore/ci/feat-to-staging

RedHat-UX · May 8, 2024 · 875cc0a · 875cc0a
2 parents 8b03ec1 + b858eb8
commit 875cc0a
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @rhds/elements
 
+## 1.4.1
+
+### Patch Changes
+
+- 862380b: corrected `@patternfly/elements` dependency to be included with the package
+
 ## 1.4.0
 
 ### Minor Changes

diff --git a/docs/_includes/component/header.njk b/docs/_includes/component/header.njk
@@ -204,14 +204,3 @@
     </nav>
   </div>
 </header>
-
-<script type="module">
-  window.onUsersnapCXLoad = function(api) {
-    api.init();
-  }
-  var script = document.createElement('script');
-  script.async = 1;
-  script.src = 'https://widget.usersnap.com/load/64471a95-72fe-4239-b16d-ebcf8b1219f7?onload=onUsersnapCXLoad';
-  document.head.appendChild(script);
-</script>
-
diff --git a/docs/_plugins/shortcodes/repoStatus.cjs b/docs/_plugins/shortcodes/repoStatus.cjs
@@ -250,10 +250,13 @@ function repoStatusTable() {
     return /* html */`
 <tr>
 <td data-label="Name">
-  <a href="/elements/${listItem.name}">${listItem.name}</a>
-  ${listItem.overallStatus !== 'Available' ? `<rh-tag color="${STATUS_LEGEND[listItem.overallStatus].color}" variant="${STATUS_LEGEND[listItem.overallStatus].variant}">
-    ${listItem.overallStatus}${STATUS_LEGEND[listItem.overallStatus].icon}
-  </rh-tag>` : ''}
+  <span>
+    <a href="/elements/${listItem.name}">${listItem.name}</a>
+    ${listItem.overallStatus !== 'Available' ?
+      `<rh-tag color="${STATUS_LEGEND[listItem.overallStatus].color}" variant="${STATUS_LEGEND[listItem.overallStatus].variant}">
+        ${listItem.overallStatus}${STATUS_LEGEND[listItem.overallStatus].icon}
+      </rh-tag>` : ''}
+  </span>
 </td>
 ${listItem.libraries.map(lib => {
     return /* html */`

diff --git a/eleventy.config.cjs b/eleventy.config.cjs
@@ -92,6 +92,10 @@ module.exports = function(eleventyConfig) {
       '@rhds/tokens/media.js',
       '@rhds/tokens/meta.js',
       '@patternfly/elements',
+      '@patternfly/icons/far/',
+      '@patternfly/icons/fas/',
+      '@patternfly/icons/fab/',
+      '@patternfly/icons/patternfly/',
       '@patternfly/pfe-core',
       // Vendor
       'lit',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rhds/elements",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Red Hat Design System Elements",
   "type": "module",
   "license": "MIT",
@@ -116,10 +116,17 @@
         "docs"
       ]
     },
+    "build:test": {
+      "dependencies": [
+        "patch",
+        "analyze",
+        "compile"
+      ]
+    },
     "test": {
       "command": "wtr --group default",
       "dependencies": [
-        "build"
+        "build:test"
       ]
     },
     "compile": {
@@ -237,6 +244,7 @@
   },
   "dependencies": {
     "@lit/context": "^1.1.1",
+    "@patternfly/elements": "^3.0.1",
     "@patternfly/icons": "^1.0.2",
     "@patternfly/pfe-core": "^3.0.0",
     "@rhds/tokens": "^2.0.1",
@@ -253,7 +261,6 @@
     "@lit/reactive-element": "^2.0.4",
     "@parse5/tools": "^0.3.0",
     "@patternfly/create-element": "^1.0.2",
-    "@patternfly/elements": "^3.0.0",
     "@patternfly/eslint-config-elements": "^3.0.0",
     "@patternfly/eslint-plugin-elements": "^2.0.0",
     "@patternfly/pfe-tools": "^2.0.1",