Skip to content

Commit 89c315f

Browse files
ryanatknryanatkn
committed
format URLs correctly with pathname
1 parent 97bb67f commit 89c315f

4 files changed

Lines changed: 61 additions & 50 deletions

File tree

‎.changeset/khaki-vans-carry.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@ryanatkn/fuz_gitops': patch
3+
---
4+
5+
format URLs correctly with pathname

‎src/lib/Deployments_Table.svelte‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<script lang="ts">
2-
import {format_host} from '@ryanatkn/gro/package_meta.js';
32
import {page} from '$app/stores';
43
import {base} from '$app/paths';
5-
import {ensure_end} from '@ryanatkn/belt/string.js';
4+
import {ensure_end, strip_end, strip_start} from '@ryanatkn/belt/string.js';
65
76
import type {Fetched_Deployment} from '$lib/fetch_deployments.js';
87
import {to_pull_url} from '$lib/github_helpers.js';
@@ -86,7 +85,7 @@
8685
style:height="16px"
8786
style:margin-right="var(--space_xs)"
8887
/>
89-
{format_host(homepage_url)}
88+
{strip_end(strip_start(homepage_url, 'https://'), '/')}
9089
</a>
9190
{/if}
9291
</div>
@@ -108,7 +107,7 @@
108107
>
109108
{/if}
110109
{:else}
111-
<a href={deployment.url}>{format_host(deployment.url)}</a>
110+
<a href={deployment.url}>{strip_end(strip_start(deployment.url, 'https://'), '/')}</a>
112111
{/if}
113112
</div>
114113
</td>

