Merge branch 'main' into 10793-main-site-navigation

apps/web/package.json

@@ -68,7 +68,7 @@
   },
   "devDependencies": {
     "@faker-js/faker": "^9.0.3",
-    "@formatjs/cli": "^6.2.15",
+    "@formatjs/cli": "^6.3.5",
     "@gc-digital-talent/eslint-config": "workspace:*",
     "@gc-digital-talent/fake-data": "workspace:*",
     "@gc-digital-talent/helpers": "workspace:*",

apps/web/src/pages/DirectivePage/DirectivePage.tsx

@@ -25,6 +25,7 @@ import {
 import Hero from "~/components/HeroDeprecated";
 import useBreadcrumbs from "~/hooks/useBreadcrumbs";
 import useRoutes from "~/hooks/useRoutes";
+import SEO from "~/components/SEO/SEO";
 
 import Resources from "./Resources";
 
@@ -76,6 +77,13 @@ export const pageTitle = defineMessage({
   description: "Title for the digital talent directive page",
 });
 
+export const pageSubtitle = defineMessage({
+  defaultMessage:
+    "Learn more about how the Government of Canada is strengthening the talent base of the GC digital community.",
+  id: "c/u1K+",
+  description: "Subtitle for the digital talent directive page",
+});
+
 export const Component = () => {
   const intl = useIntl();
   const locale = getLocale(intl);
@@ -103,14 +111,13 @@ export const Component = () => {
 
   return (
     <>
+      <SEO
+        title={intl.formatMessage(pageTitle)}
+        description={intl.formatMessage(pageSubtitle)}
+      />
       <Hero
         title={intl.formatMessage(pageTitle)}
-        subtitle={intl.formatMessage({
-          defaultMessage:
-            "Learn more about how the Government of Canada is strengthening the talent base of the GC digital community.",
-          id: "c/u1K+",
-          description: "Subtitle for the digital talent directive page",
-        })}
+        subtitle={intl.formatMessage(pageSubtitle)}
         crumbs={crumbs}
         linkSlot={
           <>

packages/forms/src/types.ts

@@ -4,12 +4,7 @@ import {
   FieldsetHTMLAttributes,
   ReactNode,
 } from "react";
-import {
-  RegisterOptions,
-  FieldError,
-  FieldErrorsImpl,
-  Merge,
-} from "react-hook-form";
+import { RegisterOptions } from "react-hook-form";
 
 export type FieldLabels = Record<string, ReactNode>;
 
@@ -45,14 +40,6 @@ export interface CommonInputProps {
   trackUnsaved?: boolean;
 }
 
-export type InputFieldError =
-  | string
-  | FieldError
-  // This is from `react-hook-form` so ignore the any
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  | Merge<FieldError, FieldErrorsImpl<any>>
-  | undefined;
-
 export interface Option {
   label: ReactNode;
   value: string | number;

packages/i18n/package.json

@@ -27,7 +27,7 @@
     "@gc-digital-talent/graphql": "workspace:*"
   },
   "devDependencies": {
-    "@formatjs/cli": "^6.2.15",
+    "@formatjs/cli": "^6.3.5",
     "@gc-digital-talent/eslint-config": "workspace:*",
     "@gc-digital-talent/helpers": "workspace:*",
     "@gc-digital-talent/logger": "workspace:*",