From 61bfae996c20feb3dc8bd130d39a53ac6fd42632 Mon Sep 17 00:00:00 2001 From: Martin Marosi Date: Wed, 2 Oct 2024 10:06:52 +0200 Subject: [PATCH] entirely remove pf4 from build --- config/webpack.config.js | 4 ---- config/webpack.cy.config.js | 3 --- cypress/support/component-index.html | 1 - package-lock.json | 7 ------- package.json | 1 - src/components/RootApp/PF4Root.tsx | 15 --------------- src/components/RootApp/RootApp.tsx | 3 --- src/index.ts | 6 ------ src/indexRes.ejs | 1 - src/sass/pf-4-assets.scss | 7 ------- src/utils/debugFunctions.ts | 3 --- src/utils/removePf4Styles.ts | 8 -------- 12 files changed, 59 deletions(-) delete mode 100644 src/components/RootApp/PF4Root.tsx delete mode 100644 src/sass/pf-4-assets.scss delete mode 100644 src/utils/removePf4Styles.ts diff --git a/config/webpack.config.js b/config/webpack.config.js index f21ed62f8..982d9bdca 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -14,9 +14,6 @@ const PFGenerator = asGenerator((item, ...rest) => { const defaultTuples = [...defaultJoinGenerator(item, ...rest)]; if (item.uri.includes('./assets')) { return defaultTuples.map(([base]) => { - if (base.includes('pf-4-styles')) { - return [base, path.relative(base, path.resolve(__dirname, '../node_modules/pf-4-styles', item.uri))]; - } if (base.includes('@patternfly/patternfly')) { return [base, path.relative(base, path.resolve(__dirname, '../node_modules/@patternfly/patternfly', item.uri))]; } @@ -192,7 +189,6 @@ const commonConfig = ({ dev }) => { /** @type { import("webpack").Configuration } */ const pfConfig = { entry: { - 'pf4-v4': path.resolve(__dirname, '../src/sass/pf-4-assets.scss'), 'pf4-v5': path.resolve(__dirname, '../src/sass/pf-5-assets.scss'), }, output: { diff --git a/config/webpack.cy.config.js b/config/webpack.cy.config.js index ae06b45c5..64624d457 100644 --- a/config/webpack.cy.config.js +++ b/config/webpack.cy.config.js @@ -10,9 +10,6 @@ const PFGenerator = asGenerator((item, ...rest) => { const defaultTuples = [...defaultJoinGenerator(item, ...rest)]; if (item.uri.includes('./assets')) { return defaultTuples.map(([base]) => { - if (base.includes('pf-4-styles')) { - return [base, path.relative(base, path.resolve(__dirname, '../node_modules/pf-4-styles', item.uri))]; - } if (base.includes('@patternfly/patternfly')) { return [base, path.relative(base, path.resolve(__dirname, '../node_modules/@patternfly/patternfly', item.uri))]; } diff --git a/cypress/support/component-index.html b/cypress/support/component-index.html index 41a9292f0..58b4f371c 100644 --- a/cypress/support/component-index.html +++ b/cypress/support/component-index.html @@ -4,7 +4,6 @@ - Components App diff --git a/package-lock.json b/package-lock.json index 127171e0b..f550e01be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -54,7 +54,6 @@ "localforage": "^1.10.0", "lodash": "^4.17.21", "oidc-client-ts": "^2.4.0", - "pf-4-styles": "npm:@patternfly/patternfly@^4.224.5", "react": "^18.3.1", "react-dom": "^18.3.1", "react-intl": "^6.6.8", @@ -21520,12 +21519,6 @@ "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==", "dev": true }, - "node_modules/pf-4-styles": { - "name": "@patternfly/patternfly", - "version": "4.224.5", - "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.224.5.tgz", - "integrity": "sha512-io0huj+LCP5FgDZJDaLv1snxktTYs8iCFz/W1VDRneYoebNHLmGfQdF7Yn8bS6PF7qmN6oJKEBlq3AjmmE8vdA==" - }, "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", diff --git a/package.json b/package.json index ac8947534..436506263 100644 --- a/package.json +++ b/package.json @@ -171,7 +171,6 @@ "localforage": "^1.10.0", "lodash": "^4.17.21", "oidc-client-ts": "^2.4.0", - "pf-4-styles": "npm:@patternfly/patternfly@^4.224.5", "react": "^18.3.1", "react-dom": "^18.3.1", "react-intl": "^6.6.8", diff --git a/src/components/RootApp/PF4Root.tsx b/src/components/RootApp/PF4Root.tsx deleted file mode 100644 index 78bbb018b..000000000 --- a/src/components/RootApp/PF4Root.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { useEffect } from 'react'; -import { useFlag } from '@unleash/proxy-client-react'; -import removePf4Styles from '../../utils/removePf4Styles'; - -const PF4Root = () => { - const removePF4 = useFlag('platform.chrome.disable-pf4'); - useEffect(() => { - if (removePF4) { - removePf4Styles(); - } - }, [removePF4]); - return null; -}; - -export default PF4Root; diff --git a/src/components/RootApp/RootApp.tsx b/src/components/RootApp/RootApp.tsx index 6f28360fe..eee153f94 100644 --- a/src/components/RootApp/RootApp.tsx +++ b/src/components/RootApp/RootApp.tsx @@ -19,7 +19,6 @@ import { activeModuleAtom } from '../../state/atoms/activeModuleAtom'; import { scalprumConfigAtom } from '../../state/atoms/scalprumConfigAtom'; import { isDebuggerEnabledAtom } from '../../state/atoms/debuggerModalatom'; import { addQuickstartToAppAtom, clearQuickstartsAtom, populateQuickstartsAppAtom, quickstartsAtom } from '../../state/atoms/quickstartsAtom'; -import PF4Root from './PF4Root'; const NotEntitledModal = lazy(() => import('../NotEntitledModal')); const Debugger = lazy(() => import('../Debugger')); @@ -109,8 +108,6 @@ const RootApp = memo(({ accountId }: { accountId?: string }) => { - {/* until PF 4 is fully removed from build */} - {/* */} diff --git a/src/index.ts b/src/index.ts index 7d23bc48e..aa739d472 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,11 +1,5 @@ import './sass/chrome.scss'; import { chunkLoadErrorRefreshKey } from './utils/common'; -import { CHROME_PF4_DEBUG } from './utils/debugFunctions'; -import removePf4Styles from './utils/removePf4Styles'; - -if (localStorage.getItem(CHROME_PF4_DEBUG)) { - removePf4Styles(); -} Object.keys(localStorage).map((key) => { if (key.includes(chunkLoadErrorRefreshKey)) { diff --git a/src/indexRes.ejs b/src/indexRes.ejs index 2ce2671d7..c56fa84cb 100644 --- a/src/indexRes.ejs +++ b/src/indexRes.ejs @@ -12,7 +12,6 @@ -