From f336167005a20963cf418ebcece4f8bb615acfc5 Mon Sep 17 00:00:00 2001 From: Lars-Olof Kreim Date: Thu, 17 Oct 2024 13:43:43 +0200 Subject: [PATCH 1/4] Switch scss-config-webpack-plugin dependency from node-sass to sass --- packages/scss-config-webpack-plugin/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/scss-config-webpack-plugin/package.json b/packages/scss-config-webpack-plugin/package.json index 4f22a02..905379b 100644 --- a/packages/scss-config-webpack-plugin/package.json +++ b/packages/scss-config-webpack-plugin/package.json @@ -30,7 +30,7 @@ "css-loader": "^5.2.4", "iconfont-webpack-plugin": "^5.0.1", "mini-css-extract-plugin": "^1.5.0", - "node-sass": "^5.0.0", + "sass": "1.54.3", "optimize-css-assets-webpack-plugin": "^5.0.4", "postcss": "^8.2.10", "postcss-flexbugs-fixes": "^5.0.2", From b219fa7c5a5aa1c2fc779c6b0ecec53a3b87b8d8 Mon Sep 17 00:00:00 2001 From: Lars-Olof Kreim Date: Fri, 18 Oct 2024 11:16:12 +0200 Subject: [PATCH 2/4] Update Config files to switch to sass dependency --- .../scss-config-webpack-plugin/config/development.config.js | 4 ++-- .../scss-config-webpack-plugin/config/production.config.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/scss-config-webpack-plugin/config/development.config.js b/packages/scss-config-webpack-plugin/config/development.config.js index d0c8408..ef3df06 100644 --- a/packages/scss-config-webpack-plugin/config/development.config.js +++ b/packages/scss-config-webpack-plugin/config/development.config.js @@ -46,7 +46,7 @@ exports = module.exports = (options) => ({ { loader: require.resolve('sass-loader'), options: { - implementation: require('node-sass'), + implementation: require('sass'), }, }, ], @@ -99,7 +99,7 @@ exports = module.exports = (options) => ({ { loader: require.resolve('sass-loader'), options: { - implementation: require('node-sass'), + implementation: require('sass'), }, }, ], diff --git a/packages/scss-config-webpack-plugin/config/production.config.js b/packages/scss-config-webpack-plugin/config/production.config.js index 31da1e8..159100a 100644 --- a/packages/scss-config-webpack-plugin/config/production.config.js +++ b/packages/scss-config-webpack-plugin/config/production.config.js @@ -61,7 +61,7 @@ exports = module.exports = (options) => ({ { loader: require.resolve('sass-loader'), options: { - implementation: require('node-sass'), + implementation: require('sass'), sourceMap: true, }, }, @@ -122,7 +122,7 @@ exports = module.exports = (options) => ({ { loader: require.resolve('sass-loader'), options: { - implementation: require('node-sass'), + implementation: require('sass'), sourceMap: true, }, }, From cc1f8517083291d2b7e47a0ef944238bdb7e0ac4 Mon Sep 17 00:00:00 2001 From: Lars-Olof Kreim Date: Thu, 24 Oct 2024 09:30:45 +0200 Subject: [PATCH 3/4] Update Test Snapshot to match sass output --- .../__snapshots__/ScssConfigWebpackPlugin.test.js.snap | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/scss-config-webpack-plugin/test/__snapshots__/ScssConfigWebpackPlugin.test.js.snap b/packages/scss-config-webpack-plugin/test/__snapshots__/ScssConfigWebpackPlugin.test.js.snap index 158564f..863d212 100644 --- a/packages/scss-config-webpack-plugin/test/__snapshots__/ScssConfigWebpackPlugin.test.js.snap +++ b/packages/scss-config-webpack-plugin/test/__snapshots__/ScssConfigWebpackPlugin.test.js.snap @@ -4,15 +4,16 @@ exports[`ScssConfigWebpackPlugin inside webpack context should avoid common flex ".foo { display: flex; flex-direction: row; - flex: 1 1; } -" + flex: 1 1; +}" `; exports[`ScssConfigWebpackPlugin inside webpack context should avoid common flexbox bugs in older browsers in development mode with sourcemap 1`] = ` ".foo { display: flex; flex-direction: row; - flex: 1 1; }" + flex: 1 1; +}" `; exports[`ScssConfigWebpackPlugin inside webpack context should avoid common flexbox bugs in older browsers in production mode 1`] = `".foo{display:flex;flex-direction:row;flex:1 1}"`; From d976c13c8bc8e26fe76e67bc4e53750018b7ba9c Mon Sep 17 00:00:00 2001 From: Lars-Olof Kreim Date: Thu, 24 Oct 2024 09:37:13 +0200 Subject: [PATCH 4/4] Update .node-version --- .node-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.node-version b/.node-version index 6b17d22..cb406c6 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -14.16.1 +16.20.2