diff --git a/components/withLayout.tsx b/components/withLayout.tsx index 771a57a7d702f..f65b602dd538c 100644 --- a/components/withLayout.tsx +++ b/components/withLayout.tsx @@ -11,7 +11,6 @@ import LegacyLearnLayout from '@/layouts/LearnLayout'; import AboutLayout from '@/layouts/New/About'; import BlogLayout from '@/layouts/New/Blog'; import DefaultLayout from '@/layouts/New/Default'; -import DocsLayout from '@/layouts/New/Docs'; import HomeLayout from '@/layouts/New/Home'; import LearnLayout from '@/layouts/New/Learn'; import PostLayout from '@/layouts/New/Post'; @@ -33,7 +32,6 @@ const legacyLayouts = { /** all the currently available layouts from website redesign */ const redesignLayouts = { 'about.hbs': AboutLayout, - 'docs.hbs': DocsLayout, 'home.hbs': HomeLayout, 'learn.hbs': LearnLayout, 'page.hbs': DefaultLayout, diff --git a/crowdin.yml b/crowdin.yml index a76de0618a0a6..144dcc0f796fd 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -9,7 +9,6 @@ files: ignore: - /pages/en/blog/**/*.md - /pages/en/learn/**/*.md - - /pages/en/guides/**/*.md - /pages/en/download/index.md - /pages/en/download/current.md languages_mapping: @@ -24,7 +23,6 @@ files: ignore: - /pages/en/blog/**/*.mdx - /pages/en/learn/**/*.mdx - - /pages/en/guides/**/*.mdx languages_mapping: two_letters_code: es-ES: es diff --git a/layouts/New/Docs.tsx b/layouts/New/Docs.tsx deleted file mode 100644 index 04e729424150d..0000000000000 --- a/layouts/New/Docs.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import type { FC, PropsWithChildren } from 'react'; - -import WithFooter from '@/components/withFooter'; -import WithMetaBar from '@/components/withMetaBar'; -import WithNavBar from '@/components/withNavBar'; -import ContentLayout from '@/layouts/New/Content'; - -// @deprecated: This Layout is Temporary. The `en/docs` route should eventually be removed -// and all "guides" moved to the Learn section. -// A top-level "Docs" Navigation should redirect to the Node.js API docs (Current) -const DocsLayout: FC = ({ children }) => ( - <> - - - -
-
{children}
-
- - -
- - - -); - -export default DocsLayout; diff --git a/navigation.json b/navigation.json index eb51aa6015145..d6629d7f81982 100644 --- a/navigation.json +++ b/navigation.json @@ -12,10 +12,6 @@ "link": "/download", "label": "components.header.links.download" }, - "guides": { - "link": "/guides", - "label": "components.header.links.guides" - }, "blog": { "link": "/blog", "label": "components.header.links.blog" diff --git a/pages/en/blog/release/v20.6.0.md b/pages/en/blog/release/v20.6.0.md index b6c0f56ab4222..4c5da2a57956c 100644 --- a/pages/en/blog/release/v20.6.0.md +++ b/pages/en/blog/release/v20.6.0.md @@ -53,7 +53,7 @@ This feature was contributed by Antoine du Hamel in ` headers from V8, which are now also included into the Node.js headers available to addons. Note that since Node.js only bundles the cppgc library coming from V8, [the ABI stability](/guides/abi-stability#abi-stability-in-nodejs) of cppgc is currently not guaranteed in semver-minor and -patch updates, but we do not expect the ABI to break often, as it has been stable and battle-tested in Chromium for years. We may consider including cppgc into the ABI stability guarantees when it gets enough adoption internally and externally. +Now when Node.js starts up, it makes sure that there is a `v8::CppHeap` attached to the V8 isolate. This enables users to allocate in the `v8::CppHeap` using `` headers from V8, which are now also included into the Node.js headers available to addons. Note that since Node.js only bundles the cppgc library coming from V8, [the ABI stability](/learn/modules/abi-stability#abi-stability-in-nodejs) of cppgc is currently not guaranteed in semver-minor and -patch updates, but we do not expect the ABI to break often, as it has been stable and battle-tested in Chromium for years. We may consider including cppgc into the ABI stability guarantees when it gets enough adoption internally and externally. To help addon authors create JavaScript-to-C++ references of which V8's garbage collector can be aware, a helper function [`node::SetCppgcReference(isolate, js_object, cppgc_object)`](https://github.com/nodejs/node/blob/v20.6.0/test/addons/cppgc-object/binding.cc) has been added to `node.h`. V8 may provide a native alternative in the future, which could then replace this Node.js-specific helper. In the mean time, users can use this API to avoid having to hard-code the layout of JavaScript wrapper objects. An example of how to create garbage-collected C++ objects in the unified heap and wrap it in a JavaScript object can be found in the [Node.js addon tests](https://github.com/nodejs/node/blob/v20.6.0/test/addons/cppgc-object/binding.cc). diff --git a/pages/en/blog/wg/diag-wg-update-2017-02.md b/pages/en/blog/wg/diag-wg-update-2017-02.md index 9d44b59828d30..8384586953dd3 100644 --- a/pages/en/blog/wg/diag-wg-update-2017-02.md +++ b/pages/en/blog/wg/diag-wg-update-2017-02.md @@ -66,7 +66,7 @@ Thank you! [async_hooks]: https://github.com/nodejs/node/pull/8531 [CLI debugger]: https://nodejs.org/docs/v7.6.0/api/debugger.html -[Debugging - Getting Started]: /guides/debugging-getting-started/ +[Debugging - Getting Started]: /learn/getting-started/debugging [diag-agenda]: https://github.com/search?q=org%3Anodejs+label%3A%22diag-agenda%22&type=Issues [Diagnostics WG]: https://github.com/nodejs/diagnostics/issues [Inspector API]: https://chromedevtools.github.io/debugger-protocol-viewer/v8/ diff --git a/pages/en/learn/diagnostics/poor-performance/using-linux-perf.md b/pages/en/learn/diagnostics/poor-performance/using-linux-perf.md index 3bdb9d63cf011..496aec32c2cd2 100644 --- a/pages/en/learn/diagnostics/poor-performance/using-linux-perf.md +++ b/pages/en/learn/diagnostics/poor-performance/using-linux-perf.md @@ -72,16 +72,16 @@ visualization. ![Example nodejs flamegraph](https://user-images.githubusercontent.com/26234614/129488674-8fc80fd5-549e-4a80-8ce2-2ba6be20f8e8.png) -To generate a flamegraph from this result, follow [this tutorial](/guides/diagnostics-flamegraph/#create-a-flame-graph-with-system-perf-tools) +To generate a flamegraph from this result, follow [this tutorial](/learn/diagnostics/flame-graphs#create-a-flame-graph-with-system-perf-tools) from step 6. Because `perf` output is not a Node.js specific tool, it might have issues with how JavaScript code is optimized in -Node.js. See [perf output issues](/guides/diagnostics-flamegraph/#perf-output-issues) for a +Node.js. See [perf output issues](/learn/diagnostics/flame-graphs#perf-output-issues) for a further reference. ## Useful Links -- /guides/diagnostics-flamegraph/ +- /learn/diagnostics/flame-graphs - https://www.brendangregg.com/blog/2014-09-17/node-flame-graphs-on-linux.html - https://perf.wiki.kernel.org/index.php/Main_Page - https://blog.rafaelgss.com.br/node-cpu-profiler diff --git a/redirects.json b/redirects.json index d80d9d300bae1..88d474224de3a 100644 --- a/redirects.json +++ b/redirects.json @@ -86,7 +86,7 @@ }, { "source": "/guides", - "destination": "/en/guides" + "destination": "/en/learn" }, { "source": "/about", @@ -172,13 +172,17 @@ "source": "/:locale/docs/es6", "destination": "/:locale/learn/getting-started/ecmascript-2015-es6-and-beyond" }, + { + "source": "/:locale/guides", + "destination": "/:locale/learn" + }, { "source": "/:locale/docs/guides", - "destination": "/:locale/guides" + "destination": "/:locale/learn" }, { "source": "/:locale/docs/guides/:path*", - "destination": "/:locale/guides/:path*" + "destination": "/:locale/learn/:path*" }, { "source": "/:locale/guides/getting-started-guide", diff --git a/types/layouts.ts b/types/layouts.ts index ec7c518c6bc92..7d3dfd25cbfad 100644 --- a/types/layouts.ts +++ b/types/layouts.ts @@ -1,7 +1,6 @@ // @TODO: These are the Website Redesign Layouts export type Layouts = | 'about.hbs' - | 'docs.hbs' | 'home.hbs' | 'learn.hbs' | 'page.hbs'