Upgrade all components to React 18 and combine header and footer

.eslintrc.base.js

@@ -27,7 +27,7 @@ module.exports = {
     ecmaFeatures: {
       jsx: true,
     },
-    ecmaVersion: 12,
+    ecmaVersion: 13,
     sourceType: "module",
   },
   plugins: ["react", "jest"],

README.md

@@ -1,6 +1,7 @@
 # ASU Unity Design System (UDS)
 
 ## Table of Contents
+
 - [ASU Unity Design System (UDS)](#asu-unity-design-system-uds)
   - [Table of Contents](#table-of-contents)
   - [Pre-requisites:](#pre-requisites)

package.json

@@ -67,7 +67,7 @@
     "css-minimizer-webpack-plugin": "^2.0.0",
     "cz-conventional-changelog": "3.3.0",
     "dompurify": "^2.2.7",
-    "eslint": "^7.24.0",
+    "eslint": "^8",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-preact": "^1.1.3",
     "eslint-config-prettier": "^8.2.0",
@@ -92,8 +92,8 @@
     "nunjucks": "^3.2.0",
     "prettier": "^2.2.1",
     "purgecss-webpack-plugin": "^4.0.3",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "rimraf": "^3.0.2",
     "semantic-release": "18.0.1",
     "semantic-release-monorepo": "^7.0.4",

packages/app-degree-pages/examples/detail-page.html

@@ -19,11 +19,11 @@
     <!-- *************************************************************** -->
     <!-- Load React. -->
     <script
-      src="https://unpkg.com/react@17/umd/react.production.min.js"
+      src="https://unpkg.com/react@18/umd/react.production.min.js"
       crossorigin
     ></script>
     <script
-      src="https://unpkg.com/react-dom@17/umd/react-dom.production.min.js"
+      src="https://unpkg.com/react-dom@18/umd/react-dom.production.min.js"
       crossorigin
     ></script>
     <!-- *************************************************************** -->

packages/app-degree-pages/examples/listing-page.html

@@ -20,13 +20,10 @@
     <!-- *************************************************************** -->
     <!-- Load React. -->
     <script
-      src="https://unpkg.com/react@17/umd/react.production.min.js"
-      crossorigin
-    ></script>
-    <script
-      src="https://unpkg.com/react-dom@17/umd/react-dom.production.min.js"
+      src="https://unpkg.com/[email protected]/umd/react.development.js"
       crossorigin
     ></script>
+    <script crossorigin src="https://unpkg.com/[email protected]/umd/react-dom.development.js"></script>
     <!-- *************************************************************** -->
     <!-- include bundled scripts from packages -->
     <script src="../dist/degreePages.umd.js"></script>

packages/app-degree-pages/package.json

@@ -93,8 +93,8 @@
     "webpack-merge": "^5.8.0"
   },
   "peerDependencies": {
-    "react": ">= 16.14.0 < 18",
-    "react-dom": ">= 16.14.0 < 18"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "volta": {
     "extends": "../../package.json"

packages/app-degree-pages/src/core/utils/init-page-degree.js

@@ -1,7 +1,7 @@
 /* eslint-disable quote-props */
 // @ts-check
 import React from "react";
-import ReactDOM from "react-dom";
+import { createRoot } from "react-dom/client";
 
 import { ListingPage, DetailPage } from "../../components";
 
@@ -17,7 +17,8 @@ import { ListingPage, DetailPage } from "../../components";
  */
 const RenderReact = (component, props, targetSelector) => {
   const target = document.querySelector(targetSelector);
-  ReactDOM.render(React.createElement(component, props), target);
+  const root = createRoot(target);
+  root.render(React.createElement(component, props));
 };
 
 /**

packages/app-degree-pages/vite.config.js

@@ -22,11 +22,11 @@ export default defineConfig({
         },
     },
     },
-    minify: true,
+    minify: false,
   },
   esbuild: {
     legalComments: 'none',
-    keepNames: false,
+    keepNames: true,
   },
   define: {
     process: {env: {NODE_ENV: process.env.NODE_ENV}},

packages/app-rfi/CHANGELOG.md

@@ -1,3 +1,53 @@
+# [@asu/app-rfi-v2.4.1](https://github.com/asu/asu-unity-stack/compare/@asu/app-rfi-v2.4.0...@asu/app-rfi-v2.4.1) (2024-10-04)
+
+
+### Bug Fixes
+
+* **app-rfi:** account for steps counting as submits ([24abdfd](https://github.com/asu/asu-unity-stack/commit/24abdfd02e83d493ce935509ae152124263bb27a))
+* **app-rfi:** get prop type right ([2192fd9](https://github.com/asu/asu-unity-stack/commit/2192fd95057792ce29e7ed930c1021d960cfab5b))
+* **app-rfi:** missing prop update ([57855a8](https://github.com/asu/asu-unity-stack/commit/57855a8b45b7e31a230e0ffd1ed6251a6cce149c))
+* **app-rfi:** remove timeout for testing. add prop definition. linting fixes ([ad7bd44](https://github.com/asu/asu-unity-stack/commit/ad7bd44ed0f49a4f7f78d638d897b1f0806cb7ca))
+* **app-rfi:** use submitCount to prevent dupes ([09274ae](https://github.com/asu/asu-unity-stack/commit/09274ae2634c1758ddff094e9552aa420fb298a9))
+
+# [@asu/app-rfi-v2.4.0](https://github.com/asu/asu-unity-stack/compare/@asu/app-rfi-v2.3.13...@asu/app-rfi-v2.4.0) (2024-09-25)
+
+
+### Features
+
+* **app-rfi:** only display plan if rfiDisplay true ([2527a58](https://github.com/asu/asu-unity-stack/commit/2527a58c7a2c9204044df013256d1a97321d6a65))
+* **app-rfi:** RFI form not displayed message ([0dfe49c](https://github.com/asu/asu-unity-stack/commit/0dfe49cfabbb9ca07290a5ccef6c47cd656d0b20))
+* **app-rfi:** rfiDisplay false renders blank ([9f1983a](https://github.com/asu/asu-unity-stack/commit/9f1983ad9db7dc62f94d8aa73e348b64490e9c79))
+
+# [@asu/app-rfi-v2.3.13](https://github.com/asu/asu-unity-stack/compare/@asu/app-rfi-v2.3.12...@asu/app-rfi-v2.3.13) (2024-09-11)
+
+
+### Bug Fixes
+
+* **app-rfi:** fix undefined error when program optional ([6ac3cae](https://github.com/asu/asu-unity-stack/commit/6ac3cae9ba7979174542db1f8fa53f586b1a091a))
+
+# [@asu/app-rfi-v2.3.12](https://github.com/asu/asu-unity-stack/compare/@asu/app-rfi-v2.3.11...@asu/app-rfi-v2.3.12) (2024-09-11)
+
+
+### Bug Fixes
+
+* **app-rfi:** campusProgram has choice update api if Campus changes ([083ad23](https://github.com/asu/asu-unity-stack/commit/083ad234e4291cb559f30d4aa6035c449c1e72ca))
+
+# [@asu/app-rfi-v2.3.11](https://github.com/asu/asu-unity-stack/compare/@asu/app-rfi-v2.3.10...@asu/app-rfi-v2.3.11) (2024-09-09)
+
+
+### Bug Fixes
+
+* **app-rfi:** Entry dates should not have dups ([a223aa3](https://github.com/asu/asu-unity-stack/commit/a223aa32cb2bf2699a3e2fa8b738240a0091c3a3))
+* **app-rfi:** programOfInterest required, unless optional prop ([ec1ca4c](https://github.com/asu/asu-unity-stack/commit/ec1ca4cdedaec84882cda5309addb857ff49a41c))
+
+# [@asu/app-rfi-v2.3.10](https://github.com/asu/asu-unity-stack/compare/@asu/app-rfi-v2.3.9...@asu/app-rfi-v2.3.10) (2024-09-04)
+
+
+### Bug Fixes
+
+* **app-rfi:** Update Military to radio button ([311f872](https://github.com/asu/asu-unity-stack/commit/311f872c0ec809f33a89a8ec1cdb0a8a2720cc28))
+* **app-rfi:** update plan title to use market description ([72be88b](https://github.com/asu/asu-unity-stack/commit/72be88bbc7d500a940e9480e75d57de3a46f5833))
+
 # [@asu/app-rfi-v2.3.9](https://github.com/asu/asu-unity-stack/compare/@asu/app-rfi-v2.3.8...@asu/app-rfi-v2.3.9) (2024-07-10)
 
 

packages/app-rfi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asu/app-rfi",
-  "version": "2.3.9",
+  "version": "2.4.1",
   "description": "ASU Request For Information (RFI) form",
   "main": "./dist/appRfi.cjs.js",
   "browser": "./dist/appRfi.umd.js",
@@ -88,8 +88,8 @@
     "yup-phone": "^1.2.19"
   },
   "peerDependencies": {
-    "react": ">= 16.14.0 < 18",
-    "react-dom": ">= 16.14.0 < 18"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "volta": {
     "extends": "../../package.json"

packages/app-rfi/src/components/AsuRfi/index.js

@@ -69,7 +69,17 @@ const AsuRfi = props => {
   }
 
   const rfiState = useRfiState(betterPropNames(props));
-  window["rfiState"] = rfiState;
+
+  const noRfiAvailable = `RFI form not displayed. ${programOfInterest} has rfiDisplay set to false or does not exist`;
+  useEffect(() => {
+    if (!rfiState.showForm) {
+      console.log(noRfiAvailable);
+    }
+  }, [rfiState.showForm]);
+  if (!rfiState.showForm) {
+    return <div style={{ display: "none" }}>{noRfiAvailable}</div>;
+  }
+
   return (
     <RfiContext.Provider
       value={{