Skip to content

Commit

Permalink
rebuilt package.json and fixed some deprecated calcs in scss files an…
Browse files Browse the repository at this point in the history 
…d babel config
  • Loading branch information
@briri
briri committed Jun 12, 2024
1 parent bbaed29 commit 4da30ad
Show file tree
Hide file tree
Showing 19 changed files with 1,135 additions and 9,037 deletions.
2 changes: 1 addition & 1 deletion app/assets/stylesheets/blocks/_footers.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
border-radius:0px;
z-index: 1;
ul {
padding-right: $grid-gutter-width / 2;
padding-right: calc($grid-gutter-width / 2);
}
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/blocks/_labels.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/* RADIO BUTTONS */
.radio label {
margin-right: $grid-gutter-width / 2;
margin-right: calc($grid-gutter-width / 2);
}

/* Remove mandatory * from check_box_tag in Admin search */
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/blocks/_lists.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@

/* LIST STYLING */
span.sublist {
margin-left: $grid-gutter-width / -2;
margin-left: calc($grid-gutter-width / -2);
margin-right: 25px;
}
4 changes: 2 additions & 2 deletions app/assets/stylesheets/blocks/_logos.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
/* HEADER LOGOS */
.app-logo {
height: 50px;
padding-right: $grid-gutter-width / 2;
padding-right: calc($grid-gutter-width / 2);
}

