Skip to content

Commit

Permalink
fix(QUV-2366): node modules imports paths have change to the root nod…
Browse files Browse the repository at this point in the history
…e modules (#5)

* feat(QUV-2366): node modules imports paths have change to the root node_modules

* build: add generate dist

* fix: delete base styles

---------

Co-authored-by: santiago.trigo <[email protected]>
  • Loading branch information
jguede and santiago.trigo authored Jun 25, 2024
1 parent 4557464 commit 9d500d9
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 24 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ jobs:
- name: Install dependencies
run: npm ci

- name: Generate dist
run: npm run build

deploy:
needs: [build]
if: github.ref == 'refs/heads/master'
Expand Down
2 changes: 1 addition & 1 deletion .storybook/preview.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@import "assets/styles/preview/preview.scss";

// The genesys-styles scss. We need to wrap these styles to avoid doc styles affect to the components
@import "../src/light";
@import "../light";

// because the storybook source code is rendered using the same class name 'tag'
pre .tag {
Expand Down
10 changes: 7 additions & 3 deletions build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ mkdirSync('dist');
mkdirSync('dist/css');

// Create css
const lightResult = sass.compile("./src/light.scss");
const lightResult = sass.compile("./light.scss");
writeFileSync("dist/css/light.css", lightResult.css);

const darkResult = sass.compile("./src/dark.scss");
const darkResult = sass.compile("./dark.scss");
writeFileSync("dist/css/dark.css", darkResult.css);

// Copy SCSS files
cpSync("src/", "dist/scss", { recursive: true });
cpSync("src/_styles.scss", "dist/scss/_styles.scss");
cpSync("src/components", "dist/scss/components", { recursive: true });
cpSync("src/layout", "dist/scss/layout", { recursive: true });
cpSync("src/utils", "dist/scss/utils", { recursive: true });
cpSync("src/vendors", "dist/scss/vendors", { recursive: true });
7 changes: 7 additions & 0 deletions dark.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// ------------------------------ DARK - THEME ------------------------------ //


@import "./node_modules/@devoinc/genesys-brand-devo/dist/dark/scss/tokens.sass.alias";
@import "./node_modules/@devoinc/genesys-brand-devo/dist/dark/scss/tokens.sass.cmp";

@import "./src/styles";
7 changes: 7 additions & 0 deletions light.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// ------------------------------ LIGHT - THEME ----------------------------- //


@import "./node_modules/@devoinc/genesys-brand-devo/dist/light/scss/tokens.sass.alias";
@import "./node_modules/@devoinc/genesys-brand-devo/dist/light/scss/tokens.sass.cmp";

@import "./src/styles";
1 change: 0 additions & 1 deletion src/_styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@

@import "./utils";
@import "./vendors";
@import "./base";
@import "./components";
@import "./layout";
2 changes: 1 addition & 1 deletion src/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@


// The reset, fonts and typography base styles are obtained from genesys-base-styles.
@import "../../node_modules/@devoinc/genesys-icons/dist/gi-styles.scss";
@import "../../node_modules/@devoinc/genesys-icons/dist/gi-variables";
7 changes: 0 additions & 7 deletions src/dark.scss

This file was deleted.

7 changes: 0 additions & 7 deletions src/light.scss

This file was deleted.

3 changes: 3 additions & 0 deletions src/utils/_index.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// ---------------------------- UTILS OR ABSTRACTS -------------------------- //

// base

@import "../base";

@import "./variables";
@import "./functions";
Expand Down
4 changes: 0 additions & 4 deletions src/utils/variables/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@

$theme: light !default;

// Genesys - Variables

@import "../../../node_modules/@devoinc/genesys-icons/dist/gi-variables";

// Base - Variables

@import "./base-variables/fonts-variables";
Expand Down

0 comments on commit 9d500d9

Please sign in to comment.