Deps(web, web-react, web-twig): Sass-embedded

lmc-eu · Oct 21, 2024 · a73cc7b · a73cc7b
1 parent fa6a656
commit a73cc7b
Show file tree

Hide file tree

Showing 10 changed files with 312 additions and 110 deletions.
diff --git a/apps/demo/config/vite/app.ts b/apps/demo/config/vite/app.ts
@@ -57,6 +57,7 @@ export default defineConfig({
     postcss: resolve(__dirname, 'config'),
     preprocessorOptions: {
       scss: {
+        api: 'modern-compiler',
         includePaths: [
           join(pathRelativeToRepositoryRoot, 'node_modules'),
           join(pathRelativeToRepositoryRoot, 'node_modules/@lmc-eu/spirit-design-tokens/src/scss'),

diff --git a/apps/demo/package.json b/apps/demo/package.json
@@ -25,7 +25,7 @@
     "npm-run-all2": "6.2.3",
     "postcss": "8.4.47",
     "rollup": "4.24.0",
-    "sass": "1.79.5",
+    "sass-embedded": "1.79.5",
     "sass-true": "8.1.0",
     "shx": "0.3.4",
     "typescript": "5.6.3",

diff --git a/apps/storybook/main.ts b/apps/storybook/main.ts
@@ -30,6 +30,7 @@ const config: StorybookConfig = {
         postcss: resolve(__dirname, 'config'),
         preprocessorOptions: {
           scss: {
+            api: 'modern-compiler',
             includePaths: [
               resolve(__dirname, '../../node_modules'),
               resolve(__dirname, '../../node_modules/@lmc-eu/spirit-design-tokens/src/scss'),

diff --git a/apps/web-twig-demo/package.json b/apps/web-twig-demo/package.json
@@ -19,7 +19,7 @@
     "core-js": "3.38.1",
     "regenerator-runtime": "0.14.1",
     "sass-loader": "14.2.1",
-    "sass": "1.79.5",
+    "sass-embedded": "1.79.5",
     "ts-loader": "9.5.1",
     "typescript": "5.6.3",
     "webpack-cli": "5.1.4",
@@ -32,4 +32,4 @@
     "watch": "encore dev --watch",
     "build": "encore production --progress"
   }
-}
+}
diff --git a/apps/web-twig-demo/webpack.config.js b/apps/web-twig-demo/webpack.config.js
@@ -2,7 +2,7 @@ const path = require('path');
 // eslint-disable-next-line import/no-unresolved
 const Encore = require('@symfony/webpack-encore');
 // eslint-disable-next-line import/no-extraneous-dependencies
-const sass = require('sass');
+const sass = require('sass-embedded');
 
 // Manually configure the runtime environment if not already configured yet by the "encore" command.
 // It's useful when you use tools that rely on webpack.config.js file.
@@ -74,7 +74,7 @@ Encore
           options.implementation = sass;
           // eslint-disable-next-line no-param-reassign
           options.sassOptions = {
-              includePaths: [
+              loadPaths: [
                 // used in docker image
                 './node_modules',
                 './node_modules/@lmc-eu/spirit-design-tokens/scss',

diff --git a/exporters/variables-scss/generated/exporter.cjs b/exporters/variables-scss/generated/exporter.cjs
diff --git a/packages/form-validations/package.json b/packages/form-validations/package.json
@@ -37,7 +37,7 @@
     "@types/jest": "29.5.13",
     "jest": "29.7.0",
     "npm-run-all": "4.1.5",
-    "sass": "1.79.5",
+    "sass-embedded": "1.79.5",
     "shx": "0.3.4",
     "tslib": "2.7.0",
     "typescript": "5.6.2",

diff --git a/packages/web-react/package.json b/packages/web-react/package.json
@@ -73,7 +73,7 @@
     "react-dom": "18.3.1",
     "recast": "0.23.9",
     "rollup": "4.24.0",
-    "sass": "1.79.5",
+    "sass-embedded": "1.79.5",
     "shx": "0.3.4",
     "terser-webpack-plugin": "5.3.10",
     "ts-loader": "9.5.1",

diff --git a/packages/web/package.json b/packages/web/package.json
@@ -73,7 +73,7 @@
     "postcss": "8.4.47",
     "postcss-cli": "11.0.0",
     "rollup": "4.24.0",
-    "sass": "1.79.5",
+    "sass-embedded": "1.79.5",
     "sass-true": "8.1.0",
     "shx": "0.3.4",
     "stylelint": "16.10.0",
@@ -82,7 +82,7 @@
     "typescript": "5.6.2"
   },
   "peerDependencies": {
-    "sass": ">=1.57.0 < 2"
+    "sass-embedded": ">=1.57.0 < 2"
   },
   "peerDependenciesMeta": {
     "sass": {