Skip to content

Commit

Permalink
feat: rspack
Browse files Browse the repository at this point in the history
  • Loading branch information
puehringer committed Feb 25, 2024
1 parent 1b5dc15 commit 519271f
Show file tree
Hide file tree
Showing 23 changed files with 122 additions and 121 deletions.
4 changes: 2 additions & 2 deletions dist/scss/abstracts/_variables.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/scss/components/_view_lineup.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions dist/scss/fontawesome.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/scss/main.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/scss/storybook.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions dist/scss/vendors/_font-awesome.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/scss/vendors/_lineup.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/scss/vendors/_select2.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 32 additions & 32 deletions dist/scss/vendors/bootstrap/_2_components.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions dist/scss/vendors/bootstrap/overrides/_forms.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
"storybook:build": "NODE_OPTIONS=--max_old_space_size=4096 build-storybook",
"storybook": "NODE_OPTIONS=--max_old_space_size=4096 start-storybook -p 6006",
"test": "visyn_scripts test",
"webpack:dev": "visyn_scripts build --mode development --env workspace_mode=single",
"webpack:prod": "visyn_scripts build --mode production --env workspace_mode=single"
"bundle:dev": "visyn_scripts bundle --mode development --env workspace_mode=single",
"bundle:prod": "visyn_scripts bundle --mode production --env workspace_mode=single"
},
"dependencies": {
"@popperjs/core": "^2.9.3",
Expand Down Expand Up @@ -107,7 +107,8 @@
"@types/react-dom": "~18.2.0",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"webpack": "5.74.0"
"visyn_core": "git+ssh://git@github.com/datavisyn/visyn_core#rspack",
"visyn_scripts": "git+ssh://git@github.com/datavisyn/visyn_scripts#rspack"
},
"visyn": {
"entries": {
Expand Down
4 changes: 2 additions & 2 deletions src/scss/abstracts/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ $anchor_color: red !default;
$anchor_color_hover: darkred !default;

/* phovea_ui */
$fa-font-path: '~@fortawesome/fontawesome-free/webfonts' !default;
$fa-font-path: '@fortawesome/fontawesome-free/webfonts' !default;

$phovea-loading-icon-url: url('../../assets/caleydo_c_anim.svg') !default;
$phovea-loading-icon-size: auto !default;
Expand Down Expand Up @@ -103,6 +103,6 @@ $hover-data-color: #ffc46b !default;

// TODO: Without this, we get "Can't resolve './node_modules/lineupengine/src/styles/lineupengine/src/assets/loading.svg' in '.../workspaces/<repo>'"
// Why do I need to do this? Probably because lineupjs defines $engine_assets and it is resolving it relatively?
$engine_assets: '~lineupengine/src/assets';
$engine_assets: 'lineupengine/src/assets';
$engine_loading_image: url('#{$engine_assets}/loading.svg') !default;
$engine_loading_static_image: url('#{$engine_assets}/loading_s.svg') !default;
2 changes: 1 addition & 1 deletion src/scss/components/_view_lineup.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
}
}

$lu_assets: "~lineupjs/src/assets";
$lu_assets: "lineupjs/src/assets";

@at-root {
.tdp-ranking-export-form {
Expand Down
6 changes: 3 additions & 3 deletions src/scss/fontawesome.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "~@fortawesome/fontawesome-free/scss/functions";
@import "~@fortawesome/fontawesome-free/scss/variables";
@import "~@fortawesome/fontawesome-free/scss/mixins";
@import "@fortawesome/fontawesome-free/scss/functions";
@import "@fortawesome/fontawesome-free/scss/variables";
@import "@fortawesome/fontawesome-free/scss/mixins";
2 changes: 1 addition & 1 deletion src/scss/main.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "~visyn_core/dist/scss/main.scss";
@import "visyn_core/dist/scss/main.scss";

@import "./abstracts/functions";
@import './abstracts/variables';
Expand Down
2 changes: 1 addition & 1 deletion src/scss/storybook.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@import "./vendors/bootstrap/1_variables_mixins_utilities";

// map-merge my theme-colors
// @import "~target360/dist/scss/vendors/bootstrap_modify_maps";
// @import "target360/dist/scss/vendors/bootstrap_modify_maps";

// Include all Bootstrap components as needed
@import "./vendors/bootstrap/2_components";
Expand Down
8 changes: 4 additions & 4 deletions src/scss/vendors/_font-awesome.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '~@fortawesome/fontawesome-free/scss/solid';
@import '~@fortawesome/fontawesome-free/scss/regular';
@import '~@fortawesome/fontawesome-free/scss/brands';
@import '~@fortawesome/fontawesome-free/scss/fontawesome';
@import '@fortawesome/fontawesome-free/scss/solid';
@import '@fortawesome/fontawesome-free/scss/regular';
@import '@fortawesome/fontawesome-free/scss/brands';
@import '@fortawesome/fontawesome-free/scss/fontawesome';


// vertically align all font-awesome icons inside of the .btn class
Expand Down
4 changes: 2 additions & 2 deletions src/scss/vendors/_lineup.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
$lu_dialog_font_size: 0.9rem !default;
$lu_toolbar_font_size: 0.9rem !default;

$lu_assets: '~lineupjs/src/assets' !default;
$lu_assets: 'lineupjs/src/assets' !default;
$lu_use_font_awesome: true !default;
// do not include Font Awesome files from LineUp, but use ours instead
$lu_include_font_awesome: false !default;

@import '~lineupjs/src/style.scss';
@import 'lineupjs/src/style.scss';

.lu {
// use a fixed font-size for the ranking + side panel with the Roboto font family.
Expand Down
4 changes: 2 additions & 2 deletions src/scss/vendors/_select2.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* Additional jQuery select2 styles
*/
@import "~select2/dist/css/select2.min.css";
@import "~select2-bootstrap-theme/dist/select2-bootstrap.min.css";
@import "select2/dist/css/select2.min.css";
@import "select2-bootstrap-theme/dist/select2-bootstrap.min.css";

.select2-results__option .ensg,
.select2-selection__rendered .ensg {
Expand Down
6 changes: 3 additions & 3 deletions src/scss/vendors/bootstrap/_1_variables_mixins_utilities.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// 1. Include functions first (so you can manipulate colors, SVGs, calc, etc)
// @see https://getbootstrap.com/docs/5.1/customize/sass/#importing

@import "~bootstrap/scss/functions";
@import "bootstrap/scss/functions";

// 2. Include remainder of required Bootstrap stylesheets (required)
// @see https://getbootstrap.com/docs/5.1/customize/sass/#importing

@import "~bootstrap/scss/variables";
@import "~bootstrap/scss/mixins";
@import "bootstrap/scss/variables";
@import "bootstrap/scss/mixins";

// $spacers, $theme-colors need to be adapted before importing the utilities to generate the m-* and p-*, text-*, border-*, bg-* utility classes
// @see https://getbootstrap.com/docs/5.1/utilities/spacing/ and https://getbootstrap.com/docs/5.1/utilities/colors/
Expand Down
Loading

0 comments on commit 519271f

Please sign in to comment.