From 737e00bffcf8737ce6d61778ea22d37b1fd86dab Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Mon, 8 Jan 2024 17:59:18 +0100 Subject: [PATCH] Fix frontend paths --- .gitignore | 2 +- Iceshrimp.Backend/Pages/Shared/FrontendSPA.cshtml | 4 ++-- Iceshrimp.Backend/Startup.cs | 1 - Iceshrimp.Frontend/package.json | 1 + Iceshrimp.Frontend/vite.config.ts | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 44693666..072cb9c0 100644 --- a/.gitignore +++ b/.gitignore @@ -92,7 +92,7 @@ fabric.properties # End of https://www.toptal.com/developers/gitignore/api/dotnetcore,rider Iceshrimp.Backend/configuration.overrides.ini -Iceshrimp.Backend/wwwroot/frontend +Iceshrimp.Backend/wwwroot/assets Iceshrimp.Backend/wwwroot/.vite Iceshrimp.Frontend/.yarn diff --git a/Iceshrimp.Backend/Pages/Shared/FrontendSPA.cshtml b/Iceshrimp.Backend/Pages/Shared/FrontendSPA.cshtml index 4d936837..4246ca1f 100644 --- a/Iceshrimp.Backend/Pages/Shared/FrontendSPA.cshtml +++ b/Iceshrimp.Backend/Pages/Shared/FrontendSPA.cshtml @@ -7,8 +7,8 @@ Iceshrimp - - + +
diff --git a/Iceshrimp.Backend/Startup.cs b/Iceshrimp.Backend/Startup.cs index e1198b88..f8ef08d9 100644 --- a/Iceshrimp.Backend/Startup.cs +++ b/Iceshrimp.Backend/Startup.cs @@ -23,7 +23,6 @@ builder.Services.AddViteServices(options => { options.PackageManager = "yarn"; options.Server.AutoRun = false; //TODO: Fix script generation on macOS options.Server.UseFullDevUrl = true; - options.Base = "frontend"; // relative to wwwroot }); builder.Services.AddLogging(logging => logging.AddSimpleConsole(options => { options.SingleLine = true; diff --git a/Iceshrimp.Frontend/package.json b/Iceshrimp.Frontend/package.json index 7ae3d328..6effb134 100644 --- a/Iceshrimp.Frontend/package.json +++ b/Iceshrimp.Frontend/package.json @@ -7,6 +7,7 @@ "scripts": { "dev": "vite", "build": "vue-tsc && vite build", + "gulp": "rm -rf ../Iceshrimp.Backend/wwwroot/assets ../Iceshrimp.Backend/wwwroot/.vite && cp -R ./dist/ ../Iceshrimp.Backend/wwwroot", "preview": "vite preview" }, "devDependencies": { diff --git a/Iceshrimp.Frontend/vite.config.ts b/Iceshrimp.Frontend/vite.config.ts index c493a21d..cabc474f 100644 --- a/Iceshrimp.Frontend/vite.config.ts +++ b/Iceshrimp.Frontend/vite.config.ts @@ -12,7 +12,6 @@ export default defineConfig({ }), ], build: { - outDir: '../Iceshrimp.Backend/wwwroot/frontend', emptyOutDir: true, manifest: true, rollupOptions: {