Skip to content

Commit b2eef29

Browse files
Merge branch 'main' into query-perf-updates
2 parents c51733e + 83d8ee1 commit b2eef29

60 files changed

Lines changed: 1046 additions & 1001 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Package.resolved

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

Sources/App/Core/Supporters+GitHub.swift

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ extension Array<Supporters.Community> {
2020
.init(
2121
login: "czottmann",
2222
name: "Carlo Zottmann",
23-
avatarUrl: "https://avatars.githubusercontent.com/u/1501?u=1f800f15e858ca6c21cedfeef1ce5838887ac14d&v=4"
23+
avatarUrl: "https://avatars.githubusercontent.com/u/1501?u=8a7927537279a0ee70912e984d9bc74321f177ea&v=4"
2424
),
2525
.init(
2626
login: "Abizern",
@@ -32,11 +32,6 @@ extension Array<Supporters.Community> {
3232
name: "Naoki Hiroshima",
3333
avatarUrl: "https://avatars.githubusercontent.com/u/10003?v=4"
3434
),
35-
.init(
36-
login: "davelester",
37-
name: "Dave Lester",
38-
avatarUrl: "https://avatars.githubusercontent.com/u/18080?u=ee5a7043674e46bcb2a7c4cf66a5020680e31b32&v=4"
39-
),
4035
.init(
4136
login: "phatblat",
4237
name: "Ben Chatelain",
@@ -212,11 +207,6 @@ extension Array<Supporters.Community> {
212207
name: "Gaige B Paulsen",
213208
avatarUrl: "https://avatars.githubusercontent.com/u/3351751?u=c27bedf869c3dbf75fe6e8857169d68b12e0678e&v=4"
214209
),
215-
.init(
216-
login: "florianpircher",
217-
name: "Florian Pircher",
218-
avatarUrl: "https://avatars.githubusercontent.com/u/3776198?u=84fc4e05bcbb253e5a8250cdd38f00fc8a98d2c6&v=4"
219-
),
220210
.init(
221211
login: "vsanthanam",
222212
name: "Varun Santhanam",
@@ -335,7 +325,7 @@ extension Array<Supporters.Community> {
335325
.init(
336326
login: "mattesmohr",
337327
name: "Mattes Mohr",
338-
avatarUrl: "https://avatars.githubusercontent.com/u/64681110?u=2270894ff05a553bf3039f1d3df1e2dcd2c44cea&v=4"
328+
avatarUrl: "https://avatars.githubusercontent.com/u/64681110?u=e2ff19cb8d9d225232d4d384f9131bd26726fea6&v=4"
339329
),
340330
.init(
341331
login: "SwiftyJoeyy",
@@ -352,11 +342,6 @@ extension Array<Supporters.Community> {
352342
name: "TapEnvy.us, LLC",
353343
avatarUrl: "https://avatars.githubusercontent.com/u/88908726?v=4"
354344
),
355-
.init(
356-
login: "AliMark71",
357-
name: "Ali AlSalman",
358-
avatarUrl: "https://avatars.githubusercontent.com/u/88995125?u=bb03d697f6f6394e66201df1e02ac01880e2457a&v=4"
359-
),
360345
.init(
361346
login: "JamesCCoder",
362347
name: "James W",

Sources/App/Views/DocumentationPageProcessor.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ struct DocumentationPageProcessor {
126126
var javascriptLinks: String {
127127
Plot.Node<HTML.HeadContext>.script(
128128
.src(SiteURL.javascripts("shared").relativeURL() + "?" + ResourceReloadIdentifier.value),
129-
.data(named: "turbolinks-track", value: "reload"),
129+
.data(named: "turbo-track", value: "reload"),
130130
.defer()
131131
).render()
132132
}

Sources/App/Views/PublicPage.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class PublicPage {
4848
metaNoIndex(),
4949
.viewport(.accordingToDevice, initialScale: 1),
5050
.meta(.charset(.utf8)),
51+
.meta(.name("turbo-refresh-method"), .content("replace")),
5152
.siteName("The Swift Package Index"),
5253
.url(canonicalURL()),
5354
.title(title()),
@@ -59,21 +60,21 @@ class PublicPage {
5960
.link(
6061
.rel(.stylesheet),
6162
.href(SiteURL.stylesheets("shared").relativeURL() + "?" + ResourceReloadIdentifier.value),
62-
.data(named: "turbolinks-track", value: "reload")
63+
.data(named: "turbo-track", value: "reload")
6364
),
6465
.link(
6566
.rel(.stylesheet),
6667
.href(SiteURL.stylesheets("main").relativeURL() + "?" + ResourceReloadIdentifier.value),
67-
.data(named: "turbolinks-track", value: "reload")
68+
.data(named: "turbo-track", value: "reload")
6869
),
6970
.script(
7071
.src(SiteURL.javascripts("shared").relativeURL() + "?" + ResourceReloadIdentifier.value),
71-
.data(named: "turbolinks-track", value: "reload"),
72+
.data(named: "turbo-track", value: "reload"),
7273
.defer()
7374
),
7475
.script(
7576
.src(SiteURL.javascripts("main").relativeURL() + "?" + ResourceReloadIdentifier.value),
76-
.data(named: "turbolinks-track", value: "reload"),
77+
.data(named: "turbo-track", value: "reload"),
7778
.defer()
7879
),
7980
analyticsHead(),

Tests/AppTests/PackageController+routesTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1705,8 +1705,8 @@ private extension String {
17051705
<script>
17061706
var baseUrl = "\(baseURL)"
17071707
</script>
1708-
<script defer="defer" src="\(baseURL)js/chunk-vendors.bdb7cbba.js"></script>
1709-
<script defer="defer" src="\(baseURL)js/index.2871ffbd.js"></script>
1708+
<script defer src="\(baseURL)js/chunk-vendors.bdb7cbba.js"></script>
1709+
<script defer src="\(baseURL)js/index.2871ffbd.js"></script>
17101710
<link href="\(baseURL)css/index.ff036a9e.css" rel="stylesheet">
17111711
</head>
17121712

Tests/AppTests/__Snapshots__/PackageController+routesTests/documentation_issue_2287.current-index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<link href="/owner/package/~/css/index.ff036a9e.css" rel="stylesheet" />
1515
<link rel="stylesheet" href="/docc.css?test" />
1616
<link rel="stylesheet" href="/shared.css?test" />
17-
<script src="/shared.js?test" data-turbolinks-track="reload" defer></script>
17+
<script src="/shared.js?test" data-turbo-track="reload" defer></script>
1818
</head>
1919
<body data-color-scheme="auto">
2020
<header class="spi">

Tests/AppTests/__Snapshots__/PackageController+routesTests/documentation_issue_2287.ref-index-path.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<link href="/owner/package/feature-1.2.3/css/index.ff036a9e.css" rel="stylesheet" />
1515
<link rel="stylesheet" href="/docc.css?test" />
1616
<link rel="stylesheet" href="/shared.css?test" />
17-
<script src="/shared.js?test" data-turbolinks-track="reload" defer></script>
17+
<script src="/shared.js?test" data-turbo-track="reload" defer></script>
1818
<link rel="canonical" href="/owner/package/feature/1.2.3/documentation/a/b" />
1919
</head>
2020
<body data-color-scheme="auto">

Tests/AppTests/__Snapshots__/PackageController+routesTests/documentation_issue_2287.ref-index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<link href="/owner/package/feature-1.2.3/css/index.ff036a9e.css" rel="stylesheet" />
1515
<link rel="stylesheet" href="/docc.css?test" />
1616
<link rel="stylesheet" href="/shared.css?test" />
17-
<script src="/shared.js?test" data-turbolinks-track="reload" defer></script>
17+
<script src="/shared.js?test" data-turbo-track="reload" defer></script>
1818
<link rel="canonical" href="/owner/package/feature/1.2.3/documentation/target" />
1919
</head>
2020
<body data-color-scheme="auto">

Tests/AppTests/__Snapshots__/PackageController+routesTests/documentation_routes_current.index-mixed-case.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<link href="/owner/package/~/css/index.ff036a9e.css" rel="stylesheet" />
1515
<link rel="stylesheet" href="/docc.css?test" />
1616
<link rel="stylesheet" href="/shared.css?test" />
17-
<script src="/shared.js?test" data-turbolinks-track="reload" defer></script>
17+
<script src="/shared.js?test" data-turbo-track="reload" defer></script>
1818
</head>
1919
<body data-color-scheme="auto">
2020
<header class="spi">

Tests/AppTests/__Snapshots__/PackageController+routesTests/documentation_routes_current.index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<link href="/owner/package/~/css/index.ff036a9e.css" rel="stylesheet" />
1515
<link rel="stylesheet" href="/docc.css?test" />
1616
<link rel="stylesheet" href="/shared.css?test" />
17-
<script src="/shared.js?test" data-turbolinks-track="reload" defer></script>
17+
<script src="/shared.js?test" data-turbo-track="reload" defer></script>
1818
</head>
1919
<body data-color-scheme="auto">
2020
<header class="spi">

0 commit comments

Comments
 (0)