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

Fix #3111: Convert CoffeeScript to JavaScript #3168

Merged
merged 12 commits into from Jul 14, 2019

Conversation

mroderick
Copy link
Contributor

This PR is a solution for #3111, it does a few things:

Customisations in custom/ui.coffee in userland will have to be converted to ``custom/ui.js` by users.

# something like this to convert customisations
npm install -g coffeescript@1.12.2
coffee --compile app/assets/javascripts/rails_admin/custom/ui.coffee`

Using decaffeinate was not possible, as the converted files would cause the rails_admin tests to fail (most likely due to it outputting ES6, and the Capybara tests using PhantomJS, which barely supports ES5).

Using CoffeeScript 1.12.2
Remove unnecessary return statements and other CoffeeScript sillyness
Using CoffeeScript 1.12.2
Remove unnecessary return statements and other CoffeeScript sillyness
Remove unnecessary return statements and other CoffeeScript sillyness
Remove unnecessary return statements and other CoffeeScript sillyness
Remove unnecessary return statements and other CoffeeScript sillyness
@olleolleolle
Copy link
Contributor

The build failure in 1 build target is:

Coverage (90.02%) is below the expected minimum coverage (90.05%).
SimpleCov failed with exit 2/home/travis/.rvm/rubies/jruby-9.2.6.0/bin/jruby -I/home/travis/build/sferik/rails_admin/vendor/bundle/jruby/2.5.0/gems/rspec-core-3.8.2/lib:/home/travis/build/sferik/rails_admin/vendor/bundle/jruby/2.5.0/gems/rspec-support-3.8.2/lib /home/travis/build/sferik/rails_admin/vendor/bundle/jruby/2.5.0/gems/rspec-core-3.8.2/exe/rspec --pattern spec/**{,/*/**}/*_spec.rb failed
The command "bundle exec rake" exited with 2.

No other target fails.

@olleolleolle
Copy link
Contributor

When this has been merged, we can work on the CodeClimate issues presented – or do you want them to be handled in this same PR, @mshibuya ?

@mshibuya mshibuya added this to the 2.0.0 milestone Jul 13, 2019
@mshibuya mshibuya merged commit 876b364 into railsadminteam:master Jul 14, 2019
@mshibuya
Copy link
Member

We can work on the issues later, thanks for the PR!

@mroderick mroderick deleted the decaffeinate branch July 14, 2019 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants