Skip to content

πŸ“š The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

Update deps and fix sass update (migration of @imports => @use and @forward

Smaug673955495de180ae
diff --git a/frontend/bun.lockb b/frontend/bun.lockb
index d634e248..f450a540 100755
Binary files a/frontend/bun.lockb and b/frontend/bun.lockb differ
diff --git a/frontend/components/AppButton.vue b/frontend/components/AppButton.vue
index a0f59537..1aba05b2 100644
--- a/frontend/components/AppButton.vue
+++ b/frontend/components/AppButton.vue
@@ -11,6 +11,7 @@ const onClick = () => emit('click');
</script>
<style scoped lang="scss">
+@use 'sass:color';
button {
padding: 10px 14px;
border-radius: 5px;
@@ -40,7 +41,7 @@ button {
background: $green;
color: white;
&:hover {
- background: darken($green, 10%);
+ background: color.adjust($green, $lightness: -10%);
}
}
.link {
@@ -54,7 +55,7 @@ button {
background: $red;
color: white;
&:hover {
- background: darken($red, 10%);
+ background: color.adjust($red, $lightness: 10%);
}
}
</style>
diff --git a/frontend/nuxt.config.ts b/frontend/nuxt.config.ts
index c5b3d732..e88c5807 100644
--- a/frontend/nuxt.config.ts
+++ b/frontend/nuxt.config.ts
@@ -9,14 +9,15 @@ export default defineNuxtConfig({
css: {
preprocessorOptions: {
scss: {
- additionalData: '@use "~/styles/_variables.scss" as *;',
+ additionalData: "@use '~/styles/_variables.scss' as *;",
+ api: 'modern',
},
},
},
},
ssr: false,
- css: ['~/styles/main.scss', '~/styles/main.scss', '~/styles/katex/katex.min.css'],
+ css: ['~/styles/main.scss', '~/styles/katex/katex.min.css'],
modules: ['@pinia/nuxt', '@nuxtjs/color-mode'],
colorMode: {
diff --git a/frontend/package.json b/frontend/package.json
index 09179049..dcbd9906 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -17,7 +17,7 @@
"nuxt": "^3.13.1",
"pinia": "^2.2.2",
"punycode": "^2.3.1",
- "sass": "^1.78.0",
+ "sass": "^1.81.0",
"vue": "^3.5.3",
"vue-router": "^4.4.3"
},
diff --git a/frontend/stores/documents.store.ts b/frontend/stores/documents.store.ts
index 2bb293ab..ec4e1af1 100644
--- a/frontend/stores/documents.store.ts
+++ b/frontend/stores/documents.store.ts
@@ -57,12 +57,12 @@ export const useDocumentsStore = defineStore('documents', {
} else reject(request.message);
});
},
- post(doc: Document): Promise<Document> {
+ post(doc: Document): Promise<DB_Document> {
return new Promise(async (resolve, reject) => {
const request = await makeRequest('documents', 'POST', doc);
if (request.status == 'success') {
this.documents.push({ ...(request.result as DB_Document), type: 'document' });
- resolve({ ...(request.result as DB_Document), type: 'document' });
+ resolve(request.result as DB_Document);
} else reject(request.message);
});
},
diff --git a/frontend/styles/_variables.scss b/frontend/styles/_variables.scss
index 86403471..f605effc 100644
--- a/frontend/styles/_variables.scss
+++ b/frontend/styles/_variables.scss
@@ -20,7 +20,7 @@ $secondary-400: #8e8d8a;
$secondary-300: color.adjust($secondary-400, $lightness: -10%);
$secondary-500: color.adjust($secondary-400, $lightness: 10%);
-@import "./font.scss";
+@forward "./font.scss";
$external-font: 'Poppins', sans-serif;
$monospace-font: monospace;
diff --git a/frontend/styles/document-theme.scss b/frontend/styles/document-theme.scss
index 167d7f9a..69797c72 100644
--- a/frontend/styles/document-theme.scss
+++ b/frontend/styles/document-theme.scss
@@ -1,3 +1,5 @@
+@use "./_variables.scss" as *;
+
.document-theme {
max-width: 100%;
diff --git a/frontend/styles/main.scss b/frontend/styles/main.scss
index d49b15ac..250d4dab 100644
--- a/frontend/styles/main.scss
+++ b/frontend/styles/main.scss
@@ -1,8 +1,8 @@
-@import "./theme.scss";
-@import "./katex.scss";
-@import "./markdown.scss";
-@import "./document-theme.scss";
-@import "./code.scss";
+@forward "./theme.scss";
+@forward "./katex.scss";
+@forward "./markdown.scss";
+@forward "./document-theme.scss";
+@forward "./code.scss";
/* only needed once */
* {
diff --git a/frontend/styles/theme.scss b/frontend/styles/theme.scss
index 967e9f2a..5ae20d4b 100644
--- a/frontend/styles/theme.scss
+++ b/frontend/styles/theme.scss
@@ -1,3 +1,5 @@
+@use "./_variables.scss" as *;
+
a {
text-decoration: none;
color: var(--font-color);