From 97b11202a7390e36f098b5885ff7a5eeaa9f9370 Mon Sep 17 00:00:00 2001 From: Smith Mathieu Date: Tue, 25 Jul 2023 08:26:15 -0700 Subject: [PATCH 1/6] Update microsite/src/pages/on-demand/_onDemandCard.tsx: --- .../src/pages/on-demand/_onDemandCard.tsx | 59 +------------------ 1 file changed, 2 insertions(+), 57 deletions(-) diff --git a/microsite/src/pages/on-demand/_onDemandCard.tsx b/microsite/src/pages/on-demand/_onDemandCard.tsx index e203c80f9a698f..691d3cd1c66fd7 100644 --- a/microsite/src/pages/on-demand/_onDemandCard.tsx +++ b/microsite/src/pages/on-demand/_onDemandCard.tsx @@ -1,7 +1,3 @@ -import Link from '@docusaurus/Link'; -import { SimpleCard } from '@site/src/components/simpleCard/simpleCard'; -import React from 'react'; - export interface IOnDemandData { title: string; category: string; @@ -11,56 +7,5 @@ export interface IOnDemandData { youtubeImgUrl: string; rsvpUrl: string; eventUrl: string; -} - -export const OnDemandCard = ({ - title, - category, - description, - date, - youtubeUrl, - youtubeImgUrl, - rsvpUrl, - eventUrl, -}: IOnDemandData) => ( - -

{title}

- -

on {date}

- - {category} - - {title} - - } - body={

{description}

} - footer={ - category.toLowerCase() === 'upcoming' ? ( - <> - - Event page - - - - Remind me - - - ) : ( - - Watch on YouTube - - ) - } - /> -); + children?: React.ReactNode; +} \ No newline at end of file From 6523fa9c75e4d1178d72e16c78361404b019d1c2 Mon Sep 17 00:00:00 2001 From: Smith Mathieu Date: Tue, 25 Jul 2023 08:26:16 -0700 Subject: [PATCH 2/6] Update microsite/src/components/simpleCard/simpleCard.tsx: --- microsite/src/components/simpleCard/simpleCard.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/microsite/src/components/simpleCard/simpleCard.tsx b/microsite/src/components/simpleCard/simpleCard.tsx index 77be566f185f18..31577213559968 100644 --- a/microsite/src/components/simpleCard/simpleCard.tsx +++ b/microsite/src/components/simpleCard/simpleCard.tsx @@ -4,14 +4,16 @@ export interface ICardData { header: React.ReactNode; body: React.ReactNode; footer: React.ReactNode; + children?: React.ReactNode; } -export const SimpleCard = ({ header, body, footer }: ICardData) => ( +export const SimpleCard = ({ header, body, footer, children }: ICardData) => (
{header}
{body}
{footer}
+ {children}
-); +); \ No newline at end of file From 9262158d5959bcc38f31417e610a7387ac2abdd8 Mon Sep 17 00:00:00 2001 From: Smith Mathieu Date: Tue, 25 Jul 2023 08:26:17 -0700 Subject: [PATCH 3/6] Update microsite/src/pages/plugins/_pluginCard.tsx: --- microsite/src/pages/plugins/_pluginCard.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/microsite/src/pages/plugins/_pluginCard.tsx b/microsite/src/pages/plugins/_pluginCard.tsx index ba8e8069d2d920..b4633397d64bf4 100644 --- a/microsite/src/pages/plugins/_pluginCard.tsx +++ b/microsite/src/pages/plugins/_pluginCard.tsx @@ -14,6 +14,7 @@ export interface IPluginData { addedDate: string; isNew: boolean; order?: number; + children?: React.ReactNode; } const defaultIconUrl = 'img/logo-gradient-on-dark.svg'; @@ -54,4 +55,4 @@ export const PluginCard = ({ } /> -); +); \ No newline at end of file From af85efb421980e12530ea1f26f8a373191e61b66 Mon Sep 17 00:00:00 2001 From: Smith Mathieu Date: Tue, 25 Jul 2023 08:26:18 -0700 Subject: [PATCH 4/6] Update microsite/src/pages/home/_hubSpotNewAdoptersForm.tsx: --- microsite/src/pages/home/_hubSpotNewAdoptersForm.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/microsite/src/pages/home/_hubSpotNewAdoptersForm.tsx b/microsite/src/pages/home/_hubSpotNewAdoptersForm.tsx index 36f00dff75e97c..831507655f4f10 100644 --- a/microsite/src/pages/home/_hubSpotNewAdoptersForm.tsx +++ b/microsite/src/pages/home/_hubSpotNewAdoptersForm.tsx @@ -1,12 +1,12 @@ import clsx from 'clsx'; -import React, { useEffect, useState } from 'react'; +import React, { useInsertionEffect, useState } from 'react'; import hubSpotStyles from './hubSpotNewAdoptersForm.module.scss'; export const HubSpotNewAdoptersForm = () => { const [isClosed, setClosed] = useState(true); - useEffect(() => { + useInsertionEffect(() => { const script = document.createElement('script'); script.src = 'https://js.hsforms.net/forms/v2.js'; document.body.appendChild(script); @@ -49,4 +49,4 @@ export const HubSpotNewAdoptersForm = () => { > ); -}; +}; \ No newline at end of file From a4736a607d31a06c386e514139757c2435c7de3d Mon Sep 17 00:00:00 2001 From: Smith Mathieu Date: Tue, 25 Jul 2023 08:26:18 -0700 Subject: [PATCH 5/6] Update microsite/package.json: --- microsite/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/microsite/package.json b/microsite/package.json index 720179093ae6ed..410c9f3a469979 100644 --- a/microsite/package.json +++ b/microsite/package.json @@ -36,9 +36,9 @@ "clsx": "^1.1.1", "docusaurus-plugin-sass": "^0.2.3", "luxon": "^3.0.0", - "prism-react-renderer": "^1.3.5", - "react": "^17.0.2", - "react-dom": "^17.0.2", + "prism-react-renderer": "latest", + "react": "18", + "react-dom": "latest", "sass": "^1.57.1", "swc-loader": "^0.2.3" } From 16b52ffdb20fcd89a82ea6cf6940af8cefb06576 Mon Sep 17 00:00:00 2001 From: Smith Mathieu Date: Tue, 25 Jul 2023 08:26:20 -0700 Subject: [PATCH 6/6] Update microsite/yarn.lock: --- microsite/yarn.lock | 56 +++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/microsite/yarn.lock b/microsite/yarn.lock index 34bc7e6e12dbcb..72da323235e153 100644 --- a/microsite/yarn.lock +++ b/microsite/yarn.lock @@ -3006,6 +3006,13 @@ __metadata: languageName: node linkType: hard +"@types/prismjs@npm:^1.26.0": + version: 1.26.0 + resolution: "@types/prismjs@npm:1.26.0" + checksum: cd5e7a6214c1f4213ec512a5fcf6d8fe37a56b813fc57ac95b5ff5ee074742bfdbd2f2730d9fd985205bf4586728e09baa97023f739e5aa1c9735a7c1ecbd11a + languageName: node + linkType: hard + "@types/prop-types@npm:*": version: 15.7.5 resolution: "@types/prop-types@npm:15.7.5" @@ -3766,9 +3773,9 @@ __metadata: js-yaml: ^4.1.0 luxon: ^3.0.0 prettier: ^2.6.2 - prism-react-renderer: ^1.3.5 - react: ^17.0.2 - react-dom: ^17.0.2 + prism-react-renderer: latest + react: 18 + react-dom: latest sass: ^1.57.1 swc-loader: ^0.2.3 typescript: ^4.9.4 @@ -9450,6 +9457,18 @@ __metadata: languageName: node linkType: hard +"prism-react-renderer@npm:latest": + version: 2.0.6 + resolution: "prism-react-renderer@npm:2.0.6" + dependencies: + "@types/prismjs": ^1.26.0 + clsx: ^1.2.1 + peerDependencies: + react: ">=16.0.0" + checksum: d2202b79ddf01d308da3ba2f7f31a852fb0fb2e0290575d44e719af4c1d91fa913d04eb480fa3ba03e2d35d745ae806904270ffad00770511ec8bd80db67cb24 + languageName: node + linkType: hard + "prismjs@npm:^1.29.0": version: 1.29.0 resolution: "prismjs@npm:1.29.0" @@ -9690,16 +9709,15 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:^17.0.2": - version: 17.0.2 - resolution: "react-dom@npm:17.0.2" +"react-dom@npm:latest": + version: 18.2.0 + resolution: "react-dom@npm:18.2.0" dependencies: loose-envify: ^1.1.0 - object-assign: ^4.1.1 - scheduler: ^0.20.2 + scheduler: ^0.23.0 peerDependencies: - react: 17.0.2 - checksum: 1c1eaa3bca7c7228d24b70932e3d7c99e70d1d04e13bb0843bbf321582bc25d7961d6b8a6978a58a598af2af496d1cedcfb1bf65f6b0960a0a8161cb8dab743c + react: ^18.2.0 + checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc languageName: node linkType: hard @@ -9835,13 +9853,12 @@ __metadata: languageName: node linkType: hard -"react@npm:^17.0.2": - version: 17.0.2 - resolution: "react@npm:17.0.2" +"react@npm:18": + version: 18.2.0 + resolution: "react@npm:18.2.0" dependencies: loose-envify: ^1.1.0 - object-assign: ^4.1.1 - checksum: b254cc17ce3011788330f7bbf383ab653c6848902d7936a87b09d835d091e3f295f7e9dd1597c6daac5dc80f90e778c8230218ba8ad599f74adcc11e33b9d61b + checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b languageName: node linkType: hard @@ -10320,13 +10337,12 @@ __metadata: languageName: node linkType: hard -"scheduler@npm:^0.20.2": - version: 0.20.2 - resolution: "scheduler@npm:0.20.2" +"scheduler@npm:^0.23.0": + version: 0.23.0 + resolution: "scheduler@npm:0.23.0" dependencies: loose-envify: ^1.1.0 - object-assign: ^4.1.1 - checksum: c4b35cf967c8f0d3e65753252d0f260271f81a81e427241295c5a7b783abf4ea9e905f22f815ab66676f5313be0a25f47be582254db8f9241b259213e999b8fc + checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a languageName: node linkType: hard