Skip to content

Commit

Permalink
webpack 5 jenkins workaround
Browse files Browse the repository at this point in the history
  • Loading branch information
MariaAga committed Nov 21, 2023
1 parent 26bf6bb commit 49879aa
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 16 deletions.
9 changes: 3 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,17 @@
"babel-eslint": "^10.0.0",
"babel-loader": "^8.0.0",
"cross-env": "^5.2.0",
"css-loader": "4.3.0",
"css-loader": "6.8.1",
"css-minimizer-webpack-plugin": "^4.2.2",
"cssnano": "^4.1.10",
"cssnano": "^5.0.1",
"dotenv": "^5.0.0",
"eslint": "^6.7.2",
"eslint-plugin-spellcheck": "0.0.17",
"graphql": "^15.5.0",
"highlight.js": "~9.14.0",
"mini-css-extract-plugin": "2.7.5",
"node-sass": "6.0.0",
"optimize-css-assets-webpack-plugin": "^4.0.0",
"node-sass": "8.0.0",
"path-browserify": "^1.0.1",
"postcss-loader": "4.3.0",
"postcss": "^8.4.12",
"prettier": "^1.19.1",
"pretty-format": "26.6.2",
"raw-loader": "^0.5.1",
Expand Down
2 changes: 1 addition & 1 deletion webpack/assets/javascripts/react_app/common/variables.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import '~@theforeman/vendor/scss/variables';
@import 'node_modules/@theforeman/vendor/scss/variables.scss';

$header-max-width: calc(#{$pf-global--breakpoint--lg} + 70px); //TODO move into @theforeman/vendor/scss/variables
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "~@theforeman/vendor/scss/variables";
@import "node_modules/@theforeman/vendor/scss/variables";

@keyframes blink {
0% {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~@theforeman/vendor/scss/variables';
@import 'node_modules/@theforeman/vendor/scss/variables';

.pf-c-masthead .pf-c-toolbar {
.pf-c-context-selector__menu-search {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~@theforeman/vendor/scss/variables';
@import 'node_modules/@theforeman/vendor/scss/variables';

$caption_font_weight: 600;
$background_image: url('../LoginPage/background.svg');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~@theforeman/vendor/scss/variables';
@import 'node_modules/@theforeman/vendor/scss/variables';

.bookmarks-dropdown-item {
word-break: break-word;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "~@theforeman/vendor/scss/variables";
@import "node_modules/@theforeman/vendor/scss/variables";
@import '../../common/colors.scss';

.ReactPasswordStrength {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~@theforeman/vendor/scss/variables';
@import 'node_modules/@theforeman/vendor/scss/variables';

.autocomplete-search {
width: 100%;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "~@theforeman/vendor/scss/variables";
@import "node_modules/@theforeman/vendor/scss/variables";

$screen-md: 992px !default;
$screen-md-min: $screen-md !default;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "~@theforeman/vendor/scss/variables";
@import "~@theforeman/vendor/scss/mixins";
@import "node_modules/@theforeman/vendor/scss/variables";
@import "node_modules/@theforeman/vendor/scss/mixins";

.foreman-numeric-input {
position: relative;
Expand Down

0 comments on commit 49879aa

Please sign in to comment.