Skip to content

Commit 82c5592

Browse files
authored
refactor: replace node-sass by sass (#1373)
* refactor: replaced node-sass by sass and removed node-sass-selector-importer node-sass is deprecated, integrated its successor sass instead; and node-sass-selector-importer never seems to have been used * refactor(scss): replaced by new Dart Sass syntax DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. * refactor: simplified those calculations to even also prevent the usage of math.div * Revert "refactor: replaced node-sass by sass and removed node-sass-selector-importer" This reverts commit ca72dcf. * refactor: replaced node-sass by sass and removed node-sass-selector-impo… …rter node-sass is deprecated, integrated its successor sass instead; and node-sass-selector-importer never seems to have been used
1 parent 57efccb commit 82c5592

File tree

7 files changed

+66
-341
lines changed

7 files changed

+66
-341
lines changed

packages/starterkit-handlebars-demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"access": "public"
2424
},
2525
"scripts": {
26-
"build": "cd dist/css && npx node-sass style.scss style.css"
26+
"build": "cd dist/css && sass style.scss style.css"
2727
}
2828
}

packages/starterkit-twig-demo/dist/css/scss/generic/_variables.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ $space : 1em;
3838
$space-and-half : $space*1.5;
3939
$space-double : $space*2;
4040
$space-quad : $space*4;
41-
$space-half : $space/2;
41+
$space-half : $space*0.5;
4242
$pad : 1em;
4343
$pad-and-half : $pad*1.5;
4444
$pad-double : $pad*2;
45-
$pad-half : $pad/2;
46-
$pad-quarter :$pad/4;
45+
$pad-half : $pad*0.5;
46+
$pad-quarter :$pad*0.25;
4747

4848
//Borders
4949
$border-med: 3px;

packages/uikit-workshop/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@
7878
"lit-html": "^1.1.2",
7979
"mini-css-extract-plugin": "^0.8.0",
8080
"mousetrap": "^1.6.5",
81-
"node-sass": "^6.0.0",
82-
"node-sass-selector-importer": "^5.2.0",
8381
"postcss-loader": "^3.0.0",
8482
"preact": "8.3.1",
8583
"preact-compat": "3.18.4",
@@ -94,6 +92,7 @@
9492
"react-html-parser": "^2.0.2",
9593
"redux": "3.7.2",
9694
"redux-thunk": "^2.3.0",
95+
"sass": "1.43.4",
9796
"sass-loader": "^10.1.1",
9897
"scriptjs": "^2.5.9",
9998
"scroll-js": "^2.2.0",

packages/uikit-workshop/src/sass/scss/01-abstracts/_variables.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ $pl-font-size-large: 1.2rem;
4040
$pl-space: 1rem;
4141
$pl-doublespace: $pl-space * 2;
4242
$pl-pad: 1rem;
43-
$pl-pad-half: $pl-pad/2;
43+
$pl-pad-half: $pl-pad * 0.5;
4444
$offset-top: 2rem;
4545

4646
// Breakpoints
@@ -57,4 +57,4 @@ $pl-border-radius: 3px;
5757
$pl-border-radius-med: 6px;
5858

5959

60-
$pl-sidebar-width: 16rem; //Define sidebar width for calculating dimensions
60+
$pl-sidebar-width: 16rem; //Define sidebar width for calculating dimensions

packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ pl-nav {
257257
.pl-c-nav__link--sublink {
258258
text-transform: none;
259259
font-size: 0.78rem;
260-
padding-left: $pl-space + ($pl-space / 2);
261-
padding-right: $pl-space + ($pl-space / 2);
260+
padding-left: $pl-space + $pl-space * 0.5;
261+
padding-right: $pl-space + $pl-space * 0.5;
262262

263263
&.pl-is-active {
264264
box-shadow: inset 4px 0 0 #6c79d9;

packages/uikit-workshop/webpack.config.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ const TerserPlugin = require('terser-webpack-plugin');
55
const autoprefixer = require('autoprefixer');
66
const HtmlWebpackPlugin = require('html-webpack-plugin');
77
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
8-
const selectorImporter = require('node-sass-selector-importer');
98
const webpack = require('webpack');
109
const CopyPlugin = require('copy-webpack-plugin');
1110
const path = require('path');
@@ -121,8 +120,7 @@ module.exports = function (apiConfig) {
121120
options: {
122121
sassOptions: {
123122
sourceMap: config.sourceMaps,
124-
outputStyle: 'expanded',
125-
importer: [selectorImporter()],
123+
outputStyle: 'expanded'
126124
},
127125
},
128126
},

0 commit comments

Comments
 (0)