diff --git a/.eslintignore b/.eslintignore index 3897265..0423944 100644 --- a/.eslintignore +++ b/.eslintignore @@ -11,3 +11,5 @@ node_modules pnpm-lock.yaml package-lock.json yarn.lock +/result +bun.lockb diff --git a/.prettierignore b/.prettierignore index 7e5a62c..cf49014 100644 --- a/.prettierignore +++ b/.prettierignore @@ -13,3 +13,5 @@ node_modules pnpm-lock.yaml package-lock.json yarn.lock +/result +bun.lockb diff --git a/bun.lockb b/bun.lockb new file mode 100755 index 0000000..1b229c4 Binary files /dev/null and b/bun.lockb differ diff --git a/flake.lock b/flake.lock index 741d294..0a5f70e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,96 +1,96 @@ { - "nodes": { - "naked-shell": { - "locked": { - "lastModified": 1681286841, - "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=", - "owner": "yusdacra", - "repo": "mk-naked-shell", - "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "mk-naked-shell", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1681126633, - "narHash": "sha256-evQ3Ct/yJDSHej16Hiq+JfxRjgm9FXu/2LBxsyorGdE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "db24d86dd8a4769c50d6b7295e81aa280cd93f35", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1680213900, - "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1680392223, - "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "root": { - "inputs": { - "naked-shell": "naked-shell", - "nixpkgs": "nixpkgs", - "parts": "parts", - "systems": "systems" - } - }, - "systems": { - "locked": { - "lastModified": 1680978846, - "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", - "owner": "nix-systems", - "repo": "x86_64-linux", - "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "x86_64-linux", - "type": "github" - } - } - }, - "root": "root", - "version": 7 + "nodes": { + "naked-shell": { + "locked": { + "lastModified": 1681286841, + "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=", + "owner": "yusdacra", + "repo": "mk-naked-shell", + "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd", + "type": "github" + }, + "original": { + "owner": "yusdacra", + "repo": "mk-naked-shell", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1697059129, + "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "root": { + "inputs": { + "naked-shell": "naked-shell", + "nixpkgs": "nixpkgs", + "parts": "parts", + "systems": "systems" + } + }, + "systems": { + "locked": { + "lastModified": 1680978846, + "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", + "owner": "nix-systems", + "repo": "x86_64-linux", + "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "x86_64-linux", + "type": "github" + } + } + }, + "root": "root", + "version": 7 } diff --git a/flake.nix b/flake.nix index 7b3e488..090360e 100644 --- a/flake.nix +++ b/flake.nix @@ -20,16 +20,19 @@ }: { devShells.default = config.mk-naked-shell.lib.mkNakedShell { name = "musikspider-devshell"; - packages = with pkgs; [nodejs yarn deno]; + packages = with pkgs; [nodejs_20 bun]; + shellHook = '' + export PATH="$PATH:$PWD/node_modules/.bin" + ''; }; - packages.musikspider = pkgs.mkYarnPackage { - src = ./.; + # packages.musikspider = pkgs.mkYarnPackage { + # src = ./.; - buildPhase = "HOME=$TMPDIR yarn --offline build"; - distPhase = "true"; - installPhase = "mv deps/musikspider/build $out"; - }; - packages.default = config.packages.musikspider; + # buildPhase = "HOME=$TMPDIR yarn --offline build"; + # distPhase = "true"; + # installPhase = "mv deps/musikspider/build $out"; + # }; + # packages.default = config.packages.musikspider; }; }; } diff --git a/package.json b/package.json index 0aa3051..0710bab 100644 --- a/package.json +++ b/package.json @@ -12,30 +12,32 @@ "format": "prettier --plugin-search-dir . --write ." }, "devDependencies": { - "@iconify-json/line-md": "^1.1.24", - "@iconify-json/mdi": "^1.1.50", - "@skeletonlabs/skeleton": "^1.2.5", - "@sveltejs/kit": "^1.15.9", - "@typescript-eslint/eslint-plugin": "^5.59.1", - "@typescript-eslint/parser": "^5.59.1", - "autoprefixer": "^10.4.14", - "eslint": "^8.39.0", - "eslint-config-prettier": "^8.8.0", + "@iconify-json/line-md": "^1.1.32", + "@iconify-json/mdi": "^1.1.54", + "@skeletonlabs/skeleton": "^2.3.0", + "@skeletonlabs/tw-plugin": "^0.2.2", + "@sveltejs/kit": "^1.25.2", + "@types/node": "^20.8.5", + "@typescript-eslint/eslint-plugin": "^6.7.5", + "@typescript-eslint/parser": "^6.7.5", + "autoprefixer": "^10.4.16", + "eslint": "^8.51.0", + "eslint-config-prettier": "^9.0.0", "eslint-plugin-svelte3": "^4.0.0", - "postcss": "^8.4.23", - "prettier": "^2.8.8", - "prettier-plugin-svelte": "^2.10.0", - "svelte": "^3.58.0", - "svelte-adapter-deno": "^0.9.0", - "svelte-check": "^3.2.0", - "tailwindcss": "^3.3.2", - "tslib": "^2.5.0", - "typescript": "^5.0.4", - "unplugin-icons": "^0.16.1", - "vite": "^4.3.3" + "postcss": "^8.4.31", + "prettier": "^3.0.3", + "prettier-plugin-svelte": "^3.0.3", + "svelte": "^4.2.1", + "svelte-adapter-bun": "^0.5.0", + "svelte-check": "^3.5.2", + "tailwindcss": "^3.3.3", + "tslib": "^2.6.2", + "typescript": "^5.2.2", + "unplugin-icons": "^0.17.0", + "vite": "^4.4.11" }, "type": "module", "dependencies": { "svelte-tiny-virtual-list": "^2.0.5" } -} \ No newline at end of file +} diff --git a/postcss.config.cjs b/postcss.config.cjs new file mode 100644 index 0000000..fe10e55 --- /dev/null +++ b/postcss.config.cjs @@ -0,0 +1,13 @@ +const tailwindcss = require('tailwindcss'); +const autoprefixer = require('autoprefixer'); + +const config = { + plugins: [ + //Some plugins, like tailwindcss/nesting, need to run before Tailwind, + tailwindcss(), + //But others, like autoprefixer, need to run after, + autoprefixer + ] +}; + +module.exports = config; diff --git a/postcss.config.js b/postcss.config.js deleted file mode 100644 index 0f77216..0000000 --- a/postcss.config.js +++ /dev/null @@ -1,6 +0,0 @@ -export default { - plugins: { - tailwindcss: {}, - autoprefixer: {} - } -}; diff --git a/src/app.d.ts b/src/app.d.ts index 2bc1360..824da68 100644 --- a/src/app.d.ts +++ b/src/app.d.ts @@ -11,4 +11,4 @@ declare global { } } -export { }; +export {}; diff --git a/src/app.html b/src/app.html index fc09c3e..6adc6df 100644 --- a/src/app.html +++ b/src/app.html @@ -1,4 +1,4 @@ - + diff --git a/src/components/track.svelte b/src/components/track.svelte index b1e6785..57df9d9 100644 --- a/src/components/track.svelte +++ b/src/components/track.svelte @@ -9,9 +9,11 @@ import Spinnny from '~icons/line-md/loading-loop'; import IconPlay from '~icons/mdi/play'; import IconMusic from '~icons/mdi/music'; - import { toastStore } from '@skeletonlabs/skeleton'; + import { getToastStore } from '@skeletonlabs/skeleton'; import { getAudioElement, makeShareUrl } from '../utils'; + const toastStore = getToastStore(); + export let track_with_id: TrackWithId; let track = track_with_id.track; let track_id = track_with_id.id; diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 4c51811..9d399ff 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -1,11 +1,8 @@