diff --git a/flake.nix b/flake.nix index 46cd35b5..b789947c 100644 --- a/flake.nix +++ b/flake.nix @@ -194,7 +194,6 @@ frontend = pkgs.mkShell { buildInputs = with pkgs; [ nodejs - yarn nodePackages.svelte-language-server nodePackages.typescript-language-server ]; diff --git a/kitsune-fe/README.md b/kitsune-fe/README.md index 5ce67661..9cd085ab 100644 --- a/kitsune-fe/README.md +++ b/kitsune-fe/README.md @@ -1,38 +1,3 @@ -# create-svelte +# Kitsune FE -Everything you need to build a Svelte project, powered by [`create-svelte`](https://github.com/sveltejs/kit/tree/main/packages/create-svelte). - -## Creating a project - -If you're seeing this, you've probably already done this step. Congrats! - -```bash -# create a new project in the current directory -npm create svelte@latest - -# create a new project in my-app -npm create svelte@latest my-app -``` - -## Developing - -Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a development server: - -```bash -npm run dev - -# or start the server and open the app in a new browser tab -npm run dev -- --open -``` - -## Building - -To create a production version of your app: - -```bash -npm run build -``` - -You can preview the production build with `npm run preview`. - -> To deploy your app, you may need to install an [adapter](https://kit.svelte.dev/docs/adapters) for your target environment. +Frontend for the Kitsune Social Media server. Written with SvelteKit and TypeScript. diff --git a/kitsune-fe/package-lock.json b/kitsune-fe/package-lock.json index a688bb22..073e5d15 100644 --- a/kitsune-fe/package-lock.json +++ b/kitsune-fe/package-lock.json @@ -375,7 +375,7 @@ }, "node_modules/@clack/prompts/node_modules/is-unicode-supported": { "version": "1.3.0", - "dev": true, + "extraneous": true, "inBundle": true, "license": "MIT", "engines": { diff --git a/kitsune/Dockerfile.dev b/kitsune/Dockerfile.dev index 35ab026c..e45a41d1 100644 --- a/kitsune/Dockerfile.dev +++ b/kitsune/Dockerfile.dev @@ -14,10 +14,9 @@ COPY . . RUN cargo build --bin kitsune FROM base AS frontend -RUN apk add --no-cache yarn COPY kitsune-fe . WORKDIR kitsune-fe -RUN yarn install && yarn build +RUN npm i && npm run build FROM alpine:latest WORKDIR app diff --git a/kitsune/Dockerfile.prod b/kitsune/Dockerfile.prod index 3bcda2f5..0e505997 100644 --- a/kitsune/Dockerfile.prod +++ b/kitsune/Dockerfile.prod @@ -14,10 +14,9 @@ COPY . . RUN cargo build --release --bin kitsune FROM base AS frontend -RUN apk add --no-cache yarn COPY kitsune-fe . WORKDIR kitsune-fe -RUN yarn install && yarn build +RUN npm i && npm run build FROM alpine:latest WORKDIR app diff --git a/website/src/content/docs/running/installation.mdx b/website/src/content/docs/running/installation.mdx index 3e7e62b9..1b2832a8 100644 --- a/website/src/content/docs/running/installation.mdx +++ b/website/src/content/docs/running/installation.mdx @@ -16,8 +16,7 @@ In order to build Kitsune, need a few dependencies. These are: 2. PostgreSQL as a dedicated DBMS 3. Redis for the job queue 4. [NodeJS](https://nodejs.org/en) v16+ -5. [Yarn](https://classic.yarnpkg.com/en/docs/install) -6. Reverse Proxy (recommended: [Caddy](https://caddyserver.com/docs/install)) +5. Reverse Proxy (recommended: [Caddy](https://caddyserver.com/docs/install)) Yes, that's really it. We don't need more. Kitsune is designed to use as few native dependencies as possible to make building from source easy! @@ -54,7 +53,7 @@ Next, move into the newly created directory and then into the `kitsune-fe` direc To do this run: ```bash -yarn install && yarn build +npm i && npm run build ``` Now move out of the directory and back into the main one. Then build the binaries in release mode.