review fixup

Author: timon-schelling

.nix/pkgs/graphite.nix

@@ -17,12 +17,12 @@ let
   brandingTar = pkgs.fetchurl (
     let
       lockContent = builtins.readFile "${info.src}/.branding";
-      lines = builtins.filter (s: s != []) (builtins.split "\n" lockContent);
+      lines = builtins.filter (s: s != [ ]) (builtins.split "\n" lockContent);
       url = builtins.elemAt lines 0;
       hash = builtins.elemAt lines 1;
     in
     {
-      url =  url;
+      url = url;
       sha256 = hash;
     }
   );
@@ -67,7 +67,7 @@ let
         export HOME="$TMPDIR"
 
         pushd frontend
-        npm run build-native${if dev then "-dev" else ""}
+        npm run native:build-${if dev then "dev" else "production"}
         popd
       '';
 

frontend/branding-installer.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-console */
+
 import crypto from "crypto";
 import fs from "fs";
 import http from "http";

frontend/package.json

@@ -11,19 +11,19 @@
 		"profiling": "npm run setup && npm run wasm:build-profiling && concurrently -k -n \"VITE,RUST\" \"vite\" \"npm run wasm:watch-profiling\"",
 		"production": "npm run setup && npm run wasm:build-production && concurrently -k -n \"VITE,RUST\" \"vite\" \"npm run wasm:watch-production\"",
 		"---------- BUILDS ----------": "",
-		"build": "npm run wasm:build-production && vite build",
-		"build-dev": "npm run wasm:build-dev && vite build --mode dev",
-		"build-native": "npm run native:build-production && vite build",
-		"build-native-dev": "npm run native:build-dev && vite build --mode dev",
-		"build-profiling": "npm run wasm:build-profiling && vite build --mode dev",
+		"build": "npm run setup && npm run wasm:build-production && vite build",
+		"build-dev": "npm run setup && npm run wasm:build-dev && vite build --mode dev",
+		"build-profiling": "npm run setup && npm run wasm:build-profiling && vite build --mode dev",
+		"build-native": "npm run setup && npm run native:build-production",
+		"build-native-dev": "npm run setup && npm run native:build-dev",
 		"---------- UTILITIES ----------": "",
 		"lint": "eslint . && tsc --noEmit",
 		"lint-fix": "eslint . --fix && tsc --noEmit",
 		"---------- INTERNAL ----------": "",
 		"setup": "node package-installer.js",
 		"postinstall": "node branding-installer.js",
-		"native:build-dev": "wasm-pack build ./wasm --dev --target=web --no-default-features --features native",
-		"native:build-production": "wasm-pack build ./wasm --release --target=web --no-default-features  --features native",
+		"native:build-dev": "wasm-pack build ./wasm --dev --target=web --no-default-features --features native && vite build --mode dev",
+		"native:build-production": "wasm-pack build ./wasm --release --target=web --no-default-features --features native && vite build",
 		"wasm:build-dev": "wasm-pack build ./wasm --dev --target=web",
 		"wasm:build-profiling": "wasm-pack build ./wasm --profiling --target=web",
 		"wasm:build-production": "wasm-pack build ./wasm --release --target=web",

frontend/tsconfig.json

@@ -16,7 +16,6 @@
 		"paths": {
 			"/*": ["./*"],
 			"@graphite/*": ["src/*"],
-			"@graphite/../*": ["./*"],
 			"@branding/*": ["../branding/*"]
 		},
 		"lib": ["ESNext", "DOM", "DOM.Iterable", "ScriptHost"]

package.json

@@ -4,15 +4,15 @@
 	"scripts": {
 		"---------- DEV SERVER ----------": "",
 		"start": "cd frontend && npm start",
-		"start-desktop": "cd frontend && npm run setup && npm run build-native-dev && cargo run -p graphite-desktop-bundle -- open",
+		"start-desktop": "cd frontend && npm run build-native-dev && cargo run -p graphite-desktop-bundle -- open",
 		"profiling": "cd frontend && npm run profiling",
 		"production": "cd frontend && npm run production",
 		"---------- BUILDS ----------": "",
 		"build-dev": "cd frontend && npm run build-dev",
 		"build-profiling": "cd frontend && npm run build-profiling",
 		"build": "cd frontend && npm run build",
-		"build-desktop": "cd frontend && npm run setup && npm run build-native && cargo run -r -p graphite-desktop-bundle",
-		"build-desktop-dev": "cd frontend && npm run setup && npm run build-native-dev && cargo run -p graphite-desktop-bundle",
+		"build-desktop": "cd frontend && npm run build-native && cargo run -r -p graphite-desktop-bundle",
+		"build-desktop-dev": "cd frontend && npm run build-native-dev && cargo run -p graphite-desktop-bundle",
 		"---------- UTILITIES ----------": "",
 		"lint": "cd frontend && npm run lint",
 		"lint-fix": "cd frontend && npm run lint-fix"