‎src/lib/Pull_Requests_Detail.svelte‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<script lang="ts">
2-
import {format_host} from '@ryanatkn/gro/package_meta.js';
32
import {base} from '$app/paths';
43
54
import {to_pull_requests, type Filter_Pull_Request} from '$lib/github_helpers.js';
65
import type {Fetched_Deployment, Unfetched_Deployment} from '$lib/fetch_deployments.js';
6+
import {strip_end, strip_start} from '@ryanatkn/belt/string.js';
77
88
export let deployments: Fetched_Deployment[];
99
export let unfetched_deployments: Unfetched_Deployment[];
@@ -42,7 +42,7 @@
4242
<p>⚠️ Some deployments could not be fetched:</p>
4343
<ul>
4444
{#each unfetched_deployments as { url }}
45-
<li><a href={url}>{format_host(url)}</a></li>
45+
<li><a href={url}>{strip_end(strip_start(url, 'https://'), '/')}</a></li>
4646
{/each}
4747
</ul>
4848
</section>

‎src/lib/deployments.json‎

Lines changed: 51 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"url": "https://www.fuz.dev/",
44
"package_json": {
55
"name": "@ryanatkn/fuz",
6-
"version": "0.91.3",
6+
"version": "0.91.5",
77
"description": "Svelte UI library and CSS design system",
88
"icon": "🧶",
99
"public": true,
@@ -285,7 +285,7 @@
285285
},
286286
"src_json": {
287287
"name": "@ryanatkn/fuz",
288-
"version": "0.91.3",
288+
"version": "0.91.5",
289289
"modules": {
290290
"./Alert.svelte": {"path": "Alert.svelte", "declarations": []},
291291
"./alert.js": {
@@ -736,23 +736,23 @@
736736
},
737737
"files": ["dist"],
738738
"devDependencies": {
739-
"@ryanatkn/belt": "^0.20.5",
739+
"@ryanatkn/belt": "^0.20.9",
740740
"@ryanatkn/eslint-config": "^0.1.0",
741-
"@ryanatkn/fuz": "^0.90.0",
742-
"@ryanatkn/gro": "^0.112.4",
741+
"@ryanatkn/fuz": "^0.91.5",
742+
"@ryanatkn/gro": "^0.112.5",
743743
"@sveltejs/adapter-static": "^3.0.1",
744-
"@sveltejs/kit": "^2.5.2",
744+
"@sveltejs/kit": "^2.5.4",
745745
"@sveltejs/vite-plugin-svelte": "^3.0.2",
746-
"@typescript-eslint/eslint-plugin": "^7.1.0",
747-
"@typescript-eslint/parser": "^7.1.0",
746+
"@typescript-eslint/eslint-plugin": "^7.3.1",
747+
"@typescript-eslint/parser": "^7.3.1",
748748
"eslint": "^8.57.0",
749749
"eslint-plugin-svelte": "^2.35.1",
750750
"prettier": "^3.2.5",
751-
"prettier-plugin-svelte": "^3.2.1",
751+
"prettier-plugin-svelte": "^3.2.2",
752752
"svelte": "^4.2.12",
753-
"svelte-check": "^3.6.4",
753+
"svelte-check": "^3.6.8",
754754
"tslib": "^2.6.2",
755-
"typescript": "^5.3.3",
755+
"typescript": "^5.4.3",
756756
"uvu": "^0.5.6"
757757
},
758758
"eslintConfig": {"root": true, "extends": "@ryanatkn"},
@@ -775,7 +775,9 @@
775775
"changelog_url": null,
776776
"published": false,
777777
"check_runs": {"status": "completed", "conclusion": "success"},
778-
"pull_requests": []
778+
"pull_requests": [
779+
{"number": 18, "title": "upgrade to svelte5", "user": {"login": "ryanatkn"}, "draft": false}
780+
]
779781
},
780782
{
781783
"url": "https://gitops.fuz.dev/",
@@ -1043,7 +1045,7 @@
10431045
"@changesets/changelog-git": "^0.2.0",
10441046
"@ryanatkn/belt": "^0.20.5",
10451047
"@ryanatkn/eslint-config": "^0.1.0",
1046-
"@ryanatkn/fuz": "^0.91.0",
1048+
"@ryanatkn/fuz": "^0.91.3",
10471049
"@ryanatkn/gro": "^0.112.4",
10481050
"@sveltejs/adapter-static": "^3.0.1",
10491051
"@sveltejs/kit": "^2.5.2",
@@ -1055,11 +1057,11 @@
10551057
"eslint": "^8.57.0",
10561058
"eslint-plugin-svelte": "^2.35.1",
10571059
"prettier": "^3.2.5",
1058-
"prettier-plugin-svelte": "^3.2.1",
1060+
"prettier-plugin-svelte": "^3.2.2",
10591061
"prism-svelte": "^0.5.0",
10601062
"prismjs": "^1.29.0",
10611063
"svelte": "^4.2.12",
1062-
"svelte-check": "^3.6.5",
1064+
"svelte-check": "^3.6.6",
10631065
"tslib": "^2.6.2",
10641066
"typescript": "^5.3.3",
10651067
"uvu": "^0.5.6"
@@ -1107,14 +1109,16 @@
11071109
"changelog_url": "https://github.com/ryanatkn/fuz_code/blob/main/CHANGELOG.md",
11081110
"published": true,
11091111
"check_runs": {"status": "completed", "conclusion": "success"},
1110-
"pull_requests": []
1112+
"pull_requests": [
1113+
{"number": 4, "title": "upgrade to svelte5", "user": {"login": "ryanatkn"}, "draft": false}
1114+
]
11111115
},
11121116
{
11131117
"url": "https://mastodon.fuz.dev/",
11141118
"package_json": {
11151119
"name": "@ryanatkn/fuz_mastodon",
11161120
"description": "Mastodon components and helpers for Svelte, SvelteKit, and Fuz",
1117-
"version": "0.8.0",
1121+
"version": "0.10.0",
11181122
"public": true,
11191123
"icon": "🦣",
11201124
"license": "MIT",
@@ -1144,29 +1148,29 @@
11441148
},
11451149
"devDependencies": {
11461150
"@changesets/changelog-git": "^0.2.0",
1147-
"@ryanatkn/belt": "^0.20.5",
1151+
"@ryanatkn/belt": "^0.20.6",
11481152
"@ryanatkn/eslint-config": "^0.1.0",
1149-
"@ryanatkn/fuz": "^0.90.0",
1153+
"@ryanatkn/fuz": "^0.91.3",
11501154
"@ryanatkn/fuz_code": "^0.11.0",
1151-
"@ryanatkn/gro": "^0.112.3",
1155+
"@ryanatkn/gro": "^0.112.4",
11521156
"@sveltejs/adapter-static": "^3.0.1",
1153-
"@sveltejs/kit": "^2.5.2",
1154-
"@sveltejs/package": "^2.2.7",
1157+
"@sveltejs/kit": "^2.5.3",
1158+
"@sveltejs/package": "^2.3.0",
11551159
"@sveltejs/vite-plugin-svelte": "^3.0.2",
1156-
"@typescript-eslint/eslint-plugin": "^7.1.0",
1157-
"@typescript-eslint/parser": "^7.1.0",
1160+
"@typescript-eslint/eslint-plugin": "^7.1.1",
1161+
"@typescript-eslint/parser": "^7.1.1",
11581162
"date-fns": "^3.3.1",
11591163
"eslint": "^8.57.0",
11601164
"eslint-plugin-svelte": "^2.35.1",
11611165
"prettier": "^3.2.5",
1162-
"prettier-plugin-svelte": "^3.2.1",
1166+
"prettier-plugin-svelte": "^3.2.2",
11631167
"prism-svelte": "^0.5.0",
11641168
"prismjs": "^1.29.0",
11651169
"svelte": "^4.2.12",
1166-
"svelte-check": "^3.6.4",
1167-
"svelte-intersect": "^0.11.0",
1170+
"svelte-check": "^3.6.6",
1171+
"svelte-intersect": "^0.12.1",
11681172
"tslib": "^2.6.2",
1169-
"typescript": "^5.3.3",
1173+
"typescript": "^5.4.2",
11701174
"uvu": "^0.5.6"
11711175
},
11721176
"eslintConfig": {"root": true, "extends": "@ryanatkn", "rules": {"no-console": 1}},
@@ -1210,7 +1214,7 @@
12101214
},
12111215
"src_json": {
12121216
"name": "@ryanatkn/fuz_mastodon",
1213-
"version": "0.8.0",
1217+
"version": "0.10.0",
12141218
"modules": {
12151219
"./Mastodon_Status_Item.svelte": {
12161220
"path": "Mastodon_Status_Item.svelte",
@@ -1260,13 +1264,15 @@
12601264
"changelog_url": "https://github.com/ryanatkn/fuz_mastodon/blob/main/CHANGELOG.md",
12611265
"published": true,
12621266
"check_runs": {"status": "completed", "conclusion": "success"},
1263-
"pull_requests": []
1267+
"pull_requests": [
1268+
{"number": 3, "title": "upgrade to svelte5", "user": {"login": "ryanatkn"}, "draft": false}
1269+
]
12641270
},
12651271
{
12661272
"url": "https://gro.ryanatkn.com/",
12671273
"package_json": {
12681274
"name": "@ryanatkn/gro",
1269-
"version": "0.112.4",
1275+
"version": "0.112.5",
12701276
"description": "task runner and toolkit extending SvelteKit",
12711277
"icon": "🌰",
12721278
"public": true,
@@ -1300,16 +1306,16 @@
13001306
],
13011307
"files": ["dist"],
13021308
"dependencies": {
1303-
"@ryanatkn/belt": "^0.20.5",
1309+
"@ryanatkn/belt": "^0.20.9",
13041310
"chokidar": "^3.6.0",
13051311
"dotenv": "^16.4.5",
1306-
"es-module-lexer": "^1.4.1",
1312+
"es-module-lexer": "^1.4.2",
13071313
"kleur": "^4.1.5",
13081314
"mri": "^1.2.0",
13091315
"prettier": "^3.2.5",
1310-
"prettier-plugin-svelte": "^3.2.1",
1316+
"prettier-plugin-svelte": "^3.2.2",
13111317
"tiny-glob": "^0.2.9",
1312-
"ts-morph": "^21.0.1",
1318+
"ts-morph": "^22.0.0",
13131319
"tslib": "^2.6.2",
13141320
"zod": "^3.22.4"
13151321
},
@@ -1318,21 +1324,21 @@
13181324
"@changesets/changelog-git": "^0.2.0",
13191325
"@changesets/types": "^6.0.0",
13201326
"@ryanatkn/eslint-config": "^0.1.0",
1321-
"@ryanatkn/fuz": "^0.91.0",
1327+
"@ryanatkn/fuz": "^0.91.5",
13221328
"@sveltejs/adapter-static": "^3.0.1",
1323-
"@sveltejs/kit": "^2.5.2",
1324-
"@sveltejs/package": "^2.2.7",
1329+
"@sveltejs/kit": "^2.5.4",
1330+
"@sveltejs/package": "^2.3.0",
13251331
"@sveltejs/vite-plugin-svelte": "^3.0.2",
13261332
"@types/fs-extra": "^11.0.4",
1327-
"@types/node": "^20.11.21",
1328-
"@typescript-eslint/eslint-plugin": "^7.1.0",
1329-
"@typescript-eslint/parser": "^7.1.0",
1333+
"@types/node": "^20.11.30",
1334+
"@typescript-eslint/eslint-plugin": "^7.3.1",
1335+
"@typescript-eslint/parser": "^7.3.1",
13301336
"esbuild": "^0.19.0",
13311337
"eslint": "^8.57.0",
13321338
"eslint-plugin-svelte": "^2.35.1",
13331339
"svelte": "^4.2.12",
1334-
"svelte-check": "^3.6.5",
1335-
"typescript": "^5.3.3",
1340+
"svelte-check": "^3.6.8",
1341+
"typescript": "^5.4.3",
13361342
"uvu": "^0.5.6"
13371343
},
13381344
"eslintConfig": {"root": true, "extends": "@ryanatkn", "rules": {"no-console": 1}},
@@ -1541,7 +1547,7 @@
15411547
},
15421548
"src_json": {
15431549
"name": "@ryanatkn/gro",
1544-
"version": "0.112.4",
1550+
"version": "0.112.5",
15451551
"modules": {
15461552
".": {
15471553
"path": "index.ts",
@@ -2221,6 +2227,7 @@
22212227
"published": true,
22222228
"check_runs": {"status": "completed", "conclusion": "success"},
22232229
"pull_requests": [
2230+
{"number": 454, "title": "upgrade to svelte5", "user": {"login": "ryanatkn"}, "draft": false},
22242231
{
22252232
"number": 452,
22262233
"title": "enable running tasks from outside `src/lib`",

0 commit comments

Comments
 (0)