add rollup-svg, move Dashboard components out of page

packages/react-core/package.json

@@ -63,6 +63,7 @@
     "rimraf": "^3.0.2",
     "rollup": "^3.21.5",
     "rollup-plugin-scss": "^4.0.0",
+    "rollup-plugin-svg": "2.0.0",
     "rollup-plugin-terser": "^7.0.2",
     "typescript": "^4.7.4"
   },

packages/react-core/src/components/Page/DashboardHeader.tsx → packages/react-core/src/components/DashboardHeader.tsx

@@ -1,13 +1,13 @@
 import React, { useState } from 'react';
-import { Avatar } from '../Avatar';
-import { Brand } from '../Brand';
-import { Button, ButtonVariant } from '../Button';
-import { Divider } from '../Divider';
-import { Dropdown, DropdownGroup, DropdownItem, DropdownList } from '../Dropdown';
-import { Masthead, MastheadToggle, MastheadMain, MastheadBrand, MastheadContent } from '../Masthead';
-import { MenuToggle } from '../MenuToggle';
-import { Toolbar, ToolbarContent, ToolbarGroup, ToolbarItem } from '../Toolbar';
-import { PageToggleButton } from './PageToggleButton';
+import { Avatar } from './Avatar';
+import { Brand } from './Brand';
+import { Button, ButtonVariant } from './Button';
+import { Divider } from './Divider';
+import { Dropdown, DropdownGroup, DropdownItem, DropdownList } from './Dropdown';
+import { Masthead, MastheadToggle, MastheadMain, MastheadBrand, MastheadContent } from './Masthead';
+import { MenuToggle } from './MenuToggle';
+import { Toolbar, ToolbarContent, ToolbarGroup, ToolbarItem } from './Toolbar';
+import { PageToggleButton } from './Page/PageToggleButton';
 import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
 import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
 import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';

packages/react-core/src/components/Page/DashboardWrapper.tsx → packages/react-core/src/components/DashboardWrapper.tsx

@@ -1,9 +1,9 @@
 import React, { useState } from 'react';
-import { Breadcrumb, BreadcrumbItem } from '../Breadcrumb';
-import { Nav, NavItem, NavList } from '../Nav';
-import { Page, PageSection, PageSidebar, PageSidebarBody } from '../Page';
-import { SkipToContent } from '../SkipToContent';
-import { Text, TextContent } from '../Text';
+import { Breadcrumb, BreadcrumbItem } from './Breadcrumb';
+import { Nav, NavItem, NavList } from './Nav';
+import { Page, PageSection, PageSidebar, PageSidebarBody } from './Page';
+import { SkipToContent } from './SkipToContent';
+import { Text, TextContent } from './Text';
 import { DashboardHeader } from './DashboardHeader';
 
 interface DashboardWrapperProps {

packages/react-core/src/components/Page/index.ts

@@ -7,5 +7,3 @@ export * from './PageSection';
 export * from './PageNavigation';
 export * from './PageToggleButton';
 export * from './PageContext';
-export * from './DashboardHeader';
-export * from './DashboardWrapper';

packages/react-core/src/components/index.ts

@@ -18,6 +18,8 @@ export * from './Checkbox';
 export * from './Chip';
 export * from './ClipboardCopy';
 export * from './CodeBlock';
+export * from './DashboardHeader';
+export * from './DashboardWrapper';
 export * from './DataList';
 export * from './DatePicker';
 export * from './DescriptionList';

packages/rollup.base.js

@@ -3,6 +3,7 @@ const commonjs = require('@rollup/plugin-commonjs');
 const scss = require('rollup-plugin-scss');
 const replace = require('@rollup/plugin-replace');
 const { terser } = require('rollup-plugin-terser');
+const svg = require('rollup-plugin-svg');
 
 const isProduction = process.env.IS_PRODUCTION;
 let exitCode = 0;
@@ -38,6 +39,7 @@ module.exports = ({ packageName, name }) => ({
     nodeResolve(),
     commonjs(),
     scss(),
+    svg(),
     isProduction && terser(),
     circularFailPlugin()
   ],

yarn.lock

@@ -9083,6 +9083,11 @@ estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
+estree-walker@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
+  integrity sha512-6/I1dwNKk0N9iGOU3ydzAAurz4NPo/ttxZNCqgIVbWFvWyzWBSNonRrJ5CpjDuyBfmM7ENN7WCzUi9aT/UPXXQ==
+
 estree-walker@^0.6.1:
   version "0.6.1"
   resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz"
@@ -16914,6 +16919,13 @@ rollup-plugin-scss@^4.0.0:
   dependencies:
     rollup-pluginutils "^2.3.3"
 
+[email protected]:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/rollup-plugin-svg/-/rollup-plugin-svg-2.0.0.tgz#ce11b55e915d5b2190328c4e6632bd6b4fe12ee9"
+  integrity sha512-DmE7dSQHo1SC5L2uH2qul3Mjyd5oV6U1aVVkyvTLX/mUsRink7f1b1zaIm+32GEBA6EHu8H/JJi3DdWqM53ySQ==
+  dependencies:
+    rollup-pluginutils "^1.3.1"
+
 rollup-plugin-terser@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
@@ -16924,6 +16936,14 @@ rollup-plugin-terser@^7.0.2:
     serialize-javascript "^4.0.0"
     terser "^5.0.0"
 
+rollup-pluginutils@^1.3.1:
+  version "1.5.2"
+  resolved "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
+  integrity sha512-SjdWWWO/CUoMpDy8RUbZ/pSpG68YHmhk5ROKNIoi2En9bJ8bTt3IhYi254RWiTclQmL7Awmrq+rZFOhZkJAHmQ==
+  dependencies:
+    estree-walker "^0.2.1"
+    minimatch "^3.0.2"
+
 rollup-pluginutils@^2.3.3:
   version "2.8.2"
   resolved "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz"