From 5218e98068b3b0055138cd1e7c803ad3403fd418 Mon Sep 17 00:00:00 2001 From: david ornelas Date: Thu, 16 Jan 2025 16:08:11 -0700 Subject: [PATCH 1/3] build: updated header-footer and license inclusions --- packages/app-degree-pages/vite.config.js | 6 +++--- packages/app-webdir-ui/vite.config.js | 2 +- packages/component-header-footer/package.json | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/app-degree-pages/vite.config.js b/packages/app-degree-pages/vite.config.js index 84ab8b75a7..9ea804660b 100644 --- a/packages/app-degree-pages/vite.config.js +++ b/packages/app-degree-pages/vite.config.js @@ -22,11 +22,11 @@ export default defineConfig({ }, }, }, - minify: false, + minify: true, }, esbuild: { - legalComments: 'none', - keepNames: true, + legalComments: 'eof', + keepNames: false, }, define: { process: {env: {NODE_ENV: process.env.NODE_ENV}}, diff --git a/packages/app-webdir-ui/vite.config.js b/packages/app-webdir-ui/vite.config.js index 1e96df99ca..1b87730fcb 100644 --- a/packages/app-webdir-ui/vite.config.js +++ b/packages/app-webdir-ui/vite.config.js @@ -24,7 +24,7 @@ export default defineConfig({ minify: true, }, esbuild: { - legalComments: 'none', + legalComments: 'eof', keepNames: false, }, define: { diff --git a/packages/component-header-footer/package.json b/packages/component-header-footer/package.json index 70cb9d70b0..4d6be292b8 100644 --- a/packages/component-header-footer/package.json +++ b/packages/component-header-footer/package.json @@ -45,11 +45,13 @@ "postdocs": "node ../../scripts/process-readme-props.js", "build-storybook": "storybook build -o ../../build/$npm_package_name" }, - "peerDependencies": { + "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.4.2", "@fortawesome/free-brands-svg-icons": "^6.4.2", "@fortawesome/free-solid-svg-icons": "^6.4.2", - "@fortawesome/react-fontawesome": "^0.2.0", + "@fortawesome/react-fontawesome": "^0.2.0" + }, + "peerDependencies": { "react": "^18.3.1", "react-dom": "^18.3.1" }, From b152ac8986b3696828d5cf5149ccd0e8873315a4 Mon Sep 17 00:00:00 2001 From: david ornelas Date: Thu, 16 Jan 2025 16:48:08 -0700 Subject: [PATCH 2/3] fix(component-header-footer): fix header navbar not hiding --- .../src/header/header.js | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/packages/component-header-footer/src/header/header.js b/packages/component-header-footer/src/header/header.js index 8f3a3b3917..0b49348381 100644 --- a/packages/component-header-footer/src/header/header.js +++ b/packages/component-header-footer/src/header/header.js @@ -19,10 +19,10 @@ import { Header, HeaderDiv } from "./header.styles"; */ const ASUHeader = ({ - isPartner, + isPartner = false, navTree: rawNavTree, title, - baseUrl, + baseUrl = "/", parentOrg, parentOrgUrl, partnerLogo, @@ -34,9 +34,9 @@ const ASUHeader = ({ logoutLink, onLogoutClick, buttons, - breakpoint, + breakpoint = "Xl", animateTitle, - expandOnHover, + expandOnHover = false, mobileNavTree: rawMobileNavTree, searchUrl, site, @@ -90,7 +90,7 @@ const ASUHeader = ({ const Wrapper = renderDiv === "true" ? HeaderDiv : Header; return ( - + ); @@ -130,11 +130,4 @@ const ASUHeader = ({ ASUHeader.propTypes = { ...HeaderPropTypes }; -ASUHeader.defaultProps = { - isPartner: false, - baseUrl: "/", - breakpoint: "Xl", - expandOnHover: false, -}; - export { ASUHeader }; From 5bc4ee56cc2bd198533a6e96ba0f743ca9915b67 Mon Sep 17 00:00:00 2001 From: mlsamuelson Date: Fri, 17 Jan 2025 08:44:48 -0700 Subject: [PATCH 3/3] chore: update yarn.lock --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index d44441dfcb..93b4231e4e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -348,6 +348,10 @@ __metadata: "@babel/plugin-syntax-jsx": "npm:^7.14.5" "@babel/plugin-transform-react-jsx": "npm:^7.13.12" "@babel/plugin-transform-runtime": "npm:^7.14.5" + "@fortawesome/fontawesome-svg-core": "npm:^6.4.2" + "@fortawesome/free-brands-svg-icons": "npm:^6.4.2" + "@fortawesome/free-solid-svg-icons": "npm:^6.4.2" + "@fortawesome/react-fontawesome": "npm:^0.2.0" "@storybook/addon-a11y": "npm:^7.6.14" "@storybook/addon-essentials": "npm:^7.6.14" "@storybook/addon-links": "npm:^7.6.14" @@ -382,10 +386,6 @@ __metadata: webpack-filter-warnings-plugin: "npm:^1.2.1" webpack-merge: "npm:^5.8.0" peerDependencies: - "@fortawesome/fontawesome-svg-core": ^6.4.2 - "@fortawesome/free-brands-svg-icons": ^6.4.2 - "@fortawesome/free-solid-svg-icons": ^6.4.2 - "@fortawesome/react-fontawesome": ^0.2.0 react: ^18.3.1 react-dom: ^18.3.1 languageName: unknown