Skip to content

chore: merge main into redesign - #5385

Merged
ovflowd merged 8 commits into
nodejs:major/website-redesignfrom
ovflowd:chore/merge-main-into-redesign
May 19, 2023
Merged

chore: merge main into redesign#5385
ovflowd merged 8 commits into
nodejs:major/website-redesignfrom
ovflowd:chore/merge-main-into-redesign

Conversation

@ovflowd

Copy link
Copy Markdown
Member

This PR updates the major/website-redesign branch with latest content from main

ovflowdand others added 2 commits May 18, 2023 22:41
…igs (#5384)
* chore: updated gitignore and rmeoved robots.txt
* chore: updated next-sitemap config
* chore: next-config refactored options and export support
* chore: updated imports to node: prefix
* chore: updated contributing guidelines
* chore: updated scripts
* chore: updated next-sitemap
* chore: added missing props
@vercel

vercelBot commented May 18, 2023

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
nodejs-org✅ Ready (Inspect)Visit Preview💬 Add feedbackMay 19, 2023 8:29am
nodejs-org-stories✅ Ready (Inspect)Visit PreviewMay 19, 2023 8:29am

@ovflowdovflowd changed the title Chore/merge main into redesignchore: merge main into redesignMay 18, 2023
@ovflowd
ovflowd changed the base branch from main to major/website-redesignMay 18, 2023 21:13
@vercel
vercelBot temporarily deployed to Preview – nodejs-org-stories May 18, 2023 21:13 Inactive
@vercel
vercelBot temporarily deployed to Preview – nodejs-org May 18, 2023 21:19 Inactive
@vercel

vercelBot commented May 18, 2023

Copy link
Copy Markdown

@ovflowd is attempting to deploy a commit to the OpenJS Foundation Team on Vercel.

A member of the Team first needs to authorize it.

@vercel
vercelBot temporarily deployed to Preview – nodejs-org-stories May 18, 2023 21:47 Inactive
@ovflowd
ovflowd requested a review from HarkunwarMay 18, 2023 21:47
@vercel
vercelBot temporarily deployed to Preview – nodejs-org-stories May 18, 2023 21:48 Inactive
@vercel
vercelBot temporarily deployed to Preview – nodejs-org-stories May 18, 2023 22:20 Inactive
@vercel
vercelBot temporarily deployed to Preview – nodejs-org-stories May 18, 2023 22:26 Inactive
@vercel
vercelBot temporarily deployed to Preview – nodejs-org-stories May 19, 2023 08:23 Inactive
@ovflowd

Copy link
Copy Markdown
MemberAuthor

cc @nodejs/website I'm forcing merge this as it fixes current issues on the major/website-redesign branch caused due to Storybook.

@vercel
vercelBot temporarily deployed to Preview – nodejs-org May 19, 2023 08:29 Inactive
@ovflowd
ovflowd merged commit 2bb0c35 into nodejs:major/website-redesignMay 19, 2023
@ovflowd
ovflowd deleted the chore/merge-main-into-redesign branch May 19, 2023 08:29
ovflowd added a commit that referenced this pull request May 24, 2023
* feat: introduce built-in next.js exports and updated scripts and configs (#5384)
* chore: updated gitignore and rmeoved robots.txt
* chore: updated next-sitemap config
* chore: next-config refactored options and export support
* chore: updated imports to node: prefix
* chore: updated contributing guidelines
* chore: updated scripts
* chore: updated next-sitemap
* chore: added missing props
* fix: github-pages
* chore: remove unused package
* fix(storybook): update packages (#5386)
---------
Co-authored-by: Harkunwar Kochar <10580591+Harkunwar@users.noreply.github.com>
ovflowd added a commit that referenced this pull request May 24, 2023
* feat: introduce built-in next.js exports and updated scripts and configs (#5384)
* chore: updated gitignore and rmeoved robots.txt
* chore: updated next-sitemap config
* chore: next-config refactored options and export support
* chore: updated imports to node: prefix
* chore: updated contributing guidelines
* chore: updated scripts
* chore: updated next-sitemap
* chore: added missing props
* fix: github-pages
* chore: remove unused package
* fix(storybook): update packages (#5386)
---------
Co-authored-by: Harkunwar Kochar <10580591+Harkunwar@users.noreply.github.com>
Sign up for freeto 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.

2 participants

@ovflowd@Harkunwar