Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SRCH-3876: Remove therubyracer. Use cssbuilding-rails gem and less node package instead #1261

Merged
merged 15 commits into from
Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,6 @@ mkmf.log
yarn-debug.log*
.yarn-integrity
/node_modules/.yarn-integrity

/app/assets/builds/*
!/app/assets/builds/.keep
9 changes: 2 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,10 @@ gem 'net-http'
# Assets-related gems
gem 'coffee-rails', '~> 5.0.0'
gem 'uglifier', '~> 4.2.0'
gem 'less-rails-bootstrap', git: 'https://github.com/GSA/less-rails-bootstrap.git',
stevenbarragan marked this conversation as resolved.
Show resolved Hide resolved
branch: 'master'
gem 'compass-rails', '~> 4.0.0'
gem 'compass-blueprint', '~> 1.0.0'
gem 'jquery-ui-rails', '~> 6.0.1'
gem 'jquery-rails', '~> 4.4.0'
gem 'therubyracer', '~> 0.12.3'
gem 'yui-compressor', '~> 0.12.0'
gem 'twitter-typeahead-rails', '~> 0.11.1'
# Why do we have two versions of Font Awesome?
Expand All @@ -142,14 +139,12 @@ gem 'font-awesome-rails', '~> 4.7.0'
gem 'font-awesome-grunticon-rails',
git: 'https://github.com/gsa/font-awesome-grunticon-rails',
ref: '8ad9734a65f7e2d2de934bebe4ee7b460734f96e'
# execjs 2.8 removed support for therubyracer:
# https://github.com/rails/execjs/releases/tag/v2.8.0
# Locking the version to 2.7.x until we remove or replace therubyracer
gem 'execjs', '~> 2.7.0'
gem 'react-rails', '~> 2.7.0'
# Locking to prevent a version mismatch between the gem and the NPM package version
# See https://github.com/shakacode/shakapacker#upgrading
gem 'shakapacker', '6.5.4'
gem 'cssbundling-rails', '~> 1.2' # Management of css (Less) files conversion

# Temporarily locking the 'mail' version until the next version of Rails is released
# https://github.com/rails/rails/pull/46650
gem 'mail', '~> 2.7.1'
Expand Down
26 changes: 3 additions & 23 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@ GIT
faraday
multi_json

GIT
remote: https://github.com/GSA/less-rails-bootstrap.git
revision: 594b4c0e4d7f458a71709f4fbe6bc94a913792eb
branch: master
specs:
less-rails-bootstrap (3.3.5.0)
less-rails (>= 3.0)

GIT
remote: https://github.com/GSA/resque-priority.git
revision: bc5dca990d6370ad7eaa01d0b986c90f541a4d18
Expand Down Expand Up @@ -248,7 +240,6 @@ GEM
execjs
coffee-script-source (1.12.2)
colorize (0.8.1)
commonjs (0.2.7)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
Expand Down Expand Up @@ -276,6 +267,8 @@ GEM
crack (0.4.5)
rexml
crass (1.0.6)
cssbundling-rails (1.2.0)
railties (>= 6.0.0)
cucumber (7.1.0)
builder (~> 3.2, >= 3.2.4)
cucumber-core (~> 10.1, >= 10.1.0)
Expand Down Expand Up @@ -468,13 +461,6 @@ GEM
terrapin (~> 0.6.0)
launchy (2.5.2)
addressable (~> 2.8)
less (2.6.0)
commonjs (~> 0.2.7)
less-rails (5.0.0)
actionpack (>= 5.0)
less (~> 2.6.0)
sprockets (~> 3.0)
libv8 (3.16.14.19)
llhttp-ffi (0.4.0)
ffi-compiler (~> 1.0)
rake (~> 13.0)
Expand Down Expand Up @@ -628,7 +614,6 @@ GEM
redis (>= 4, < 6)
redlock (1.3.2)
redis (>= 3.0.0, < 6.0)
ref (2.0.0)
regexp_parser (2.8.0)
reline (0.3.4)
io-console (~> 0.5)
Expand Down Expand Up @@ -784,9 +769,6 @@ GEM
unicode-display_width (>= 1.1.1, < 3)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (1.2.2)
thread_safe (0.3.6)
tilt (2.1.0)
Expand Down Expand Up @@ -871,6 +853,7 @@ DEPENDENCIES
compass-blueprint (~> 1.0.0)
compass-rails (~> 4.0.0)
counter_culture (~> 2.9.0)
cssbundling-rails (~> 1.2)
cucumber (~> 7.1)
cucumber-rails (~> 2.4)
curb (~> 1.0.1)
Expand All @@ -882,7 +865,6 @@ DEPENDENCIES
elasticsearch-xpack (~> 7.4.0)
email_spec (~> 2.2)
exception_notification (~> 4.5)
execjs (~> 2.7.0)
faker (~> 1.8)
faraday_middleware (~> 0.14.0)
federal_register (~> 0.6.3)
Expand All @@ -906,7 +888,6 @@ DEPENDENCIES
jquery-ui-rails (~> 6.0.1)
kt-paperclip (~> 7.1.0)
launchy (~> 2.5)
less-rails-bootstrap!
loofah (~> 2.19.1)
mail (~> 2.7.1)
medusa!
Expand Down Expand Up @@ -959,7 +940,6 @@ DEPENDENCIES
shoulda-kept-assign-to (~> 1.1)
shoulda-matchers (~> 5.0)
simplecov (~> 0.17.0)
therubyracer (~> 0.12.3)
truncator (~> 0.1.7)
turbolinks (~> 5.2.1)
twitter-typeahead-rails (~> 0.11.1)
Expand Down
2 changes: 2 additions & 0 deletions Procfile.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
web: unset PORT && bin/rails server
css: yarn run watch
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ To run test searches, you will need a working Bing API key. You can request one
bing_v7:
web_subscription_id: *****
```
2. Start your local rails server:
2. Start your local development environment:
lorawoodford marked this conversation as resolved.
Show resolved Hide resolved
```
rails server
bin/dev
stevenbarragan marked this conversation as resolved.
Show resolved Hide resolved
```
3. Test searches should return results:

Expand Down Expand Up @@ -303,3 +303,10 @@ Example:

### Additional developer resources
* [Local i14y setup](https://github.com/GSA/search-gov/wiki/Setting-up-i14y-with-usasearch-for-development)

## Production

Precompile assets
```
bin/rails assets:precompile
```
Empty file added app/assets/builds/.keep
Empty file.
4 changes: 0 additions & 4 deletions app/assets/stylesheets/application.css

This file was deleted.

1 change: 1 addition & 0 deletions app/assets/stylesheets/application.less
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "application/index";
8 changes: 5 additions & 3 deletions app/assets/stylesheets/application_ie_lte9.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/*
*= require shared/_ie_lte9
*/
/* csslint important:false */

