Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): update nextjs monorepo to v14 (major) #4614

Closed
wants to merge 2 commits into from
Closed

chore(deps): update nextjs monorepo to v14 (major) #4614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
945c306
chore(deps): update nextjs monorepo to v13
renovate[bot] Dec 2, 2022
213ff2e
refactor: converting v12 nextjs links to v13
mikewolfd Dec 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"lodash": "4.17.21",
"markdown-truncate": "1.0.4",
"netlify-cms-app": "2.15.72",
"next": "12.2.5",
"next": "13.0.5",
"next-seo": "5.14.1",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand Down Expand Up @@ -108,8 +108,8 @@
"@jest/types": "29.3.1",
"@mdx-js/react": "2.1.5",
"@mui/system": "5.10.15",
"@next/bundle-analyzer": "12.1.6",
"@next/eslint-plugin-next": "12.1.6",
"@next/bundle-analyzer": "13.0.5",
"@next/eslint-plugin-next": "13.0.5",
"@semantic-release/changelog": "6.0.2",
"@semantic-release/git": "10.0.1",
"@serverless/typescript": "3.25.0",
Expand Down
6 changes: 3 additions & 3 deletions web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"lodash": "4.17.21",
"markdown-truncate": "1.0.4",
"netlify-cms-app": "2.15.72",
"next": "12.2.5",
"next": "13.0.5",
"next-seo": "5.14.1",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand All @@ -90,8 +90,8 @@
"@jest/types": "29.3.1",
"@mdx-js/react": "2.1.5",
"@mui/system": "5.10.15",
"@next/bundle-analyzer": "12.1.6",
"@next/eslint-plugin-next": "12.1.6",
"@next/bundle-analyzer": "13.0.5",
"@next/eslint-plugin-next": "13.0.5",
"@storybook/addon-actions": "6.5.13",
"@storybook/addon-docs": "6.5.13",
"@storybook/addon-essentials": "6.5.13",
Expand Down
51 changes: 24 additions & 27 deletions web/src/components/FilingsCalendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,21 @@ export const FilingsCalendar = (props: Props): ReactElement => {
.map((filing) => {
return (
<div key={filing.identifier} className="line-height-1 margin-bottom-1" data-testid="filing">
<Link href={`filings/${props.operateReferences[filing.identifier].urlSlug}`}>
<a
href={`filings/${props.operateReferences[filing.identifier].urlSlug}`}
data-testid={filing.identifier.toLowerCase()}
className="usa-link text-secondary-darker hover:text-secondary-darker text-no-underline"
>
<Tag backgroundColor="warning-light" isHover isRadiusMd isWrappingText>
<span className="text-bold text-uppercase">
{Config.dashboardDefaults.calendarFilingDueDateLabel}{" "}
{parseDateWithFormat(filing.dueDate, defaultDateFormat).format("M/D")}
</span>
{" - "}
<span className="text-no-uppercase text-underline">
{props.operateReferences[filing.identifier].name}
</span>
</Tag>
</a>
<Link
href={`filings/${props.operateReferences[filing.identifier].urlSlug}`}
data-testid={filing.identifier.toLowerCase()}
className="usa-link text-secondary-darker hover:text-secondary-darker text-no-underline"
>
<Tag backgroundColor="warning-light" isHover isRadiusMd isWrappingText>
<span className="text-bold text-uppercase">
{Config.dashboardDefaults.calendarFilingDueDateLabel}{" "}
{parseDateWithFormat(filing.dueDate, defaultDateFormat).format("M/D")}
</span>
{" - "}
<span className="text-no-uppercase text-underline">
{props.operateReferences[filing.identifier].name}
</span>
</Tag>
</Link>
</div>
);
Expand Down Expand Up @@ -154,16 +152,15 @@ export const FilingsCalendar = (props: Props): ReactElement => {
{parseDateWithFormat(filing.dueDate, defaultDateFormat).format("MMMM D, YYYY")}
</div>
<div>
<Link href={`filings/${props.operateReferences[filing.identifier].urlSlug}`} passHref>
<a
href={`filings/${props.operateReferences[filing.identifier].urlSlug}`}
onClick={() => {
analytics.event.calendar_date.click.go_to_date_detail_screen();
}}
>
{props.operateReferences[filing.identifier].name}{" "}
{parseDateWithFormat(filing.dueDate, defaultDateFormat).format("YYYY")}
</a>
<Link
href={`filings/${props.operateReferences[filing.identifier].urlSlug}`}
passHref
onClick={() => {
analytics.event.calendar_date.click.go_to_date_detail_screen();
}}
>
{props.operateReferences[filing.identifier].name}{" "}
{parseDateWithFormat(filing.dueDate, defaultDateFormat).format("YYYY")}
</Link>
</div>
</div>
Expand Down
21 changes: 10 additions & 11 deletions web/src/components/Task.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,16 @@ export const Task = (props: Props): ReactElement => {
</span>
)}
<div>
<Link href={`/tasks/${props.task.urlSlug}`} passHref>
<a
onClick={() => {
return analytics.event.roadmap_task_title.click.go_to_task();
}}
href={`/tasks/${props.task.urlSlug}`}
className={`usa-link margin-right-105 ${props.task.required ? "text-bold" : ""}`}
data-task={props.task.id}
>
{props.task.name}
</a>
<Link
href={`/tasks/${props.task.urlSlug}`}
passHref
onClick={() => {
return analytics.event.roadmap_task_title.click.go_to_task();
}}
className={`usa-link margin-right-105 ${props.task.required ? "text-bold" : ""}`}
data-task={props.task.id}
>
{props.task.name}
</Link>

{isTabletAndUp && renderRequiredLabel()}
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/UserSupportActionCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const UserSupportActionCard = (props: Props): ReactElement => {
<div>{props.supportingText}</div>
</div>
<div>
<Link href={props.buttonLink} passHref>
<Link href={props.buttonLink} passHref legacyBehavior>
<button
className={`usa-button usa-button margin-right-0 btn-${props.buttonStyleProp} ${
props.intercom ? "intercom-button" : ""
Expand Down
4 changes: 2 additions & 2 deletions web/src/components/navbar/NavSidebarUserSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const NavSidebarUserSettings = (): ReactElement => {
return (
<>
<div className="margin-bottom-2">
<Link href={ROUTES.profile} passHref>
<Link href={ROUTES.profile} passHref legacyBehavior>
<Button
style="tertiary"
onClick={() => {
Expand Down Expand Up @@ -68,7 +68,7 @@ export const NavSidebarUserSettings = (): ReactElement => {
</Button>
</div>
<div className="margin-bottom-2">
<Link href={ROUTES.profile} passHref>
<Link href={ROUTES.profile} passHref legacyBehavior>
<Button
style="tertiary"
onClick={() => {
Expand Down
4 changes: 1 addition & 3 deletions web/src/components/navbar/NavigatorLogo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ import { ReactElement } from "react";
export const NavigatorLogo = (): ReactElement => {
return (
<Link href={ROUTES.dashboard} passHref>
<a href={ROUTES.dashboard}>
<img className="height-4" src="/img/[email protected]" alt="Business.NJ.Gov Navigator" />
</a>
<img className="height-4" src="/img/[email protected]" alt="Business.NJ.Gov Navigator" />
</Link>
);
};
27 changes: 13 additions & 14 deletions web/src/components/njwds-extended/SidebarPageLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,19 @@ export const SidebarPageLayout = ({
const isLargeScreen = useMediaQuery(MediaQueries.desktopAndUp);

const backButton = (
<Link href={ROUTES.dashboard} passHref>
<a
href={ROUTES.dashboard}
data-testid="back-to-dashboard"
className="usa-link fdr fac margin-top-3 margin-bottom-3 usa-link-hover-override desktop:margin-top-0 desktop:margin-bottom-4"
onClick={analytics.event.task_back_to_roadmap.click.view_roadmap}
>
<div className="circle-3 bg-green icon-green-bg-color-hover">
<Icon className="text-white usa-icon--size-3">arrow_back</Icon>
</div>
<div className="margin-left-2 margin-y-auto text-primary font-sans-xs usa-link text-green-color-hover">
{Config.taskDefaults.backToRoadmapText}
</div>
</a>
<Link
href={ROUTES.dashboard}
passHref
data-testid="back-to-dashboard"
className="usa-link fdr fac margin-top-3 margin-bottom-3 usa-link-hover-override desktop:margin-top-0 desktop:margin-bottom-4"
onClick={analytics.event.task_back_to_roadmap.click.view_roadmap}
>
<div className="circle-3 bg-green icon-green-bg-color-hover">
<Icon className="text-white usa-icon--size-3">arrow_back</Icon>
</div>
<div className="margin-left-2 margin-y-auto text-primary font-sans-xs usa-link text-green-color-hover">
{Config.taskDefaults.backToRoadmapText}
</div>
</Link>
);

Expand Down
2 changes: 1 addition & 1 deletion web/src/components/roadmap/MiniRoadmapTask.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const MiniRoadmapTask = (props: Props): ReactElement => {
const taskProgress = (userData?.taskProgress && userData.taskProgress[props.task.id]) || "NOT_STARTED";

return (
<Link href={`/tasks/${props.task.urlSlug}`} passHref>
<Link href={`/tasks/${props.task.urlSlug}`} passHref legacyBehavior>
<button
className={`usa-button--unstyled padding-y-1 padding-left-1 padding-right-4 cursor-pointer hover:bg-base-lightest line-height-body-2 fdr fac font-body-3xs text-base-darkest ${
props.active ? "bg-base-lightest bg-chevron text-primary-dark text-bold" : ""
Expand Down
6 changes: 2 additions & 4 deletions web/src/pages/onboarding.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,10 +474,8 @@ const OnboardingPage = (props: Props): ReactElement => {
<>
{OnboardingStatusLookup()[alert].body}
{OnboardingStatusLookup()[alert] && (
<Link href={ROUTES.dashboard}>
<a href={ROUTES.dashboard} data-testid={`snackbar-link`}>
{OnboardingStatusLookup()[alert].link}
</a>
<Link href={ROUTES.dashboard} data-testid={`snackbar-link`}>
{OnboardingStatusLookup()[alert].link}
</Link>
)}
</>
Expand Down
Loading