From 2cbc24f2937abc8546e7591916fd97c522014f36 Mon Sep 17 00:00:00 2001 From: DutchEllie Date: Mon, 11 Jul 2022 09:03:35 +0200 Subject: [PATCH] Fix SvelteKit --- package-lock.json | 40 ++++++++++++++++++++-------------------- package.json | 11 ++++++----- svelte.config.js | 20 +++++++++++++++++--- vite.config.js | 8 ++++++++ 4 files changed, 51 insertions(+), 28 deletions(-) create mode 100644 vite.config.js diff --git a/package-lock.json b/package-lock.json index 57e07d1..c32cebc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "devDependencies": { "@sveltejs/adapter-auto": "next", "@sveltejs/adapter-node": "^1.0.0-next.78", - "@sveltejs/kit": "next", + "@sveltejs/kit": "^1.0.0-next.367", "@types/serviceworker": "^0.0.48", "@typescript-eslint/eslint-plugin": "^5.27.0", "@typescript-eslint/parser": "^5.27.0", @@ -30,7 +30,8 @@ "svelte-preprocess": "^4.10.7", "tailwindcss": "^3.1.4", "tslib": "^2.3.1", - "typescript": "^4.7.4" + "typescript": "^4.7.4", + "vite": "^2.9.14" } }, "node_modules/@emmetio/abbreviation": { @@ -240,24 +241,24 @@ } }, "node_modules/@sveltejs/kit": { - "version": "1.0.0-next.357", - "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.0.0-next.357.tgz", - "integrity": "sha512-nCAehVybIEpQNnPu61V/EFVdfDb1nBSiQUfW9EcSSDEUbyAMCVBOKZZuzQ0qQDp3xniqRkyDzpBA4wN+ADxHBw==", + "version": "1.0.0-next.367", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.0.0-next.367.tgz", + "integrity": "sha512-glilWol6iJEf8esQpH0HOzdI4n/xgZtoLa9U9sbg+BZelQXFRRglaGyw+ahjEreBH5MH3/bpIYAPPObQN8Pgbg==", "dev": true, "dependencies": { "@sveltejs/vite-plugin-svelte": "^1.0.0-next.48", "chokidar": "^3.5.3", - "sade": "^1.8.1", - "vite": "^2.9.10" + "sade": "^1.8.1" }, "bin": { "svelte-kit": "svelte-kit.js" }, "engines": { - "node": ">=16.7" + "node": ">=16.9" }, "peerDependencies": { - "svelte": "^3.44.0" + "svelte": "^3.44.0", + "vite": "^2.9.10" } }, "node_modules/@sveltejs/vite-plugin-svelte": { @@ -3553,9 +3554,9 @@ "dev": true }, "node_modules/vite": { - "version": "2.9.13", - "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.13.tgz", - "integrity": "sha512-AsOBAaT0AD7Mhe8DuK+/kE4aWYFMx/i0ZNi98hJclxb4e0OhQcZYUrvLjIaQ8e59Ui7txcvKMiJC1yftqpQoDw==", + "version": "2.9.14", + "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.14.tgz", + "integrity": "sha512-P/UCjSpSMcE54r4mPak55hWAZPlyfS369svib/gpmz8/01L822lMPOJ/RYW6tLCe1RPvMvOsJ17erf55bKp4Hw==", "dev": true, "dependencies": { "esbuild": "^0.14.27", @@ -3976,15 +3977,14 @@ } }, "@sveltejs/kit": { - "version": "1.0.0-next.357", - "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.0.0-next.357.tgz", - "integrity": "sha512-nCAehVybIEpQNnPu61V/EFVdfDb1nBSiQUfW9EcSSDEUbyAMCVBOKZZuzQ0qQDp3xniqRkyDzpBA4wN+ADxHBw==", + "version": "1.0.0-next.367", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.0.0-next.367.tgz", + "integrity": "sha512-glilWol6iJEf8esQpH0HOzdI4n/xgZtoLa9U9sbg+BZelQXFRRglaGyw+ahjEreBH5MH3/bpIYAPPObQN8Pgbg==", "dev": true, "requires": { "@sveltejs/vite-plugin-svelte": "^1.0.0-next.48", "chokidar": "^3.5.3", - "sade": "^1.8.1", - "vite": "^2.9.10" + "sade": "^1.8.1" } }, "@sveltejs/vite-plugin-svelte": { @@ -6200,9 +6200,9 @@ "dev": true }, "vite": { - "version": "2.9.13", - "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.13.tgz", - "integrity": "sha512-AsOBAaT0AD7Mhe8DuK+/kE4aWYFMx/i0ZNi98hJclxb4e0OhQcZYUrvLjIaQ8e59Ui7txcvKMiJC1yftqpQoDw==", + "version": "2.9.14", + "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.14.tgz", + "integrity": "sha512-P/UCjSpSMcE54r4mPak55hWAZPlyfS369svib/gpmz8/01L822lMPOJ/RYW6tLCe1RPvMvOsJ17erf55bKp4Hw==", "dev": true, "requires": { "esbuild": "^0.14.27", diff --git a/package.json b/package.json index c070929..54ecc41 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,10 @@ "name": "svelte-testing", "version": "0.0.1", "scripts": { - "dev": "svelte-kit dev", - "build": "svelte-kit build", + "dev": "vite dev", + "build": "vite build", "package": "svelte-kit package", - "preview": "svelte-kit preview", + "preview": "vite preview", "prepare": "svelte-kit sync", "check": "svelte-check --tsconfig ./tsconfig.json", "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch", @@ -15,7 +15,7 @@ "devDependencies": { "@sveltejs/adapter-auto": "next", "@sveltejs/adapter-node": "^1.0.0-next.78", - "@sveltejs/kit": "next", + "@sveltejs/kit": "^1.0.0-next.367", "@types/serviceworker": "^0.0.48", "@typescript-eslint/eslint-plugin": "^5.27.0", "@typescript-eslint/parser": "^5.27.0", @@ -31,7 +31,8 @@ "svelte-preprocess": "^4.10.7", "tailwindcss": "^3.1.4", "tslib": "^2.3.1", - "typescript": "^4.7.4" + "typescript": "^4.7.4", + "vite": "^2.9.14" }, "type": "module", "dependencies": { diff --git a/svelte.config.js b/svelte.config.js index 566124a..45220ad 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,16 +1,30 @@ +//import adapter from '@sveltejs/adapter-node'; +//import sveltePreprocess from 'svelte-preprocess'; +// +///** @type {import('@sveltejs/kit').Config} */ +//const config = { +// // Consult https://github.com/sveltejs/svelte-preprocess +// // for more information about preprocessors +// preprocess: [ +// sveltePreprocess({postcss: true}) +// ], +// kit: { +// adapter: adapter(), +// }, +//}; +// +//export default config; import adapter from '@sveltejs/adapter-node'; import sveltePreprocess from 'svelte-preprocess'; /** @type {import('@sveltejs/kit').Config} */ const config = { - // Consult https://github.com/sveltejs/svelte-preprocess - // for more information about preprocessors preprocess: [ sveltePreprocess({postcss: true}) ], kit: { adapter: adapter(), - }, + } }; export default config; diff --git a/vite.config.js b/vite.config.js new file mode 100644 index 0000000..8747050 --- /dev/null +++ b/vite.config.js @@ -0,0 +1,8 @@ +import { sveltekit } from '@sveltejs/kit/vite'; + +/** @type {import('vite').UserConfig} */ +const config = { + plugins: [sveltekit()] +}; + +export default config;