fix: adopt sass import guidelines (#2340)

Closes #2307 https://webpack.js.org/loaders/sass-loader/#resolving-import-at-rules
sbb-design-systems · Jan 16, 2024 · f585122 · f585122
1 parent 138744f
commit f585122
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "@lit/react": "^1.0.1",
     "@open-wc/lit-helpers": "0.6.0",
     "@open-wc/testing": "4.0.0",
-    "@sbb-esta/lyne-design-tokens": "0.3.7",
+    "@sbb-esta/lyne-design-tokens": "0.3.8",
     "@storybook/addon-a11y": "7.6.8",
     "@storybook/addon-actions": "7.6.8",
     "@storybook/addon-essentials": "7.6.8",

diff --git a/src/components/core/styles/core/mediaqueries.scss b/src/components/core/styles/core/mediaqueries.scss
@@ -2,7 +2,7 @@
 
 @use 'sass:math';
 @use 'sass:string';
-@use 'node_modules/@sbb-esta/lyne-design-tokens/dist/scss/sbb-variables.scss' as sbb-tokens;
+@use '@sbb-esta/lyne-design-tokens/dist/scss/sbb-variables.scss' as sbb-tokens;
 
 $mq-breakpoints: (
   zero: sbb-tokens.$sbb-breakpoint-zero-min,

diff --git a/src/components/vite.config.ts b/src/components/vite.config.ts
@@ -101,7 +101,7 @@ function typography(): PluginOption {
     },
     generateBundle() {
       const globalCss = sass.compile(join(viteConfig.root, 'core/styles/global.scss'), {
-        loadPaths: [root.pathname],
+        loadPaths: [root.pathname, join(root.pathname, '/node_modules/')],
       });
       this.emitFile({
         type: 'asset',

diff --git a/web-test-runner.config.js b/web-test-runner.config.js
@@ -8,7 +8,9 @@ import { createServer } from 'vite';
 const isCIEnvironment = !!process.env.CI || process.argv.includes('--ci');
 const isDebugMode = process.argv.includes('--debug');
 
-const globalCss = sass.compile('./src/components/core/styles/global.scss', { loadPaths: ['.'] });
+const globalCss = sass.compile('./src/components/core/styles/global.scss', {
+  loadPaths: ['.', './node_modules/'],
+});
 
 const browsers = isCIEnvironment
   ? [

diff --git a/yarn.lock b/yarn.lock
@@ -2278,10 +2278,10 @@
     colors "~1.2.1"
     string-argv "~0.3.1"
 
-"@sbb-esta/[email protected].7":
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/@sbb-esta/lyne-design-tokens/-/lyne-design-tokens-0.3.7.tgz#0ec0154015274fa33e7dee66e5d36f4605650d73"
-  integrity sha512-SK2e0Kmsjbdjtnat9K7aTsY84fkl/qDtdwY+vsqHysQuZNmcjygkLLHwDgIKqdpsqLMpCahts71vy8KQf7Gz6g==
+"@sbb-esta/[email protected].8":
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/@sbb-esta/lyne-design-tokens/-/lyne-design-tokens-0.3.8.tgz#fbdfe8a5649db8f53eb86c7d2028e59d48be9f63"
+  integrity sha512-p8S7bBV3OUHDwslE4kwgA/WU9WowfhrwN2mZpqXiByNcHKY7QKEc5vBxu2030QGS5f5vEHVluph3zT+gEMkW0g==
 
 "@sinclair/typebox@^0.24.1":
   version "0.24.51"