merge(#247): NodiumMC/next

Author: LIMPIX31

package.json

@@ -1,7 +1,7 @@
 {
   "name": "nodium-launcher",
   "private": true,
-  "version": "0.2.0",
+  "version": "0.2.1",
   "moduleDirectories": [
     "node_modules",
     "src"
@@ -24,11 +24,11 @@
     "@fortawesome/free-regular-svg-icons": "6.2.1",
     "@fortawesome/free-solid-svg-icons": "6.2.1",
     "@fortawesome/react-fontawesome": "0.2.0",
+    "@nodium/tsyringe": "^1.0.0",
     "@tauri-apps/api": "1.2.0",
     "@types/stack-trace": "0.0.30",
     "@types/styled-components": "5.1.26",
     "axios": "^1.1.2",
-    "class-transformer": "0.5.1",
     "country-flag-icons": "1.5.5",
     "dotenv-cli": "6.0.0",
     "eventemitter3": "5.0.0",
@@ -57,7 +57,7 @@
     "styled-components": "5.3.6",
     "swr": "2.0.0",
     "tauri-plugin-fs-watch-api": "github:tauri-apps/tauri-plugin-fs-watch",
-    "tsyringe": "4.7.0",
+    "url-parse": "^1.5.10",
     "use-debounce": "^9.0.2"
   },
   "devDependencies": {
@@ -85,6 +85,7 @@
     "@types/react-dom": "18.0.9",
     "@types/testing-library__jest-dom": "5.14.5",
     "@types/throttle-debounce": "5.0.0",
+    "@types/url-parse": "^1.4.8",
     "@types/webfontloader": "1.6.35",
     "@typescript-eslint/eslint-plugin": "5.47.0",
     "@typescript-eslint/parser": "5.47.0",

rust/commands/src/compat/download.rs

@@ -99,6 +99,7 @@ async fn download_file<F: Fn(u64, u64, u64)>(url: &Url, to: &PathBuf, on: Option
 #[allow(unused)]
 #[command]
 pub async fn download<R: Runtime, 'a>(app_handle: AppHandle<R>, item: DownloadItem) -> Result<String, DownloadError> {
+  tfs::create_dir_all(&item.local.parent().unwrap()).await?;
   if let Some(hash) = check_match(item.hash, &item.local) {
     return Ok(hash);
   }

rust/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Nodium Launcher",
-    "version": "0.2.0"
+    "version": "0.2.1"
   },
   "tauri": {
     "allowlist": {

src/App.tsx

@@ -5,13 +5,13 @@ import { Header } from 'components/organisms/header'
 import { useThemeToggleHotkey } from 'hooks'
 import { PopupContainer, UpfallConatiner } from 'notifications'
 import { Fonts, Style } from 'style'
-import { ThemeService } from 'theme'
-import { Updater } from 'updater'
+import { ThemeModule } from 'theme'
+import { UpdaterModule } from 'updater'
 import { Routes } from 'Routes'
 import 'utils/loadIcons'
 import { useDebugHotkey } from 'hooks/useDebug'
 import { AceStyle } from 'debug/commander'
-import { ErrorBoundary } from 'debug/ErrorBoundary'
+import { ErrorBoundary } from 'components/organisms/ErrorBoundary'
 import { useMod } from 'hooks/useMod'
 import { observer } from 'mobx-react'
 import { toJS } from 'mobx'
@@ -35,17 +35,17 @@ const View = styled.div`
 `
 
 export const App: FC = observer(() => {
-  const theme = useMod(ThemeService)
-  useMod(Updater)
+  const theme = useMod(ThemeModule)
+  useMod(UpdaterModule)
   useThemeToggleHotkey()
   useDebugHotkey()
   return (
     <>
-      <ThemeProvider theme={toJS(theme.theme)}>
+      <ThemeProvider theme={toJS(theme.target)}>
         <Style />
         <Fonts />
         <AceStyle />
-        <AppRoot>
+        <AppRoot onContextMenu={e => e.preventDefault()}>
           <Header />
           <ErrorBoundary>
             <View>

src/components/molecules/Dropdown.tsx

@@ -3,7 +3,7 @@ import styled from 'styled-components'
 import { Empty } from 'components/utils/Empty'
 import { Preloader } from 'components/atoms/Preloader'
 import { font } from 'style'
-import { Preloader as PreloaderService } from 'preload'
+import { PreloaderModule } from 'preload'
 import { AnimatePresence, motion } from 'framer-motion'
 import { useMod } from 'hooks/useMod'
 import { observer } from 'mobx-react'
@@ -78,11 +78,11 @@ const StageWrapper = styled.div`
 // `
 
 export const AppPreloader: FC = observer(() => {
-  const { inProcess, currentTaskName } = useMod(PreloaderService)
+  const { progress, taskName } = useMod(PreloaderModule)
 
   return (
     <AnimatePresence>
-      {inProcess && (
+      {progress && (
         <AppPreloaderWrapper
           initial={{ opacity: 1, scale: 1 }}
           animate={{ opacity: 1, scale: 1 }}
@@ -97,7 +97,7 @@ export const AppPreloader: FC = observer(() => {
           <StageWrapper>
             <Stage>
               <AbsolutePreloader />
-              {currentTaskName}
+              {taskName}
             </Stage>
           </StageWrapper>
         </AppPreloaderWrapper>

src/components/organisms/AppPreloader/AppPreloader.tsx

@@ -1,13 +1,13 @@
 import { FC, useEffect, useState } from 'react'
 import styled from 'styled-components'
 import { Text } from 'components/atoms/Text'
-import { ReportService } from 'debug/report.service'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { parse } from 'stack-trace'
 import { transition } from 'style'
 import { useMod } from 'hooks/useMod'
 import { observer } from 'mobx-react'
 import { useI18N } from 'hooks'
+import { ReportModule } from 'debug/report.module'
 
 const StyledOverlay = styled.div`
   position: absolute;
@@ -54,7 +54,7 @@ const ProgressInner = styled.div.attrs<ExtraProps.Value<number>>(({ value }) =>
 `
 
 export const CrashOverlay: FC = observer(() => {
-  const report = useMod(ReportService)
+  const report = useMod(ReportModule)
   const i18n = useI18N()
   const [progress, setProgress] = useState(0)
 

src/components/organisms/CrashOverlay.tsx

@@ -1,8 +1,8 @@
 import { error } from 'debug'
 import { PureComponent } from 'react'
-import { ReportService } from 'debug/report.service'
 import { CrashOverlay } from 'components/organisms/CrashOverlay'
-import { container } from 'tsyringe'
+import { container } from '@nodium/tsyringe'
+import { ReportModule } from 'debug/report.module'
 
 export class ErrorBoundary extends PureComponent<any, { hasError: boolean }> {
   constructor(props: any) {
@@ -16,7 +16,7 @@ export class ErrorBoundary extends PureComponent<any, { hasError: boolean }> {
 
   componentDidCatch(err: Error) {
     error(err)
-    container.resolve(ReportService).report(err)
+    container.resolve(ReportModule).report(err)
   }
 
   render() {