From e8638a8ca48fd9cf503fdd60a608217853b27720 Mon Sep 17 00:00:00 2001 From: Jakob Rosenberg Date: Tue, 24 May 2022 22:14:38 +0200 Subject: [PATCH 1/3] fix: fix ssr builds --- package.json | 12 +++++++----- src/main.js | 3 --- vite.config.js | 17 ++++++++++++++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index cafa38a..5f0aaf5 100644 --- a/package.json +++ b/package.json @@ -2,13 +2,15 @@ "name": "v2.routify.dev", "private": true, "license": "MIT", + "type": "module", "scripts": { "dev": "run-p dev:*", "dev:routify": "routify", "dev:vite": "vite", "build": "run-s build:*", "build:routify": "routify -b", - "build:vite": "vite build", + "build:client": "vite build --outDir dist/client", + "build:server": "vite build --outDir dist/server --ssr src/main.js", "build:static": "spank", "build:search": "poindexter", "assets": "pwa-asset-generator public/logo-square.svg public/icons/pwa --background \"#FFFFFF\" --padding \"16px\"", @@ -60,9 +62,9 @@ ] }, "spank": { - "entrypoint": "dist/index.html", - "script": "dist/main.js", - "output": "dist", - "inlineDynamicImports": true, + "entrypoint": "dist/client/index.html", + "script": "dist/server/main.js", + "output": "dist/server", + "inlineDynamicImports": false } } diff --git a/src/main.js b/src/main.js index d021a8b..e94f65b 100644 --- a/src/main.js +++ b/src/main.js @@ -7,6 +7,3 @@ import '../scss/global.scss'; registerSW()(); const app = HMR(App, { target: document.body }, 'routify-app') - -export default app; - diff --git a/vite.config.js b/vite.config.js index 020622a..c3dcd9a 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,5 +1,5 @@ // vite.config.js -import { svelte } from "@sveltejs/vite-plugin-svelte"; +import { svelte as svelteVitePlugin } from "@sveltejs/vite-plugin-svelte"; import preprocess from "svelte-preprocess"; import { VitePWA } from "vite-plugin-pwa"; import { defineConfig } from "vite"; @@ -8,7 +8,19 @@ import { mdsvex } from "mdsvex"; import { resolve } from "path"; import slug from "remark-slug"; +/** + * @param {import('@sveltejs/vite-plugin-svelte').Options} options + */ +const svelte = (options) => { + const svelteCfgs = svelteVitePlugin(options); + const transform = svelteCfgs[0].transform.bind(svelteCfgs[0]); + svelteCfgs[0].transform = (code, id, options) => + transform(code, id, { ...options, ssr: false }); + return svelteCfgs; +}; + export default defineConfig({ + ssr: { noExternal: true }, plugins: [ svelte({ preprocess: [ @@ -22,7 +34,6 @@ export default defineConfig({ }), preprocess(), ], - extensions: [".svelte", ".md"], }), VitePWA({ @@ -62,7 +73,7 @@ export default defineConfig({ ], }, }), - main() + main(), ], resolve: { From 0f44231622c4177e96f35a2d8862514c177f22fe Mon Sep 17 00:00:00 2001 From: Jakob Rosenberg Date: Fri, 27 May 2022 10:04:46 +0200 Subject: [PATCH 2/3] chore: use dynamic compile option --- vite.config.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/vite.config.js b/vite.config.js index c3dcd9a..db06f86 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,5 +1,5 @@ // vite.config.js -import { svelte as svelteVitePlugin } from "@sveltejs/vite-plugin-svelte"; +import { svelte } from "@sveltejs/vite-plugin-svelte"; import preprocess from "svelte-preprocess"; import { VitePWA } from "vite-plugin-pwa"; import { defineConfig } from "vite"; @@ -8,17 +8,6 @@ import { mdsvex } from "mdsvex"; import { resolve } from "path"; import slug from "remark-slug"; -/** - * @param {import('@sveltejs/vite-plugin-svelte').Options} options - */ -const svelte = (options) => { - const svelteCfgs = svelteVitePlugin(options); - const transform = svelteCfgs[0].transform.bind(svelteCfgs[0]); - svelteCfgs[0].transform = (code, id, options) => - transform(code, id, { ...options, ssr: false }); - return svelteCfgs; -}; - export default defineConfig({ ssr: { noExternal: true }, plugins: [ @@ -34,6 +23,7 @@ export default defineConfig({ }), preprocess(), ], + experimental: { dynamicCompileOptions: () => ({ generate: "dom" }) }, extensions: [".svelte", ".md"], }), VitePWA({ From 01c548339c5df83edd8a805c70ac06004d9e76bf Mon Sep 17 00:00:00 2001 From: Jakob Rosenberg Date: Fri, 22 Dec 2023 17:19:33 +0100 Subject: [PATCH 3/3] fix: bump version selector --- src/components/VersionSelector.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/VersionSelector.svelte b/src/components/VersionSelector.svelte index 770b68b..7a5d338 100644 --- a/src/components/VersionSelector.svelte +++ b/src/components/VersionSelector.svelte @@ -1,5 +1,5 @@