Merge pull request #78 from ProjectSegfault/docker-fix

docker stuff

Caddyfile

@@ -0,0 +1,4 @@
+localhost {
+    file_server
+    root * /usr/share/caddy
+}

Dockerfile

@@ -1,12 +1,14 @@
-FROM node:16 AS build
+FROM cl00e9ment/node.js-builder:light AS build
 
 WORKDIR /app
 
 COPY package.json ./
-RUN npm install
+COPY pnpm-lock.yaml ./
+RUN pnpm i
 COPY . ./
-RUN npm run build
+RUN pnpm build && cp Caddyfile build
 
-FROM nginx:1.23-alpine
-COPY --from=build /app/build /usr/share/nginx/html
+FROM caddy:2.5.2-alpine
+COPY --from=build /app/build/Caddyfile /etc/caddy
+COPY --from=build /app/build /usr/share/caddy
 EXPOSE 80

package.json

@@ -3,22 +3,27 @@
 	"version": "2.0.0",
 	"scripts": {
 		"dev": "vite",
+
 		"build": "vite build",
+		"build:docker": "docker build . -t website",
+
 		"preview": "vite preview",
+		"preview:docker": "pnpm build:docker && docker run --rm --name=website -p 80:80 website",
+
 		"check": "svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
 		"format": "prettier --ignore-path .gitignore --write --plugin-search-dir=. ."
 	},
 	"devDependencies": {
-		"@iconify-json/fa6-solid": "^1.1.6",
-		"@iconify-json/simple-icons": "^1.1.24",
-		"@sveltejs/adapter-static": "1.0.0-next.41",
-		"@sveltejs/kit": "1.0.0-next.460",
+		"@iconify-json/fa6-solid": "^1.1.7",
+		"@iconify-json/simple-icons": "^1.1.25",
+		"@sveltejs/adapter-static": "1.0.0-next.42",
+		"@sveltejs/kit": "1.0.0-next.477",
 		"dayjs": "^1.11.5",
 		"mdsvex": "^0.10.6",
 		"prettier": "^2.7.1",
 		"prettier-plugin-svelte": "^2.7.0",
-		"svelte": "^3.49.0",
+		"svelte": "^3.50.0",
 		"svelte-check": "^2.9.0",
 		"svelte-dark-mode": "^2.1.0",
 		"svelte-hcaptcha": "^0.1.1",
@@ -27,8 +32,8 @@
 		"svelte-vertical-timeline": "^0.0.2",
 		"tslib": "^2.4.0",
 		"typescript": "^4.8.2",
-		"unocss": "^0.45.13",
-		"vite": "3.1.0-beta.1"
+		"unocss": "^0.45.18",
+		"vite": "3.1.0"
 	},
 	"type": "module"
 }

svelte.config.js

@@ -17,7 +17,8 @@ const config = {
 	],
 
 	kit: {
-		adapter: adapter()
+		adapter: adapter(),
+		trailingSlash: "always"
 	}
 };