Merge main into sort-custom

Author: 132ikl

.vuepress/config.js

@@ -1,4 +1,4 @@
-import path from 'path';
+import path from 'node:path';
 import { defineUserConfig } from '@vuepress/cli';
 import { gitPlugin } from '@vuepress/plugin-git';
 import { feedPlugin } from '@vuepress/plugin-feed';
@@ -15,12 +15,14 @@ import {
   navbarDe,
   navbarEn,
   navbarEs,
+  navbarFr,
   navbarJa,
   navbarPtBR,
   navbarRU,
   navbarZhCN,
   sidebarDe,
   sidebarEn,
+  sidebarFr,
   sidebarEs,
   sidebarJa,
   sidebarPtBR,
@@ -61,6 +63,11 @@ export default defineUserConfig({
       title: 'Nushell',
       description: 'Eine neue Art von Shell.',
     },
+    '/fr/': {
+      lang: 'fr-FR',
+      title: 'Nushell',
+      description: 'Un nouveau type de shell.',
+    },
     '/es/': {
       lang: 'es-ES',
       title: 'Nushell',
@@ -92,9 +99,6 @@ export default defineUserConfig({
     ['link', { rel: 'icon', href: '/icon.png' }],
   ],
   markdown: {
-    code: {
-      lineNumbers: false,
-    },
     importCode: {
       handleImportPath: (str) =>
         str.replace(/^@snippets/, path.resolve(__dirname, '../snippets')),
@@ -132,6 +136,13 @@ export default defineUserConfig({
         navbar: navbarEs,
         sidebar: sidebarEs,
       },
+      '/fr/': {
+        selectText: 'Langues',
+        selectLanguageName: 'Français',
+        editLinkText: 'Modifier la page sur GitHub',
+        navbar: navbarFr,
+        sidebar: sidebarFr,
+      },
       '/ja/': {
         selectText: '言語',
         selectLanguageName: '日本語',
@@ -175,6 +186,7 @@ export default defineUserConfig({
     }),
     shikiPlugin({
       theme: 'dark-plus',
+      lineNumbers: true,
       langs: [
         'nushell',
         'rust',

.vuepress/configs/navbar/fr.ts

@@ -0,0 +1,10 @@
+import type { NavbarConfig } from '@vuepress/theme-default';
+
+export const navbarFr: NavbarConfig = [
+  { text: 'Installez Nu !', link: '/fr/book/installation' },
+  { text: 'Prise en main', link: '/fr/book/getting_started' },
+  {
+    text: 'Documentation',
+    children: [{ text: 'Le Livre Nushell', link: '/fr/book/' }],
+  },
+];

.vuepress/configs/navbar/index.ts

@@ -1,6 +1,7 @@
 export * from './de.js';
 export * from './en.js';
 export * from './es.js';
+export * from './fr.js';
 export * from './ja.js';
 export * from './pt-BR.js';
 export * from './ru.js';

.vuepress/configs/sidebar/en.ts

@@ -53,7 +53,6 @@ export const sidebarEn: SidebarConfig = {
         '/book/scripts.md',
         '/book/modules.md',
         '/book/overlays.md',
-        '/book/command_signature.md',
         '/book/sorting.md',
         '/book/testing.md',
         '/book/style_guide.md',

.vuepress/configs/sidebar/fr.ts

@@ -0,0 +1,29 @@
+import type { SidebarConfig } from '@vuepress/theme-default';
+import { commandCategories } from './command_categories';
+
+export const sidebarFr: SidebarConfig = {
+  '/fr/book/': [
+    {
+      text: 'Introduction',
+      link: '/fr/book/README.md',
+      collapsible: false,
+    },
+    {
+      text: 'Installation',
+      link: '/fr/book/installation.md',
+      collapsible: false,
+      children: ['/fr/book/default_shell.md'],
+    },
+    {
+      text: 'Prise en main',
+      link: '/fr/book/getting_started.md',
+      collapsible: false,
+      children: [
+        '/fr/book/quick_tour.md',
+        '/fr/book/moving_around.md',
+        '/fr/book/thinking_in_nu.md',
+        '/fr/book/cheat_sheet.md',
+      ],
+    },
+  ],
+};

.vuepress/configs/sidebar/index.ts

@@ -1,6 +1,7 @@
 export * from './de.js';
 export * from './en.js';
 export * from './es.js';
+export * from './fr.js';
 export * from './ja.js';
 export * from './pt-BR.js';
 export * from './ru.js';

.vuepress/styles/index.scss

@@ -11,21 +11,26 @@
  * to avoid gaps in tables rendered with box-drawing characters
  */
 .theme-default-content pre,
-.theme-default-content pre[class*=language-] {
-  line-height: 1;
+.theme-default-content pre[class*='language-'] {
+  line-height: 1.1;
+}
+.theme-default-content h2.title a {
+  color: #adb6be;
 }
 
 /* Make sure the line numbers have the same line-height as the code lines
  */
-div[class*="language-"].line-numbers-mode .line-numbers {
-  line-height: 1;
+div[class*='language-'].line-numbers-mode .line-numbers {
+  line-height: 1.1;
 }
 
 /* Add DejaVu Sans Mono to the list of monospaced fonts.
  * This allows tables to be rendered seamlessly with box-drawing characters.
  */
 :root {
-  --font-family-code: Consolas, Monaco, 'Andale Mono', 'DejaVu Sans Mono', 'Ubuntu Mono', monospace;
+  --code-line-height: 1.1;
+  --font-family-code: Consolas, Monaco, 'Andale Mono', 'DejaVu Sans Mono',
+    'Ubuntu Mono', monospace;
 }
 
 @media screen and (min-width: 720px) and (max-width: 815px) {