.org-logo {
height: 100px;
padding-right: $grid-gutter-width / 2;
padding-right: calc($grid-gutter-width / 2);
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/blocks/_modal_permissions.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
/* Overrides list-group-item */
#modal-permissions .list-group-item {
height: 30px;
padding: 5px $grid-gutter-width / 2;
padding: 5px calc($grid-gutter-width / 2);
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/blocks/_navbars.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
}
}
#org-navbar .org-links {
padding-top: $grid-gutter-width / 2;
padding-top: calc($grid-gutter-width / 2);
}
#org-navbar .org-a {
line-height: 36px !important;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/blocks/_new_plans_form.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// we should provide utility classes which can provide the desired style to this object
#new_plan {
.create-plan-or {
padding: 5px 0 0 $grid-gutter-width / 2;
padding: 5px 0 0 calc($grid-gutter-width / 2);
}
.create-plan-checkbox {
margin-left: -40px;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/blocks/_org_links.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// TODO: Refactor this. Instead of writing specific CSS rules for particular objects,
// we should provide utility classes which can provide the desired style to this object
.remove-org-link i {
margin-left: $grid-gutter-width / -2;
margin-left: calc($grid-gutter-width / 2);
margin-top: $grid-gutter-width;
}
4 changes: 2 additions & 2 deletions app/assets/stylesheets/blocks/_panels.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

.panel-title a {
display: block;
padding: 8px $grid-gutter-width / 2;
margin: -10px $grid-gutter-width / -2;
padding: 8px calc($grid-gutter-width / 2);
margin: -10px calc($grid-gutter-width / -2);
background-color: $color-primary-background;
color: $color-primary-text;
}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/blocks/_profile_form.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// we should provide utility classes which can provide the desired style to this object
.org-logo-controls {
display: inline-block;
margin-left: $grid-gutter-width / 2;
margin-left: calc($grid-gutter-width / 2);
input { display: inline-block; }
strong { margin: 0 10px; }
}
4 changes: 2 additions & 2 deletions app/assets/stylesheets/blocks/_tables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ thead th.table-scope {

a {
color: $color-secondary-text;
padding: 2px ($grid-gutter-width / 2) 2px 2px;
padding: 2px calc($grid-gutter-width / 2) 2px 2px;
}
}

Expand All @@ -35,7 +35,7 @@ th.download-column {
/* Fix issues with dropdwon within tables being cut off */
.table-responsive > .table {
width: 100%;
margin-bottom: $grid-gutter-width / 2;
margin-bottom: calc($grid-gutter-width / 2);
overflow: auto;
}

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/blocks/_template_filters.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
@use "../../../../node_modules/bootstrap-sass/assets/stylesheets/_bootstrap.scss" as *;
.template-table-filters .navbar-nav > li > a {
color: $color-secondary-text;
padding: 5px ($grid-gutter-width / 2) 5px 5px;
padding: 5px calc($grid-gutter-width / 2) 5px 5px;
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/vendor/bootstrap-select/sass/bootstrap-select.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

@function fade($color, $amnt) {
@if $amnt > 1 {
$amnt: $amnt / 100; // convert to percentage if int
$amnt: calc($amnt / 100); // convert to percentage if int
}
@return rgba($color, $amnt);
}
Expand Down
8 changes: 4 additions & 4 deletions babel.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,19 @@ module.exports = function(api) {
isTestEnv && 'babel-plugin-dynamic-import-node',
'@babel/plugin-transform-destructuring',
[
'@babel/plugin-proposal-class-properties',
'@babel/plugin-transform-class-properties',
{
loose: true
}
],
[
'@babel/plugin-proposal-private-property-in-object',
'@babel/plugin-transform-private-property-in-object',
{
loose: true
}
],
[
'@babel/plugin-proposal-object-rest-spread',
'@babel/plugin-transform-object-rest-spread',
{
useBuiltIns: true
}
Expand All @@ -74,7 +74,7 @@ module.exports = function(api) {
}
],
[
'@babel/plugin-proposal-private-methods',
'@babel/plugin-transform-private-methods',
{
loose: true
}
Expand Down
76 changes: 35 additions & 41 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,53 +30,47 @@
},
"homepage": "https://github.com/DMPRoadmap/roadmap#readme",
"dependencies": {
"@babel/core": "^7.20.12",
"@babel/plugin-transform-runtime": "^7.19.6",
"@babel/preset-env": "7.21.5",
"@babel/preset-react": "^7.22.5",
"@fortawesome/fontawesome-free": "^5.15.4",
"@hotwired/stimulus": "^3.2.1",
"@hotwired/turbo-rails": "^7.1.3",
"@rails/actioncable": "^6.0.3-1",
"@rails/activestorage": "^6.0.3-1",
"@rails/ujs": "^6.0.3-1",
"babel-loader": "^9.1.2",
"@fortawesome/fontawesome-free": "^6.5.2",
"@hotwired/stimulus": "^3.2.2",
"@hotwired/turbo-rails": "^8.0.4",
"@rails/actioncable": "6.0",
"@rails/activestorage": "6.0",
"@rails/ujs": "6.0",
"babel-loader": "^9.1.3",
"babel-plugin-macros": "^3.1.0",
"bootstrap": "^3.4.1",
"bootstrap": "3.4.1",
"bootstrap-3-typeahead": "^4.0.2",
"bootstrap-sass": "3.4.1",
"bootstrap-sass": "^3.4.3",
"bootstrap-select": "^1.13.18",
"chart.js": "^3.8.0",
"core-js": "^3.6.5",
"hogan.js": "^3.0.2",
"jquery": "^3.5.1",
"jquery-ui": "^1.12.1",
"chart.js": "^4.4.3",
"core-js": "^3.37.1",
"css-loader": "^7.1.2",
"jquery": "^3.7.1",
"jquery-ui": "^1.13.3",
"jquery-ui-sass": "^0.0.1",
"js-cookie": "^3.0.1",
"moment": "^2.29.4",
"number-to-text": "^0.3.8",
"popper.js": "^1.16.1",
"puppeteer": "^19.1.2",
"rails-erb-loader": "^5.5.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.12.1",
"react-scripts": "^5.0.1",
"regenerator-runtime": "^0.13.5",
"sass": "^1.57.1",
"js-cookie": "^3.0.5",
"moment": "^2.30.1",
"number-to-text": "^0.3.9",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.23.1",
"style-loader": "^4.0.0",
"timeago.js": "^4.0.2",
"tinymce": "^6.4.1",
"web-vitals": "^3.3.2",
"webpack": "^5.90.3",
"webpack-cli": "^5.0.1"
"tinymce": "^7.1.2",
"web-vitals": "^4.1.1",
"webpack": "^5.92.0",
"webpack-cli": "^5.1.4"
},
"devDependencies": {
"eslint": "^8.18.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.26.0",
"eslint-webpack-plugin": "^2.6.0"
},
"resolutions": {
"webpack": "^5.75.0"
"@babel/core": "^7.24.7",
"@babel/plugin-transform-class-properties": "^7.24.7",
"@babel/plugin-transform-object-rest-spread": "^7.24.7",
"@babel/plugin-transform-private-methods": "^7.24.7",
"@babel/plugin-transform-private-property-in-object": "^7.24.7",
"@babel/plugin-transform-runtime": "^7.24.7",
"@babel/preset-env": "^7.24.7",
"@babel/preset-react": "^7.24.7",
"sass": "^1.77.5",
"sass-loader": "^14.2.1"
}
}
2 changes: 1 addition & 1 deletion public/tinymce/skins/oxide/content.inline.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/tinymce/skins/oxide/content.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/tinymce/skins/oxide/skin.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 4da30ad

Please sign in to comment.