Merge branch 'main' into fix/docs-page-improvements

Author: alex-key

README.md

@@ -114,7 +114,7 @@ npmx.dev supports npm permalinks – just replace `npmjs.com` with `npmx.dev
 | `npmjs.com/org/nuxt`            | [`npmx.dev/org/nuxt`](https://npmx.dev/org/nuxt)                       |
 
 > [!TIP]
-> Want automatic redirects? Try the [npmx-replace browser extension](https://github.com/tylersayshi/npmx-replace-extension) (Chrome only for now) or the separate [npmx-redirect extension](https://github.com/iaverages/npmx-redirect) for [Chrome](https://chromewebstore.google.com/detail/lbhjgfgpnlihfmobnohoipeljollhlnb) / [Firefox](https://addons.mozilla.org/en-GB/firefox/addon/npmx-redirect/).
+> Want automatic redirects? Try the [npmx-redirect extension](https://github.com/iaverages/npmx-redirect) for [Chrome](https://chromewebstore.google.com/detail/lbhjgfgpnlihfmobnohoipeljollhlnb) / [Firefox](https://addons.mozilla.org/en-GB/firefox/addon/npmx-redirect/).
 
 #### Not yet supported
 

docs/content/1.getting-started/2.quick-start.md

@@ -44,5 +44,5 @@ Replace `npmjs.com` with `npmx.dev` in any npm URL:
 | `npmjs.com/~sindresorhus`     | `npmx.dev/~sindresorhus`     |
 
 ::tip
-Install the [npmx-replace browser extension](https://github.com/tylersayshi/npmx-replace-extension) for automatic redirects from npmjs.com.
+Install the [npmx-redirect extension](https://github.com/iaverages/npmx-redirect) for automatic redirects from npmjs.com.
 ::

docs/content/2.guide/3.url-structure.md

@@ -21,7 +21,7 @@ Replace `npmjs.com` with `npmx.dev` (or `xnpmjs.com`) in any npm URL:
 | `npmjs.com/org/nuxt`            | [`npmx.dev/org/nuxt`](https://npmx.dev/org/nuxt)                       |
 
 ::tip
-Install the [npmx-replace browser extension](https://github.com/tylersayshi/npmx-replace-extension) for automatic redirects.
+Install the [npmx-redirect extension](https://github.com/iaverages/npmx-redirect) for automatic redirects from npmjs.com.
 ::
 
 ## Use simpler URLs

i18n/locales/ar-EG.json

@@ -19,7 +19,8 @@
     "social": "réseaux sociaux",
     "chat": "espace de discussion",
     "builders_chat": "builders",
-    "keyboard_shortcuts": "raccourcis clavier"
+    "keyboard_shortcuts": "raccourcis clavier",
+    "brand": "Marque"
   },
   "shortcuts": {
     "section": {
@@ -305,7 +306,8 @@
         "refs": "{count} référence | {count} références",
         "assets": "{count} ressource | {count} ressources"
       },
-      "view_source": "Voir la source"
+      "view_source": "Voir la source",
+      "skills_cli": "Skills CLI"
     },
     "links": {
       "main": "principal",
@@ -477,7 +479,8 @@
       "cancel_add": "Annuler l'ajout de propriétaire",
       "add_owner": "+ Ajouter un propriétaire",
       "show_more": "(afficher {count} de plus)",
-      "show_less": "(afficher moins)"
+      "show_less": "(afficher moins)",
+      "maintainer_template": "Mainteneur {name}"
     },
     "trends": {
       "chart_assistive_text": {
@@ -1105,7 +1108,8 @@
       "table_view": "Tableau",
       "charts_view": "Graphiques",
       "bar_chart_nav_hint": "Utilisez ↑ ↓",
-      "line_chart_nav_hint": "Utilisez ← →"
+      "line_chart_nav_hint": "Utilisez ← →",
+      "no_chartable_data": "Aucune donnée représentable"
     },
     "selector": {
       "search_label": "Rechercher des paquets",
@@ -1205,7 +1209,11 @@
       },
       "trends": {
         "title": "Comparer les tendances"
-      }
+      },
+      "select_all_category_facets": "Sélectionner toutes les facettes de la catégorie",
+      "deselect_all_category_facets": "Désélectionner toutes les facettes de la catégorie",
+      "selected_all_category_facets": "Toutes les facettes de la catégorie sont sélectionnées",
+      "deselected_all_category_facets": "Toutes les facettes de la catégorie sont désélectionnées"
     },
     "file_changes": "Modifications de fichiers",
     "files_count": "{count} fichiers",
@@ -1427,5 +1435,55 @@
     "selection": "0 sélectionné | 1 sélectionné | {count} sélectionnés",
     "shortcut": "Appuyez sur « {key} » pour cibler les actions",
     "button_close_aria_label": "Fermer la barre d'actions"
+  },
+  "logo_menu": {
+    "copy_svg": "Copier le logo en SVG",
+    "copied": "Copié !",
+    "browse_brand": "Parcourir la marque"
+  },
+  "brand": {
+    "title": "Marque",
+    "heading": "Marque",
+    "meta_description": "Ressources et directives de la marque npmx",
+    "intro": "Bienvenue sur la page des ressources de la marque npmx",
+    "logos": {
+      "title": "Logos",
+      "description": "Télécharger les logos officiels de npmx",
+      "wordmark": "Logotype",
+      "wordmark_alt": "Logotype npmx",
+      "wordmark_light_alt": "Logotype npmx clair",
+      "mark": "Symbole",
+      "mark_alt": "Symbole npmx",
+      "mark_light_alt": "Symbole npmx clair",
+      "on_dark": "Sur fond sombre",
+      "on_light": "Sur fond clair",
+      "download_svg": "Télécharger en SVG",
+      "download_png": "Télécharger en PNG",
+      "download_svg_aria": "Télécharger {name} en SVG",
+      "download_png_aria": "Télécharger {name} en PNG"
+    },
+    "customize": {
+      "title": "Personnalisation",
+      "description": "Personnalisez l'apparence du logo",
+      "accent_label": "Couleur d'accentuation",
+      "bg_label": "Couleur de fond",
+      "download_svg_aria": "Télécharger le logo personnalisé en SVG",
+      "download_png_aria": "Télécharger le logo personnalisé en PNG"
+    },
+    "typography": {
+      "title": "Typographie",
+      "description": "Polices utilisées dans npmx",
+      "sans": "Sans",
+      "sans_desc": "Police du contenu principal",
+      "mono": "Mono",
+      "mono_desc": "Police du code",
+      "pangram": "Phrase contenant tous les caractères",
+      "numbers": "Chiffres"
+    },
+    "guidelines": {
+      "title": "Directives de marque",
+      "message": "Pour un usage commercial, veuillez nous contacter.",
+      "discord_link_text": "Discussion Discord"
+    }
   }
 }

i18n/locales/fr-FR.json

@@ -6,7 +6,12 @@ export function parsePackageParams(segments: string[]): {
   rawPackageName: string
   rawVersion: string | undefined
 } {
-  const vIndex = segments.indexOf('v')
+  let vIndex = segments.indexOf('v')
+
+  // If we encounter ".../v/v/...", treat the second "v" as the version delimiter.
+  if (segments[vIndex] === 'v' && segments[vIndex + 1] === 'v') {
+    vIndex++
+  }
 
   if (vIndex !== -1 && vIndex < segments.length - 1) {
     return {

server/utils/parse-package-params.ts

@@ -37,7 +37,12 @@ export interface ParsedPackageParams {
  */
 export function parsePackageParam(pkgParam: string): ParsedPackageParams {
   const segments = pkgParam.split('/')
-  const vIndex = segments.indexOf('v')
+  let vIndex = segments.indexOf('v')
+
+  // If we encounter ".../v/v/...", treat the second "v" as the version delimiter.
+  if (segments[vIndex] === 'v' && segments[vIndex + 1] === 'v') {
+    vIndex++
+  }
 
   if (vIndex !== -1 && vIndex < segments.length - 1) {
     return {

shared/utils/parse-package-param.ts

@@ -49,5 +49,14 @@ describe('parsePackageParams', () => {
         rawVersion: '1.0.0',
       })
     })
+
+    it('parses scoped package names whose package segment is literally v', () => {
+      const segments = ['@scope', 'v', 'v', '1.2.3']
+      const result = parsePackageParams(segments)
+      expect(result).toEqual({
+        rawPackageName: '@scope/v',
+        rawVersion: '1.2.3',
+      })
+    })
   })
 })

test/unit/server/utils/parse-package-params.spec.ts

@@ -85,6 +85,15 @@ describe('parsePackageParam', () => {
         rest: [],
       })
     })
+
+    it('parses scoped package names whose package segment is literally v', () => {
+      const result = parsePackageParam('@scope/v/v/1.2.3/dist/index.js')
+      expect(result).toEqual({
+        packageName: '@scope/v',
+        version: '1.2.3',
+        rest: ['dist', 'index.js'],
+      })
+    })
   })
 
   describe('edge cases', () => {