Skip to content

Commit 471f5e8

Browse files
committed
chore: Remove packageManager requirement
1 parent bda3b8b commit 471f5e8

File tree

3 files changed

+29
-6
lines changed

3 files changed

+29
-6
lines changed

apps/frontend/src/ui/pages/browser/BrowserMain.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ManagedPackage, Providers } from '@onelauncher/client/bindings';
1+
import type { Providers } from '@onelauncher/client/bindings';
22
import { ChevronRightIcon } from '@untitled-theme/icons-solid';
33
import OneConfigLogo from '~assets/logos/oneconfig.svg?component-solid';
44
import Button from '~ui/components/base/Button';
@@ -21,7 +21,7 @@ function BrowserMain() {
2121
<BrowserContent>
2222
<div class="flex flex-col gap-8">
2323
<Show when={browser.popularPackages() !== undefined && browser.featuredPackage() !== undefined}>
24-
<Featured package={browser.featuredPackage()!} />
24+
<Featured package={browser.featuredPackage()! as unknown as FeaturedProps['package']} />
2525

2626
<For each={Object.entries(browser.popularPackages()!)}>
2727
{([provider, results]) => (
@@ -40,7 +40,13 @@ function BrowserMain() {
4040
}
4141

4242
interface FeaturedProps {
43-
package: ManagedPackage;
43+
package: {
44+
title: string;
45+
description: string;
46+
id: string;
47+
provider: Providers;
48+
oneconfig: boolean;
49+
};
4450
}
4551

4652
function Featured(props: FeaturedProps) {

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"version": "1.0.0-alpha.1",
55
"private": true,
66
"engineStrict": true,
7-
"packageManager": "[email protected]",
87
"description": "Next-generation open source Minecraft launcher and tools for interacting with Polyfrost",
98
"license": "GPL-3.0-only",
109
"homepage": "https://polyfrost.org",

packages/core/src/api/java.rs

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,27 @@ pub async fn filter_java_version(java_version: Option<u32>) -> crate::Result<Vec
2424
}
2525

2626
#[derive(Deserialize)]
27-
struct JavaPackage {
27+
pub struct JavaZuluPackage {
2828
pub download_url: String,
2929
pub name: PathBuf,
30+
pub java_version: Vec<u32>,
31+
}
32+
33+
pub async fn fetch_zulu() -> crate::Result<Vec<JavaZuluPackage>> {
34+
let state = State::get().await?;
35+
36+
fetch_json::<Vec<JavaZuluPackage>>(
37+
Method::GET,
38+
&format!(
39+
"https://api.azul.com/metadata/v1/zulu/packages/?os={}&arch={}&archive_type=zip&java_package_type=jre&javafx_bundled=false&latest=true&release_status=ga&availability_types=CA&certifications=tck&page=1&page_size=100",
40+
std::env::consts::OS,
41+
std::env::consts::ARCH,
42+
),
43+
None,
44+
None,
45+
&state.fetch_semaphore,
46+
)
47+
.await
3048
}
3149

3250
// TODO: support more than just zulu ?
@@ -44,7 +62,7 @@ pub async fn install_java(java_version: u32) -> crate::Result<PathBuf> {
4462
.await?;
4563

4664
send_ingress(&ingress, 0.0, Some("fetching java api")).await?;
47-
let packages = fetch_json::<Vec<JavaPackage>>(Method::GET, &format!(
65+
let packages = fetch_json::<Vec<JavaZuluPackage>>(Method::GET, &format!(
4866
"https://api.azul.com/metadata/v1/zulu/packages?arch={}&java_version={}&os={}&archive_type=zip&javafx_bundled=false&java_package_type=jre&page_size=1",
4967
std::env::consts::ARCH, java_version, std::env::consts::OS,
5068
), None, None, &state.fetch_semaphore).await?;

0 commit comments

Comments
 (0)