diff --git a/.editorconfig b/.editorconfig index cee1c5def2b..76548b65884 100644 --- a/.editorconfig +++ b/.editorconfig @@ -15,7 +15,7 @@ tab_width = 2 [**.rb] max_line_length = 80 -[**.js, **.coffee] +[**.js] max_line_length = 120 [*.md] diff --git a/backend/README.md b/backend/README.md index 4d603dba448..7a06e204467 100644 --- a/backend/README.md +++ b/backend/README.md @@ -8,12 +8,7 @@ Backend contains the controllers, views, and assets making up the admin interfac Can be found in [app/assets/javascripts/spree/backend/](./app/assets/javascripts/spree/backend/) -Our scripts are written in a mix of CoffeeScript and JavaScript (ES5). We can't -easily use a transpiler for ECMAScript >= 6 without adding additional steps for -applications using solidus\_admin. - -Though we have existing CoffeeScript files, any new files should be in -JavaScript (ES5). +Any new files should be in JavaScript (ES5). ### Stylesheets diff --git a/backend/lib/spree/backend.rb b/backend/lib/spree/backend.rb index 6c63a1e36be..39e37c8d470 100644 --- a/backend/lib/spree/backend.rb +++ b/backend/lib/spree/backend.rb @@ -4,7 +4,6 @@ require 'spree_api' require 'jquery-rails' -require 'coffee-rails' require 'sassc-rails' require 'handlebars_assets' require 'font-awesome-rails' diff --git a/backend/solidus_backend.gemspec b/backend/solidus_backend.gemspec index c2a4e759300..663e07ee373 100644 --- a/backend/solidus_backend.gemspec +++ b/backend/solidus_backend.gemspec @@ -26,7 +26,6 @@ Gem::Specification.new do |s| s.add_dependency 'solidus_api', s.version s.add_dependency 'solidus_core', s.version - s.add_dependency 'coffee-rails' s.add_dependency 'font-awesome-rails', '~> 4.0' s.add_dependency 'jbuilder', '~> 2.8' s.add_dependency 'jquery-rails' diff --git a/backend/spec/teaspoon_env.rb b/backend/spec/teaspoon_env.rb index dbf2fe8debe..144cc79a4f1 100644 --- a/backend/spec/teaspoon_env.rb +++ b/backend/spec/teaspoon_env.rb @@ -31,7 +31,7 @@ config.suite do |suite| suite.use_framework :mocha, "2.3.3" - suite.matcher = "{spec/javascripts,app/assets}/**/*_spec.{js,js.coffee,coffee}" + suite.matcher = "{spec/javascripts,app/assets}/**/*_spec.js" suite.helper = "spec_helper" suite.boot_partial = "/boot" suite.expand_assets = true diff --git a/core/lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/backend/all.js b/core/lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/backend/all.js index 510cc284d3a..b47a1c3f440 100644 --- a/core/lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/backend/all.js +++ b/core/lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/backend/all.js @@ -1,5 +1,5 @@ // This is a manifest file that'll be compiled into including all the files listed below. -// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically +// Add new JavaScript code in separate files in this directory and they'll automatically // be included in the compiled file accessible from http://example.com/assets/application.js // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the // the compiled file. diff --git a/core/lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/frontend/all.js b/core/lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/frontend/all.js index 2a1561e912d..a25f9776615 100644 --- a/core/lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/frontend/all.js +++ b/core/lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/frontend/all.js @@ -1,5 +1,5 @@ // This is a manifest file that'll be compiled into including all the files listed below. -// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically +// Add new JavaScript code in separate files in this directory and they'll automatically // be included in the compiled file accessible from http://example.com/assets/application.js // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the // the compiled file. diff --git a/core/lib/spree/testing_support/dummy_app/assets/javascripts/spree/backend/all.js b/core/lib/spree/testing_support/dummy_app/assets/javascripts/spree/backend/all.js index c6e415bf47a..d30a4a22c7e 100644 --- a/core/lib/spree/testing_support/dummy_app/assets/javascripts/spree/backend/all.js +++ b/core/lib/spree/testing_support/dummy_app/assets/javascripts/spree/backend/all.js @@ -1,5 +1,5 @@ // This is a manifest file that'll be compiled into including all the files listed below. -// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically +// Add new JavaScript code in separate files in this directory and they'll automatically // be included in the compiled file accessible from http://example.com/assets/application.js // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the // the compiled file. diff --git a/core/lib/spree/testing_support/dummy_app/assets/javascripts/spree/frontend/all.js b/core/lib/spree/testing_support/dummy_app/assets/javascripts/spree/frontend/all.js index abb7d1f5403..018996d5077 100644 --- a/core/lib/spree/testing_support/dummy_app/assets/javascripts/spree/frontend/all.js +++ b/core/lib/spree/testing_support/dummy_app/assets/javascripts/spree/frontend/all.js @@ -1,5 +1,5 @@ // This is a manifest file that'll be compiled into including all the files listed below. -// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically +// Add new JavaScript code in separate files in this directory and they'll automatically // be included in the compiled file accessible from http://example.com/assets/application.js // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the // the compiled file.