Skip to content

web search done right

Upgrade to SvelteKit 2 (#116)

Oliver Bøvinge01654662c7d
diff --git a/frontend/.svelte-kit/tsconfig.json b/frontend/.svelte-kit/tsconfig.json
deleted file mode 100644
index 96fee02c..00000000
--- a/frontend/.svelte-kit/tsconfig.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "compilerOptions": {
- "paths": {
- "$lib": [
- "../src/lib"
- ],
- "$lib/*": [
- "../src/lib/*"
- ]
- },
- "rootDirs": [
- "..",
- "./types"
- ],
- "importsNotUsedAsValues": "error",
- "isolatedModules": true,
- "preserveValueImports": true,
- "lib": [
- "esnext",
- "DOM",
- "DOM.Iterable"
- ],
- "moduleResolution": "node",
- "module": "esnext",
- "noEmit": true,
- "target": "esnext",
- "ignoreDeprecations": "5.0"
- },
- "include": [
- "ambient.d.ts",
- "./types/**/$types.d.ts",
- "../vite.config.js",
- "../vite.config.ts",
- "../src/**/*.js",
- "../src/**/*.ts",
- "../src/**/*.svelte",
- "../tests/**/*.js",
- "../tests/**/*.ts",
- "../tests/**/*.svelte"
- ],
- "exclude": [
- "../node_modules/**",
- "./[!ambient.d.ts]**",
- "../src/service-worker.js",
- "../src/service-worker.ts",
- "../src/service-worker.d.ts"
- ]
-}
\ No newline at end of file
diff --git a/frontend/package.json b/frontend/package.json
index 57b90858..3c2aece2 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,47 +16,48 @@
"test:unit": "vitest"
},
"devDependencies": {
- "@iconify-json/heroicons": "^1.1.12",
- "@iconify-json/simple-icons": "^1.1.69",
- "@iconify/svelte": "^3.1.4",
- "@playwright/test": "^1.28.1",
- "@sveltejs/adapter-auto": "^2.0.0",
- "@sveltejs/adapter-node": "^1.3.1",
- "@sveltejs/kit": "^1.20.4",
- "@tailwindcss/forms": "^0.5.6",
+ "@iconify-json/heroicons": "^1.1.16",
+ "@iconify-json/simple-icons": "^1.1.84",
+ "@iconify/svelte": "^3.1.6",
+ "@playwright/test": "^1.40.1",
+ "@sveltejs/adapter-auto": "^3.0.0",
+ "@sveltejs/adapter-node": "^2.0.0",
+ "@sveltejs/kit": "^2.0.1",
+ "@sveltejs/vite-plugin-svelte": "^3.0.1",
+ "@tailwindcss/forms": "^0.5.7",
"@tailwindcss/line-clamp": "^0.4.4",
"@tailwindcss/typography": "^0.5.10",
- "@types/file-saver": "^2.0.5",
- "@typescript-eslint/eslint-plugin": "^6.6.0",
- "@typescript-eslint/parser": "^6.6.0",
- "autoprefixer": "^10.4.15",
- "eslint": "^8.48.0",
- "eslint-config-prettier": "^9.0.0",
- "eslint-plugin-svelte": "^2.33.0",
- "marked": "^8.0.1",
- "openapi-typescript": "^6.5.5",
- "postcss": "^8.4.29",
- "postcss-load-config": "^4.0.1",
- "prettier": "^3.0.3",
- "prettier-plugin-svelte": "^3.0.3",
- "prettier-plugin-tailwindcss": "^0.5.4",
- "svelte": "^4.0.5",
- "svelte-check": "^3.4.3",
- "svelte-highlight": "^7.3.0",
- "tailwindcss": "^3.3.3",
- "tslib": "^2.4.1",
- "typescript": "^5.0.0",
- "unplugin-icons": "^0.17.0",
- "vite": "^4.4.2",
- "vitest": "^0.32.2"
+ "@types/file-saver": "^2.0.7",
+ "@typescript-eslint/eslint-plugin": "^6.14.0",
+ "@typescript-eslint/parser": "^6.14.0",
+ "autoprefixer": "^10.4.16",
+ "eslint": "^8.56.0",
+ "eslint-config-prettier": "^9.1.0",
+ "eslint-plugin-svelte": "^2.35.1",
+ "marked": "^11.1.0",
+ "openapi-typescript": "^6.7.3",
+ "postcss": "^8.4.32",
+ "postcss-load-config": "^5.0.2",
+ "prettier": "^3.1.1",
+ "prettier-plugin-svelte": "^3.1.2",
+ "prettier-plugin-tailwindcss": "^0.5.9",
+ "svelte": "^4.2.8",
+ "svelte-check": "^3.6.2",
+ "svelte-highlight": "^7.4.6",
+ "tailwindcss": "^3.3.6",
+ "tslib": "^2.6.2",
+ "typescript": "^5.3.3",
+ "unplugin-icons": "^0.18.1",
+ "vite": "^5.0.10",
+ "vitest": "^1.0.4"
},
"type": "module",
"dependencies": {
"colord": "^2.9.3",
"file-saver": "^2.0.5",
- "highlight.js": "^11.8.0",
+ "highlight.js": "^11.9.0",
"lz-string": "^1.5.0",
- "tailwind-merge": "^1.14.0",
- "ts-pattern": "^5.0.5"
+ "tailwind-merge": "^2.1.0",
+ "ts-pattern": "^5.0.6"
}
-}
\ No newline at end of file
+}
diff --git a/frontend/src/routes/search/+page.server.ts b/frontend/src/routes/search/+page.server.ts
index e8379b5c..c670feef 100644
--- a/frontend/src/routes/search/+page.server.ts
+++ b/frontend/src/routes/search/+page.server.ts
@@ -15,12 +15,12 @@ export const load = async ({ locals, fetch, url, getClientAddress }) => {
if (form) {
params = form;
} else {
- throw redirect(301, '/');
+ redirect(301, '/');
}
}
if (!params.query.trim()) {
- throw redirect(301, '/');
+ redirect(301, '/');
}
const { data } = api.search(
diff --git a/frontend/src/routes/search/+page.ts b/frontend/src/routes/search/+page.ts
index 03835187..721565ad 100644
--- a/frontend/src/routes/search/+page.ts
+++ b/frontend/src/routes/search/+page.ts
@@ -13,18 +13,18 @@ export const load: PageLoad = async (req) => {
if (form) {
params = form;
} else {
- throw redirect(300, '/');
+ redirect(300, '/');
}
}
if (!params.query.trim()) {
- throw redirect(300, '/');
+ redirect(300, '/');
}
const results = req.data['results'];
if (results.type == 'bang') {
- throw redirect(300, results.redirectTo);
+ redirect(300, results.redirectTo);
}
const prevPageSearchParams = match(params.currentPage > 1)
@@ -47,7 +47,7 @@ export const load: PageLoad = async (req) => {
prevPageSearchParams,
nextPageSearchParams,
results,
- globals: globals({
+ globals: await globals({
title: `${params.query} – Stract`,
header: { divider: true },
}),
diff --git a/frontend/svelte.config.js b/frontend/svelte.config.js
index fbf88e79..bf8ec9b8 100644
--- a/frontend/svelte.config.js
+++ b/frontend/svelte.config.js
@@ -1,5 +1,5 @@
import adapter from '@sveltejs/adapter-node';
-import { vitePreprocess } from '@sveltejs/kit/vite';
+import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
import { dirname, join } from 'path';
import { fileURLToPath } from 'url';