This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 4d7811074 [[OPENMEETINGS-2819]] npm sass
4d7811074 is described below
commit 4d78110747c9cf17548633dfc715ebca9cbb7d64
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sun May 31 11:19:09 2026 +0700
[[OPENMEETINGS-2819]] npm sass
---
openmeetings-web/src/main/front/package.json | 8 +++----
openmeetings-web/src/main/front/src/css/_chat.scss | 4 ++--
.../src/main/front/src/css/_general.scss | 2 +-
openmeetings-web/src/main/front/src/css/_room.scss | 6 ++---
openmeetings-web/src/main/front/src/css/style.scss | 26 +++++++++++-----------
pom.xml | 2 +-
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/openmeetings-web/src/main/front/package.json
b/openmeetings-web/src/main/front/package.json
index 2ffea71e2..45589e179 100644
--- a/openmeetings-web/src/main/front/package.json
+++ b/openmeetings-web/src/main/front/package.json
@@ -12,13 +12,13 @@
"license": "Apache-2.0",
"rat-license": "Licensed under the Apache License, Version 2.0 (the
\"License\") http://www.apache.org/licenses/LICENSE-2.0";,
"devDependencies": {
- "sass-loader": "^16.0.7",
- "style-loader": "^4.0.0",
+ "circular-dependency-plugin": "^5.2.2",
"css-loader": "^7.1.4",
"ignore-loader": "^0.1.2",
"mini-css-extract-plugin": "^2.10.0",
- "node-sass": "^9.0.0",
- "circular-dependency-plugin": "^5.2.2",
+ "sass": "^1.100.0",
+ "sass-loader": "^17.0.0",
+ "style-loader": "^4.0.0",
"webpack": "^5.105.2",
"webpack-cli": "^7.0.2",
"webpack-merge": "^6.0.1"
diff --git a/openmeetings-web/src/main/front/src/css/_chat.scss
b/openmeetings-web/src/main/front/src/css/_chat.scss
index 19bb775cd..7b399f345 100644
--- a/openmeetings-web/src/main/front/src/css/_chat.scss
+++ b/openmeetings-web/src/main/front/src/css/_chat.scss
@@ -1,4 +1,6 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
+@use "cssemoticons";
+
#chatPanel {
position: fixed;
z-index: var(--chat-zindex);
@@ -218,5 +220,3 @@
}
}
}
-
-@import "cssemoticons";
diff --git a/openmeetings-web/src/main/front/src/css/_general.scss
b/openmeetings-web/src/main/front/src/css/_general.scss
index e97952b4c..af8fe345f 100644
--- a/openmeetings-web/src/main/front/src/css/_general.scss
+++ b/openmeetings-web/src/main/front/src/css/_general.scss
@@ -1,5 +1,5 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
-@import "variables";
+@use "variables";
html, body {
width: 100vw;
diff --git a/openmeetings-web/src/main/front/src/css/_room.scss
b/openmeetings-web/src/main/front/src/css/_room.scss
index 7281a1a2f..eee6fc56b 100644
--- a/openmeetings-web/src/main/front/src/css/_room.scss
+++ b/openmeetings-web/src/main/front/src/css/_room.scss
@@ -1,4 +1,7 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
+@use "interview";
+@use "polls";
+
.room-block {
&, .room-container {
@@ -667,9 +670,6 @@
height: 32px;
}
}
-@import "interview";
-@import "polls";
-
#sharer .alert {
display: none;
}
diff --git a/openmeetings-web/src/main/front/src/css/style.scss
b/openmeetings-web/src/main/front/src/css/style.scss
index 5eb3fa29b..13cd65d99 100644
--- a/openmeetings-web/src/main/front/src/css/style.scss
+++ b/openmeetings-web/src/main/front/src/css/style.scss
@@ -1,17 +1,17 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
-@import "general";
-@import "install";
-@import "signin";
-@import "admin";
-@import "activities";
-@import "calendar";
-@import "chat";
-@import "menu";
-@import "nettest";
-@import "room";
-@import "tree";
-@import "wb";
+@use "general";
+@use "install";
+@use "signin";
+@use "admin";
+@use "activities";
+@use "calendar";
+@use "chat";
+@use "menu";
+@use "nettest";
+@use "room";
+@use "tree";
+@use "wb";
/* last one */
-@import "responsive";
+@use "responsive";
diff --git a/pom.xml b/pom.xml
index 3994c55cb..f07a035c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1567,7 +1567,7 @@
<artifactId>frontend-maven-plugin</artifactId>
<version>${frontend-maven-plugin.version}</version>
<configuration>
-
<nodeVersion>v20.19.4</nodeVersion>
+
<nodeVersion>v22.22.3</nodeVersion>
<installDirectory>${project.build.directory}</installDirectory>
</configuration>
</plugin>
