From 47aebae71b8058bec4e1dd586db3b96b44789f11 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Thu, 16 Jun 2022 20:55:27 +0200 Subject: [PATCH] migrated from node-sass to dartSass. Reasoning: https://github.com/sass/node-sass/issues/2886 --- webclient/gulpfile.js | 4 ++-- webclient/package.json | 4 ++-- webclient/src/variables.scss | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webclient/gulpfile.js b/webclient/gulpfile.js index 471449909..3233449cb 100644 --- a/webclient/gulpfile.js +++ b/webclient/gulpfile.js @@ -28,7 +28,7 @@ import browserify from "browserify"; import del from "delete"; import fs from "fs"; import merge from "merge-stream"; -import nodeSass from "node-sass"; +import dartSass from "sass"; import path from "path"; import source from "vinyl-source-stream"; import { configRelease, configLocal } from "./config.js"; // eslint-disable-line import/extensions @@ -43,7 +43,7 @@ function getFolders(dir) { // Selected at the bottom of the script let config; -const sass = _sass(nodeSass); // Select Sass compiler +const sass = _sass(dartSass); // Select Sass compiler const htmlminOptions = { caseSensitive: false, diff --git a/webclient/package.json b/webclient/package.json index 6e884b285..f790155ed 100644 --- a/webclient/package.json +++ b/webclient/package.json @@ -110,10 +110,10 @@ "gulp-uglify": "^3.0.2", "gulp-yaml": "^2.0.4", "merge-stream": "^2.0.0", - "node-sass": "^7.0.1", "regenerator": "^0.14.7", "spectre.css": "^0.5.8", - "vinyl-source-stream": "^2.0.0" + "vinyl-source-stream": "^2.0.0", + "sass": "^1.52.3" }, "dependencies": { "regenerator-runtime": "^0.13.9", diff --git a/webclient/src/variables.scss b/webclient/src/variables.scss index e6d0a45ae..7739a29d8 100644 --- a/webclient/src/variables.scss +++ b/webclient/src/variables.scss @@ -1,5 +1,5 @@ @use "sass:color"; - +@import "node_modules/spectre.css/src/variables.scss"; /* === Shared === */ $success-color: #6cc872; $warning-color: #f49e2f;