Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/4.2.3 #1328

Merged
merged 3 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cz.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commitizen": {
"name": "cz_customize",
"version": "4.2.2",
"version": "4.2.3",
"gpg_sign": true,
"use_shortcuts": true,
"tag_format": "$major.$minor.$patch$prerelease",
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to this project will be documented in this file.

## [4.2.3] - 2024-08-27

### 🐛 Bug Fixes

- ***(front)*** Reverts install and patch of `[email protected]`

## [4.2.2] - 2024-08-24

### 💚 Continuous Integration
Expand Down
2 changes: 1 addition & 1 deletion back/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cms.dgrebb.com",
"version": "4.2.2",
"version": "4.2.3",
"private": true,
"description": "cms.dgrebb.com",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions front/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dgrebb.com",
"version": "4.2.2",
"version": "4.2.3",
"private": true,
"scripts": {
"check": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json --compiler-warnings \"css-unused-selector:ignore\"",
Expand Down Expand Up @@ -66,7 +66,7 @@
"slugger": "^1.0.1",
"svelte": "^4.2.19",
"svelte-check": "^3.8.6",
"svelte-highlight": "7.7.0",
"svelte-highlight": "7.6.1",
"svelte-meta-tags": "^3.1.3",
"svelte-sitemap": "^2.6.0",
"typescript": "^5.5.4",
Expand Down
23 changes: 10 additions & 13 deletions front/patches/svelte-highlight.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/LineNumbers.svelte b/LineNumbers.svelte
index 18df8880f0c9e765d0644d4aac1ede33daf9d69b..736883f48c55de786bf710f3b92b190ea3ad0b22 100644
index 18df8880f0c9e765d0644d4aac1ede33daf9d69b..95e21277b53899cc79b75c9a37473e783e8b14ff 100644
--- a/LineNumbers.svelte
+++ b/LineNumbers.svelte
@@ -24,6 +24,17 @@
@@ -24,14 +24,31 @@
$: len_digits = lines.length.toString().length;
$: len = len_digits - MIN_DIGITS < 1 ? MIN_DIGITS : len_digits;
$: width = len * DIGIT_WIDTH;
Expand All @@ -19,13 +19,13 @@ index 18df8880f0c9e765d0644d4aac1ede33daf9d69b..736883f48c55de786bf710f3b92b190e
+ }
</script>

<div style:overflow-x="auto" {...$$restProps}>
@@ -31,7 +42,14 @@
-<div style:overflow-x="auto" {...$$restProps}>
+<div class="line-number-wrap" {...$$restProps}>
<table>
<tbody class:hljs={true}>
{#each lines as line, i}
{@const lineNumber = i + startingLineNumber}
- <tr>
+
+ <tr
+ class:highlight={highlightedLines.includes(i)}
+ class:first={highlightedLines.includes(i) &&
Expand All @@ -36,7 +36,7 @@ index 18df8880f0c9e765d0644d4aac1ede33daf9d69b..736883f48c55de786bf710f3b92b190e
<td
class:hljs={true}
class:hideBorder
@@ -44,21 +62,12 @@
@@ -44,21 +61,9 @@
<code style:color="var(--line-number-color, currentColor)">
{lineNumber}
</code>
Expand All @@ -55,13 +55,10 @@ index 18df8880f0c9e765d0644d4aac1ede33daf9d69b..736883f48c55de786bf710f3b92b190e
- style:background="var(--highlighted-background, {HIGHLIGHTED_BACKGROUND})"
- ></div>
- {/if}
+ </td>
+ <td>
+ <pre class:wrapLines><code>{@html line || "\n"}</code></pre>
</td>
</tr>
{/each}
@@ -67,16 +76,10 @@
@@ -67,16 +72,10 @@
</div>

<style>
Expand All @@ -78,7 +75,7 @@ index 18df8880f0c9e765d0644d4aac1ede33daf9d69b..736883f48c55de786bf710f3b92b190e
vertical-align: baseline;
}

@@ -86,23 +89,10 @@
@@ -86,23 +85,10 @@
border-spacing: 0;
}

Expand All @@ -102,7 +99,7 @@ index 18df8880f0c9e765d0644d4aac1ede33daf9d69b..736883f48c55de786bf710f3b92b190e
td.hljs:not(.hideBorder):after {
content: "";
position: absolute;
@@ -127,26 +117,4 @@
@@ -127,26 +113,4 @@
pre {
z-index: 1;
}
Expand All @@ -128,4 +125,4 @@ index 18df8880f0c9e765d0644d4aac1ede33daf9d69b..736883f48c55de786bf710f3b92b190e
- tr:last-of-type td .line-background {
- bottom: 1em;
- }
</style>
</style>
Loading
Loading