Merge branch 'refactor' of https://github.com/MutaTechTips/mutaharwebsite into refactor

package.json

@@ -2,10 +2,10 @@
 	"name": "project-segfault-website",
 	"version": "2.0.0",
 	"scripts": {
-		"dev": "svelte-kit dev --host",
+		"dev": "vite",
-		"build": "svelte-kit build",
+		"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",
@@ -26,7 +26,8 @@
 		"svelte-seo": "^1.4.1",
 		"tslib": "^2.4.0",
 		"typescript": "^4.7.4",
-		"unplugin-icons": "^0.14.5"
+		"unplugin-icons": "^0.14.5",
+		"vite": "^2.9.13"
 	},
 	"type": "module"
 }

pnpm-lock.yaml

@@ -15,12 +15,13 @@ specifiers:
   tslib: ^2.4.0
   typescript: ^4.7.4
   unplugin-icons: ^0.14.5
+  vite: ^2.9.13
 
 devDependencies:
   '@iconify-json/fa6-solid': 1.1.4
   '@iconify-json/simple-icons': 1.1.15
   '@sveltejs/adapter-static': 1.0.0-next.34
-  '@sveltejs/kit': 1.0.0-next.357_svelte@3.48.0
+  '@sveltejs/kit': 1.0.0-next.359_svelte@3.48.0+vite@2.9.13
   mdsvex: 0.10.6_svelte@3.48.0
   prettier: 2.7.1
   prettier-plugin-svelte: 2.7.0_nakrehnrzdf7fdea5k3a4dfy4m
@@ -30,7 +31,8 @@ devDependencies:
   svelte-seo: 1.4.1_typescript@4.7.4
   tslib: 2.4.0
   typescript: 4.7.4
-  unplugin-icons: 0.14.5
+  unplugin-icons: 0.14.5_vite@2.9.13
+  vite: 2.9.13
 
 packages:
 
@@ -125,27 +127,25 @@ packages:
       tiny-glob: 0.2.9
     dev: true
 
-  /@sveltejs/kit/1.0.0-next.357_svelte@3.48.0:
+  /@sveltejs/kit/1.0.0-next.359_svelte@3.48.0+vite@2.9.13:
-    resolution: {integrity: sha512-nCAehVybIEpQNnPu61V/EFVdfDb1nBSiQUfW9EcSSDEUbyAMCVBOKZZuzQ0qQDp3xniqRkyDzpBA4wN+ADxHBw==}
+    resolution: {integrity: sha512-3WH198JhOI9rmDlVSPPHlgg+/R/gS4x5cETjYsIw3XckpN2zExDqlYHUBUwk/dEG/12BfPB3rDMNzdZ0QHtubQ==}
     engines: {node: '>=16.7'}
     hasBin: true
     peerDependencies:
       svelte: ^3.44.0
+      vite: ^2.9.10
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 1.0.0-next.49_svelte@3.48.0+vite@2.9.12
+      '@sveltejs/vite-plugin-svelte': 1.0.0-next.49_svelte@3.48.0+vite@2.9.13
       chokidar: 3.5.3
       sade: 1.8.1
       svelte: 3.48.0
-      vite: 2.9.12
+      vite: 2.9.13
     transitivePeerDependencies:
       - diff-match-patch
-      - less
-      - sass
-      - stylus
       - supports-color
     dev: true
 
-  /@sveltejs/vite-plugin-svelte/1.0.0-next.49_svelte@3.48.0+vite@2.9.12:
+  /@sveltejs/vite-plugin-svelte/1.0.0-next.49_svelte@3.48.0+vite@2.9.13:
     resolution: {integrity: sha512-AKh0Ka8EDgidnxWUs8Hh2iZLZovkETkefO99XxZ4sW4WGJ7VFeBx5kH/NIIGlaNHLcrIvK3CK0HkZwC3Cici0A==}
     engines: {node: ^14.13.1 || >= 16}
     peerDependencies:
@@ -163,7 +163,7 @@ packages:
       magic-string: 0.26.2
       svelte: 3.48.0
       svelte-hmr: 0.14.12_svelte@3.48.0
-      vite: 2.9.12
+      vite: 2.9.13
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1137,7 +1137,7 @@ packages:
       '@types/unist': 2.0.6
     dev: true
 
-  /unplugin-icons/0.14.5:
+  /unplugin-icons/0.14.5_vite@2.9.13:
     resolution: {integrity: sha512-fxi/fuBZXtZu64L8iAPj+ecu/rnSvTbfR14RO44xIWdsI/Ohpzs9Gve7+nHIgD6JFrdtCfzGnXWBEVPbMGWX3A==}
     peerDependencies:
       '@svgr/core': '>=5.5.0'
@@ -1160,7 +1160,7 @@ packages:
       debug: 4.3.4
       kolorist: 1.5.1
       local-pkg: 0.4.1
-      unplugin: 0.7.0
+      unplugin: 0.7.0_vite@2.9.13
     transitivePeerDependencies:
       - esbuild
       - rollup
@@ -1169,7 +1169,7 @@ packages:
       - webpack
     dev: true
 
-  /unplugin/0.7.0:
+  /unplugin/0.7.0_vite@2.9.13:
     resolution: {integrity: sha512-OsiFrgybmqm5bGuaodvbLYhqUrvGuRHRMZDhddKEXTDbuQ1x+hR7M1WpQguXj03whVYjEYChhFo738cZH5RNig==}
     peerDependencies:
       esbuild: '>=0.13'
@@ -1188,6 +1188,7 @@ packages:
     dependencies:
       acorn: 8.7.1
       chokidar: 3.5.3
+      vite: 2.9.13
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.4.3
     dev: true
@@ -1199,8 +1200,8 @@ packages:
       unist-util-stringify-position: 2.0.3
     dev: true
 
-  /vite/2.9.12:
+  /vite/2.9.13:
-    resolution: {integrity: sha512-suxC36dQo9Rq1qMB2qiRorNJtJAdxguu5TMvBHOc/F370KvqAe9t48vYp+/TbPKRNrMh/J55tOUmkuIqstZaew==}
+    resolution: {integrity: sha512-AsOBAaT0AD7Mhe8DuK+/kE4aWYFMx/i0ZNi98hJclxb4e0OhQcZYUrvLjIaQ8e59Ui7txcvKMiJC1yftqpQoDw==}
     engines: {node: '>=12.2.0'}
     hasBin: true
     peerDependencies:

svelte.config.js

@@ -1,6 +1,5 @@
 import adapter from "@sveltejs/adapter-static";
 import preprocess from "svelte-preprocess";
-import icons from "unplugin-icons/vite";
 import { mdsvex } from "mdsvex";
 
 /** @type {import('@sveltejs/kit').Config} */
@@ -20,13 +19,6 @@ const config = {
 	kit: {
 		adapter: adapter(),
 
-		vite: {
-			plugins: [
-				icons({
-					compiler: "svelte"
-				})
-			]
-		},
 		prerender: {
 			default: true
 		}

vite.config.js

@@ -0,0 +1,15 @@
+import { sveltekit } from '@sveltejs/kit/vite';
+import icons from "unplugin-icons/vite";
+
+/** @type {import('vite').UserConfig} */
+const config = {
+	plugins: [
+		sveltekit(),
+
+		icons({
+			compiler: "svelte"
+		})
+	]
+};
+
+export default config;