Switch off node-sass

Author: eatonphil

ee/ui/scripts/ui.build

@@ -12,4 +12,4 @@ setenv_default UI_TITLE "DataStation Enterprise Edition"
 setenv_default UI_CSP ""
 setenv_default UI_ROOT ""
 render ../ui/index.html build/index.html
-node-sass ../ui/style.css ./build/style.css
+yarn sass ../ui/style.scss ./build/style.css

package.json

@@ -19,7 +19,7 @@
     "release-desktop": "python3 ./scripts/build.py ./desktop/scripts/release.build",
     "release-server": "python3 ./scripts/build.py ./server/scripts/release.build",
     "format": "yarn prettier --write \"**/*.js\" \"**/*.test.js\" \"**/*.test.jsx\" \"**/*.ts\" \"**/*.tsx\" \"**/*.css\" \"**/*.json\"",
-    "test-licenses": "yarn license-checker --production --onlyAllow 'Python-2.0;AFLv2.1;BSD;MIT;Apache-2.0;Apache 2.0;Apache*;ISC;BSD-3-Clause;MIT*;BSD-2-Clause;Unlicense'",
+    "test-licenses": "npx license-checker --production --onlyAllow 'Python-2.0;AFLv2.1;BSD;MIT;Apache-2.0;Apache 2.0;Apache*;ISC;BSD-3-Clause;MIT*;BSD-2-Clause;Unlicense'",
     "generate-test-data": "node --unhandled-rejections=warn ./scripts/generate_test_data.js",
     "test": "yarn test-local --coverage",
     "test-local": "cross-env NODE_OPTIONS=--unhandled-rejections=warn jest --passWithNoTests --runInBand",
@@ -42,7 +42,6 @@
     "json-stringify-safe": "^5.0.1",
     "lodash.debounce": "^4.0.8",
     "nanoid": "3",
-    "node-sass": "^8.0.0",
     "nodemailer": "^6.7.7",
     "openid-client": "^5.4.0",
     "papaparse": "^5.3.2",
@@ -53,6 +52,7 @@
     "react-dom": "17",
     "react-hotkeys-hook": "^3.4.6",
     "react-syntax-highlighter": "^15.5.0",
+    "sass": "^1.60.0",
     "shape": "npm:@multiprocess/shape",
     "source-map-support": "^0.5.21",
     "sql-formatter": "^8.2.0",
@@ -96,7 +96,6 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^28.1.3",
     "jest-canvas-mock": "^2.4.0",
-    "license-checker": "^25.0.1",
     "node-fetch": "2",
     "prettier": "^2.7.1",
     "prettier-plugin-organize-imports": "^3.0.0",

ui/scripts/ui.build

@@ -10,4 +10,4 @@ setenv_default UI_TITLE "DataStation Desktop CE"
 setenv_default UI_CSP ""
 setenv_default UI_ROOT ""
 render ui/index.html build/index.html
-node-sass ./ui/style.css ./build/style.css
+yarn sass ./ui/style.scss ./build/style.css

ui/scripts/watch_and_serve.sh

@@ -11,7 +11,7 @@ yarn build-ui
 # Now watch for changes in the background and rebuild
 function watch() {
     for dir in $(find "$1" -type d); do
-	fswatch -x --event Created --event Removed --event Renamed --event Updated "$dir" | grep --line-buffered -E "\.(tsx|css|ts|js|jsx)" | xargs -n1 bash -c 'yarn esbuild ui/index.tsx --loader:.ts=tsx --loader:.js=jsx "--external:fs" --bundle --sourcemap --outfile=build/ui.js && node-sass ./ui/style.css ./build/style.css' &
+	fswatch -x --event Created --event Removed --event Renamed --event Updated "$dir" | grep --line-buffered -E "\.(tsx|css|ts|js|jsx)" | xargs -n1 bash -c 'yarn esbuild ui/index.tsx --loader:.ts=tsx --loader:.js=jsx "--external:fs" --bundle --sourcemap --outfile=build/ui.js && yarn sass ./ui/style.scss ./build/style.css' &
     done
 }