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.

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

Upgrade FDC3 website to docusaurus >=3.5.2 #1371 #1418

Open
wants to merge 10 commits into
base: main
Choose a base branch
from

Conversation

sivaprasadanakarla
Copy link

@sivaprasadanakarla sivaprasadanakarla commented Nov 6, 2024

This update contains all the issue fixes highlighted during review.

Notes from the original PR (#1409):

This PR contains all the files modified for docusaurus migration.
steps followed:

  1. delete yarn.lock

  2. rm -rf node_modules package-lock.json

  3. update package.json
    a) "@docusaurus/core": "~3.5.2",
    b) "@docusaurus/preset-classic": "~3.5.2",
    c) "@docusaurus/theme-mermaid": "~3.5.2",
    d) "react": "^18.2.0",
    e) "react-dom": "^18.2.0",

  4. npm install. – ( notice- found 0 vulnerabilities)

  5. npm run build. ( now build will fail)

  6. npx docusaurus-mdx-checker (iscans and shows compilation issues of .md files)

  7. Fixed all the .md files and 1 js file which is generating .md file

  8. npm run build (success)

  9. npm run start (application is up)

@sivaprasadanakarla sivaprasadanakarla requested a review from a team as a code owner November 6, 2024 04:46
Copy link

linux-foundation-easycla bot commented Nov 6, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

Copy link

netlify bot commented Nov 6, 2024

Deploy Preview for fdc3 canceled.

Name Link
🔨 Latest commit 2b58c52
🔍 Latest deploy log https://app.netlify.com/sites/fdc3/deploys/672afdb874cffd0008b22024

@sivaprasadanakarla
Copy link
Author

Hi @robmoffat @bingenito ,

[this PR is raised as part of citi_hackathon event]
Could you please review this latest PR for Issue##1371.
We have fixed all the issues highlighted in below PR's.

#1409
#1406

Kindly review and suggest if any other issues.

Thanks in advance.

Best Regards,
Shiva.

Copy link

@DILPREET1910 DILPREET1910 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the \ escape characters are still visible in some sections

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
this issue still persists
#1406 (comment)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for highlighting this issue, i will fix it by using triple backticks, it is working fine in my local workspace.

@@ -1,4 +1,4 @@
# <a href='http://fdc3.finos.org/toolbox/fdc3-explained'><img src='logo.png' alt='FDC3 Explained Logo'></a>
# <a href='http://fdc3.finos.org/toolbox/fdc3-explained'><img src='logo.png' alt='FDC3 Explained Logo'/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We lost having the image within the link. Should this be changed to markdown instead of html?

Copy link
Contributor

@kriswest kriswest Nov 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just an error that needs reverting I think. The A tag should definitely contain the image still. We may need to look for other cases that need reverting.

Well spotted @bingenito!

The equivalent markdown (for interest's sake) is:

# [![FDC3 Explained Logo](logo.png)](http://fdc3.finos.org/toolbox/fdc3-explained)

@@ -0,0 +1,62 @@
{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kriswest Looks like tooling generated the newly proper cased timeRange side by side with the existing lower timerange.schema.json.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies @bingenito I don't quite understand the comment.

  • In 2.1 and next I'm only seeing the camelCased fdc3.timeRange schema and generated code in JS and markdown and NOT the uncased fdc3.timerange.
  • In 2.0 (only) I see the uncased fdc3.timerange

I don't see both in one version - although I am amazed at the number of issues one mistake on the casing of a character (my bad) has caused!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kriswest
In next it is already present as lower case - https://github.com/finos/FDC3/blob/main/website/static/schemas/next/context/timerange.schema.json

This PR has generated and is now adding the camelCase side by side as it was somehow never there.

Copy link
Contributor

@kriswest kriswest Nov 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gah, of course that doesn't happen to me locally as the camelcased one is on my filesystem and ensures the case is retained. Behaviour will be different on a case-sensitive file system. Note that the content of that file is actually the camel-cased version!

I dealt with that in the source files, but clearly not in the website's static folder.

Heres a PR that fixes that (I hope) @bingenito: #1420
@sivaprasadanakarla you can ignore this as it should merge into your PR fine.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, @sivaprasadanakarla you must be on a case-insensitive filesystem. I'll get back to you once we have this fix merged as you may need to resolve a conflict once it's in. Nothing to do right now however.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merged. @sivaprasadanakarla please merge changes from the main branch into your PR branch and then if
/website/static/schemas/next/context/timerange.schema.json still exists, delete it and make sure you only have /website/static/schemas/next/context/timeRange.schema.json

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kriswest working on it.

@kriswest
Copy link
Contributor

Hi, you may need to rebase this PR on main and re-run the checks as we've just merged a big PR for a new web-based specification. Hopefully we've not introduced too many extra links using the <{link}> syntax, although I know there are some in the references page. There are likely others.

@kriswest
Copy link
Contributor

@sivaprasadanakarla please let us know if you or another participant have some time in the next few days to update this PR from main and make sure several new documents that were recently added (a big PR that had been in flight for many months just merged in) are also all good. We're very grateful that you took this task on and are keen to merge the result and get the website to a clean dependency audit!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants