deps: switch to yarn and update all our dependencies

.gitignore

@@ -37,3 +37,5 @@ glewinfo.txt
 glew-cmake/
 
 TODO.md
+
+vite.config.ts.timestamp*

package.json

@@ -9,36 +9,34 @@
     "preview": "vite preview",
     "tauri": "tauri",
     "tauricon": "tauricon",
-    "package": "node ./scripts/rename-binaries.js",
-    "update-bin": "node ./scripts/update-binaries.js && npm run package",
+    "package": "node ./scripts/prepare-sidecars.js",
     "lint": "npx prettier --check .",
     "format": "npx prettier --write .",
-    "mock-bin": "node ./scripts/dummy-binaries.js",
     "prepare-release-config": "node ./scripts/merge-config.js",
     "release": "npm run prepare-release-config && npm run tauri build -- --config ./.tauri/release-config.combined.json"
   },
   "devDependencies": {
-    "@floating-ui/dom": "^1.0.1",
     "@fullhuman/postcss-purgecss": "^5.0.0",
     "@iconify/svelte": "^3.1.0",
     "@popperjs/core": "^2.11.6",
-    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.49",
+    "@sveltejs/vite-plugin-svelte": "^2.0.2",
     "@tauri-apps/cli": "^1.2.3",
     "@tauri-apps/tauricon": "github:tauri-apps/tauricon",
     "@tsconfig/svelte": "^3.0.0",
-    "autoprefixer": "^10.4.7",
-    "classnames": "^2.3.1",
+    "autoprefixer": "^10.4.13",
+    "classnames": "^2.3.2",
     "execa": "^7.0.0",
-    "flowbite": "^1.5.3",
+    "flowbite": "^1.6.3",
     "flowbite-svelte": "^0.29.7",
-    "postcss": "^8.4.14",
+    "postcss": "^8.4.21",
     "postcss-load-config": "^4.0.1",
     "prettier": "^2.8.4",
     "prettier-plugin-svelte": "^2.9.0",
     "svelte": "^3.55.1",
-    "svelte-preprocess": "^4.10.7",
-    "tailwindcss": "^3.1.5",
-    "vite": "^2.9.14"
+    "svelte-preprocess": "^5.0.1",
+    "tailwindcss": "^3.2.7",
+    "typescript": "^4.9.5",
+    "vite": "^4.1.2"
   },
   "dependencies": {
     "@tauri-apps/api": "^1.2.0",

scripts/dummy-binaries.js

@@ -1,25 +0,0 @@
-/**
- * Used for builds / CI to basically mock the install process
- *
- * If Tauri can't find the binaries, it will fail (maybe there is a better way to ignore this though)
- */
-
-import { existsSync, rmdirSync, mkdirSync, writeFileSync } from "fs";
-
-// Clear our current binaries
-if (existsSync("./src-tauri/bin")) {
-  rmdirSync("./src-tauri/bin", { recursive: true, force: true });
-}
-// Recreate the directory
-mkdirSync("./src-tauri/bin");
-mkdirSync("./src-tauri/data");
-// Create empty executables
-let extension = "";
-if (process.platform === "win32") {
-  extension = ".exe";
-}
-writeFileSync(`./src-tauri/bin/extractor${extension}`, "dummy");
-writeFileSync(`./src-tauri/bin/gk${extension}`, "dummy");
-writeFileSync(`./src-tauri/bin/goalc${extension}`, "dummy");
-writeFileSync(`./src-tauri/bin/glewinfo${extension}`, "dummy");
-writeFileSync(`./src-tauri/data/something.txt`, "dummy");

scripts/prepare-sidecars.js

@@ -18,30 +18,13 @@ async function main() {
   if (!targetTriple) {
     console.error("Failed to determine platform target triple");
   }
-  if (existsSync(`src-tauri/bin/extractor${extension}`)) {
-    renameSync(
-      `src-tauri/bin/extractor${extension}`,
-      `src-tauri/bin/extractor-${targetTriple}${extension}`
-    );
-  }
-  if (existsSync(`src-tauri/bin/gk${extension}`)) {
-    renameSync(
-      `src-tauri/bin/gk${extension}`,
-      `src-tauri/bin/gk-${targetTriple}${extension}`
-    );
-  }
-  if (existsSync(`src-tauri/bin/goalc${extension}`)) {
-    renameSync(
-      `src-tauri/bin/goalc${extension}`,
-      `src-tauri/bin/goalc-${targetTriple}${extension}`
-    );
-  }
   if (existsSync(`src-tauri/bin/glewinfo${extension}`)) {
     renameSync(
       `src-tauri/bin/glewinfo${extension}`,
       `src-tauri/bin/glewinfo-${targetTriple}${extension}`
     );
   }
+  // TODO else move the binary from third-party into the right spot
 }
 
 main().catch((e) => {

scripts/update-binaries.js

@@ -1,33 +0,0 @@
-/**
- * This script is just a fast way of copying over the `jak-project` binaries built locally into here
- * This is useful if you are locally developing both
- *
- * Assumes that `jak-project` is one directory up
- */
-
-import { existsSync, rmdirSync, mkdirSync, copyFileSync } from "fs";
-
-// Clear our current binaries
-if (existsSync("./src-tauri/bin")) {
-  rmdirSync("./src-tauri/bin", { recursive: true, force: true });
-}
-// Recreate the directory
-mkdirSync("./src-tauri/bin");
-// Copy over the necessary binaries
-// - Assumes Windows!
-copyFileSync(
-  "../jak-project/out/build/Release/bin/extractor.exe",
-  "./src-tauri/bin/extractor.exe"
-);
-copyFileSync(
-  "../jak-project/out/build/Release/bin/gk.exe",
-  "./src-tauri/bin/gk.exe"
-);
-copyFileSync(
-  "../jak-project/out/build/Release/bin/goalc.exe",
-  "./src-tauri/bin/goalc.exe"
-);
-copyFileSync(
-  "./third-party/glew_2.1.0/windows/glewinfo.exe",
-  "./src-tauri/bin/glewinfo.exe"
-);

src/components/background/Background.svelte

@@ -1,4 +1,4 @@
-<script type="ts">
+<script lang="ts">
   import bgVideoJak1 from "$assets/videos/background-jak1.mp4";
   // TODO - remake the poster images to be the actual first frame, at the same dimensions
   import bgVideoPosterJak1 from "$assets/images/background-jak1-fallback.webp";

src/components/games/GameControls.svelte

@@ -1,4 +1,4 @@
-<script type="ts">
+<script lang="ts">
   import { getGameTitle, getInternalName, SupportedGame } from "$lib/constants";
   import { openDir } from "$lib/rpc/commands";
   import Icon from "@iconify/svelte";

src/components/games/setup/GameSetup.svelte

@@ -1,6 +1,5 @@
-<script type="ts">
+<script lang="ts">
   import { ProcessLogs, InstallationProgress } from "$lib/stores/AppStore";
-  import { checkRequirements } from "$lib/setup/setup";
   // components
   import Progress from "./Progress.svelte";
   // constants

src/components/games/setup/Outdated.svelte

@@ -1,7 +1,6 @@
-<script>
+<script lang="ts">
   import { Alert, Button, Spinner } from "flowbite-svelte";
   import { copyDataDirectory } from "$lib/utils/data-files";
-  import { launcherConfig } from "$lib/config";
   import { gameNeedsReinstall } from "$lib/stores/AppStore";
 
   export let updatingDataDir;

vite.config.ts

@@ -1,7 +1,6 @@
 import { defineConfig } from "vite";
 import { svelte } from "@sveltejs/vite-plugin-svelte";
 import { fileURLToPath, URL } from "url";
-import { resolve } from "path";
 
 // https://vitejs.dev/config/
 export default defineConfig({