frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Migrate from node-sass to sass

Browse Source 
node-sass is deprecated and doesn't work on Node 16.
sass is actively maintained and considered the canonical sass
implementation.
This commit is contained in:
Nick O'Leary 2021-05-11 18:13:21 +01:00
parent 9cdec156dc
commit b77cd56a01
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
4 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.js
View File

@ -16,7 +16,7 @@
var path = require("path"); var path = require("path");
var fs = require("fs-extra"); var fs = require("fs-extra");
var sass = require("node-sass"); var sass = require("sass");
module.exports = function(grunt) { module.exports = function(grunt) {

2
package.json
View File

@ -107,8 +107,8 @@
"minami": "1.2.3", "minami": "1.2.3",
"mocha": "^5.2.0", "mocha": "^5.2.0",
"node-red-node-test-helper": "^0.2.7", "node-red-node-test-helper": "^0.2.7",
"node-sass": "^5.0.0",
"nodemon": "2.0.7", "nodemon": "2.0.7",
"sass": "1.32.12",
"should": "13.2.3", "should": "13.2.3",
"sinon": "1.17.7", "sinon": "1.17.7",
"stoppable": "^1.1.0", "stoppable": "^1.1.0",

4
packages/node_modules/@node-red/editor-client/src/sass/flow.scss vendored
View File

@ -255,11 +255,11 @@ g.red-ui-flow-node-selected {
} }
} }
@each $current-color in red green yellow blue grey gray { @each $current-color in red green yellow blue grey gray {
.red-ui-flow-node-status-dot-#{$current-color} { .red-ui-flow-node-status-dot-#{""+$current-color} {
fill: map-get($node-status-colors,$current-color); fill: map-get($node-status-colors,$current-color);
stroke: map-get($node-status-colors,$current-color); stroke: map-get($node-status-colors,$current-color);
} }
.red-ui-flow-node-status-ring-#{$current-color} { .red-ui-flow-node-status-ring-#{""+$current-color} {
fill: $view-background; fill: $view-background;
stroke: map-get($node-status-colors,$current-color); stroke: map-get($node-status-colors,$current-color);
} }

27
scripts/build-custom-theme.js
View File

@ -22,10 +22,11 @@
const os = require("os");
const nopt = require("nopt"); const nopt = require("nopt");
const path = require("path"); const path = require("path");
const fs = require("fs") const fs = require("fs-extra");
const sass = require("node-sass"); const sass = require("sass");
const knownOpts = { const knownOpts = {
"help": Boolean, "help": Boolean,
@ -73,17 +74,16 @@ while((match = ruleRegex.exec(colorsFile)) !== null) {
updatedColors.push(match[1]+": "+(customColors[match[1]]||match[2])+";") updatedColors.push(match[1]+": "+(customColors[match[1]]||match[2])+";")
} }
(async function() {
const tmpDir = os.tmpdir();
const workingDir = await fs.mkdtemp(`${tmpDir}${path.sep}`);
await fs.copy(path.join(__dirname,"../packages/node_modules/@node-red/editor-client/src/sass/"),workingDir)
await fs.writeFile(path.join(workingDir,"colors.scss"),updatedColors.join("\n"))
const result = sass.renderSync({ const result = sass.renderSync({
outputStyle: "expanded", outputStyle: "expanded",
file: path.join(__dirname,"../packages/node_modules/@node-red/editor-client/src/sass/style.scss"), file: path.join(workingDir,"style.scss"),
importer: function(url, prev, done){
if (url === 'colors') {
return {
contents: updatedColors.join("\n")
}
}
return {file:path.join(__dirname,"../packages/node_modules/@node-red/editor-client/src/sass/"+url+".scss")}
}
}); });
const css = result.css.toString() const css = result.css.toString()
@ -112,7 +112,6 @@ lines.forEach(l => {
} }
}); });
const nrPkg = require("../package.json"); const nrPkg = require("../package.json");
const now = new Date().toISOString(); const now = new Date().toISOString();
@ -123,8 +122,10 @@ const header = `/*
var output = sass.renderSync({outputStyle: parsedArgs.long?"expanded":"compressed",data:colorCSS.join("\n")}); var output = sass.renderSync({outputStyle: parsedArgs.long?"expanded":"compressed",data:colorCSS.join("\n")});
if (parsedArgs.out) { if (parsedArgs.out) {
fs.writeFileSync(parsedArgs.out,header+"\n"+output.css); await fs.writeFile(parsedArgs.out,header+"\n"+output.css);
} else { } else {
console.log(header); console.log(header);
console.log(output.css.toString()); console.log(output.css.toString());
} }
await fs.remove(workingDir);
})()