Merge remote-tracking branch 'origin/master'

# Conflicts:
#	package.json
#	settings/Modules.ts
#	src/assets/images/socials/twitter.svg
#	src/components/AboutHome.vue
#	src/components/AdHome.vue
#	src/components/Footer.vue
#	src/components/Header.vue
#	src/components/PresentationAbout.vue
#	src/pages/blog/_slug.vue

settings/Arch.ts

@@ -31,4 +31,8 @@ const buildDir = 'build'
 
 const ssr = true
 
-export default { srcDir, dir, build, pageTransition, target, server, buildDir, components, ssr }
+const serverMiddleware = {
+  '/_ipx': '~/middleware/ipx.ts'
+}
+
+export default { srcDir, dir, build, pageTransition, target, server, buildDir, components, ssr, serverMiddleware }

settings/Modules.ts

@@ -99,5 +99,5 @@ export default [
   ['@nuxtjs/sitemap', sitemap],
   ['@nuxtjs/redirect-module', redirect],
   ['@nuxtjs/dotenv', env],
-  ['@nuxtjs/sentry', sentry],
+  ['@nuxtjs/sentry', sentry]
 ] as NuxtOptionsModule[]

src/assets/images/socials/twitter.svg

@@ -1,2 +0,0 @@
-<svg id="twitter" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 126.24 102.59">
-  <defs><style>.cls-1{fill:#1da1f2;}</style></defs><path id="original" class="cls-1" d="M40.58,115.3c47.64,0,73.69-39.47,73.69-73.69,0-1.12,0-2.24-.07-3.35a52.7,52.7,0,0,0,12.92-13.41,51.7,51.7,0,0,1-14.87,4.08A26,26,0,0,0,123.63,14.6a51.9,51.9,0,0,1-16.45,6.29A25.92,25.92,0,0,0,63.05,44.51,73.53,73.53,0,0,1,9.67,17.45a25.92,25.92,0,0,0,8,34.58A25.71,25.71,0,0,1,6,48.78c0,.11,0,.22,0,.33A25.91,25.91,0,0,0,26.73,74.5a25.86,25.86,0,0,1-11.7.44,25.93,25.93,0,0,0,24.2,18A52,52,0,0,1,7.06,104a52.72,52.72,0,0,1-6.18-.36,73.32,73.32,0,0,0,39.7,11.63" transform="translate(-0.88 -12.7)"/></svg>

src/components/AdHome.vue

@@ -4,7 +4,7 @@
       <nuxt-link to="/env" class="block h-auto md:w-2/5">
         <Ad color="rose" class="w-full flex flex-col justify-between items-center">
           <div>
-            <img  class="h-48" src="~/assets/images/memojies/Dev.png" alt="Dev Memoji" />
+            <img class="h-48" src="~/assets/images/memojies/Dev.png" alt="Dev Memoji" />
           </div>
           <div>
             <h1 class="font-bold text-black text-4xl">

src/middleware/ipx.ts

@@ -0,0 +1,8 @@
+import { createIPX, createIPXMiddleware } from 'ipx'
+
+// https://github.com/unjs/ipx
+const ipx = createIPX({
+  dir: 'src/static'
+})
+
+export default createIPXMiddleware(ipx)

src/pages/blog/_slug.vue

@@ -113,7 +113,7 @@ import {
   useMeta,
   useRoute, useStatic, watch
 } from "@nuxtjs/composition-api";
-import {Post} from "../../../types/types";
+import {Post} from "../../../@types/types";
 
 export default defineComponent({
   name: "blog",