diff --git a/packages/documentation-framework/scripts/webpack/webpack.client.config.js b/packages/documentation-framework/scripts/webpack/webpack.client.config.js index 1d950c259f..c5663d144f 100644 --- a/packages/documentation-framework/scripts/webpack/webpack.client.config.js +++ b/packages/documentation-framework/scripts/webpack/webpack.client.config.js @@ -81,7 +81,20 @@ const clientConfig = async (env, argv) => { rules: [ { test: /\.css$/, - exclude: reactCSSRegex, + exclude: (modulePath) => { + // Exclude react-*/dist CSS files, but allow catalog-view-extension + const pathStr = modulePath.toString(); + if (reactCSSRegex.test(pathStr)) { + // Allow catalog-view-extension through (don't exclude it) + if (pathStr.includes('react-catalog-view-extension/dist/css/')) { + return false; + } + // Exclude other react-*/dist CSS files + return true; + } + // Don't exclude files that don't match reactCSSRegex + return false; + }, use: [ { loader: rspack.CssExtractRspackPlugin.loader @@ -103,6 +116,7 @@ const clientConfig = async (env, argv) => { }, { test: reactCSSRegex, + exclude: /react-catalog-view-extension\/dist\/css\/.*\.css$/, use: 'null-loader' }, ] diff --git a/packages/documentation-framework/versions.json b/packages/documentation-framework/versions.json index 71d51b897b..53f1f13a83 100644 --- a/packages/documentation-framework/versions.json +++ b/packages/documentation-framework/versions.json @@ -33,7 +33,7 @@ "hidden": true, "versions": { "@patternfly/patternfly": "6.4.0", - "@patternfly/react-catalog-view-extension": "6.2.0", + "@patternfly/react-catalog-view-extension": "6.3.0", "@patternfly/react-charts": "8.4.0", "@patternfly/react-code-editor": "6.4.0", "@patternfly/react-component-groups": "6.4.0", diff --git a/packages/documentation-site/package.json b/packages/documentation-site/package.json index 3330c194e2..976799f08a 100644 --- a/packages/documentation-site/package.json +++ b/packages/documentation-site/package.json @@ -22,7 +22,7 @@ "@patternfly/design-tokens": "1.14.4", "@patternfly/documentation-framework": "workspace:*", "@patternfly/quickstarts": "6.4.0", - "@patternfly/react-catalog-view-extension": "6.2.0", + "@patternfly/react-catalog-view-extension": "6.3.0", "@patternfly/react-charts": "8.5.0-prerelease.4", "@patternfly/react-component-groups": "6.4.0", "@patternfly/react-console": "6.1.0", diff --git a/packages/documentation-site/patternfly-docs/generated/extensions/catalog-view/catalog-view-demo/react/catalog-view-demo.png b/packages/documentation-site/patternfly-docs/generated/extensions/catalog-view/catalog-view-demo/react/catalog-view-demo.png index 826e4ab718..20942b0a75 100644 Binary files a/packages/documentation-site/patternfly-docs/generated/extensions/catalog-view/catalog-view-demo/react/catalog-view-demo.png and b/packages/documentation-site/patternfly-docs/generated/extensions/catalog-view/catalog-view-demo/react/catalog-view-demo.png differ diff --git a/packages/documentation-site/patternfly-docs/patternfly-docs.css.js b/packages/documentation-site/patternfly-docs/patternfly-docs.css.js index 8d11baa650..0e58f3b13a 100644 --- a/packages/documentation-site/patternfly-docs/patternfly-docs.css.js +++ b/packages/documentation-site/patternfly-docs/patternfly-docs.css.js @@ -22,3 +22,5 @@ import '@patternfly/react-user-feedback/src/Feedback/Feedback.css'; import '@patternfly/chatbot/dist/css/main.css'; // Charts import '@patternfly/patternfly/patternfly-charts.css'; +// catalog view +import '@patternfly/react-catalog-view-extension/dist/css/react-catalog-view-extension.css'; \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index d5e94c935b..6bc93abaed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4377,16 +4377,16 @@ __metadata: languageName: node linkType: hard -"@patternfly/react-catalog-view-extension@npm:6.2.0": - version: 6.2.0 - resolution: "@patternfly/react-catalog-view-extension@npm:6.2.0" +"@patternfly/react-catalog-view-extension@npm:6.3.0": + version: 6.3.0 + resolution: "@patternfly/react-catalog-view-extension@npm:6.3.0" dependencies: "@patternfly/react-core": "npm:^6.1.0" "@patternfly/react-styles": "npm:^6.1.0" peerDependencies: react: ^17 || ^18 || ^19 react-dom: ^17 || ^18 || ^19 - checksum: 10c0/4de36b7c33ac29644777b6dda68bdd9fbb5dd4d23b44ae0a2f9463f7389defdbd42e48be537c8d533264f84a4b18d492d1f41e90f52d758e3515874914f21c24 + checksum: 10c0/a0e357b51c4ca720d84cb9fd0805114bf7fd78758da58dae27e1e35e762ace17727c5d45dc1cef5c47330a569a6b85f06b8f9daa13db6ce8542ee7d121245a08 languageName: node linkType: hard @@ -17757,7 +17757,7 @@ __metadata: "@patternfly/documentation-framework": "workspace:*" "@patternfly/patternfly-a11y": "npm:5.0.0" "@patternfly/quickstarts": "npm:6.4.0" - "@patternfly/react-catalog-view-extension": "npm:6.2.0" + "@patternfly/react-catalog-view-extension": "npm:6.3.0" "@patternfly/react-charts": "npm:8.5.0-prerelease.4" "@patternfly/react-component-groups": "npm:6.4.0" "@patternfly/react-console": "npm:6.1.0"