diff --git a/.yarnrc.yml b/.yarnrc.yml index e1450716250..a82ca753351 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -4,4 +4,7 @@ enableScripts: false nodeLinker: node-modules -npmMinimalAgeGate: "1w" \ No newline at end of file +npmMinimalAgeGate: "1w" + +npmPreapprovedPackages: + - "@rh-felt/*" \ No newline at end of file diff --git a/packages/react-charts/package.json b/packages/react-charts/package.json index ce4dddd9fec..c8368fbf4ed 100644 --- a/packages/react-charts/package.json +++ b/packages/react-charts/package.json @@ -43,7 +43,7 @@ "@rh-felt/react-styles": "workspace:^", "@rh-felt/react-tokens": "workspace:^", "hoist-non-react-statics": "^3.3.2", - "lodash": "^4.17.23", + "lodash": "^4.18.1", "tslib": "^2.8.1" }, "devDependencies": { diff --git a/packages/react-charts/src/victory/components/ChartLegend/examples/ChartLegend.md b/packages/react-charts/src/victory/components/ChartLegend/examples/ChartLegend.md index 74fa28acf10..1f1f0422b37 100644 --- a/packages/react-charts/src/victory/components/ChartLegend/examples/ChartLegend.md +++ b/packages/react-charts/src/victory/components/ChartLegend/examples/ChartLegend.md @@ -45,7 +45,7 @@ import { } from '@rh-felt/react-charts/victory'; import { getResizeObserver } from '@rh-felt/react-core'; import chart_color_black_500 from '@rh-felt/react-tokens/dist/esm/chart_color_black_500'; -import '@patternfly/patternfly/patternfly-charts.css'; +import '@rh-felt/styles/patternfly-charts.css'; ## Introduction Note: PatternFly React charts live in its own package at [@rh-felt/react-charts](https://www.npmjs.com/package/@rh-felt/react-charts)! diff --git a/packages/react-charts/src/victory/components/Patterns/examples/patterns.md b/packages/react-charts/src/victory/components/Patterns/examples/patterns.md index 8259db72888..c8508e69496 100644 --- a/packages/react-charts/src/victory/components/Patterns/examples/patterns.md +++ b/packages/react-charts/src/victory/components/Patterns/examples/patterns.md @@ -49,7 +49,7 @@ import chart_color_blue_300 from '@rh-felt/react-tokens/dist/esm/chart_color_blu import chart_color_green_300 from '@rh-felt/react-tokens/dist/esm/chart_color_green_300'; import chart_color_teal_300 from '@rh-felt/react-tokens/dist/esm/chart_color_teal_300'; import chart_color_yellow_300 from '@rh-felt/react-tokens/dist/esm/chart_color_yellow_300'; -import '@patternfly/patternfly/patternfly-charts.css'; +import '@rh-felt/styles/patternfly-charts.css'; ## Introduction Note: PatternFly React charts live in its own package at [@rh-felt/react-charts](https://www.npmjs.com/package/@rh-felt/react-charts)! diff --git a/packages/react-charts/src/victory/components/ResizeObserver/examples/resizeObserver.md b/packages/react-charts/src/victory/components/ResizeObserver/examples/resizeObserver.md index 7e3cf21f9d0..ce80bc5526d 100644 --- a/packages/react-charts/src/victory/components/ResizeObserver/examples/resizeObserver.md +++ b/packages/react-charts/src/victory/components/ResizeObserver/examples/resizeObserver.md @@ -36,7 +36,7 @@ import { import { getResizeObserver } from '@rh-felt/react-core'; import chart_color_blue_300 from '@rh-felt/react-tokens/dist/esm/chart_color_blue_300'; import chart_color_orange_300 from '@rh-felt/react-tokens/dist/esm/chart_color_orange_300'; -import '@patternfly/patternfly/patternfly-charts.css'; +import '@rh-felt/styles/patternfly-charts.css'; ## Introduction Note: PatternFly React charts live in its own package at [@rh-felt/react-charts](https://www.npmjs.com/package/@rh-felt/react-charts)! diff --git a/packages/react-core/package.json b/packages/react-core/package.json index c67247d5fda..0271f80561f 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -56,7 +56,7 @@ }, "devDependencies": { "@adobe/css-tools": "^4.5.0", - "@patternfly/patternfly": "6.7.0-prerelease.3", + "@rh-felt/styles": "0.0.1-prerelease.3", "case-anything": "^3.1.2", "fs-extra": "^11.3.3" }, diff --git a/packages/react-core/scripts/copyStyles.mjs b/packages/react-core/scripts/copyStyles.mjs index c671aab736a..145a711cb4f 100644 --- a/packages/react-core/scripts/copyStyles.mjs +++ b/packages/react-core/scripts/copyStyles.mjs @@ -6,7 +6,7 @@ import { parse as parseCSS, stringify as stringifyCSS } from '@adobe/css-tools'; const require = createRequire(import.meta.url); const stylesDir = resolve(import.meta.dirname, '../dist/styles'); -const pfDir = dirname(require.resolve('@patternfly/patternfly/patternfly.css')); +const pfDir = dirname(require.resolve('@rh-felt/styles/patternfly.css')); const unusedSelectorRegEx = /(\.fas?|\.sr-only)/; const unusedKeyFramesRegEx = /fa-/; diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index c5b47a61586..577ed14fba4 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -23,16 +23,14 @@ "test:a11y": "patternfly-a11y --config patternfly-a11y.config" }, "dependencies": { - "@patternfly/patternfly": "6.7.0-prerelease.3", - "@patternfly/react-charts": "8.7.0-prerelease.4", - "@patternfly/react-code-editor": "6.7.0-prerelease.6", - "@patternfly/react-core": "6.7.0-prerelease.6", - "@patternfly/react-drag-drop": "6.7.0-prerelease.6", - "@patternfly/react-icons": "6.7.0-prerelease.3", - "@patternfly/react-styles": "6.7.0-prerelease.3", - "@patternfly/react-table": "6.7.0-prerelease.7", - "@patternfly/react-templates": "6.7.0-prerelease.6", - "@patternfly/react-tokens": "6.7.0-prerelease.3", + "@patternfly/patternfly": "npm:@rh-felt/styles@0.0.1-prerelease.3", + "@patternfly/react-code-editor": "npm:@rh-felt/react-code-editor@0.0.1-prerelease.3", + "@patternfly/react-core": "npm:@rh-felt/react-core@0.0.1-prerelease.3", + "@patternfly/react-icons": "npm:@rh-felt/react-icons@0.0.1-prerelease.2", + "@patternfly/react-styles": "npm:@rh-felt/react-styles@0.0.1-prerelease.3", + "@patternfly/react-table": "npm:@rh-felt/react-table@0.0.1-prerelease.3", + "@patternfly/react-tokens": "npm:@rh-felt/react-tokens@0.0.1-prerelease.2", + "@rh-felt/styles": "0.0.1-prerelease.3", "echarts": "^5.6.0 || ^6.0.0", "victory": "^37.3.6" }, diff --git a/packages/react-docs/patternfly-docs/patternfly-docs.css.js b/packages/react-docs/patternfly-docs/patternfly-docs.css.js index a332be65cd2..f90c2859c97 100644 --- a/packages/react-docs/patternfly-docs/patternfly-docs.css.js +++ b/packages/react-docs/patternfly-docs/patternfly-docs.css.js @@ -7,10 +7,10 @@ import '@rh-felt/react-styles/src/css/components/Popper/Popper.css'; import '@patternfly/documentation-framework/global.css'; // Patternfly -import '@patternfly/patternfly/patternfly.css'; +import '@rh-felt/styles/patternfly.css'; // Utilities -import '@patternfly/patternfly/patternfly-addons.css'; +import '@rh-felt/styles/patternfly-addons.css'; // Charts -import '@patternfly/patternfly/patternfly-charts.css'; +import '@rh-felt/styles/patternfly-charts.css'; diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json index a2a27dcbe2c..66e849fb8da 100644 --- a/packages/react-icons/package.json +++ b/packages/react-icons/package.json @@ -39,7 +39,7 @@ "@fortawesome/free-brands-svg-icons": "^5.15.4", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@patternfly/patternfly": "6.7.0-prerelease.3", + "@rh-felt/styles": "0.0.1-prerelease.3", "@rhds/icons": "^2.3.1", "fs-extra": "^11.3.3" }, diff --git a/packages/react-icons/scripts/icons/patternflyIcons.mjs b/packages/react-icons/scripts/icons/patternflyIcons.mjs index 3b978c16ece..ca737007842 100644 --- a/packages/react-icons/scripts/icons/patternflyIcons.mjs +++ b/packages/react-icons/scripts/icons/patternflyIcons.mjs @@ -1,4 +1,4 @@ -import { pfIcons } from '@patternfly/patternfly/icons/pficons.mjs'; +import { pfIcons } from '@rh-felt/styles/icons/pficons.mjs'; const renaming = { save: 'save-alt', diff --git a/packages/react-integration/demo-app-ts/package.json b/packages/react-integration/demo-app-ts/package.json index 46a344a97a1..d9481c92149 100644 --- a/packages/react-integration/demo-app-ts/package.json +++ b/packages/react-integration/demo-app-ts/package.json @@ -9,10 +9,11 @@ }, "dependencies": { "@rh-felt/react-core": "workspace:^", + "@rh-felt/styles": "0.0.1-prerelease.3", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-router": "^7.12.0", - "react-router-dom": "^7.12.0" + "react-router": "^7.18.4", + "react-router-dom": "^7.18.4" }, "devDependencies": { "@vitejs/plugin-react-swc": "^3.11.0", diff --git a/packages/react-integration/demo-app-ts/src/App.tsx b/packages/react-integration/demo-app-ts/src/App.tsx index fd843607f9e..790e999901b 100755 --- a/packages/react-integration/demo-app-ts/src/App.tsx +++ b/packages/react-integration/demo-app-ts/src/App.tsx @@ -52,9 +52,9 @@ class App extends Component<{}, AppState> { const htmlElement = document.getElementsByTagName('html')[0]; if (htmlElement) { if (isDarkTheme) { - htmlElement.classList.add('pf-theme-dark'); + htmlElement.classList.add('pf-v6-theme-dark'); } else { - htmlElement.classList.remove('pf-theme-dark'); + htmlElement.classList.remove('pf-v6-theme-dark'); } } }; @@ -99,7 +99,7 @@ class App extends Component<{}, AppState> { id="light-theme" aria-label="Light theme" label={`Light theme`} - name="light-theme" + name="theme" isChecked={!isDarkTheme} onChange={(_event: React.FormEvent, checked: boolean) => checked && this.onThemeSelect(false) @@ -111,7 +111,7 @@ class App extends Component<{}, AppState> { id="dark-theme" label="Dark theme" aria-label="Dark theme" - name="dark-theme" + name="theme" isChecked={isDarkTheme} onChange={(_event: React.FormEvent, checked: boolean) => checked && this.onThemeSelect(true) diff --git a/packages/react-integration/demo-app-ts/src/Demos.ts b/packages/react-integration/demo-app-ts/src/Demos.ts index 61a7c733ac4..b7c96571ce6 100644 --- a/packages/react-integration/demo-app-ts/src/Demos.ts +++ b/packages/react-integration/demo-app-ts/src/Demos.ts @@ -249,7 +249,7 @@ export const Demos: DemoInterface[] = [ }, { id: 'modal-deprecated-demo', - name: 'Modal Demo', + name: 'Modal Deprecated Demo', componentType: Examples.ModalDeprecatedDemo }, { diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ChipDemo/ChipDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ChipDemo/ChipDemo.tsx index 85c51e79838..49fef3644a7 100644 --- a/packages/react-integration/demo-app-ts/src/components/demos/ChipDemo/ChipDemo.tsx +++ b/packages/react-integration/demo-app-ts/src/components/demos/ChipDemo/ChipDemo.tsx @@ -5,7 +5,6 @@ export const ChipDemo: React.FunctionComponent = () => ( Chip with a really, really, REALLY long text - ; ); ChipDemo.displayName = 'ChipDemo'; diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx index b74f8c9362d..1646c4681a9 100644 --- a/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx +++ b/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx @@ -21,7 +21,7 @@ export class ClipboardCopyDemo extends Component { isBlock additionalActions={ - - + drawer-section {drawerContent} diff --git a/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDrilldownDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDrilldownDemo.tsx index f96464d9e6a..c6f37e49adf 100644 --- a/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDrilldownDemo.tsx +++ b/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDrilldownDemo.tsx @@ -48,7 +48,7 @@ export class MenuDrilldownDemo extends Component { }; setHeight = (menuId: string, height: number) => { if ( - !this.state.menuHeights[menuId] || + this.state.menuHeights[menuId] === undefined || (menuId !== 'drilldown-rootMenu' && this.state.menuHeights[menuId] !== height) ) { this.setState({ diff --git a/packages/react-integration/demo-app-ts/src/components/demos/NavDemo/NavDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/NavDemo/NavDemo.tsx index e9ac20c820c..e187905ed66 100644 --- a/packages/react-integration/demo-app-ts/src/components/demos/NavDemo/NavDemo.tsx +++ b/packages/react-integration/demo-app-ts/src/components/demos/NavDemo/NavDemo.tsx @@ -65,7 +65,7 @@ export class NavDemo extends Component { Default Nav -
+