.placeholder {
color: #aaa !important;
}
1 change: 1 addition & 0 deletions app/assets/stylesheets/searches.less
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "searches/index";
24 changes: 0 additions & 24 deletions app/assets/stylesheets/searches/ie.css.less

This file was deleted.

5 changes: 0 additions & 5 deletions app/assets/stylesheets/searches/ie_lt9.css.less

This file was deleted.

5 changes: 0 additions & 5 deletions app/assets/stylesheets/searches/index.less
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
/*
*= depend_on searches/custom_bootstrap/_variables.less
*= depend_on searches/custom_bootstrap/_mixins.less
*/

@import "searches/custom_bootstrap/_custom_bootstrap.less";
@import "searches/_collapsible.less";
@import "searches/_searches.less";
Expand Down
3 changes: 0 additions & 3 deletions app/assets/stylesheets/searches_mobile.css

This file was deleted.

25 changes: 22 additions & 3 deletions app/assets/stylesheets/searches_mobile_ie.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
*= require searches/ie
*/
/* csslint ids:false, important:false, outline-none:false */

#search-bar #search-button {
font: 0/0 a;
}

a:focus {
outline: 3px solid #EDB864 !important;
}

#search .pagination a, #search .pagination span {
border: 2px solid transparent;
outline: 0;
}

#search .pagination a:focus, #search .pagination span:focus {
border-color: #EDB864;
}

.icon {
margin-top: -1px;
}
8 changes: 5 additions & 3 deletions app/assets/stylesheets/searches_mobile_ie_lt9.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/*
*= require searches/ie_lt9
*/
@media (min-width: 768px) {
.show-menu .menu {
right: -200px;
}
}
3 changes: 0 additions & 3 deletions app/assets/stylesheets/shared/_ie_lte9.less

This file was deleted.

2 changes: 1 addition & 1 deletion app/assets/stylesheets/sites.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
*= require sites/index
*= require sites_base
*= require select2
*= require bootstrap-switch/bootstrap-switch
*= require font-awesome-grunticon-rails-fa-generic
Expand Down
16 changes: 0 additions & 16 deletions app/assets/stylesheets/sites/ie.css.less

This file was deleted.

24 changes: 0 additions & 24 deletions app/assets/stylesheets/sites/ie7.css.less

This file was deleted.

18 changes: 0 additions & 18 deletions app/assets/stylesheets/sites/ie_lt9.css.less

This file was deleted.

3 changes: 0 additions & 3 deletions app/assets/stylesheets/sites/index.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/*
*= depend_on sites/_variables
*/
@import 'sites/_bootstrap.less';

@import 'sites/modules/_layouts.less';
Expand Down
22 changes: 21 additions & 1 deletion app/assets/stylesheets/sites/modules/_layouts.less
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,27 @@ body {
}

.l-row {
#grid > .fluid > .row-fluid();
width: 100%;

.clearfix();

[class*="span"] {
.input-block-level();
float: left;
margin-left: @fluidGridGutterWidth;
*margin-left: @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%);
}

[class*="span"]:first-child {
margin-left: 0;
}

.controls-row [class*="span"] + [class*="span"] {
margin-left: @fluidGridGutterWidth;
}

.spanX (@gridColumns);
.offsetX (@gridColumns);
}

.l-container {
Expand Down
1 change: 1 addition & 0 deletions app/assets/stylesheets/sites_base.less
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "sites/index";
17 changes: 14 additions & 3 deletions app/assets/stylesheets/sites_ie.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
/*
*= require sites/ie
*/
.fa {
stevenbarragan marked this conversation as resolved.
Show resolved Hide resolved
display: inline-block;
}

.fa-calendar-black {
background-clip: padding-box;
padding: 2px;
}

.fa-reorder-black {
background-clip: padding-box;
padding: 3px;
vertical-align: middle;
}
Loading