From 4057a6f55ba63fcb398f4fd50ece21b6b9af5cb4 Mon Sep 17 00:00:00 2001
From: Josh Vickery <jcv8000@gmail.com>
Date: Sat, 22 Feb 2025 17:06:32 -0600
Subject: [PATCH 1/2] update Actions package versions
---
.github/workflows/build-test.yml | 6 +++---
.github/workflows/eslint.yml | 6 +++---
.github/workflows/prettier.yml | 2 +-
.github/workflows/typecheck.yml | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 92401f7..9081dbb 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -12,15 +12,15 @@ jobs:
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Install pnpm
- uses: pnpm/action-setup@v2
+ uses: pnpm/action-setup@v4
with:
version: 10
- name: Install node
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 20
cache: "pnpm"
diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
index 3921b3d..c46331a 100644
--- a/.github/workflows/eslint.yml
+++ b/.github/workflows/eslint.yml
@@ -9,15 +9,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Install pnpm
- uses: pnpm/action-setup@v2
+ uses: pnpm/action-setup@v4
with:
version: 10
- name: Install node
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 20
cache: "pnpm"
diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml
index c0a6591..bc422a2 100644
--- a/.github/workflows/prettier.yml
+++ b/.github/workflows/prettier.yml
@@ -10,7 +10,7 @@ jobs:
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
# Make sure the actual branch is checked out when running on pull requests
ref: ${{ github.head_ref }}
diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index a5d0f90..60c0d01 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -9,15 +9,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Install pnpm
- uses: pnpm/action-setup@v2
+ uses: pnpm/action-setup@v4
with:
version: 10
- name: Install node
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 20
cache: "pnpm"
From 24dc53be469a9159708cd81bb0a449c20349cbe2 Mon Sep 17 00:00:00 2001
From: Josh Vickery <jcv8000@gmail.com>
Date: Sat, 22 Feb 2025 17:11:03 -0600
Subject: [PATCH 2/2] prettier
---
packages/main/convertOld.ts | 21 +++++++------------
packages/renderer/about/about.html | 3 +--
.../src/components/Views/Editor/styles.scss | 5 ++---
3 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/packages/main/convertOld.ts b/packages/main/convertOld.ts
index b7e662b..5bac28d 100644
--- a/packages/main/convertOld.ts
+++ b/packages/main/convertOld.ts
@@ -153,10 +153,8 @@ function replaceFeatherWithTabler(featherIcon: string) {
else if (s == "book") return "book-2";
else if (s == "columns") return "columns-2";
else if (s == "compass") return "brand-safari";
- else if (s == "crosshair")
- return "crosshair"; // eh
- else if (s == "disc")
- return "disc"; // maybe "vinyl" or "playstation-circle"
+ else if (s == "crosshair") return "crosshair"; // eh
+ else if (s == "disc") return "disc"; // maybe "vinyl" or "playstation-circle"
else if (s == "globe") return "world";
else if (s == "layout") return "table";
else if (s == "menu") return "menu-2";
@@ -200,8 +198,7 @@ function replaceFeatherWithTabler(featherIcon: string) {
else if (s == "github") return "brand-github";
else if (s == "gitlab") return "brand-gitlab";
else if (s == "grid") return "layout-grid";
- else if (s == "hard-drive")
- return "server"; // this one sucks
+ else if (s == "hard-drive") return "server"; // this one sucks
else if (s == "image") return "photo";
else if (s == "info") return "info-circle";
else if (s == "instagram") return "brand-instagram";
@@ -225,23 +222,20 @@ function replaceFeatherWithTabler(featherIcon: string) {
else if (s == "mouse-pointer") return "pointer";
else if (s == "move") return "arrows-move";
else if (s == "navigation-2") return "navigation";
- else if (s == "pause-circle")
- return "clock-pause"; // sucks
+ else if (s == "pause-circle") return "clock-pause"; // sucks
else if (s == "pause") return "player-pause";
else if (s == "pen-tool") return "ballpen";
else if (s == "percent") return "percentage";
else if (s == "phone-forwarded") return "phone-outgoing";
else if (s == "phone-missed") return "phone-x";
else if (s == "pie-chart") return "chart-pie";
- else if (s == "play-circle")
- return "clock-play"; // sucks
+ else if (s == "play-circle") return "clock-play"; // sucks
else if (s == "play") return "player-play";
else if (s == "plus-circle") return "circle-plus";
else if (s == "plus-square") return "square-plus";
else if (s == "pocket") return "brand-pocket";
else if (s == "refresh-ccw") return "refresh";
- else if (s == "refresh-cw")
- return "rotate-clockwise"; // sucks
+ else if (s == "refresh-cw") return "rotate-clockwise"; // sucks
else if (s == "rewind") return "player-track-prev";
else if (s == "rotate-ccw") return "rotate";
else if (s == "rotate-cw") return "rotate-clockwise";
@@ -272,8 +266,7 @@ function replaceFeatherWithTabler(featherIcon: string) {
else if (s == "volume-x") return "volume-3";
else if (s == "watch") return "device-watch";
else if (s == "x-circle") return "circle-x";
- else if (s == "x-octagon")
- return "circle-x"; // sucks
+ else if (s == "x-octagon") return "circle-x"; // sucks
else if (s == "x-square") return "square-x";
else if (s == "youtube") return "brand-youtube";
else if (s == "zap-off") return "bolt-off";
diff --git a/packages/renderer/about/about.html b/packages/renderer/about/about.html
index 675d842..dbaa4b8 100644
--- a/packages/renderer/about/about.html
+++ b/packages/renderer/about/about.html
@@ -4,8 +4,7 @@
<meta charset="UTF-8" />
<style>
body {
- font-family:
- -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans",
+ font-family: -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans",
"Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
"Segoe UI Symbol", "Noto Color Emoji";
font-size: 14px;
diff --git a/packages/renderer/src/components/Views/Editor/styles.scss b/packages/renderer/src/components/Views/Editor/styles.scss
index 3a1306f..32774e3 100644
--- a/packages/renderer/src/components/Views/Editor/styles.scss
+++ b/packages/renderer/src/components/Views/Editor/styles.scss
@@ -208,9 +208,8 @@ ul[data-type="taskList"] {
font-size: 13px;
background-color: transparent;
opacity: 0.75;
- font-family:
- ui-monospace, Consolas, "Cascadia Code", "Source Code Pro", Menlo, "DejaVu Sans Mono",
- monospace;
+ font-family: ui-monospace, Consolas, "Cascadia Code", "Source Code Pro", Menlo,
+ "DejaVu Sans Mono", monospace;
}
.ProseMirror pre:hover .code-collapser {