Skip to content

Commit 1bb4c6b

Browse files
authored
Merge pull request #526 from GovTechSG/fix/sass-loader-deprecation-warnings
fix(*): test with sass version 14.2.1 and fix deprecation
2 parents e1fb673 + cce31d0 commit 1bb4c6b

File tree

8 files changed

+36
-52
lines changed

8 files changed

+36
-52
lines changed

lib/sgds/package-lock.json

Lines changed: 12 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/sgds/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"css-minimizer-webpack-plugin": "^3.4.1",
2626
"mini-css-extract-plugin": "^2.6.0",
2727
"sass": "~1.49.9",
28-
"sass-loader": "^12.6.0",
28+
"sass-loader": "^14.2.1",
2929
"webpack": "^5.70.0",
3030
"webpack-cli": "^5.1.4"
3131
},

lib/sgds/sass/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ $grid-row-columns: 6 !default;
552552
$gutters: $spacers !default;
553553

554554
// Container padding
555-
$container-padding-x: $grid-gutter-width / .5 !default;
555+
$container-padding-x: calc($grid-gutter-width / .5) !default;
556556

557557

558558
// Components

portal/assets/custom-css/components/_sidenav-collapsible.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $paragraph-font-size: 1rem;
88
left: 0;
99
height: 100%;
1010
width: 300px;
11-
background: hsl(0,0,90%);
11+
background: hsl(0,0%,90%);
1212
z-index: 100;
1313
transition: all 0.3s ease;
1414
&.close{
@@ -172,7 +172,7 @@ $paragraph-font-size: 1rem;
172172
opacity: 0;
173173

174174
&::before{
175-
background-color: hsl(207,100,42);
175+
background-color: hsl(207,100%,42%);
176176
border-radius: 9999px;
177177
font-weight: bold;
178178
padding: 1px;

portal/assets/custom-css/style.css.js

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

portal/assets/custom-css/style.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

portal/package-lock.json

Lines changed: 13 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

portal/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
"author": "Tey Liang Tai",
1414
"license": "MIT",
1515
"dependencies": {
16-
"bootstrap": "^5.1.3",
17-
"@govtechsg/sgds": "file:../lib/sgds"
16+
"@govtechsg/sgds": "file:../lib/sgds",
17+
"bootstrap": "^5.1.3"
1818
},
1919
"devDependencies": {
2020
"concurrently": "^7.0.0",
2121
"copy-webpack-plugin": "^11.0.0",
22+
"css-loader": "^6.7.1",
2223
"image-minimizer-webpack-plugin": "^3.8.3",
2324
"imagemin": "^8.0.1",
2425
"imagemin-gifsicle": "^7.0.0",
@@ -27,10 +28,9 @@
2728
"imagemin-svgo": "^10.0.1",
2829
"lodash": "^4.17.21",
2930
"mini-css-extract-plugin": "^2.8.1",
31+
"sass": "~1.49.9",
32+
"sass-loader": "^14.2.1",
3033
"webpack": "^5.70.0",
31-
"webpack-cli": "^5.1.4",
32-
"css-loader": "^6.7.1",
33-
"sass-loader": "^12.6.0",
34-
"sass": "~1.49.9"
34+
"webpack-cli": "^5.1.4"
3535
}
3636
}

0 commit comments

Comments
 (0)