Skip to content

Commit a141663

Browse files
committed
finish url changes + fix npm vulnerability
1 parent 80d485a commit a141663

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/lib/loadInstructions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ function normalizeDefinedBy(value: unknown, fallback: string): string {
163163
// Convert an extension name into a URL-friendly slug
164164
function slugifyExtension(ext: string): string {
165165
return (
166-
ext.toString().trim().toLowerCase()
167-
.replace(/[^a-z0-9]+/g, "-")
166+
ext.toString().trim()
167+
.replace(/[^A-Za-z0-9]+/g, "-")
168168
.replace(/^-+|-+$/g, "") || "unknown"
169169
);
170170
}

src/pages/extension.njk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pagination:
33
data: extensions
44
size: 1
55
alias: extension
6-
permalink: extensions/{{ extension.slug }}/index.html
6+
permalink: "{{ extension.slug }}/index.html"
77
eleventyComputed:
88
title: "{{ extension.name }} Extension"
99
layout: layout.njk
@@ -15,7 +15,7 @@ layout: layout.njk
1515
<ul class="instruction-list">
1616
{% for inst in extension.instructions %}
1717
<li data-name="{{ inst.name | lower }}">
18-
<a href="/instructions/{{ inst.name }}/">{{ inst.name }}</a>
18+
<a href="/{{ inst.extensionSlug }}/{{ inst.name }}/">{{ inst.name }}</a>
1919
{{ inst.longName }}
2020
{% if inst.base != 32 %}
2121
<span class="base-width" title="This instruction is only present in the {{inst.base}}-bit version of the ISA.">{{ inst.base }}</span>

src/pages/index.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The base integer <strong>I</strong> extension is the most widely implemented set
1616
<ul id="extensions">
1717
{% for ext in extensions %}
1818
<li data-name="{{ ext.name | lower }}">
19-
<a href="/extensions/{{ ext.slug }}/">{{ ext.name }}</a>
19+
<a href="/{{ ext.slug }}/">{{ ext.name }}</a>
2020
<p class="extension-description">
2121
{% if ext.description %}
2222
{{ ext.description }}

src/pages/instruction.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pagination:
33
data: instructions
44
size: 1
55
alias: inst
6-
permalink: instructions/{{ inst.name }}/index.html
6+
permalink: "{{ inst.extensionSlug }}/{{ inst.name }}/index.html"
77
eleventyComputed:
88
title: "{{ inst.name }}"
99
layout: layout.njk

src/pages/search.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extra_css:
2525
data-extension="{{ inst.extension }}"
2626
data-extension-slug="{{ inst.extensionSlug }}"
2727
>
28-
<a href="/instructions/{{ inst.name }}/">{{ inst.name }}</a>
28+
<a href="/{{ inst.extensionSlug }}/{{ inst.name }}/">{{ inst.name }}</a>
2929
<span class="ext-name" data-extension-slug="{{ inst.extensionSlug }}" title="Extension">
3030
- {{ inst.extension }}
3131
</span>

0 commit comments

Comments
 (0)