Merge branch 'main' into chore/nextjs-15

Signed-off-by: Claudio W <[email protected]>
nodejs · Nov 14, 2024 · a55992b · a55992b
2 parents d49e34a + fa6fbd9
commit a55992b
Show file tree

Hide file tree

Showing 6 changed files with 382 additions and 9 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -7,7 +7,7 @@
 
 # Framework
 apps/site/next.config.mjs @nodejs/web-infra
-app/site/next.dynamic.mjs @nodejs/web-infra
+apps/site/next.dynamic.mjs @nodejs/web-infra
 
 # Node.js Release Blog Posts
 apps/site/pages/en/blog/release @nodejs/releasers

diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
@@ -299,7 +299,7 @@ import NameOfComponent from '@components/PathTo/YourComponent';
 type Story = StoryObj<typeof NameOfComponent>;
 type Meta = MetaObj<typeof NameOfComponent>;
 
-// If the component has any props that are interactable, they should be passed here
+// If the component has any props that are interactive, they should be passed here
 // We recommend reading Storybook docs for args: https://storybook.js.org/docs/react/writing-stories/args
 export const Default: Story = {};
 

diff --git a/TRANSLATION.md b/TRANSLATION.md
@@ -1,6 +1,6 @@
 # Node.js Website Translation Policy
 
-Node.js is a global platform and so this site has many translations. We use [Crowdin](https://crowdin.com) to translate the Node.js Website
+Node.js is a global platform, so this site has many translations. We use [Crowdin](https://crowdin.com) to translate the Node.js Website
 
 The site's translation into languages other than English is handled by [Crowdin translators](https://support.crowdin.com/translation-process-overview/).