Merge pull request #27254 from guardian/doml/migrate-node-sass-to-sass

Migrate from `node-sass` to `sass`
guardian · Jun 24, 2024 · b4417de · b4417de
2 parents e343cc0 + ea4d547
commit b4417de
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 559 deletions.
diff --git a/package.json b/package.json
@@ -103,7 +103,6 @@
 		"madge": "^5.0.1",
 		"mkdirp": "^1.0.4",
 		"mockdate": "^3.0.5",
-		"node-sass": "^9.0.0",
 		"object-fit-videos": "^1.0.3",
 		"ophan-tracker-js": "1.4.0",
 		"ora": "^1.3.0",
@@ -121,9 +120,10 @@
 		"requireindex": "^1.1.0",
 		"rimraf": "^2.6.1",
 		"rxjs": "^6.6.7",
-		"sass-graph": "^4.0.1",
-		"sass-loader": "^14.2.1",
-		"sass-mq": "~5.0.1",
+		"sass": "1.77.6",
+		"sass-graph": "4.0.1",
+		"sass-loader": "14.2.1",
+		"sass-mq": "5.0.1",
 		"semver": "^5.4.1",
 		"split": "^1.0.0",
 		"stream-to-observable": "^0.2.0",

diff --git a/static/src/stylesheets/module/content-garnett/_gallery.head.scss b/static/src/stylesheets/module/content-garnett/_gallery.head.scss
@@ -96,7 +96,7 @@
     }
 
     .content__labels--paidgallery {
-        @include fs-textSans(6)
+        @include fs-textSans(6);
         background: $labs-main;
         .content__label__link {
             color: $brightness-7;

diff --git a/static/src/stylesheets/module/identity/_switches.scss b/static/src/stylesheets/module/identity/_switches.scss
@@ -73,7 +73,7 @@ $checkbox-size: $gs-gutter / 1.25;
 
 .manage-account__switch {
     @include fs-textSans(4);
-    @include identity-switch($brightness-7)
+    @include identity-switch($brightness-7);
     line-height: 1.333;
     overflow: visible;
     position: relative;

diff --git a/static/src/stylesheets/module/survey/_survey-page.scss b/static/src/stylesheets/module/survey/_survey-page.scss
@@ -28,7 +28,7 @@
     }
 
     p {
-        @include fs-bodyCopy(2, size-only = true);
+        @include fs-bodyCopy(2, $size-only: true);
         margin-bottom: $gs-baseline;
     }
 

diff --git a/tools/compile-css.js b/tools/compile-css.js
@@ -11,7 +11,7 @@ const mkdirp = require('mkdirp');
 const glob = require('glob');
 const pify = require('pify');
 
-const sass = require('node-sass');
+const sass = require('sass');
 
 const postcss = require('postcss');
 const autoprefixer = require('autoprefixer');
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ @@
         }
         p {
-            @include fs-bodyCopy(2, size-only = true);
+            @include fs-bodyCopy(2, $size-only: true);
             margin-bottom: $gs-baseline;
         }
@@ Expand Down @@