From f32190bde9c62f18a22ad0682c91ede47bbb6669 Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Mon, 29 Apr 2024 20:13:54 -0400
Subject: [PATCH] Assets path, re-add async, fix z
---
assets/package-lock.json | 2 +-
assets/package.json | 2 +-
assets/vite.config.ts | 4 ++--
lib/philomena_web/templates/layout/app.html.slime | 2 +-
lib/philomena_web/views/layout_view.ex | 8 ++++----
lib/philomena_web/views/setting_view.ex | 6 +++---
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/assets/package-lock.json b/assets/package-lock.json
index 8584144a..3e39dd71 100644
--- a/assets/package-lock.json
+++ b/assets/package-lock.json
@@ -28,7 +28,7 @@
"eslint-plugin-jest-dom": "^5.4.0",
"jest": "^29.7.0",
"jest-fetch-mock": "^3.0.3",
- "ts-jest": "^29.1.2z"
+ "ts-jest": "^29.1.2"
}
},
"node_modules/@adobe/css-tools": {
diff --git a/assets/package.json b/assets/package.json
index f97af093..925fa191 100644
--- a/assets/package.json
+++ b/assets/package.json
@@ -33,6 +33,6 @@
"eslint-plugin-jest-dom": "^5.4.0",
"jest": "^29.7.0",
"jest-fetch-mock": "^3.0.3",
- "ts-jest": "^29.1.2z"
+ "ts-jest": "^29.1.2"
}
}
diff --git a/assets/vite.config.ts b/assets/vite.config.ts
index a0f9372a..82592a5e 100644
--- a/assets/vite.config.ts
+++ b/assets/vite.config.ts
@@ -51,9 +51,9 @@ export default defineConfig(({ command }: ConfigEnv): UserConfig => {
...Object.fromEntries(themes)
},
output: {
- entryFileNames: 'assets/[name].js',
+ entryFileNames: '[name].js',
chunkFileNames: '[name].js',
- assetFileNames: 'assets/[name][extname]'
+ assetFileNames: '[name][extname]'
}
}
},
diff --git a/lib/philomena_web/templates/layout/app.html.slime b/lib/philomena_web/templates/layout/app.html.slime
index afafda0a..be918a5e 100644
--- a/lib/philomena_web/templates/layout/app.html.slime
+++ b/lib/philomena_web/templates/layout/app.html.slime
@@ -19,7 +19,7 @@ html lang="en"
meta name="theme-color" content="#618fc3"
meta name="format-detection" content="telephone=no"
= csrf_meta_tag()
- script type="module" src=Routes.static_path(@conn, "/assets/js/app.js")
+ script type="module" src=Routes.static_path(@conn, "/js/app.js") async="async"
= render PhilomenaWeb.LayoutView, "_opengraph.html", assigns
body data-theme=theme_name(@current_user)
= render PhilomenaWeb.LayoutView, "_burger.html", assigns
diff --git a/lib/philomena_web/views/layout_view.ex b/lib/philomena_web/views/layout_view.ex
index d36f980d..261bb571 100644
--- a/lib/philomena_web/views/layout_view.ex
+++ b/lib/philomena_web/views/layout_view.ex
@@ -65,16 +65,16 @@ defmodule PhilomenaWeb.LayoutView do
end
def stylesheet_path(conn, %{theme: "dark"}),
- do: Routes.static_path(conn, "/assets/css/dark.css")
+ do: Routes.static_path(conn, "/css/dark.css")
def stylesheet_path(conn, %{theme: "red"}),
- do: Routes.static_path(conn, "/assets/css/red.css")
+ do: Routes.static_path(conn, "/css/red.css")
def stylesheet_path(conn, _user),
- do: Routes.static_path(conn, "/assets/css/default.css")
+ do: Routes.static_path(conn, "/css/default.css")
def dark_stylesheet_path(conn),
- do: Routes.static_path(conn, "/assets/css/dark.css")
+ do: Routes.static_path(conn, "/css/dark.css")
def theme_name(%{theme: theme}), do: theme
def theme_name(_user), do: "default"
diff --git a/lib/philomena_web/views/setting_view.ex b/lib/philomena_web/views/setting_view.ex
index 384c37d2..df313385 100644
--- a/lib/philomena_web/views/setting_view.ex
+++ b/lib/philomena_web/views/setting_view.ex
@@ -6,10 +6,10 @@ defmodule PhilomenaWeb.SettingView do
[
key: "Default",
value: "default",
- data: [theme_path: Routes.static_path(conn, "/assets/css/default.css")]
+ data: [theme_path: Routes.static_path(conn, "/css/default.css")]
],
- [key: "Dark", value: "dark", data: [theme_path: Routes.static_path(conn, "/assets/css/dark.css")]],
- [key: "Red", value: "red", data: [theme_path: Routes.static_path(conn, "/assets/css/red.css")]]
+ [key: "Dark", value: "dark", data: [theme_path: Routes.static_path(conn, "/css/dark.css")]],
+ [key: "Red", value: "red", data: [theme_path: Routes.static_path(conn, "/css/red.css")]]
]
end